Changes in / [4a87a3b:ebe26af]


Ignore:
Location:
src
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • src/app/app.pro

    r4a87a3b rebe26af  
    33TARGET = confclerk
    44DESTDIR = ../bin
    5 QT += sql xml network
     5QT += sql xml network widgets
    66CONFIG(maemo5) {
    77    QT += maemo5
  • src/gui/eventdialog.cpp

    r4a87a3b rebe26af  
    3939    QString info;
    4040    // title
    41     info.append(QString("<h1>%1</h1>\n").arg(Qt::escape(event.title())));
     41    info.append(QString("<h1>%1</h1>\n").arg(event.title().toHtmlEscaped()));
    4242
    4343    // persons
    4444    info += QString("<h2>%1</h2>\n").arg(tr("Persons"));
    4545    QStringList persons = event.persons();
    46     for (int i = 0; i != persons.size(); ++i) persons[i] = Qt::escape(persons[i]);
     46    for (int i = 0; i != persons.size(); ++i) persons[i] = persons[i].toHtmlEscaped();
    4747    info += QString("<p>%1</p>\n").arg(persons.join(", "));
    4848
     
    6464        if (url.isEmpty() || url == "http://") continue;
    6565        if (name.isEmpty()) name = url;
    66         info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(Qt::escape(url), Qt::escape(name));
     66        info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(url.toHtmlEscaped(), name.toHtmlEscaped());
    6767    }
    6868    info += QString("</ul>\n");
  • src/gui/gui.pro

    r4a87a3b rebe26af  
    66QT += sql \
    77    xml \
    8     network
     8    network \
     9    widgets
    910QMAKE_CLEAN += ../bin/libgui.a
    1011
     
    8788}
    8889
     90OTHER_FILES += \
     91    test.qml
     92
  • src/gui/mainwindow.h

    r4a87a3b rebe26af  
    2121#define MAINWINDOW_H
    2222
    23 #include <QtGui/QMainWindow>
     23#include <QtWidgets>
    2424
    2525#include "ui_mainwindow.h"
  • src/gui/searchhead.h

    r4a87a3b rebe26af  
    2121#define SEARCHHEAD_H
    2222
    23 #include <QtGui/QWidget>
     23#include <QtWidgets>
    2424#include <QDebug>
    2525#include "ui_searchhead.h"
  • src/mvc/conferencemodel.h

    r4a87a3b rebe26af  
    5353    void reinit()
    5454    {
     55        beginResetModel();
    5556        conferences = Conference::getAll();
    56         reset();
     57        endResetModel();
    5758    }
    5859
  • src/mvc/delegate.cpp

    r4a87a3b rebe26af  
    215215                option.rect.y()+option.rect.height()-fmBig.descent());
    216216        painter->setFont(fontBig);
    217         painter->drawText(titlePointF,qVariantValue<QString>(index.data()));
     217        painter->drawText(titlePointF,index.data().value<QString>());
    218218    }
    219219
  • src/mvc/delegate.h

    r4a87a3b rebe26af  
    2121#define DELEGATE_H
    2222
    23 #include <QtGui>
     23#include <QtWidgets>
    2424
    2525class Delegate : public QItemDelegate
  • src/mvc/eventmodel.cpp

    r4a87a3b rebe26af  
    4545void EventModel::createTimeGroups()
    4646{
     47    beginResetModel();
     48
    4749    mGroups.clear();
    4850    mParents.clear();
     
    9193    mGroups.last().setTitle(mEvents);
    9294
    93     reset();
     95    endResetModel();
    9496}
    9597
     
    175177    if (!parent.isValid())
    176178    {
    177         return createIndex(row, column, 0);
     179        return createIndex(row, column, (quintptr) 0);
    178180    }
    179181    else if (parent.internalId() == 0)
     
    200202        Event * event = static_cast<Event*>(index.internalPointer());
    201203
    202         return createIndex(mParents[event->id()], 0, 0);
     204        return createIndex(mParents[event->id()], 0, (quintptr) 0);
    203205    }
    204206
     
    229231void EventModel::clearModel()
    230232{
     233    beginResetModel();
    231234    mGroups.clear();
    232235    mEvents.clear();
    233236    mParents.clear();
    234 
    235     reset();
     237    endResetModel();
    236238}
    237239
  • src/mvc/mvc.pro

    r4a87a3b rebe26af  
    44DESTDIR = ../bin
    55CONFIG += static
    6 QT += sql
     6QT += sql \
     7    widgets
    78QMAKE_CLEAN += ../bin/libmvc.a
    89
  • src/sql/sqlengine.cpp

    r4a87a3b rebe26af  
    2424#include <QVariant>
    2525#include <QDateTime>
     26#include <QStandardPaths>
    2627
    2728#include <QDir>
    28 #include <QDesktopServices>
    2929#include "sqlengine.h"
    3030#include "track.h"
     
    3737
    3838SqlEngine::SqlEngine(QObject *aParent): QObject(aParent) {
    39     QDir dbPath(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
     39    QDir dbPath(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
    4040    dbFilename = dbPath.absoluteFilePath("ConfClerk.sqlite");
    4141}
Note: See TracChangeset for help on using the changeset viewer.