Commit 892327ec authored by David Jarvie's avatar David Jarvie

Replace deprecated calls, QList -> QVector

parent 0cc5d330
Pipeline #34734 passed with stage
in 11 minutes and 13 seconds
......@@ -1046,7 +1046,7 @@ void MainWindow::initUndoMenu(QMenu* menu, Undo::Type type)
menu->clear();
mUndoMenuIds.clear();
const QString& action = (type == Undo::UNDO) ? undoTextStripped : redoTextStripped;
const QList<int> ids = Undo::ids(type);
const QVector<int> ids = Undo::ids(type);
for (const int id : ids)
{
const QString actText = Undo::actionText(type, id);
......
......@@ -137,11 +137,12 @@ void MessageNotification::sessionRestore()
* displayed.
*/
MessageNotification::MessageNotification(const KAEvent& event, const KAAlarm& alarm, int flags)
: KNotification(getNotifyEventId(event), MainWindow::mainMainWindow(), NFLAGS)
: KNotification(getNotifyEventId(event), NFLAGS)
, MessageDisplay(event, alarm, flags)
{
qCDebug(KALARM_LOG) << "MessageNotification():" << mEventId();
MNSessionManager::create();
setWidget(MainWindow::mainMainWindow());
if (!(flags & (NoInitView | AlwaysHide)))
MessageNotification::setUpDisplay(); // avoid calling virtual method from constructor
......@@ -162,11 +163,12 @@ MessageNotification::MessageNotification(const KAEvent& event, const KAAlarm& al
*/
MessageNotification::MessageNotification(const KAEvent& event, const DateTime& alarmDateTime,
const QStringList& errmsgs, const QString& dontShowAgain)
: KNotification(ErrorId, MainWindow::mainMainWindow(), NFLAGS)
: KNotification(ErrorId, NFLAGS)
, MessageDisplay(event, alarmDateTime, errmsgs, dontShowAgain)
{
qCDebug(KALARM_LOG) << "MessageNotification(errmsg)";
MNSessionManager::create();
setWidget(MainWindow::mainMainWindow());
MessageNotification::setUpDisplay(); // avoid calling virtual method from constructor
connect(this, QOverload<unsigned int>::of(&KNotification::activated), this, &MessageNotification::buttonActivated);
......@@ -182,11 +184,12 @@ MessageNotification::MessageNotification(const KAEvent& event, const DateTime& a
* Ownership of the helper is taken by the new instance.
*/
MessageNotification::MessageNotification(const QString& eventId, MessageDisplayHelper* helper)
: KNotification(eventId, MainWindow::mainMainWindow(), NFLAGS)
: KNotification(eventId, NFLAGS)
, MessageDisplay(helper)
{
qCDebug(KALARM_LOG) << "MessageNotification(helper):" << mEventId();
MNSessionManager::create();
setWidget(MainWindow::mainMainWindow());
connect(this, QOverload<unsigned int>::of(&KNotification::activated), this, &MessageNotification::buttonActivated);
connect(this, &KNotification::closed, this, &MessageNotification::slotClosed);
......
......@@ -494,9 +494,9 @@ QString Undo::description(Undo::Type type, int id)
* listed, to force dependent undos to be executed in their correct order.
* If 'ids' is non-null, also returns a list of their corresponding IDs.
*/
QList<int> Undo::ids(Undo::Type type)
QVector<int> Undo::ids(Undo::Type type)
{
QList<int> ids;
QVector<int> ids;
QStringList ignoreIDs;
//int n=0;
const List* const list = (type == UNDO) ? &mUndoList : (type == REDO) ? &mRedoList : nullptr;
......
......@@ -24,78 +24,78 @@ using namespace KAlarmCal;
class Undo : public QObject
{
Q_OBJECT
Q_OBJECT
public:
enum Type { NONE, UNDO, REDO };
// N.B. The Event structure must be constructed before the action for
// which the undo is being created is carried out, since the
// don't-show-errors status is not contained within the KAEvent itself.
struct Event
{
Event() {}
Event(const KAEvent&, const Resource&);
KAEvent event;
mutable Resource resource;
QStringList dontShowErrors;
};
class EventList : public QVector<Event>
{
public:
enum Type { NONE, UNDO, REDO };
// N.B. The Event structure must be constructed before the action for
// which the undo is being created is carried out, since the
// don't-show-errors status is not contained within the KAEvent itself.
struct Event
{
Event() {}
Event(const KAEvent&, const Resource&);
KAEvent event;
mutable Resource resource;
QStringList dontShowErrors;
};
class EventList : public QVector<Event>
{
public:
void append(const KAEvent& e, const Resource& res) { QVector<Event>::append(Event(e, res)); }
};
static Undo* instance();
static void saveAdd(const KAEvent&, const Resource&, const QString& name = QString());
static void saveAdds(const EventList&, const QString& name = QString());
static void saveEdit(const Event& oldEvent, const KAEvent& newEvent);
static void saveDelete(const Event&, const QString& name = QString());
static void saveDeletes(const EventList&, const QString& name = QString());
static void saveReactivate(const KAEvent&, const Resource&, const QString& name = QString());
static void saveReactivates(const EventList&, const QString& name = QString());
static bool undo(QWidget* parent, const QString& action)
{ return undo(0, UNDO, parent, action); }
static bool undo(int id, QWidget* parent, const QString& action)
{ return undo(findItem(id, UNDO), UNDO, parent, action); }
static bool redo(QWidget* parent, const QString& action)
{ return undo(0, REDO, parent, action); }
static bool redo(int id, QWidget* parent, const QString& action)
{ return undo(findItem(id, REDO), REDO, parent, action); }
static void clear();
static bool haveUndo() { return !mUndoList.isEmpty(); }
static bool haveRedo() { return !mRedoList.isEmpty(); }
static QString actionText(Type);
static QString actionText(Type, int id);
static QString description(Type, int id);
static QList<int> ids(Type);
static void emitChanged();
static void dumpDebug(Type, int count);
// Types for use by UndoItem class and its descendants
typedef AutoDeleteList<UndoItem> List;
Q_SIGNALS:
void changed(const QString& undo, const QString& redo);
protected:
// Methods for use by UndoItem class
static void add(UndoItem*, bool undo);
static void remove(UndoItem*, bool undo);
static void replace(UndoItem* old, UndoItem* New);
private:
Undo(QObject* parent) : QObject(parent) { }
static void removeRedos(const QString& eventID);
static bool undo(int index, Type, QWidget* parent, const QString& action);
static UndoItem* getItem(int id, Type);
static int findItem(int id, Type);
void emitChanged(const QString& undo, const QString& redo)
{ Q_EMIT changed(undo, redo); }
static Undo* mInstance; // the one and only Undo instance
static List mUndoList; // edit history for undo, latest undo first
static List mRedoList; // edit history for redo, latest redo first
friend class UndoItem;
void append(const KAEvent& e, const Resource& res) { QVector<Event>::append(Event(e, res)); }
};
static Undo* instance();
static void saveAdd(const KAEvent&, const Resource&, const QString& name = QString());
static void saveAdds(const EventList&, const QString& name = QString());
static void saveEdit(const Event& oldEvent, const KAEvent& newEvent);
static void saveDelete(const Event&, const QString& name = QString());
static void saveDeletes(const EventList&, const QString& name = QString());
static void saveReactivate(const KAEvent&, const Resource&, const QString& name = QString());
static void saveReactivates(const EventList&, const QString& name = QString());
static bool undo(QWidget* parent, const QString& action)
{ return undo(0, UNDO, parent, action); }
static bool undo(int id, QWidget* parent, const QString& action)
{ return undo(findItem(id, UNDO), UNDO, parent, action); }
static bool redo(QWidget* parent, const QString& action)
{ return undo(0, REDO, parent, action); }
static bool redo(int id, QWidget* parent, const QString& action)
{ return undo(findItem(id, REDO), REDO, parent, action); }
static void clear();
static bool haveUndo() { return !mUndoList.isEmpty(); }
static bool haveRedo() { return !mRedoList.isEmpty(); }
static QString actionText(Type);
static QString actionText(Type, int id);
static QString description(Type, int id);
static QVector<int> ids(Type);
static void emitChanged();
static void dumpDebug(Type, int count);
// Types for use by UndoItem class and its descendants
typedef AutoDeleteList<UndoItem> List;
Q_SIGNALS:
void changed(const QString& undo, const QString& redo);
protected:
// Methods for use by UndoItem class
static void add(UndoItem*, bool undo);
static void remove(UndoItem*, bool undo);
static void replace(UndoItem* old, UndoItem* New);
private:
Undo(QObject* parent) : QObject(parent) { }
static void removeRedos(const QString& eventID);
static bool undo(int index, Type, QWidget* parent, const QString& action);
static UndoItem* getItem(int id, Type);
static int findItem(int id, Type);
void emitChanged(const QString& undo, const QString& redo)
{ Q_EMIT changed(undo, redo); }
static Undo* mInstance; // the one and only Undo instance
static List mUndoList; // edit history for undo, latest undo first
static List mRedoList; // edit history for redo, latest redo first
friend class UndoItem;
};
#endif // UNDO_H
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment