[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmuddy] /: More porting and getting it all to compile
From: Tomas Mecir <null () kde ! org>
Date: 2018-03-31 19:47:16
Message-ID: E1f2MT6-0001ET-3r () code ! kde ! org
[Download RAW message or body]
Git commit a0fa36f87705798b52a6d5070cb4d8a9b882646a by Tomas Mecir.
Committed on 31/03/2018 at 19:46.
Pushed by mecir into branch 'master'.
More porting and getting it all to compile
M +0 -1 kmuddy/cbutton.cpp
M +0 -1 kmuddy/cbuttoneditor.cpp
M +3 -3 kmuddy/cbuttoneditor.h
M +4 -4 kmuddy/cbuttonlist.h
M +4 -3 kmuddy/cconnection.cpp
M +4 -5 kmuddy/cconnection.h
M +0 -1 kmuddy/cgaugebar.cpp
M +0 -2 kmuddy/cgaugebaritem.cpp
M +0 -1 kmuddy/cgaugeeditor.cpp
M +3 -3 kmuddy/cgaugeeditor.h
M +4 -4 kmuddy/cgaugelist.h
M +11 -13 kmuddy/cmultiinputline.cpp
M +5 -5 kmuddy/cmultiinputline.h
M +0 -1 kmuddy/cmultilineinput.cpp
M +1 -1 kmuddy/cmultilineinput.h
M +0 -2 kmuddy/cmxpconsole.cpp
M +0 -1 kmuddy/cmxpmanager.cpp
M +3 -3 kmuddy/cmxpmanager.h
M +0 -2 kmuddy/cscriptapi.cpp
M +4 -4 kmuddy/csession.cpp
M +3 -4 kmuddy/csession.h
M +1 -1 kmuddy/csessionmanager.h
M +3 -3 kmuddy/cshortcut.h
M +0 -1 kmuddy/cshortcuteditor.cpp
M +3 -3 kmuddy/cshortcuteditor.h
M +3 -3 kmuddy/cshortcutlist.h
M +0 -1 kmuddy/cstatusvareditor.cpp
M +3 -3 kmuddy/cstatusvareditor.h
M +4 -4 kmuddy/cstatusvarlist.h
M +0 -1 kmuddy/ctelnet.cpp
M +3 -2 kmuddy/ctelnet.h
M +0 -1 kmuddy/ctextprocessor.cpp
M +2 -3 kmuddy/ctextprocessor.h
M +3 -3 kmuddy/ctimer.h
M +0 -1 kmuddy/ctimereditor.cpp
M +3 -3 kmuddy/ctimereditor.h
M +0 -1 kmuddy/ctimerlist.cpp
M +4 -4 kmuddy/ctimerlist.h
M +84 -102 kmuddy/ctranscript.cpp
M +5 -6 kmuddy/ctranscript.h
M +0 -1 kmuddy/ctriggereditor.cpp
M +3 -3 kmuddy/ctriggereditor.h
M +3 -3 kmuddy/ctriggerlist.h
M +1 -1 kmuddy/cwindowlist.h
M +8 -2 kmuddy/dialogs/dlgmudlist.cpp
M +20 -15 kmuddy/dialogs/dlgobjects.cpp
M +2 -2 kmuddy/dialogs/dlgobjects.h
M +1 -1 kmuddy/dialogs/dlgstatistics.h
M +99 -99 kmuddy/kmuddy.cpp
M +12 -12 kmuddy/kmuddy.h
M +1 -1 libs/cconsole.cpp
M +2 -1 libs/cconsole.h
M +3 -3 libs/clistgroupeditor.h
M +2 -2 libs/clistviewer.h
M +16 -16 libs/cmenumanager.cpp
M +6 -6 libs/cmenumanager.h
M +4 -4 libs/cpluginmanager.h
M +2 -2 libs/cprompt.h
https://commits.kde.org/kmuddy/a0fa36f87705798b52a6d5070cb4d8a9b882646a
diff --git a/kmuddy/cbutton.cpp b/kmuddy/cbutton.cpp
index e0ac382..58a3422 100644
--- a/kmuddy/cbutton.cpp
+++ b/kmuddy/cbutton.cpp
@@ -130,4 +130,3 @@ void cButton::objectDisabled ()
((cButtonList *) list())->updateButtons();
}
-#include "cbutton.moc"
diff --git a/kmuddy/cbuttoneditor.cpp b/kmuddy/cbuttoneditor.cpp
index 1a08dfe..37ff55e 100644
--- a/kmuddy/cbuttoneditor.cpp
+++ b/kmuddy/cbuttoneditor.cpp
@@ -157,4 +157,3 @@ void cButtonEditor::getDataFromGUI (cListObjectData *data)
data->strValues["script-release"] = d->scriptrel->text();
}
-#include "cbuttoneditor.moc"
diff --git a/kmuddy/cbuttoneditor.h b/kmuddy/cbuttoneditor.h
index 6488263..585a7c6 100644
--- a/kmuddy/cbuttoneditor.h
+++ b/kmuddy/cbuttoneditor.h
@@ -32,9 +32,9 @@ class cButtonEditor : public cListEditor {
cButtonEditor (QWidget *parent);
~cButtonEditor ();
- virtual void createGUI(QWidget *parent);
- virtual void fillGUI (const cListObjectData &data);
- virtual void getDataFromGUI (cListObjectData *data);
+ virtual void createGUI(QWidget *parent) override;
+ virtual void fillGUI (const cListObjectData &data) override;
+ virtual void getDataFromGUI (cListObjectData *data) override;
protected:
struct Private;
Private *d;
diff --git a/kmuddy/cbuttonlist.h b/kmuddy/cbuttonlist.h
index 7e7f24c..b8152c8 100644
--- a/kmuddy/cbuttonlist.h
+++ b/kmuddy/cbuttonlist.h
@@ -41,16 +41,16 @@ public:
~cButtonList ();
static cList *newList () { return new cButtonList; };
- virtual cListObject *newObject ();
- virtual QString objName () { return "Button"; }
- virtual cListEditor *editor (QWidget *parent);
+ virtual cListObject *newObject () override;
+ virtual QString objName () override { return "Button"; }
+ virtual cListEditor *editor (QWidget *parent) override;
void updateButtons ();
private:
bool loaded;
friend class cButton;
- virtual void listLoaded ();
+ virtual void listLoaded () override;
};
#endif //CBUTTONLIST_H
diff --git a/kmuddy/cconnection.cpp b/kmuddy/cconnection.cpp
index 5d97f70..4ce4793 100644
--- a/kmuddy/cconnection.cpp
+++ b/kmuddy/cconnection.cpp
@@ -24,8 +24,10 @@
#include <klocale.h>
#include <kapplication.h>
#include <kstandarddirs.h>
-#include <qdatetime.h>
-#include <qtimer.h>
+
+#include <QDateTime>
+#include <QPushButton>
+#include <QTimer>
#include "kmuddy.h"
#include "ccmdprocessor.h"
@@ -838,4 +840,3 @@ void cConnection::save ()
d->windowlist->save();
}
-#include "cconnection.moc"
diff --git a/kmuddy/cconnection.h b/kmuddy/cconnection.h
index 97ba8de..5d2dbeb 100644
--- a/kmuddy/cconnection.h
+++ b/kmuddy/cconnection.h
@@ -54,11 +54,10 @@ public:
void sendCommands ();
int sentCommands ();
- virtual void eventNothingHandler (QString event, int session);
- virtual void eventStringHandler (QString event, int session,
- QString &par1, const QString &);
- virtual QString actionStringHandler (QString action, int session, QString &par1, \
const QString &);
- virtual QString actionNothingHandler (QString action, int session);
+ virtual void eventNothingHandler (QString event, int session) override;
+ virtual void eventStringHandler (QString event, int session, QString &par1, const \
QString &) override; + virtual QString actionStringHandler (QString action, int \
session, QString &par1, const QString &) override; + virtual QString \
actionNothingHandler (QString action, int session) override;
public slots:
void showConnPrefsDialog ();
diff --git a/kmuddy/cgaugebar.cpp b/kmuddy/cgaugebar.cpp
index 9675e2e..c7e2342 100644
--- a/kmuddy/cgaugebar.cpp
+++ b/kmuddy/cgaugebar.cpp
@@ -62,4 +62,3 @@ void cGaugeBar::removeGauge (cGauge *g)
update ();
}
-#include "cgaugebar.moc"
diff --git a/kmuddy/cgaugebaritem.cpp b/kmuddy/cgaugebaritem.cpp
index 78188db..18721d7 100644
--- a/kmuddy/cgaugebaritem.cpp
+++ b/kmuddy/cgaugebaritem.cpp
@@ -129,5 +129,3 @@ QSize cGaugeBarItemPrivate::sizeHint () const {
return QSize (102, 16);
}
-
-#include "cgaugebaritem.moc"
diff --git a/kmuddy/cgaugeeditor.cpp b/kmuddy/cgaugeeditor.cpp
index 697ea07..3e13f7c 100644
--- a/kmuddy/cgaugeeditor.cpp
+++ b/kmuddy/cgaugeeditor.cpp
@@ -125,4 +125,3 @@ void cGaugeEditor::getDataFromGUI (cListObjectData *data)
data->intValues["color"] = c.red() * 256 * 256 + c.green() * 256 + c.blue();
}
-#include "cgaugeeditor.moc"
diff --git a/kmuddy/cgaugeeditor.h b/kmuddy/cgaugeeditor.h
index 35d15fd..c563ab1 100644
--- a/kmuddy/cgaugeeditor.h
+++ b/kmuddy/cgaugeeditor.h
@@ -32,9 +32,9 @@ class cGaugeEditor : public cListEditor {
cGaugeEditor (QWidget *parent);
~cGaugeEditor ();
- virtual void createGUI(QWidget *parent);
- virtual void fillGUI (const cListObjectData &data);
- virtual void getDataFromGUI (cListObjectData *data);
+ virtual void createGUI(QWidget *parent) override;
+ virtual void fillGUI (const cListObjectData &data) override;
+ virtual void getDataFromGUI (cListObjectData *data) override;
protected:
struct Private;
Private *d;
diff --git a/kmuddy/cgaugelist.h b/kmuddy/cgaugelist.h
index 255e6ea..17f410b 100644
--- a/kmuddy/cgaugelist.h
+++ b/kmuddy/cgaugelist.h
@@ -42,9 +42,9 @@ public:
~cGaugeList ();
static cList *newList () { return new cGaugeList; };
- virtual cListObject *newObject ();
- virtual QString objName () { return "Gauge"; }
- virtual cListEditor *editor (QWidget *parent);
+ virtual cListObject *newObject () override;
+ virtual QString objName () override { return "Gauge"; }
+ virtual cListEditor *editor (QWidget *parent) override;
/** a gauge request, adds a new gauge, if there is no gauge already using the
same base variable */
@@ -60,7 +60,7 @@ public:
Private *d;
friend class cGauge;
- virtual void listLoaded ();
+ virtual void listLoaded () override;
void addGauge (cGauge *g);
void removeGauge (cGauge *g);
diff --git a/kmuddy/cmultiinputline.cpp b/kmuddy/cmultiinputline.cpp
index 7d6746e..6c912fb 100644
--- a/kmuddy/cmultiinputline.cpp
+++ b/kmuddy/cmultiinputline.cpp
@@ -26,21 +26,20 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>. #include "ccmdqueue.h"
#include "ccmdqueues.h"
-#include <kglobalsettings.h>
#include <QKeyEvent>
+#include <QFontDatabase>
//maximum number of lines ...
#define MAXLINES 10
cMultiInputLine::cMultiInputLine (int sess, QWidget *parent)
- : Q3TextEdit(parent), cActionBase ("multiinputline", sess)
+ : QTextEdit(parent), cActionBase ("multiinputline", sess)
{
setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
setTextFormat (Qt::PlainText);
- setWordWrap (Q3TextEdit::WidgetWidth);
- setWrapPolicy (Q3TextEdit::AtWordOrDocumentBoundary);
+ setWrapMode (QTextOption::WrapAtWordBoundaryOrAnywhere);
//height: 2 lines
setLinesHeight (2);
@@ -65,7 +64,7 @@ void cMultiInputLine::eventNothingHandler (QString event, int \
session) if (event == "global-settings-changed") {
cGlobalSettings *gs = cGlobalSettings::self();
- setFont (gs->getFont ("input-font"));
+ setMyFont (gs->getFont ("input-font"));
keepText (gs->getBool ("keep-text"));
selectKeptText (gs->getBool ("keep-text") ? gs->getBool ("select-kept") : \
false); swapEnters (gs->getBool ("swap-enters"));
@@ -87,16 +86,16 @@ void cMultiInputLine::initialize ()
setPalette (p);
//scroll-bars
- setHScrollBarMode (Q3ScrollView::AlwaysOff);
- setVScrollBarMode (Q3ScrollView::AlwaysOn);
+ setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
+ setVerticalScrollBarPolicy (Qt::ScrollBarAlwaysOn);
//change font
- setFont (KGlobalSettings::fixedFont ()); //default system fixed font
+ setMyFont (QFontDatabase::systemFont (QFontDatabase::FixedFont)); //default system \
fixed font }
-void cMultiInputLine::setFont (const QFont &font)
+void cMultiInputLine::setMyFont (const QFont &font)
{
- Q3TextEdit::setFont (font);
+ setCurrentFont (font);
setLinesHeight (_lines);
}
@@ -165,10 +164,9 @@ void cMultiInputLine::keyPressEvent (QKeyEvent *e)
sendCommands ();
else
//standard behaviour otherwise
- Q3TextEdit::keyPressEvent (e);
+ QTextEdit::keyPressEvent (e);
}
else
- Q3TextEdit::keyPressEvent (e);
+ QTextEdit::keyPressEvent (e);
}
-#include "cmultiinputline.moc"
diff --git a/kmuddy/cmultiinputline.h b/kmuddy/cmultiinputline.h
index c1915e1..38d6c05 100644
--- a/kmuddy/cmultiinputline.h
+++ b/kmuddy/cmultiinputline.h
@@ -23,7 +23,7 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>. #ifndef CMULTIINPUTLINE_H
#define CMULTIINPUTLINE_H
-#include <q3textedit.h>
+#include <QTextEdit>
#include "cactionbase.h"
@@ -32,7 +32,7 @@ The multi-line input line. It can hold several lines, and can \
automatically expa
@author Tomas Mecir
*/
-class cMultiInputLine : public Q3TextEdit, public cActionBase
+class cMultiInputLine : public QTextEdit, public cActionBase
{
Q_OBJECT
public:
@@ -54,7 +54,7 @@ public:
void setLinesHeight (int lines);
/** set the new font */
- virtual void setFont (const QFont &font);
+ void setMyFont (const QFont &font);
signals:
void commandEntered (const QString &command);
@@ -62,10 +62,10 @@ signals:
protected slots:
void updateHeight ();
protected:
- virtual void eventNothingHandler (QString event, int session);
+ virtual void eventNothingHandler (QString event, int session) override;
void sendCommands ();
- virtual void keyPressEvent (QKeyEvent *e);
+ virtual void keyPressEvent (QKeyEvent *e) override;
int _lines;
diff --git a/kmuddy/cmultilineinput.cpp b/kmuddy/cmultilineinput.cpp
index 31d6407..c0af2a9 100644
--- a/kmuddy/cmultilineinput.cpp
+++ b/kmuddy/cmultilineinput.cpp
@@ -91,4 +91,3 @@ void cMultiLineInput::setFont (QFont font)
if (multiline) multiline->setFont (font);
}
-#include "cmultilineinput.moc"
diff --git a/kmuddy/cmultilineinput.h b/kmuddy/cmultilineinput.h
index c714764..01c56dc 100644
--- a/kmuddy/cmultilineinput.h
+++ b/kmuddy/cmultilineinput.h
@@ -47,7 +47,7 @@ protected slots:
protected:
cMultiLineInput ();
void init ();
- virtual void eventNothingHandler (QString event, int session);
+ virtual void eventNothingHandler (QString event, int session) override;
dlgMultiLine *multiline;
static cMultiLineInput *_self;
diff --git a/kmuddy/cmxpconsole.cpp b/kmuddy/cmxpconsole.cpp
index e25ba3d..b9f5db2 100644
--- a/kmuddy/cmxpconsole.cpp
+++ b/kmuddy/cmxpconsole.cpp
@@ -93,5 +93,3 @@ void cMXPConsole::addWarning (int sess, const QString &text)
#endif //HAVE_MXP
}
-
-#include "cmxpconsole.moc"
diff --git a/kmuddy/cmxpmanager.cpp b/kmuddy/cmxpmanager.cpp
index 346e813..822958b 100644
--- a/kmuddy/cmxpmanager.cpp
+++ b/kmuddy/cmxpmanager.cpp
@@ -390,4 +390,3 @@ void cMXPManager::reset ()
#endif //HAVE_MXP
}
-#include "cmxpmanager.moc"
diff --git a/kmuddy/cmxpmanager.h b/kmuddy/cmxpmanager.h
index ea4aab4..b56a8ea 100644
--- a/kmuddy/cmxpmanager.h
+++ b/kmuddy/cmxpmanager.h
@@ -51,9 +51,9 @@ public:
~cMXPManager ();
#ifdef HAVE_MXP
- virtual void eventNothingHandler (QString event, int session);
- virtual QString actionIntHandler (QString action, int session, int par1, int par2 \
= 0);
- virtual QString actionNothingHandler (QString action, int session);
+ virtual void eventNothingHandler (QString event, int session) override;
+ virtual QString actionIntHandler (QString action, int session, int par1, int par2 \
= 0) override; + virtual QString actionNothingHandler (QString action, int session) \
override;
bool isMXPActive () { return mxpactive; };
void setMXPActive (bool active);
diff --git a/kmuddy/cscriptapi.cpp b/kmuddy/cscriptapi.cpp
index 9df31ca..b258edf 100644
--- a/kmuddy/cscriptapi.cpp
+++ b/kmuddy/cscriptapi.cpp
@@ -59,5 +59,3 @@ cVariableList *cScriptAPI::varList ()
return dynamic_cast<cVariableList *>(am->object ("variables", sess()));
}
-
-#include "cscriptapi.moc"
diff --git a/kmuddy/csession.cpp b/kmuddy/csession.cpp
index efd4fbe..d04394a 100644
--- a/kmuddy/csession.cpp
+++ b/kmuddy/csession.cpp
@@ -49,7 +49,8 @@
#include <kpushbutton.h>
#include <kstatusbar.h>
-#include <qtooltip.h>
+#include <QPushButton>
+#include <QToolTip>
cSession::cSession (int sess, QWidget *parent) :
KVBox (parent), cActionBase ("session", sess)
@@ -81,8 +82,8 @@ cSession::cSession (int sess, QWidget *parent) :
_multiinputline->hide ();
_multiinputline->setToolTip (i18n ("Ctrl+Enter adds new line, unless changed in \
settings"));
- KPushButton *switchlinebutton = new KPushButton (promptinput);
- switchlinebutton->setIcon (KIcon ("format-justify-center"));
+ QPushButton *switchlinebutton = new QPushButton (promptinput);
+ switchlinebutton->setIcon (QIcon::fromTheme ("format-justify-center"));
switchlinebutton->setToolTip (i18n ("Switches between standard and multi-line \
input line."));
//the button should take as few space as possible
@@ -208,4 +209,3 @@ void cSession::switchInputLines ()
}
}
-#include "csession.moc"
diff --git a/kmuddy/csession.h b/kmuddy/csession.h
index 1fec7ff..29ffa0e 100644
--- a/kmuddy/csession.h
+++ b/kmuddy/csession.h
@@ -66,10 +66,9 @@ public:
void setAuxInput (bool val);
- virtual QString actionNothingHandler (QString action, int session);
- virtual void eventNothingHandler (QString event, int session);
- virtual void eventStringHandler (QString event, int session,
- QString &par1, const QString &par2);
+ virtual QString actionNothingHandler (QString action, int session) override;
+ virtual void eventNothingHandler (QString event, int session) override;
+ virtual void eventStringHandler (QString event, int session, QString &par1, const \
QString &par2) override; protected slots:
/** switch between standard input and multi-line input */
void switchInputLines ();
diff --git a/kmuddy/csessionmanager.h b/kmuddy/csessionmanager.h
index bac390c..9030221 100644
--- a/kmuddy/csessionmanager.h
+++ b/kmuddy/csessionmanager.h
@@ -69,7 +69,7 @@ private:
/** constructor */
cSessionManager ();
- void eventNothingHandler (QString event, int session);
+ void eventNothingHandler (QString event, int session) override;
enum ProfileIcon {
IconOk, IconNo, IconFlag
diff --git a/kmuddy/cshortcut.h b/kmuddy/cshortcut.h
index 792ff95..6bdab47 100644
--- a/kmuddy/cshortcut.h
+++ b/kmuddy/cshortcut.h
@@ -29,13 +29,13 @@ class cShortcut : public cListObject {
public:
virtual ~cShortcut ();
- virtual void attribChanged (const QString &name);
+ virtual void attribChanged (const QString &name) override;
- virtual void updateVisibleName();
+ virtual void updateVisibleName() override;
#define SHORTCUT_MATCH 1
- virtual cList::TraverseAction traverse (int traversalType);
+ virtual cList::TraverseAction traverse (int traversalType) override;
static QString keyToString (int _key, int _state);
private:
diff --git a/kmuddy/cshortcuteditor.cpp b/kmuddy/cshortcuteditor.cpp
index f2c9a85..5536fcb 100644
--- a/kmuddy/cshortcuteditor.cpp
+++ b/kmuddy/cshortcuteditor.cpp
@@ -158,4 +158,3 @@ void cShortcutEditor::grabKey ()
d->cmd->setFocus ();
}
-#include "cshortcuteditor.moc"
diff --git a/kmuddy/cshortcuteditor.h b/kmuddy/cshortcuteditor.h
index cba20af..9f7b747 100644
--- a/kmuddy/cshortcuteditor.h
+++ b/kmuddy/cshortcuteditor.h
@@ -32,9 +32,9 @@ class cShortcutEditor : public cListEditor {
cShortcutEditor (QWidget *parent);
~cShortcutEditor ();
- virtual void createGUI(QWidget *parent);
- virtual void fillGUI (const cListObjectData &data);
- virtual void getDataFromGUI (cListObjectData *data);
+ virtual void createGUI(QWidget *parent) override;
+ virtual void fillGUI (const cListObjectData &data) override;
+ virtual void getDataFromGUI (cListObjectData *data) override;
protected slots:
void grabKey ();
protected:
diff --git a/kmuddy/cshortcutlist.h b/kmuddy/cshortcutlist.h
index fd49879..49be577 100644
--- a/kmuddy/cshortcutlist.h
+++ b/kmuddy/cshortcutlist.h
@@ -32,9 +32,9 @@ public:
~cShortcutList ();
static cList *newList () { return new cShortcutList; };
- virtual cListObject *newObject ();
- virtual QString objName () { return "Macro key"; }
- virtual cListEditor *editor (QWidget *parent);
+ virtual cListObject *newObject () override;
+ virtual QString objName () override { return "Macro key"; }
+ virtual cListEditor *editor (QWidget *parent) override;
/** this key was pressed - send a command if needed, returns true if
some shortcut matched the key */
diff --git a/kmuddy/cstatusvareditor.cpp b/kmuddy/cstatusvareditor.cpp
index 9bc051c..3c26c14 100644
--- a/kmuddy/cstatusvareditor.cpp
+++ b/kmuddy/cstatusvareditor.cpp
@@ -114,4 +114,3 @@ void cStatusVarEditor::getDataFromGUI (cListObjectData *data)
data->boolValues["percentage"] = d->chkpercent->isChecked();
}
-#include "cstatusvareditor.moc"
diff --git a/kmuddy/cstatusvareditor.h b/kmuddy/cstatusvareditor.h
index d3490df..4f71bdc 100644
--- a/kmuddy/cstatusvareditor.h
+++ b/kmuddy/cstatusvareditor.h
@@ -32,9 +32,9 @@ class cStatusVarEditor : public cListEditor {
cStatusVarEditor (QWidget *parent);
~cStatusVarEditor ();
- virtual void createGUI(QWidget *parent);
- virtual void fillGUI (const cListObjectData &data);
- virtual void getDataFromGUI (cListObjectData *data);
+ virtual void createGUI(QWidget *parent) override;
+ virtual void fillGUI (const cListObjectData &data) override;
+ virtual void getDataFromGUI (cListObjectData *data) override;
protected:
struct Private;
Private *d;
diff --git a/kmuddy/cstatusvarlist.h b/kmuddy/cstatusvarlist.h
index 23f2c04..b7f222b 100644
--- a/kmuddy/cstatusvarlist.h
+++ b/kmuddy/cstatusvarlist.h
@@ -39,9 +39,9 @@ class cStatusVarList : public cList
~cStatusVarList ();
static cList *newList () { return new cStatusVarList; };
- virtual cListObject *newObject ();
- virtual QString objName () { return "Status variable"; }
- virtual cListEditor *editor (QWidget *parent);
+ virtual cListObject *newObject () override;
+ virtual QString objName () override { return "Status variable"; }
+ virtual cListEditor *editor (QWidget *parent) override;
void variableChanged (const QString &varname);
private:
@@ -49,7 +49,7 @@ class cStatusVarList : public cList
Private *d;
friend class cStatusVar;
- virtual void listLoaded ();
+ virtual void listLoaded () override;
QString variableName () const;
diff --git a/kmuddy/ctelnet.cpp b/kmuddy/ctelnet.cpp
index 9401998..f479d09 100644
--- a/kmuddy/ctelnet.cpp
+++ b/kmuddy/ctelnet.cpp
@@ -1104,4 +1104,3 @@ void cTelnet::setNegotiateOnStartup (bool startupneg)
d->_startupneg = startupneg;
}
-#include "ctelnet.moc"
diff --git a/kmuddy/ctelnet.h b/kmuddy/ctelnet.h
index 4d57a4d..c6af56a 100644
--- a/kmuddy/ctelnet.h
+++ b/kmuddy/ctelnet.h
@@ -25,6 +25,7 @@
#include <config-mxp.h>
#include "cactionbase.h"
+#include <QObject>
struct cTelnetPrivate;
@@ -222,8 +223,8 @@ protected slots:
void socketRead ();
void socketClosed ();
protected:
- virtual void eventIntHandler (QString event, int session, int par1, int par2);
- virtual void eventNothingHandler (QString event, int session);
+ virtual void eventIntHandler (QString event, int session, int par1, int par2) \
override; + virtual void eventNothingHandler (QString event, int session) override;
void reset ();
void setupSocketHandlers ();
diff --git a/kmuddy/ctextprocessor.cpp b/kmuddy/ctextprocessor.cpp
index 1d22f8a..abb8dc1 100644
--- a/kmuddy/ctextprocessor.cpp
+++ b/kmuddy/ctextprocessor.cpp
@@ -461,4 +461,3 @@ void cTextProcessor::timeout ()
receivedGA ();
}
-#include "ctextprocessor.moc"
diff --git a/kmuddy/ctextprocessor.h b/kmuddy/ctextprocessor.h
index 027f337..477c3a9 100644
--- a/kmuddy/ctextprocessor.h
+++ b/kmuddy/ctextprocessor.h
@@ -57,9 +57,8 @@ public:
void setOutputWindow(QString winname) { wname = winname; };
- virtual void eventStringHandler (QString event, int session, QString &par1,
- const QString &);
- virtual void eventNothingHandler (QString event, int session);
+ virtual void eventStringHandler (QString event, int session, QString &par1, const \
QString &) override; + virtual void eventNothingHandler (QString event, int session) \
override;
public slots:
// processing of various received items...
diff --git a/kmuddy/ctimer.h b/kmuddy/ctimer.h
index 54e7e5a..188c34b 100644
--- a/kmuddy/ctimer.h
+++ b/kmuddy/ctimer.h
@@ -37,12 +37,12 @@ protected:
friend class cTimerList;
cTimer (cList *list);
- virtual void setEnabled (bool en = true);
+ virtual void setEnabled (bool en = true) override;
/** React on an attribute change by adjusting the visible name. */
- virtual void attribChanged (const QString &name);
+ virtual void attribChanged (const QString &name) override;
- virtual void updateVisibleName();
+ virtual void updateVisibleName() override;
#define TIMER_RESET 1
#define TIMER_TICK 2
diff --git a/kmuddy/ctimereditor.cpp b/kmuddy/ctimereditor.cpp
index eb17d2c..e6c7742 100644
--- a/kmuddy/ctimereditor.cpp
+++ b/kmuddy/ctimereditor.cpp
@@ -164,4 +164,3 @@ void cTimerEditor::getDataFromGUI (cListObjectData *data)
data->strValues["script"] = d->script->text();
}
-#include "ctimereditor.moc"
diff --git a/kmuddy/ctimereditor.h b/kmuddy/ctimereditor.h
index 12db8ce..262fe51 100644
--- a/kmuddy/ctimereditor.h
+++ b/kmuddy/ctimereditor.h
@@ -32,9 +32,9 @@ class cTimerEditor : public cListEditor {
cTimerEditor (QWidget *parent);
~cTimerEditor ();
- virtual void createGUI(QWidget *parent);
- virtual void fillGUI (const cListObjectData &data);
- virtual void getDataFromGUI (cListObjectData *data);
+ virtual void createGUI(QWidget *parent) override;
+ virtual void fillGUI (const cListObjectData &data) override;
+ virtual void getDataFromGUI (cListObjectData *data) override;
protected:
struct Private;
Private *d;
diff --git a/kmuddy/ctimerlist.cpp b/kmuddy/ctimerlist.cpp
index a1ed031..4fe11ed 100644
--- a/kmuddy/ctimerlist.cpp
+++ b/kmuddy/ctimerlist.cpp
@@ -92,4 +92,3 @@ int cTimerList::tickCount ()
return d->tickCount;
}
-#include "ctimerlist.moc"
diff --git a/kmuddy/ctimerlist.h b/kmuddy/ctimerlist.h
index dd421b9..6deb820 100644
--- a/kmuddy/ctimerlist.h
+++ b/kmuddy/ctimerlist.h
@@ -33,11 +33,11 @@ public:
~cTimerList ();
static cList *newList () { return new cTimerList; };
- virtual cListObject *newObject ();
- virtual QString objName () { return "Timer"; }
- virtual cListEditor *editor (QWidget *parent);
+ virtual cListObject *newObject () override;
+ virtual QString objName () override { return "Timer"; }
+ virtual cListEditor *editor (QWidget *parent) override;
- virtual void setEnabled (bool en = true);
+ virtual void setEnabled (bool en = true) override;
protected slots:
void timeout ();
protected:
diff --git a/kmuddy/ctranscript.cpp b/kmuddy/ctranscript.cpp
index c0a96ce..2781f54 100644
--- a/kmuddy/ctranscript.cpp
+++ b/kmuddy/ctranscript.cpp
@@ -29,9 +29,10 @@
#include "dialogs/dlgtranscript.h"
#include "dialogs/dlgdumpbuffer.h"
-#include <errno.h>
-
-#include <qdir.h>
+#include <QDir>
+#include <QFile>
+#include <QPushButton>
+#include <QTimer>
#include <klocale.h>
#include <kmessagebox.h>
#include <kconfig.h>
@@ -43,8 +44,6 @@ cTranscript::cTranscript (int sess) : cActionBase ("transcript", \
sess) running = false;
advrunning = false;
rotatedaily = false;
- file = NULL;
- advfile = NULL;
overwrite = true;
includedump = false;
includetimestamp = false;
@@ -118,11 +117,8 @@ void cTranscript::addLineToTranscript (cTextChunk *chunk)
case TRANSCRIPT_HTML: s = chunk->toHTML (); break;
};
s += "\n"; // we use <pre> in HTML, so this applies equally to all three
- QByteArray b = s.toLocal8Bit ();
- const char *ch = b.constData();
- if (ch)
- fputs (ch, file);
- fflush (file);
+ file.write (s.toLocal8Bit ());
+ file.flush();
}
void cTranscript::addLineToAdvTranscript (cTextChunk *chunk)
@@ -135,7 +131,7 @@ void cTranscript::addLineToAdvTranscript (cTextChunk *chunk)
{
QTime time = QTime::currentTime ();
timestamp.sprintf ("[%02d:%02d:%02d.%02d] ", time.hour(), time.minute(), \
time.second(), time.msec() / 10);
- fputs (timestamp.toLatin1(), advfile);
+ advfile.write (timestamp.toLatin1());
}
cANSIParser *ap = dynamic_cast<cANSIParser *>(object ("ansiparser"));
@@ -146,12 +142,9 @@ void cTranscript::addLineToAdvTranscript (cTextChunk *chunk)
case TRANSCRIPT_HTML: s = chunk->toHTML (); break;
};
s += "\n"; // we use <pre> in HTML, so this applies equally to all three
- QByteArray b = s.toLocal8Bit ();
- const char *ch = b.constData();
- if (ch)
- fputs (ch, advfile);
+ advfile.write (s.toLocal8Bit ());
- fflush (advfile);
+ advfile.flush();
}
void cTranscript::stopTranscript ()
@@ -159,7 +152,7 @@ void cTranscript::stopTranscript ()
if (!running)
return;
- fputs ("\n\n", file);
+ file.write ("\n\n");
if (type == TRANSCRIPT_ANSI) //ANSI transcript
{
@@ -170,17 +163,16 @@ void cTranscript::stopTranscript ()
defcolor[2] = '0';
defcolor[3] = 'm';
defcolor[4] = 0;
- fputs (defcolor, file);
+ file.write (defcolor);
}
if (type == TRANSCRIPT_HTML) //HTML transcript
{
//closing HTML tags
- fputs ("</pre></body></html>\n", file);
+ file.write ("</pre></body></html>\n");
}
running = false;
- fclose (file);
- file = 0;
+ file.close();
invokeEvent ("message", sess(), i18n ("Session transcript has been stopped."));
}
@@ -189,7 +181,7 @@ void cTranscript::stopAdvTranscript ()
if (!advrunning)
return;
- fputs ("\n\n", advfile);
+ advfile.write ("\n\n");
if (type == TRANSCRIPT_ANSI) //ANSI transcript
{
@@ -200,17 +192,16 @@ void cTranscript::stopAdvTranscript ()
defcolor[2] = '0';
defcolor[3] = 'm';
defcolor[4] = 0;
- fputs (defcolor, advfile);
+ advfile.write (defcolor);
}
if (type == TRANSCRIPT_HTML) //HTML transcript
{
//closing HTML tags
- fputs ("</pre></body></html>\n", advfile);
+ advfile.write ("</pre></body></html>\n");
}
advrunning = false;
- fclose (advfile);
- advfile = 0;
+ advfile.close();
if (transtimer->isActive ())
{
transtimer->stop ();
@@ -262,41 +253,38 @@ void cTranscript::startTranscript ()
cTelnet *telnet = dynamic_cast<cTelnet *>(object ("telnet"));
if (!(telnet->isConnected())) //no transcript if we aren't connected
return;
- errno = 0;
- file = fopen (fname.toLatin1(), overwrite ? "w" : "a");
- if (file == NULL)
+ file.setFileName (fname);
+ if (!file.open (QIODevice::WriteOnly | QIODevice::Text | ( overwrite ? \
QIODevice::Truncate : QIODevice::Append ))) {
KMessageBox::detailedSorry (cActionManager::self()->mainWidget(),
- i18n ("Transcript file could not be opened."), strerror (errno));
- errno = 0;
+ i18n ("Transcript file could not be opened."), file.errorString());
invokeEvent ("message", sess(), i18n ("Session transcript could not be \
started.")); + return;
}
- else
+
+ running = true;
+ cOutput *output = dynamic_cast<cOutput *>(object ("output"));
+ file.write ("\n\n");
+ if (type == TRANSCRIPT_HTML)
{
- running = true;
- cOutput *output = dynamic_cast<cOutput *>(object ("output"));
- fputs ("\n\n", file);
- if (type == TRANSCRIPT_HTML)
- {
- //TODO: what if we're adding to an existing HTML transcript?
- fputs ("<html>\n", file);
- fputs ("<meta name=\"Generator\" content=\"KMuddy\">\n", file);
- fputs ("<body bgcolor=", file);
- fputs (output->defaultBkColor().name().toLatin1(), file);
- fputs (">\n", file);
- }
- QString s = i18n ("Session transcript has just started.");
- fputs (s.toLatin1(), file);
- if (type == TRANSCRIPT_HTML) fputs ("<br><pre>", file); //pre-formatted text \
starting...
- fputs ("\n\n", file);
+ //TODO: what if we're adding to an existing HTML transcript?
+ file.write ("<html>\n");
+ file.write ("<meta name=\"Generator\" content=\"KMuddy\">\n");
+ file.write ("<body bgcolor=");
+ file.write (output->defaultBkColor().name().toLatin1());
+ file.write (">\n");
+ }
+ QString s = i18n ("Session transcript has just started.");
+ file.write (s.toLatin1());
+ if (type == TRANSCRIPT_HTML) file.write ("<br/><pre>"); //pre-formatted text \
starting... + file.write ("\n\n");
- //add buffer dump if requested
- if (includedump)
- output->console()->dumpBuffer (false, file, type);
+ //add buffer dump if requested
+ if (includedump)
+ output->console()->dumpBuffer (false, file, type);
- invokeEvent ("message", sess(), i18n ("Session transcript has been started."));
- }
+ invokeEvent ("message", sess(), i18n ("Session transcript has been started."));
}
void cTranscript::startAdvTranscript ()
@@ -312,8 +300,6 @@ void cTranscript::startAdvTranscript ()
if(advfname.isEmpty())
return; // no transcript if advanced filename failed
- errno = 0;
-
transtimer = new QTimer();
connect (transtimer, SIGNAL (timeout ()), this, SLOT (timeout ()));
@@ -321,40 +307,38 @@ void cTranscript::startAdvTranscript ()
af = sett ? sett->getString ("transcript-directory") : QDir::homePath();
af += advfname;
- advfile = fopen (af.toLatin1(), "a");
- if (advfile == NULL)
+ file.setFileName (af);
+ if (!advfile.open (QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append))
{
KMessageBox::detailedSorry (cActionManager::self()->mainWidget(),
- i18n ("Advanced transcript file could not be opened."), strerror (errno));
- errno = 0;
+ i18n ("Advanced transcript file could not be opened."), \
advfile.errorString());
invokeEvent ("message", sess(), i18n ("Advanced session transcript could not be \
started.")); + return;
}
- else
+
+ advrunning = true;
+ cOutput *output = dynamic_cast<cOutput *>(object ("output"));
+ advfile.write ("\n\n");
+ if (advtype == TRANSCRIPT_HTML)
{
- advrunning = true;
- cOutput *output = dynamic_cast<cOutput *>(object ("output"));
- fputs ("\n\n", advfile);
- if (advtype == TRANSCRIPT_HTML)
- {
- //TODO: what if we're adding to an existing HTML transcript?
- fputs ("<html>\n", advfile);
- fputs ("<meta name=\"Generator\" content=\"KMuddy\">\n", advfile);
- fputs ("<body bgcolor=", advfile);
- fputs (output->defaultBkColor().name().toLatin1(), advfile);
- fputs (">\n", advfile);
- }
- QString s = i18n ("Advanced session transcript has just started.");
- fputs (s.toLatin1(), advfile);
- if (advtype == TRANSCRIPT_HTML) fputs ("<br><pre>", advfile); //pre-formatted \
text starting...
- fputs ("\n\n", advfile);
+ //TODO: what if we're adding to an existing HTML transcript?
+ advfile.write ("<html>\n");
+ advfile.write ("<meta name=\"Generator\" content=\"KMuddy\">\n");
+ advfile.write ("<body bgcolor=");
+ advfile.write (output->defaultBkColor().name().toLatin1());
+ advfile.write (">\n");
+ }
+ QString s = i18n ("Advanced session transcript has just started.");
+ advfile.write (s.toLatin1());
+ if (advtype == TRANSCRIPT_HTML) advfile.write ("<br/><pre>"); //pre-formatted \
text starting... + advfile.write ("\n\n");
- invokeEvent ("message", sess(), i18n ("Advanced session transcript has been \
started."));
-
- if (rotatedaily)
- {
- invokeEvent ("message", sess(), i18n ("Session transcript will be rotated at \
midnight."));
- transtimer->start (60000);
- }
+ invokeEvent ("message", sess(), i18n ("Advanced session transcript has been \
started.")); +
+ if (rotatedaily)
+ {
+ invokeEvent ("message", sess(), i18n ("Session transcript will be rotated at \
midnight.")); + transtimer->start (60000);
}
}
@@ -436,26 +420,25 @@ void cTranscript::doDumpBuffer ()
{
QString fName = bdlg->fileName();
int type = bdlg->type();
- FILE *f = fopen (fName.toLatin1(), "w");
- if (f)
+ QFile f (fName);
+ if (!f.open (QIODevice::WriteOnly | QIODevice::Text)) {
+ KMessageBox::detailedSorry (cActionManager::self()->mainWidget(),
+ i18n ("Dump file could not be opened."), f.errorString());
+ return;
+ }
+ cOutput *output = dynamic_cast<cOutput *>(object ("output"));
+ if (type == TRANSCRIPT_HTML)
{
- cOutput *output = dynamic_cast<cOutput *>(object ("output"));
- if (type == TRANSCRIPT_HTML)
- {
- fputs ("<html>\n", f);
- fputs ("<meta name=\"Generator\" content=\"KMuddy\">\n", f);
- fputs ("<body bgcolor=", f);
- fputs (output->defaultBkColor().name().toLatin1(), f);
- fputs ("><pre>\n", f);
- }
- output->console()->dumpBuffer (bdlg->curPos(), f, type);
- if (type == TRANSCRIPT_HTML)
- fputs ("\n</pre></body></html>\n", f);
+ f.write ("<html>\n");
+ f.write ("<meta name=\"Generator\" content=\"KMuddy\">\n");
+ f.write ("<body bgcolor=");
+ f.write (output->defaultBkColor().name().toLatin1());
+ f.write ("><pre>\n");
}
- else
- KMessageBox::detailedSorry (cActionManager::self()->mainWidget(),
- i18n ("Dump file could not be opened."), strerror (errno));
- fclose (f);
+ output->console()->dumpBuffer (bdlg->curPos(), f, type);
+ if (type == TRANSCRIPT_HTML)
+ f.write ("\n</pre></body></html>\n");
+ f.close ();
}
void cTranscript::timeout()
@@ -515,4 +498,3 @@ QString cTranscript::getAFName()
return advfname;
}
-#include "ctranscript.moc"
diff --git a/kmuddy/ctranscript.h b/kmuddy/ctranscript.h
index 12396b1..2595b3b 100644
--- a/kmuddy/ctranscript.h
+++ b/kmuddy/ctranscript.h
@@ -19,9 +19,8 @@
#ifndef CTRANSCRIPT_H
#define CTRANSCRIPT_H
-#include <stdio.h>
-
-#include <qobject.h>
+#include <QObject>
+#include <QFile>
#include "cactionbase.h"
@@ -63,8 +62,8 @@ protected slots:
void applyTranscript ();
void doDumpBuffer ();
protected:
- virtual void eventNothingHandler (QString event, int session);
- virtual void eventChunkHandler (QString event, int session, cTextChunk *chunk);
+ virtual void eventNothingHandler (QString event, int session) override;
+ virtual void eventChunkHandler (QString event, int session, cTextChunk *chunk) \
override;
void startTranscript ();
@@ -74,7 +73,7 @@ protected:
bool running, advrunning, rotatedaily;
bool overwrite, includedump;
bool includetimestamp;
- FILE *file, *advfile;
+ QFile file, advfile;
QString fname, advfname, fileformat;
QTimer *transtimer;
diff --git a/kmuddy/ctriggereditor.cpp b/kmuddy/ctriggereditor.cpp
index fa64e31..da51125 100644
--- a/kmuddy/ctriggereditor.cpp
+++ b/kmuddy/ctriggereditor.cpp
@@ -944,4 +944,3 @@ void cTriggerEditor::getDataFromGUI (cListObjectData *data)
}
-#include "ctriggereditor.moc"
diff --git a/kmuddy/ctriggereditor.h b/kmuddy/ctriggereditor.h
index bd98dec..80e63ca 100644
--- a/kmuddy/ctriggereditor.h
+++ b/kmuddy/ctriggereditor.h
@@ -31,9 +31,9 @@ class cTriggerEditor : public cListEditor {
cTriggerEditor (QWidget *parent);
~cTriggerEditor ();
- virtual void createGUI(QWidget *parent);
- virtual void fillGUI (const cListObjectData &data);
- virtual void getDataFromGUI (cListObjectData *data);
+ virtual void createGUI(QWidget *parent) override;
+ virtual void fillGUI (const cListObjectData &data) override;
+ virtual void getDataFromGUI (cListObjectData *data) override;
protected slots:
void updateEditButton (const QString &comboText);
void editRegExp ();
diff --git a/kmuddy/ctriggerlist.h b/kmuddy/ctriggerlist.h
index 9068428..422d5bb 100644
--- a/kmuddy/ctriggerlist.h
+++ b/kmuddy/ctriggerlist.h
@@ -40,9 +40,9 @@ public:
~cTriggerList ();
static cList *newList () { return new cTriggerList; };
- virtual cListObject *newObject ();
- virtual QString objName () { return "Trigger"; }
- virtual cListEditor *editor (QWidget *parent);
+ virtual cListObject *newObject () override;
+ virtual QString objName () override { return "Trigger"; }
+ virtual cListEditor *editor (QWidget *parent) override;
/** Sends these commands via cCmdProcessor. */
virtual void processCommands (const QStringList &commands);
diff --git a/kmuddy/cwindowlist.h b/kmuddy/cwindowlist.h
index 1022cca..bc4f631 100644
--- a/kmuddy/cwindowlist.h
+++ b/kmuddy/cwindowlist.h
@@ -72,7 +72,7 @@ public:
protected:
void load ();
- virtual void eventNothingHandler (QString event, int session);
+ virtual void eventNothingHandler (QString event, int session) override;
std::map<QString, dlgOutputWindow *> windows;
QStringList toerase;
diff --git a/kmuddy/dialogs/dlgmudlist.cpp b/kmuddy/dialogs/dlgmudlist.cpp
index 65ffdc9..d54f167 100644
--- a/kmuddy/dialogs/dlgmudlist.cpp
+++ b/kmuddy/dialogs/dlgmudlist.cpp
@@ -24,12 +24,14 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>.
#include "cmudlist.h"
+#include <QDialogButtonBox>
#include <QGridLayout>
#include <QLabel>
#include <QSortFilterProxyModel>
#include <QSplitter>
#include <QTextDocument>
#include <QTreeView>
+
#include <klineedit.h>
#include <klocale.h>
#include <ktextbrowser.h>
@@ -53,7 +55,6 @@ dlgMudList::dlgMudList (QWidget *parent) : QDialog (parent)
// initialize the dialog
setWindowTitle (i18n ("MUD Listing"));
- setButtons (KDialog::Ok | KDialog::Cancel);
//create main dialog's widget
QVBoxLayout *mainLayout = new QVBoxLayout (this);
@@ -75,9 +76,14 @@ dlgMudList::dlgMudList (QWidget *parent) : QDialog (parent)
QLabel *source = new QLabel ("The list is provided courtesy of <a \
href=\"http://www.mudconnector.com/\">The MUD Connector</a>.<br/>If you are unsure \
which game to pick, you may also want to check out <a \
href=\"http://www.topmudsites.com\">www.topmudsites.com</a>.", this); \
source->setOpenExternalLinks (true); source->setWordWrap (true);
-
+
+ QDialogButtonBox *buttons = new QDialogButtonBox (QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel, this); + connect (buttons, &QDialogButtonBox::accepted, \
this, &QDialog::accept); + connect (buttons, &QDialogButtonBox::rejected, this, \
&QDialog::reject); +
mainLayout->addWidget (page);
mainLayout->addWidget (source);
+ mainLayout->addWidget (buttons);
d->view->setRootIsDecorated (false);
d->view->setItemsExpandable (false);
diff --git a/kmuddy/dialogs/dlgobjects.cpp b/kmuddy/dialogs/dlgobjects.cpp
index 29ad261..7221000 100644
--- a/kmuddy/dialogs/dlgobjects.cpp
+++ b/kmuddy/dialogs/dlgobjects.cpp
@@ -29,16 +29,17 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>. #include "clistmanager.h"
#include "clistviewer.h"
-#include <kaction.h>
#include <kactioncollection.h>
#include <klocale.h>
#include <ktoolbar.h>
#include <kdebug.h>
#include <QComboBox>
+#include <QDialogButtonBox>
#include <QSplitter>
#include <QStackedWidget>
#include <QStandardItemModel>
+#include <QVBoxLayout>
struct dlgObjects::Private
{
@@ -51,7 +52,7 @@ struct dlgObjects::Private
QString currentList;
int currentSession;
- KAction *aUp, *aDown, *aLeft, *aRight;
+ QAction *aUp, *aDown, *aLeft, *aRight;
};
dlgObjects::dlgObjects (QWidget *parent)
@@ -61,12 +62,10 @@ dlgObjects::dlgObjects (QWidget *parent)
//initial dialog size
setWindowTitle (i18n ("Object Manager"));
- setButtons (KDialog::Close);
//create main dialog's widget
QSplitter *page = new QSplitter (this);
-
- setMainWidget (page);
+ QVBoxLayout *mainLayout = new QVBoxLayout (this);
QWidget *left = new QWidget (page);
d->editorStack = new QStackedWidget (page);
@@ -87,21 +86,21 @@ dlgObjects::dlgObjects (QWidget *parent)
d->editorStack->addWidget (d->emptyEditor);
d->editorStack->addWidget (d->groupEditor);
- d->aUp = new KAction (this);
+ d->aUp = new QAction (this);
d->aUp->setText (i18n ("Up"));
- d->aUp->setIcon (KIcon ("arrow-up"));
+ d->aUp->setIcon (QIcon::fromTheme ("arrow-up"));
connect (d->aUp, SIGNAL (triggered()), d->viewer, SLOT (moveUp()));
- d->aDown = new KAction(this);
+ d->aDown = new QAction(this);
d->aDown->setText (i18n ("Down"));
- d->aDown->setIcon (KIcon ("arrow-down"));
+ d->aDown->setIcon (QIcon::fromTheme ("arrow-down"));
connect (d->aDown, SIGNAL (triggered()), d->viewer, SLOT (moveDown()));
- d->aLeft = new KAction (this);
+ d->aLeft = new QAction (this);
d->aLeft->setText (i18n ("Left"));
- d->aLeft->setIcon (KIcon ("arrow-left"));
+ d->aLeft->setIcon (QIcon::fromTheme ("arrow-left"));
connect (d->aLeft, SIGNAL (triggered()), d->viewer, SLOT (moveLeft()));
- d->aRight = new KAction (this);
+ d->aRight = new QAction (this);
d->aRight->setText (i18n ("Right"));
- d->aRight->setIcon (KIcon ("arrow-right"));
+ d->aRight->setIcon (QIcon::fromTheme ("arrow-right"));
connect (d->aRight, SIGNAL (triggered()), d->viewer, SLOT (moveRight()));
KActionCollection *col = d->viewer->actionCollection ();
@@ -122,11 +121,17 @@ dlgObjects::dlgObjects (QWidget *parent)
page->addWidget (left);
page->addWidget (d->editorStack);
+ QDialogButtonBox *buttons = new QDialogButtonBox (QDialogButtonBox::Close, this);
+ connect (buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+ mainLayout->addWidget (page);
+ mainLayout->addWidget (buttons);
+
connect (d->lists, SIGNAL (currentIndexChanged (int)),
this, SLOT (listChanged (int)));
connect (d->viewer, SIGNAL (itemActivated (cListObject *)), this, SLOT \
(activeObjectChanged (cListObject *)));
- connect (buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
- connect (this, &QDialog::accepted, this, SLOT (saveChanges()));
+ connect (this, &QDialog::accepted, this, &dlgObjects::saveChanges);
+ connect (this, &QDialog::rejected, this, &dlgObjects::saveChanges);
d->currentSession = cActionManager::self()->activeSession ();
diff --git a/kmuddy/dialogs/dlgobjects.h b/kmuddy/dialogs/dlgobjects.h
index fa397ae..4fd1ccc 100644
--- a/kmuddy/dialogs/dlgobjects.h
+++ b/kmuddy/dialogs/dlgobjects.h
@@ -40,8 +40,8 @@ class dlgObjects: public QDialog, public cActionBase {
void activeObjectChanged (cListObject *obj);
void saveChanges ();
private:
- void eventNothingHandler (QString event, int session);
- void eventIntHandler (QString event, int, int par1, int);
+ void eventNothingHandler (QString event, int session) override;
+ void eventIntHandler (QString event, int, int par1, int) override;
void switchList ();
diff --git a/kmuddy/dialogs/dlgstatistics.h b/kmuddy/dialogs/dlgstatistics.h
index 5279110..8ec6911 100644
--- a/kmuddy/dialogs/dlgstatistics.h
+++ b/kmuddy/dialogs/dlgstatistics.h
@@ -38,7 +38,7 @@ public:
public slots:
void update ();
protected:
- void eventIntHandler (QString event, int, int, int);
+ void eventIntHandler (QString event, int, int, int) override;
QTimer *updateTimer;
diff --git a/kmuddy/kmuddy.cpp b/kmuddy/kmuddy.cpp
index 8c35837..1a3187d 100644
--- a/kmuddy/kmuddy.cpp
+++ b/kmuddy/kmuddy.cpp
@@ -59,21 +59,22 @@
#include <stdlib.h>
#include <ctime>
-#include <qdesktopwidget.h>
-#include <qtimer.h>
+#include <QAction>
+#include <QDesktopWidget>
+#include <QIcon>
+#include <QMenu>
+#include <QMenuBar>
+#include <QTimer>
#include <QKeyEvent>
#include <kaboutapplicationdialog.h>
-#include <kaction.h>
#include <kactioncollection.h>
#include <kactionmenu.h>
#include <kapplication.h>
#include <khelpmenu.h>
#include <kinputdialog.h>
#include <klocale.h>
-#include <kmenubar.h>
#include <kmessagebox.h>
-#include <kmenu.h>
#include <kshortcut.h>
#include <kstatusbar.h>
#include <ktoggleaction.h>
@@ -140,7 +141,7 @@ void KMuddy::eventNothingHandler (QString event, int session)
}
else if (systrayenabled && !sysIcon){
// Load the system tray icon
- sysIcon = new KSystemTrayIcon(KIcon("kmuddy.png"), this);
+ sysIcon = new KSystemTrayIcon(QIcon::fromTheme ("kmuddy.png"), this);
sysIcon->show ();
QAction* quitAction = sysIcon->actionCollection()->action("file_quit");
quitAction->disconnect ();
@@ -189,9 +190,9 @@ void KMuddy::eventStringHandler (QString event, int, QString \
&par1, void registerInternalMacros ();
void unregisterInternalMacros ();
-#define SHIFT Qt::ShiftModifier
-#define CTRL Qt::ControlModifier
-#define ALT Qt::AltModifier
+#define KEY_SHIFT Qt::ShiftModifier
+#define KEY_CTRL Qt::ControlModifier
+#define KEY_ALT Qt::AltModifier
void KMuddy::prepareObjects ()
{
@@ -243,33 +244,33 @@ void KMuddy::prepareObjects ()
cMenuManager::self()->setMenuBar (menuBar());
//Connection
- KAction *stdconnect = new KAction (this);
+ QAction *stdconnect = new QAction (this);
stdconnect->setText (i18n ("&Connect..."));
- stdconnect->setIcon (KIcon ("network-connect"));
- stdconnect->setShortcut (CTRL+Qt::Key_N);
+ stdconnect->setIcon (QIcon::fromTheme ("network-connect"));
+ stdconnect->setShortcut (KEY_CTRL+Qt::Key_N);
connect (stdconnect, SIGNAL (triggered()), this, SLOT \
(showAndHandleConnectDialog())); acol->addAction ("Connect", stdconnect);
- KAction *qconnect = new KAction (this);
+ QAction *qconnect = new QAction (this);
qconnect->setText (i18n ("&QuickConnect..."));
- qconnect->setIcon (KIcon ("network-connect"));
- qconnect->setShortcut (CTRL+Qt::Key_O);
+ qconnect->setIcon (QIcon::fromTheme ("network-connect"));
+ qconnect->setShortcut (KEY_CTRL+Qt::Key_O);
connect (qconnect, SIGNAL (triggered()), this, SLOT \
(showAndHandleQuickConnectDialog())); acol->addAction ("QuickConnect", qconnect);
- KAction *dodisconnect = new KAction (this);
+ QAction *dodisconnect = new QAction (this);
dodisconnect->setText (i18n ("&Disconnect"));
- dodisconnect->setIcon (KIcon ("network-disconnect"));
- dodisconnect->setShortcut (CTRL+Qt::Key_D);
+ dodisconnect->setIcon (QIcon::fromTheme ("network-disconnect"));
+ dodisconnect->setShortcut (KEY_CTRL+Qt::Key_D);
connect (dodisconnect, SIGNAL (triggered()), this, SLOT (doDisconnect()));
acol->addAction ("Disconnect", dodisconnect);
- KAction *reconnect = new KAction (this);
+ QAction *reconnect = new QAction (this);
reconnect->setText (i18n ("&Reconnect"));
- reconnect->setShortcut (CTRL+Qt::Key_R);
+ reconnect->setShortcut (KEY_CTRL+Qt::Key_R);
connect (reconnect, SIGNAL (triggered()), this, SLOT (doReconnect()));
acol->addAction ("Reconnect", reconnect);
- KAction *closetab = new KAction (this);
+ QAction *closetab = new QAction (this);
closetab->setText (i18n ("Close &tab"));
- closetab->setShortcut (KShortcut(CTRL+Qt::Key_W));
+ closetab->setShortcut (KEY_CTRL+Qt::Key_W);
connect (closetab, SIGNAL (triggered()), this, SLOT (closeTab()));
acol->addAction ("CloseTab", closetab);
closetab->setEnabled (false);
@@ -278,43 +279,43 @@ void KMuddy::prepareObjects ()
//Edit
KActionMenu *pastemenu = new KActionMenu (this);
pastemenu->setText (i18n ("Paste &As"));
- pastemenu->setIcon (KIcon ("edit-paste"));
+ pastemenu->setIcon (QIcon::fromTheme ("edit-paste"));
acol->addAction ("PasteMenu", pastemenu);
//"Paste As" items
- KAction *pastecommand = new KAction (this);
+ QAction *pastecommand = new QAction (this);
pastecommand->setText (i18n ("&Command"));
connect (pastecommand, SIGNAL (triggered()), this, SLOT (pasteCommand()));
acol->addAction ("PasteCommand", pastecommand);
- KAction *pasteinput = new KAction (this);
+ QAction *pasteinput = new QAction (this);
pasteinput->setText (i18n ("&Input"));
connect (pasteinput, SIGNAL (triggered()), this, SLOT (pasteInput()));
acol->addAction ("PasteInput", pasteinput);
pastemenu->addAction(pastecommand);
pastemenu->addAction(pasteinput);
- KAction *clipcopy = new KAction (this);
+ QAction *clipcopy = new QAction (this);
clipcopy->setText (i18n ("Copy &Selection"));
- clipcopy->setIcon (KIcon ("edit-copy"));
- clipcopy->setShortcut (CTRL+Qt::Key_C);
+ clipcopy->setIcon (QIcon::fromTheme ("edit-copy"));
+ clipcopy->setShortcut (KEY_CTRL+Qt::Key_C);
connect (clipcopy, SIGNAL (triggered()), this, SLOT (addSelectionToClipboard()));
acol->addAction ("ClipboardCopy", clipcopy);
KToggleAction *parsing = new KToggleAction (this);
parsing->setText (i18n ("Enable command &parsing"));
- parsing->setIcon (KIcon ("go-jump"));
- parsing->setShortcut (CTRL+SHIFT+Qt::Key_P);
+ parsing->setIcon (QIcon::fromTheme ("go-jump"));
+ parsing->setShortcut (KEY_CTRL+KEY_SHIFT+Qt::Key_P);
connect (parsing, SIGNAL (triggered (bool)), this, SLOT (setParsing (bool)));
parsing->setChecked (true); //enabled by default
acol->addAction ("EnableParsing", parsing);
- KAction *cancelpending = new KAction (this);
+ QAction *cancelpending = new QAction (this);
cancelpending->setText (i18n ("Ca&ncel pending commands"));
- cancelpending->setIcon (KIcon ("list-remove"));
+ cancelpending->setIcon (QIcon::fromTheme ("list-remove"));
connect (cancelpending, SIGNAL (triggered()), this, SLOT (clearCommandQueue()));
acol->addAction ("CancelPending", cancelpending);
//View
QAction *showmultiline = cMultiLineInput::self()->dialog()->toggleViewAction ();
- showmultiline->setIcon (KIcon ("format-justify-left"));
- showmultiline->setShortcut (CTRL+SHIFT+Qt::Key_M);
+ showmultiline->setIcon (QIcon::fromTheme ("format-justify-left"));
+ showmultiline->setShortcut (KEY_CTRL+KEY_SHIFT+Qt::Key_M);
acol->addAction ("ShowMultiLine", showmultiline);
KToggleAction *showgaugebar = new KToggleAction (this);
showgaugebar->setText (i18n ("Show &gaugebar"));
@@ -329,24 +330,24 @@ void KMuddy::prepareObjects ()
#endif
//Profile
- KAction *objects = new KAction (this);
+ QAction *objects = new QAction (this);
objects->setText (i18n ("&Object Editor..."));
- objects->setShortcut (CTRL+ALT+Qt::Key_O);
+ objects->setShortcut (KEY_CTRL+KEY_ALT+Qt::Key_O);
connect (objects, SIGNAL (triggered()), this, SLOT (showObjectsDialog()));
acol->addAction ("Objects", objects);
- KAction *windows = new KAction (this);
+ QAction *windows = new QAction (this);
windows->setText (i18n ("&Output windows..."));
connect (windows, SIGNAL (triggered()), this, SLOT (handleWindowsDialog()));
acol->addAction ("OutputWindows", windows);
KToggleAction *switchaliases = new KToggleAction (this);
switchaliases->setText (i18n ("A&liases enabled"));
- switchaliases->setShortcut (CTRL+SHIFT+Qt::Key_A);
+ switchaliases->setShortcut (KEY_CTRL+KEY_SHIFT+Qt::Key_A);
connect (switchaliases, SIGNAL (triggered (bool)), this, SLOT (switchAliases \
(bool))); switchaliases->setChecked (true);
acol->addAction ("EnableAliases", switchaliases);
KToggleAction *switchtriggers = new KToggleAction (this);
switchtriggers->setText (i18n ("Tri&ggers enabled"));
- switchtriggers->setShortcut (CTRL+SHIFT+Qt::Key_T);
+ switchtriggers->setShortcut (KEY_CTRL+KEY_SHIFT+Qt::Key_T);
connect (switchtriggers, SIGNAL (triggered (bool)), this, SLOT (switchTriggers \
(bool))); switchtriggers->setChecked (true);
acol->addAction ("EnableTriggers", switchtriggers);
@@ -360,55 +361,55 @@ void KMuddy::prepareObjects ()
connect (switchshortcuts, SIGNAL (triggered (bool)), this, SLOT (switchShortcuts \
(bool))); switchshortcuts->setChecked (true);
acol->addAction ("EnableMacroKeys", switchshortcuts);
- KAction *connprefs = new KAction (this);
+ QAction *connprefs = new QAction (this);
connprefs->setText (i18n ("&MUD Preferences..."));
- connprefs->setIcon (KIcon ("user-identity"));
+ connprefs->setIcon (QIcon::fromTheme ("user-identity"));
connect (connprefs, SIGNAL (triggered()), this, SLOT (showConnPrefsDialog()));
acol->addAction ("ConnPrefs", connprefs);
- KAction *save = new KAction (this);
+ QAction *save = new QAction (this);
save->setText (i18n ("&Save Profile"));
- save->setShortcut (CTRL+Qt::Key_S);
+ save->setShortcut (KEY_CTRL+Qt::Key_S);
connect (save, SIGNAL (triggered()), this, SLOT (saveProfile()));
acol->addAction ("SaveProfile", save);
//Tools
- KAction *sesstranscript = new KAction (this);
+ QAction *sesstranscript = new QAction (this);
sesstranscript->setText (i18n ("&Session transcript..."));
- sesstranscript->setIcon (KIcon ("utilities-log-viewer"));
+ sesstranscript->setIcon (QIcon::fromTheme ("utilities-log-viewer"));
connect (sesstranscript, SIGNAL (triggered()), this, SLOT \
(configureTranscript())); acol->addAction ("Transcript", sesstranscript);
- KAction *dumpbuffer = new KAction (this);
+ QAction *dumpbuffer = new QAction (this);
dumpbuffer->setText (i18n ("Dump output &buffer..."));
connect (dumpbuffer, SIGNAL (triggered()), this, SLOT (dumpBuffer()));
acol->addAction ("DumpBuffer", dumpbuffer);
- KAction *decide = new KAction (this);
+ QAction *decide = new QAction (this);
decide->setText (i18n ("&Decision assistant"));
connect (decide, SIGNAL (triggered()), this, SLOT (makeDecision()));
acol->addAction ("Decision", decide);
-/* KAction *importprofile = new KAction (this);
+/* QAction *importprofile = new QAction (this);
importprofile->setText (i18n ("&Import profile..."));
connect (importprofile, SIGNAL (triggered()), this, SLOT (importProfile()));
acol->addAction ("ImportProf", importprofile);
- KAction *exportprofile = new KAction (this);
+ QAction *exportprofile = new QAction (this);
exportprofile->setText (i18n ("&Export profile..."));
connect (exportprofile, SIGNAL (triggered()), this, SLOT (exportProfile()));
acol->addAction ("ExportProf", exportprofile); */
//Settings
- KAction *appconfig = new KAction (this);
+ QAction *appconfig = new QAction (this);
appconfig->setText (i18n ("&Global settings..."));
- appconfig->setIcon (KIcon ("configure"));
+ appconfig->setIcon (QIcon::fromTheme ("configure"));
connect (appconfig, SIGNAL (triggered()), this, SLOT (showSettingsDialog()));
acol->addAction ("Global settings", appconfig);
- KAction *pluginsconfig = new KAction (this);
+ QAction *pluginsconfig = new QAction (this);
pluginsconfig->setText (i18n ("&Plugins..."));
connect (pluginsconfig, SIGNAL(triggered()), cPluginManager::self(), \
SLOT(showPluginsDialog())); acol->addAction ("Plugins", pluginsconfig);
- KAction *showmenubar = acol->addAction (KStandardAction::ShowMenubar, \
"ShowMenuBar", this, SLOT (toggleShowMenu())); + QAction *showmenubar = \
acol->addAction (KStandardAction::ShowMenubar, "ShowMenuBar", this, SLOT \
(toggleShowMenu())); KToggleAction *fullscreenmode = new KToggleAction (this);
fullscreenmode->setText (i18n ("F&ull screen mode"));
- fullscreenmode->setIcon (KIcon ("view-fullscreen"));
- fullscreenmode->setShortcut (CTRL+SHIFT+Qt::Key_F);
+ fullscreenmode->setIcon (QIcon::fromTheme ("view-fullscreen"));
+ fullscreenmode->setShortcut (KEY_CTRL+KEY_SHIFT+Qt::Key_F);
connect (fullscreenmode, SIGNAL (toggled (bool)), this,
SLOT (setFullScreen(bool)));
acol->addAction ("SetFullScreen", fullscreenmode);
@@ -416,95 +417,95 @@ void KMuddy::prepareObjects ()
//Help
//other actions
- KAction *lineup = new KAction (this);
+ QAction *lineup = new QAction (this);
lineup->setText (i18n ("Shift line up"));
- lineup->setShortcut (SHIFT+Qt::Key_Up);
+ lineup->setShortcut (KEY_SHIFT+Qt::Key_Up);
connect (lineup, SIGNAL (triggered()), this, SLOT (lineUp()));
acol->addAction ("LineUp", lineup);
- KAction *linedown = new KAction (this);
+ QAction *linedown = new QAction (this);
linedown->setText (i18n ("Shift line down"));
- linedown->setShortcut (SHIFT+Qt::Key_Down);
+ linedown->setShortcut (KEY_SHIFT+Qt::Key_Down);
connect (linedown, SIGNAL (triggered()), this, SLOT (lineDown()));
acol->addAction ("LineDown", linedown);
- KAction *pageup = new KAction (this);
+ QAction *pageup = new QAction (this);
pageup->setText (i18n ("Shift page up"));
- pageup->setShortcut (SHIFT+Qt::Key_PageUp);
+ pageup->setShortcut (KEY_SHIFT+Qt::Key_PageUp);
connect (pageup, SIGNAL (triggered()), this, SLOT (pageUp()));
acol->addAction ("PageUp", pageup);
- KAction *pagedown = new KAction (this);
+ QAction *pagedown = new QAction (this);
pagedown->setText (i18n ("Shift page down"));
- pagedown->setShortcut (SHIFT+Qt::Key_PageDown);
+ pagedown->setShortcut (KEY_SHIFT+Qt::Key_PageDown);
connect (pagedown, SIGNAL (triggered()), this, SLOT (pageDown()));
acol->addAction ("PageDown", pagedown);
- KAction *aconup = new KAction (this);
+ QAction *aconup = new QAction (this);
aconup->setText (i18n ("Split-screen up"));
- aconup->setShortcut (CTRL+ALT+Qt::Key_Up);
+ aconup->setShortcut (KEY_CTRL+KEY_ALT+Qt::Key_Up);
connect (aconup, SIGNAL (triggered()), this, SLOT (aconUp()));
acol->addAction ("AconUp", aconup);
- KAction *acondown = new KAction (this);
+ QAction *acondown = new QAction (this);
acondown->setText (i18n ("Split-screen down"));
- acondown->setShortcut (CTRL+ALT+Qt::Key_Down);
+ acondown->setShortcut (KEY_CTRL+KEY_ALT+Qt::Key_Down);
connect (acondown, SIGNAL (triggered()), this, SLOT (aconDown()));
acol->addAction ("AconDown", acondown);
- KAction *prevtab = new KAction (this);
+ QAction *prevtab = new QAction (this);
prevtab->setText (i18n ("Previous tab"));
- prevtab->setShortcut (ALT+Qt::Key_PageUp);
+ prevtab->setShortcut (KEY_ALT+Qt::Key_PageUp);
connect (prevtab, SIGNAL (triggered()), this, SLOT (prevTab()));
acol->addAction ("PreviousTab", prevtab);
- KAction *nexttab = new KAction (this);
+ QAction *nexttab = new QAction (this);
nexttab->setText (i18n ("Next tab"));
- nexttab->setShortcut (ALT+Qt::Key_PageDown);
+ nexttab->setShortcut (KEY_ALT+Qt::Key_PageDown);
connect (nexttab, SIGNAL (triggered()), this, SLOT (nextTab()));
acol->addAction ("NextTab", nexttab);
- KAction *tabnum[10];
- tabnum[0] = new KAction (this);
+ QAction *tabnum[10];
+ tabnum[0] = new QAction (this);
tabnum[0]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "1"));
- tabnum[0]->setShortcut (ALT+Qt::Key_1);
+ tabnum[0]->setShortcut (KEY_ALT+Qt::Key_1);
connect (tabnum[0], SIGNAL (triggered()), this, SLOT (switchTab1()));
acol->addAction ("SwitchTab1", tabnum[0]);
- tabnum[1] = new KAction (this);
+ tabnum[1] = new QAction (this);
tabnum[1]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "2"));
- tabnum[1]->setShortcut (ALT+Qt::Key_2);
+ tabnum[1]->setShortcut (KEY_ALT+Qt::Key_2);
connect (tabnum[1], SIGNAL (triggered()), this, SLOT (switchTab2()));
acol->addAction ("SwitchTab2", tabnum[1]);
- tabnum[2] = new KAction (this);
+ tabnum[2] = new QAction (this);
tabnum[2]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "3"));
- tabnum[2]->setShortcut (ALT+Qt::Key_3);
+ tabnum[2]->setShortcut (KEY_ALT+Qt::Key_3);
connect (tabnum[2], SIGNAL (triggered()), this, SLOT (switchTab3()));
acol->addAction ("SwitchTab3", tabnum[2]);
- tabnum[3] = new KAction (this);
+ tabnum[3] = new QAction (this);
tabnum[3]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "4"));
- tabnum[3]->setShortcut (ALT+Qt::Key_4);
+ tabnum[3]->setShortcut (KEY_ALT+Qt::Key_4);
connect (tabnum[3], SIGNAL (triggered()), this, SLOT (switchTab4()));
acol->addAction ("SwitchTab4", tabnum[3]);
- tabnum[4] = new KAction (this);
+ tabnum[4] = new QAction (this);
tabnum[4]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "5"));
- tabnum[4]->setShortcut (ALT+Qt::Key_5);
+ tabnum[4]->setShortcut (KEY_ALT+Qt::Key_5);
connect (tabnum[4], SIGNAL (triggered()), this, SLOT (switchTab5()));
acol->addAction ("SwitchTab5", tabnum[4]);
- tabnum[5] = new KAction (this);
+ tabnum[5] = new QAction (this);
tabnum[5]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "6"));
- tabnum[5]->setShortcut (ALT+Qt::Key_6);
+ tabnum[5]->setShortcut (KEY_ALT+Qt::Key_6);
connect (tabnum[5], SIGNAL (triggered()), this, SLOT (switchTab6()));
acol->addAction ("SwitchTab6", tabnum[5]);
- tabnum[6] = new KAction (this);
+ tabnum[6] = new QAction (this);
tabnum[6]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "7"));
- tabnum[6]->setShortcut (ALT+Qt::Key_7);
+ tabnum[6]->setShortcut (KEY_ALT+Qt::Key_7);
connect (tabnum[6], SIGNAL (triggered()), this, SLOT (switchTab7()));
acol->addAction ("SwitchTab7", tabnum[6]);
- tabnum[7] = new KAction (this);
+ tabnum[7] = new QAction (this);
tabnum[7]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "8"));
- tabnum[7]->setShortcut (ALT+Qt::Key_8);
+ tabnum[7]->setShortcut (KEY_ALT+Qt::Key_8);
connect (tabnum[7], SIGNAL (triggered()), this, SLOT (switchTab8()));
acol->addAction ("SwitchTab8", tabnum[7]);
- tabnum[8] = new KAction (this);
+ tabnum[8] = new QAction (this);
tabnum[8]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "9"));
- tabnum[8]->setShortcut (ALT+Qt::Key_9);
+ tabnum[8]->setShortcut (KEY_ALT+Qt::Key_9);
connect (tabnum[8], SIGNAL (triggered()), this, SLOT (switchTab9()));
acol->addAction ("SwitchTab9", tabnum[8]);
- tabnum[9] = new KAction (this);
+ tabnum[9] = new QAction (this);
tabnum[9]->setText (i18nc ("%1 - tab number", "Switch to tab %1", "10"));
- tabnum[9]->setShortcut (ALT+Qt::Key_0);
+ tabnum[9]->setShortcut (KEY_ALT+Qt::Key_0);
connect (tabnum[9], SIGNAL (triggered()), this, SLOT (switchTab10()));
acol->addAction ("SwitchTab10", tabnum[9]);
@@ -513,12 +514,12 @@ void KMuddy::prepareObjects ()
cMenuManager *menu = cMenuManager::self();
//create all the menus
- connectionMenu = new KMenu (this);
- editMenu = new KMenu (this);
- viewMenu = new KMenu (this);
- profileMenu = new KMenu (this);
- toolsMenu = new KMenu (this);
- settingsMenu = new KMenu (this);
+ connectionMenu = new QMenu (this);
+ editMenu = new QMenu (this);
+ viewMenu = new QMenu (this);
+ profileMenu = new QMenu (this);
+ toolsMenu = new QMenu (this);
+ settingsMenu = new QMenu (this);
helpMenu = new KHelpMenu (this, QString(), false);
menu->addMenuPosition ("menu-base");
@@ -1345,4 +1346,3 @@ bool KMuddy::queryClose ()
return true;
}
-#include "kmuddy.moc"
diff --git a/kmuddy/kmuddy.h b/kmuddy/kmuddy.h
index 21f750a..08f4317 100644
--- a/kmuddy/kmuddy.h
+++ b/kmuddy/kmuddy.h
@@ -24,10 +24,10 @@
#include <kmainwindow.h>
-class KMenu;
+class QMenu;
class QTimer;
class KHelpMenu;
-class KMenuBar;
+class QMenuBar;
class KToolBar;
class dlgConnect;
@@ -176,27 +176,27 @@ protected:
KMuddy ();
static KMuddy *_self;
- virtual void eventNothingHandler (QString event, int session);
- virtual void eventIntHandler (QString event, int session, int, int);
- virtual void eventChunkHandler (QString event, int session, cTextChunk *);
+ virtual void eventNothingHandler (QString event, int session) override;
+ virtual void eventIntHandler (QString event, int session, int, int) override;
+ virtual void eventChunkHandler (QString event, int session, cTextChunk *) \
override; virtual void eventStringHandler (QString event, int session, QString \
&par1,
- const QString &par2);
+ const QString &par2) override;
void prepareObjects ();
void killObjects ();
/** called when we try to close the window (Alt+F4 or the Close icon) */
- virtual bool queryClose ();
+ virtual bool queryClose () override;
/** calls cSessionManager::self()->activeSession. Provided for convenience. */
int activeSession ();
/** event filter, used to grab macro keys */
- bool eventFilter (QObject *o, QEvent *e);
+ bool eventFilter (QObject *o, QEvent *e) override;
/** save session properties */
- void saveProperties (KConfigGroup &config);
+ void saveProperties (KConfigGroup &config) override;
/** read session properties */
- void readProperties (const KConfigGroup &config);
+ void readProperties (const KConfigGroup &config) override;
dlgGrabKey *grabdlg;
@@ -207,8 +207,8 @@ protected:
static bool goingDown;
/**menus*/
- KMenu *connectionMenu, *editMenu, *viewMenu, *profileMenu;
- KMenu *toolsMenu, *settingsMenu, *popup;
+ QMenu *connectionMenu, *editMenu, *viewMenu, *profileMenu;
+ QMenu *toolsMenu, *settingsMenu, *popup;
KHelpMenu *helpMenu;
/**System Tray Icon*/
diff --git a/libs/cconsole.cpp b/libs/cconsole.cpp
index 5c0136a..4a65c6a 100644
--- a/libs/cconsole.cpp
+++ b/libs/cconsole.cpp
@@ -212,7 +212,7 @@ void cConsole::forceEmitSize () {
emit dimensionsChanged (curCols(), curRows());
}
-void cConsole::dumpBuffer (bool fromcurrent, FILE *file, char dumpType) {
+void cConsole::dumpBuffer (bool fromcurrent, QFile &file, char dumpType) {
// TODO
}
diff --git a/libs/cconsole.h b/libs/cconsole.h
index 9ddd536..66c6210 100644
--- a/libs/cconsole.h
+++ b/libs/cconsole.h
@@ -26,6 +26,7 @@
#include <kmuddy_export.h>
#include <QClipboard>
+#include <QFile>
#include <QGraphicsView>
#include <QStringList>
class cTextChunk;
@@ -71,7 +72,7 @@ public:
functions, where this fails for unknown reasons */
void forceEmitSize ();
/** dump all history buffer to that file */
- void dumpBuffer (bool fromcurrent, FILE *file, char dumpType);
+ void dumpBuffer (bool fromcurrent, QFile &file, char dumpType);
void tryUpdateHistorySize ();
void setInitialHistorySize (int size);
diff --git a/libs/clistgroupeditor.h b/libs/clistgroupeditor.h
index 6e0a602..a798910 100644
--- a/libs/clistgroupeditor.h
+++ b/libs/clistgroupeditor.h
@@ -37,11 +37,11 @@ class KMUDDY_EXPORT cListGroupEditor : public cListEditor {
virtual ~cListGroupEditor ();
protected:
/** Create the GUI. */
- virtual void createGUI(QWidget *parent);
+ virtual void createGUI(QWidget *parent) override;
/** Fill in the GUI. */
- virtual void fillGUI (const cListObjectData &data);
+ virtual void fillGUI (const cListObjectData &data) override;
/** Read the data from the GUI, fill in the data structure. */
- virtual void getDataFromGUI (cListObjectData *data);
+ virtual void getDataFromGUI (cListObjectData *data) override;
};
diff --git a/libs/clistviewer.h b/libs/clistviewer.h
index b03bec0..c858206 100644
--- a/libs/clistviewer.h
+++ b/libs/clistviewer.h
@@ -57,10 +57,10 @@ class KMUDDY_EXPORT cListViewer: public QTreeView {
void moveLeft ();
void moveRight ();
protected slots:
- virtual void currentChanged (const QModelIndex ¤t, const QModelIndex \
&previous); + virtual void currentChanged (const QModelIndex ¤t, const \
QModelIndex &previous) override; protected:
/** Context menu handler. */
- virtual void contextMenuEvent (QContextMenuEvent *event);
+ virtual void contextMenuEvent (QContextMenuEvent *event) override;
private:
struct Private;
Private *d;
diff --git a/libs/cmenumanager.cpp b/libs/cmenumanager.cpp
index e62f7d6..15994da 100644
--- a/libs/cmenumanager.cpp
+++ b/libs/cmenumanager.cpp
@@ -22,9 +22,9 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>.
#include "cmenumanager.h"
-#include <qaction.h>
-#include <kmenubar.h>
-#include <kmenu.h>
+#include <QAction>
+#include <QMenuBar>
+#include <QMenu>
#include <list>
#include <map>
@@ -32,12 +32,12 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>. using namespace std;
struct cMenuManagerPrivate {
- KMenuBar *menuBar;
+ QMenuBar *menuBar;
map<QString, QAction *> positions; // where to place individual items
- map<QString, KMenu *> locations; // which position is in which menu
- map<KMenu *, QString> lastPositionInMenu;
- map<KMenu *, QAction *> menuActions;
- map<QAction *, KMenu *> actionLocations;
+ map<QString, QMenu *> locations; // which position is in which menu
+ map<QMenu *, QString> lastPositionInMenu;
+ map<QMenu *, QAction *> menuActions;
+ map<QAction *, QMenu *> actionLocations;
};
cMenuManager *cMenuManager::_self = 0;
@@ -59,7 +59,7 @@ cMenuManager *cMenuManager::self ()
return _self;
}
-void cMenuManager::setMenuBar (KMenuBar *menuBar)
+void cMenuManager::setMenuBar (QMenuBar *menuBar)
{
d->menuBar = menuBar;
}
@@ -69,7 +69,7 @@ void cMenuManager::addMenuPosition (const QString &name)
addItemPosition (name, 0);
}
-void cMenuManager::addItemPosition (const QString &name, KMenu *menu)
+void cMenuManager::addItemPosition (const QString &name, QMenu *menu)
{
if (d->positions.count (name)) return;
@@ -84,14 +84,14 @@ void cMenuManager::addItemPosition (const QString &name, KMenu \
*menu) d->locations[name] = menu;
}
-void cMenuManager::addMenu (KMenu *menu, const QString &label, const QString \
&position) +void cMenuManager::addMenu (QMenu *menu, const QString &label, const \
QString &position) {
// nothing if there's no such position
if (!d->positions.count (position)) return;
// plug the actual item
QAction *before = d->positions[position];
- KMenu *inMenu = d->locations[position];
+ QMenu *inMenu = d->locations[position];
if (inMenu) return;
if (before)
d->menuBar->insertMenu (before, menu);
@@ -100,7 +100,7 @@ void cMenuManager::addMenu (KMenu *menu, const QString &label, \
const QString &po menu->setTitle (label);
}
-void cMenuManager::removeMenu (KMenu *menu)
+void cMenuManager::removeMenu (QMenu *menu)
{
d->menuBar->removeAction (d->menuActions[menu]);
d->menuActions.erase (menu);
@@ -108,7 +108,7 @@ void cMenuManager::removeMenu (KMenu *menu)
// remove all positions tied to this menu
QStringList pl;
- map<QString, KMenu *>::iterator it;
+ map<QString, QMenu *>::iterator it;
for (it = d->locations.begin(); it != d->locations.end(); ++it)
if (it->second == menu)
pl << it->first;
@@ -127,7 +127,7 @@ void cMenuManager::plug (QAction *action, QString position)
// plug the actual item
QAction *before = d->positions[position];
- KMenu *menu = d->locations[position];
+ QMenu *menu = d->locations[position];
if (!menu) return;
if (before)
menu->insertAction (before, action);
@@ -138,7 +138,7 @@ void cMenuManager::plug (QAction *action, QString position)
void cMenuManager::unplug (QAction *action)
{
- KMenu *menu = d->actionLocations[action];
+ QMenu *menu = d->actionLocations[action];
if (menu)
menu->removeAction (action);
d->actionLocations.erase (action);
diff --git a/libs/cmenumanager.h b/libs/cmenumanager.h
index ea06cb4..54e1566 100644
--- a/libs/cmenumanager.h
+++ b/libs/cmenumanager.h
@@ -28,9 +28,9 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>.
struct cMenuManagerPrivate;
-class KMenu;
+class QMenu;
class QAction;
-class KMenuBar;
+class QMenuBar;
/**
Menu manager. It manages the menubar, allowing plug-ins to insert items into the \
menu. @@ -44,17 +44,17 @@ public:
~cMenuManager ();
/** assign a menubar to the object. It can't work without having one. */
- void setMenuBar (KMenuBar *menuBar);
+ void setMenuBar (QMenuBar *menuBar);
/** create a position for menus */
void addMenuPosition (const QString &name);
/** create a position for menu items */
- void addItemPosition (const QString &name, KMenu *menu);
+ void addItemPosition (const QString &name, QMenu *menu);
/** add a new menu */
- void addMenu (KMenu *menu, const QString &label, const QString &position);
+ void addMenu (QMenu *menu, const QString &label, const QString &position);
/** remove an existing menu */
- void removeMenu (KMenu *menu);
+ void removeMenu (QMenu *menu);
/** plug an action to a given position */
void plug (QAction *action, QString position);
diff --git a/libs/cpluginmanager.h b/libs/cpluginmanager.h
index 5f206fb..0f076b1 100644
--- a/libs/cpluginmanager.h
+++ b/libs/cpluginmanager.h
@@ -84,10 +84,10 @@ protected:
static cPluginManager *_self;
- virtual void eventIntHandler (QString event, int session, int par1, int par2);
- virtual void eventStringHandler (QString event, int session, QString &par1, const \
QString &par2);
- virtual void eventNothingHandler (QString event, int session);
- virtual void eventChunkHandler (QString event, int session, cTextChunk *par);
+ virtual void eventIntHandler (QString event, int session, int par1, int par2) \
override; + virtual void eventStringHandler (QString event, int session, QString \
&par1, const QString &par2) override; + virtual void eventNothingHandler (QString \
event, int session) override; + virtual void eventChunkHandler (QString event, int \
session, cTextChunk *par) override;
void findPlugins ();
diff --git a/libs/cprompt.h b/libs/cprompt.h
index b586b59..308c886 100644
--- a/libs/cprompt.h
+++ b/libs/cprompt.h
@@ -36,8 +36,8 @@ class KMUDDY_EXPORT cPrompt : public QLabel, public cActionBase {
~cPrompt();
void updatePrompt (const QString &text);
protected:
- virtual void eventStringHandler (QString event, int, QString &par1, const QString \
&);
- virtual void eventNothingHandler (QString event, int);
+ virtual void eventStringHandler (QString event, int, QString &par1, const QString \
&) override; + virtual void eventNothingHandler (QString event, int) override;
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic