[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmuddy] /: The base app now compiles (though it doesn't start)
From: Tomas Mecir <null () kde ! org>
Date: 2018-03-31 19:47:16
Message-ID: E1f2MT6-0001ET-6D () code ! kde ! org
[Download RAW message or body]
Git commit 0fa5fe91047f77e4e4f3e0ef6efc014695eea297 by Tomas Mecir.
Committed on 31/03/2018 at 19:46.
Pushed by mecir into branch 'master'.
The base app now compiles (though it doesn't start)
M +1 -1 CMakeLists.txt
M +1 -1 kmuddy/CMakeLists.txt
M +1 -1 kmuddy/cbuttoneditor.cpp
M +6 -8 kmuddy/cmultiinputline.cpp
M +2 -2 kmuddy/cmxpmanager.cpp
M +7 -6 kmuddy/csessionmanager.cpp
M +2 -2 kmuddy/ctriggereditor.cpp
M +2 -3 kmuddy/cwindowlist.cpp
M +1 -2 kmuddy/cwindowlist.h
M +5 -1 kmuddy/dialogs/dlgmultiline.cpp
M +3 -11 kmuddy/kmuddy.cpp
M +1 -2 kmuddy/kmuddy.h
M +31 -31 kmuddy/macros.cpp
M +44 -41 kmuddy/main.cpp
https://commits.kde.org/kmuddy/0fa5fe91047f77e4e4f3e0ef6efc014695eea297
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6edfea2..1c79f3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ include(KDEFrameworkCompilerSettings)
include(ECMInstallIcons)
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets Script Multimedia)
-find_package(KF5 REQUIRED COMPONENTS Config CoreAddons WidgetsAddons I18n KIO \
KDELibs4Support KCMUtils XmlGui Parts Service) +find_package(KF5 REQUIRED COMPONENTS \
Config CoreAddons WidgetsAddons I18n KIO KDELibs4Support KCMUtils XmlGui Parts \
Service IconThemes)
find_package(MXP)
if (MXP_FOUND)
diff --git a/kmuddy/CMakeLists.txt b/kmuddy/CMakeLists.txt
index df305a4..35ca9f1 100644
--- a/kmuddy/CMakeLists.txt
+++ b/kmuddy/CMakeLists.txt
@@ -50,7 +50,7 @@ set(kmuddy_SRCS
add_executable(kmuddy ${kmuddy_SRCS})
-set (KMUDDY_LIBRARIES kmuddycore dialogs KF5::KDELibs4Support KF5::I18n KF5::Parts z \
) +set (KMUDDY_LIBRARIES kmuddycore dialogs KF5::KDELibs4Support KF5::I18n KF5::Parts \
KF5::IconThemes z ) if (MXP_FOUND)
set (KMUDDY_LIBRARIES ${KMUDDY_LIBRARIES} ${MXP_LIBRARIES})
endif (MXP_FOUND)
diff --git a/kmuddy/cbuttoneditor.cpp b/kmuddy/cbuttoneditor.cpp
index 37ff55e..42f4ca8 100644
--- a/kmuddy/cbuttoneditor.cpp
+++ b/kmuddy/cbuttoneditor.cpp
@@ -29,7 +29,7 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>. #include <QLabel>
#include <QTabWidget>
-#include <kicondialog.h>
+#include <KIconButton>
#include <klineedit.h>
#include <klocale.h>
diff --git a/kmuddy/cmultiinputline.cpp b/kmuddy/cmultiinputline.cpp
index 6c912fb..a50ff41 100644
--- a/kmuddy/cmultiinputline.cpp
+++ b/kmuddy/cmultiinputline.cpp
@@ -28,6 +28,7 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>.
#include <QKeyEvent>
#include <QFontDatabase>
+#include <QTextBlock>
//maximum number of lines ...
#define MAXLINES 10
@@ -37,9 +38,8 @@ cMultiInputLine::cMultiInputLine (int sess, QWidget *parent)
{
setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
- setTextFormat (Qt::PlainText);
-
- setWrapMode (QTextOption::WrapAtWordBoundaryOrAnywhere);
+ setAcceptRichText (false);
+ setWordWrapMode (QTextOption::WrapAtWordBoundaryOrAnywhere);
//height: 2 lines
setLinesHeight (2);
@@ -128,19 +128,17 @@ void cMultiInputLine::setLinesHeight (int lines)
void cMultiInputLine::updateHeight()
{
- setLinesHeight (lines ());
+ setLinesHeight (document()->lineCount());
}
void cMultiInputLine::sendCommands ()
{
- int pars = paragraphs();
-
cCmdQueues *queues = (cCmdQueues *) object ("cmdqueues");
if (!queues) return;
// create a command queue with all the commands
cCmdQueue *queue = new cCmdQueue (sess());
- for (int i = 0; i < pars; i++)
- queue->addCommand (text (i));
+ for (QTextBlock block = document()->begin(); block.isValid(); block = \
block.next()) + queue->addCommand (block.text());
queues->addQueue (queue);
//delete text if not needed
diff --git a/kmuddy/cmxpmanager.cpp b/kmuddy/cmxpmanager.cpp
index 822958b..7838335 100644
--- a/kmuddy/cmxpmanager.cpp
+++ b/kmuddy/cmxpmanager.cpp
@@ -113,7 +113,7 @@ void cMXPManager::processText (const QString &text)
return;
//give the text to the library
- mxpProcessText (h, text.toLocal8Bit());
+ mxpProcessText (h, text.toLocal8Bit().data());
//process each result
while (mxpHasResults (h)) {
@@ -320,7 +320,7 @@ QColor cMXPManager::toColor (RGB mxpColor)
void cMXPManager::sendDefaultFont ()
{
- const char *name = deffont.family ().toLatin1();
+ const char *name = deffont.family ().toLatin1().data();
int size = deffont.pointSize ();
bool bold = deffont.bold ();
bool italics = deffont.italic ();
diff --git a/kmuddy/csessionmanager.cpp b/kmuddy/csessionmanager.cpp
index f332489..160c044 100644
--- a/kmuddy/csessionmanager.cpp
+++ b/kmuddy/csessionmanager.cpp
@@ -33,16 +33,17 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>.
#include <kapplication.h>
#include <kdialog.h>
-#include <kicon.h>
#include <klocale.h>
+#include <QIcon>
+
struct cSessionManagerPrivate {
cTabWidget *widget;
cActionManager *am;
/** icons for the tab bar */
- KIcon iconOk, iconNo, iconFlag;
+ QIcon iconOk, iconNo, iconFlag;
/** should the tab bar be displayed even if there is only one connection? */
bool wantTabBar;
@@ -58,9 +59,9 @@ cSessionManager::cSessionManager () : cActionBase \
("session-manager", 0) d->am = cActionManager::self();
//icons for tabs
- d->iconOk = KIcon ("dialog-ok");
- d->iconNo = KIcon ("dialog-cancel");
- d->iconFlag = KIcon ("flag");
+ d->iconOk = QIcon::fromTheme ("dialog-ok");
+ d->iconNo = QIcon::fromTheme ("dialog-cancel");
+ d->iconFlag = QIcon::fromTheme ("flag");
addGlobalEventHandler ("global-settings-changed", 50, PT_NOTHING);
}
@@ -302,7 +303,7 @@ void cSessionManager::setAlwaysTabBar (bool value)
void cSessionManager::setIcon (int sess, ProfileIcon icon)
{
int tab = getTabBySession (sess);
- KIcon i;
+ QIcon i;
switch (icon) {
case IconOk: i = d->iconOk; break;
case IconNo: i = d->iconNo; break;
diff --git a/kmuddy/ctriggereditor.cpp b/kmuddy/ctriggereditor.cpp
index da51125..3206d4b 100644
--- a/kmuddy/ctriggereditor.cpp
+++ b/kmuddy/ctriggereditor.cpp
@@ -46,10 +46,10 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>. #include <klocale.h>
#include <kmessagebox.h>
#include <knuminput.h>
+#include <KServiceTypeTrader>
#include <ktextedit.h>
#include <kregexpeditorinterface.h>
-#include <kparts/componentfactory.h>
struct cTriggerEditor::Private {
// Basic
@@ -728,7 +728,7 @@ void cTriggerEditor::updateColorizationsList ()
void cTriggerEditor::browseForSoundFile ()
{
//open some file and place its name to the edit box
- QString fName = KFileDialog::getOpenFileName (QString(),
+ QString fName = KFileDialog::getOpenFileName (QUrl(),
"audio/x-wav audio/mpeg audio/ogg", this, i18n ("Choose sound file"));
if (!(fName.isEmpty()))
d->edsoundname->setText (fName);
diff --git a/kmuddy/cwindowlist.cpp b/kmuddy/cwindowlist.cpp
index df9e6a7..740c6a6 100644
--- a/kmuddy/cwindowlist.cpp
+++ b/kmuddy/cwindowlist.cpp
@@ -60,8 +60,7 @@ void cWindowList::eventNothingHandler (QString event, int)
if (event == "global-settings-changed") {
cGlobalSettings *gs = cGlobalSettings::self();
adjustFonts (gs->getFont ("console-font"));
- applySettings (gs->getBool ("allow-blink"), gs->getBool ("word-wrap"),
- gs->getInt ("wrap-pos"), gs->getInt ("indent"), gs->getBool \
("force-redraw")); + applySettings (gs->getBool ("allow-blink"), gs->getInt \
("indent"), gs->getBool ("force-redraw")); }
}
@@ -189,7 +188,7 @@ void cWindowList::load ()
name.replace("KMuddywin_", QString());
if(!add(name, true))
return;
- windows[name]->setInitialSize(g.readEntry("Size", QSize()));
+ windows[name]->setMinimumSize(g.readEntry("Size", QSize()));
pos = g.readEntry("Position", QPoint());
windows[name]->move(pos);
vis = g.readEntry("Visible", true);
diff --git a/kmuddy/cwindowlist.h b/kmuddy/cwindowlist.h
index bc4f631..43a7b5d 100644
--- a/kmuddy/cwindowlist.h
+++ b/kmuddy/cwindowlist.h
@@ -67,8 +67,7 @@ public:
void save ();
void adjustFonts(QFont font);
- void applySettings (bool allowblinking, bool wordwrapping, int wrappos,
- int indentvalue, int forceredraw);
+ void applySettings (bool allowblinking, int indentvalue, int forceredraw);
protected:
void load ();
diff --git a/kmuddy/dialogs/dlgmultiline.cpp b/kmuddy/dialogs/dlgmultiline.cpp
index d1aa4aa..d1b8b16 100644
--- a/kmuddy/dialogs/dlgmultiline.cpp
+++ b/kmuddy/dialogs/dlgmultiline.cpp
@@ -29,7 +29,6 @@
dlgMultiLine::dlgMultiLine (QWidget *parent) : QDockWidget (parent)
{
//initial size
- // setInitialSize (QSize (400, 250));
setWindowTitle (i18n ("Multi-line input"));
//main widget
@@ -93,6 +92,11 @@ dlgMultiLine::~dlgMultiLine ()
{
}
+QSize dlgMultiLine::sizeHint() const
+{
+ return QSize (400, 250);
+}
+
void dlgMultiLine::setFont (const QFont &font)
{
editor->setFont (font);
diff --git a/kmuddy/kmuddy.cpp b/kmuddy/kmuddy.cpp
index 1a3187d..0bd448b 100644
--- a/kmuddy/kmuddy.cpp
+++ b/kmuddy/kmuddy.cpp
@@ -62,10 +62,10 @@
#include <QAction>
#include <QDesktopWidget>
#include <QIcon>
+#include <QKeyEvent>
#include <QMenu>
#include <QMenuBar>
#include <QTimer>
-#include <QKeyEvent>
#include <kaboutapplicationdialog.h>
#include <kactioncollection.h>
@@ -73,6 +73,7 @@
#include <kapplication.h>
#include <khelpmenu.h>
#include <kinputdialog.h>
+#include <KIconLoader>
#include <klocale.h>
#include <kmessagebox.h>
#include <kshortcut.h>
@@ -80,8 +81,8 @@
#include <ktoggleaction.h>
#include <ktoolbar.h>
#include <kwindowsystem.h>
-#include <ksystemtrayicon.h>
#include <kpassivepopup.h>
+#include <KSystemTrayIcon>
#include <kdebug.h>
KMuddy *KMuddy::_self = 0;
@@ -606,8 +607,6 @@ void KMuddy::prepareObjects ()
menu->plug (pluginsconfig, "settings-slot3");
//menu Help
- //make About Kmuddy work (I have no idea why it doesn't work immediately)
- connect (helpMenu, SIGNAL (showAboutApplication ()), this, SLOT (aboutApp ()));
// global actions are tied to the main window
addAction (lineup);
@@ -916,13 +915,6 @@ QString KMuddy::reconnectText ()
return i18n ("To reconnect, press %1 or use Connection / Reconnect.", \
reconnect->shortcut().toString());; }
-void KMuddy::aboutApp ()
-{
- KAboutApplicationDialog *dlg = new KAboutApplicationDialog \
(KGlobal::activeComponent().aboutData(), this);
- dlg->exec ();
- delete dlg;
-}
-
void KMuddy::updateWindows ()
{
// TODO: the windows could react on events and update themselves ...
diff --git a/kmuddy/kmuddy.h b/kmuddy/kmuddy.h
index 08f4317..50e64b6 100644
--- a/kmuddy/kmuddy.h
+++ b/kmuddy/kmuddy.h
@@ -28,6 +28,7 @@ class QMenu;
class QTimer;
class KHelpMenu;
class QMenuBar;
+class KSystemTrayIcon;
class KToolBar;
class dlgConnect;
@@ -39,7 +40,6 @@ class dlgStatistics;
class cActionManager;
class cTabWidget;
-class KSystemTrayIcon;
/** KMuddy is the base class of the project */
class KMuddy : public KMainWindow, public cActionBase
@@ -131,7 +131,6 @@ protected slots:
void pasteInput ();
void changeSession (int tab);
- void aboutApp ();
/** lots of slots that handle menus; were handled by slots in objects,
now we have cSession, so we have to handle them here */
diff --git a/kmuddy/macros.cpp b/kmuddy/macros.cpp
index f7035e7..0acefe7 100644
--- a/kmuddy/macros.cpp
+++ b/kmuddy/macros.cpp
@@ -36,7 +36,7 @@ using namespace std;
class cMacroSet : public cMacro {
public:
cMacroSet () : cMacro ("set") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString varname = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString value = params.section (' ', 1, -1, QString::SectionSkipEmpty);
//no variable expansion for our parameter, to allow various tricks :)
@@ -47,7 +47,7 @@ public:
class cMacroUnset : public cMacro {
public:
cMacroUnset () : cMacro ("unset") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString varname = params.section (' ', 0, 0, QString::SectionSkipEmpty);
varList(sess)->unset (varname);
}
@@ -94,7 +94,7 @@ class cMacroLUnset : public cMacro {
class cMacroInc : public cMacro {
public:
cMacroInc () : cMacro ("inc") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString varname = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString value = params.section (' ', 1, 1, QString::SectionSkipEmpty);
bool ok = false;
@@ -106,7 +106,7 @@ public:
class cMacroDec : public cMacro {
public:
cMacroDec () : cMacro ("dec") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString varname = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString value = params.section (' ', 1, 1, QString::SectionSkipEmpty);
bool ok = false;
@@ -154,7 +154,7 @@ class cMacroLDec : public cMacro {
class cMacroProvideRes : public cMacro {
public:
cMacroProvideRes () : cMacro ("provide-res") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString varname = params.section (' ', 0, 0, QString::SectionSkipEmpty);
varList(sess)->provideResource (varname);
}
@@ -163,7 +163,7 @@ public:
class cMacroRequestRes : public cMacro {
public:
cMacroRequestRes () : cMacro ("request-res") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString varname = params.section (' ', 0, 0, QString::SectionSkipEmpty);
bool ret = varList(sess)->requestResource (varname);
if (!ret)
@@ -186,7 +186,7 @@ public:
class cMacroTick : public cMacro {
public:
cMacroTick () : cMacro ("tick") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString objName = params;
if (!objName.length()) {
am->invokeEvent ("message", sess, i18n ("/tick: syntax: /tick timer-name"));
@@ -215,7 +215,7 @@ public:
class cMacroTickNow : public cMacro {
public:
cMacroTickNow () : cMacro ("ticknow") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString objName = params;
if (!objName.length()) {
am->invokeEvent ("message", sess, i18n ("/ticknow: syntax: /ticknow \
timer-name")); @@ -391,7 +391,7 @@ public:
class cMacroOAdd : public cMacro {
public:
cMacroOAdd () : cMacro ("oadd") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString par2 = params.section (' ', 1, -1, QString::SectionSkipEmpty);
if (par1.isEmpty() || par2.isEmpty()) {
@@ -425,7 +425,7 @@ public:
class cMacroGAdd : public cMacro {
public:
cMacroGAdd () : cMacro ("gadd") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString par2 = params.section (' ', 1, -1, QString::SectionSkipEmpty);
if (par2.isEmpty()) {
@@ -456,7 +456,7 @@ public:
class cMacroODel : public cMacro {
public:
cMacroODel () : cMacro ("odel") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
int objId = cValue (par1).asInteger();
cListManager *lm = cListManager::self();
@@ -480,7 +480,7 @@ public:
class cMacroOMove : public cMacro {
public:
cMacroOMove () : cMacro ("omove") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString par2 = params.section (' ', 1, 1, QString::SectionSkipEmpty);
QString par3 = params.section (' ', 2, 2, QString::SectionSkipEmpty);
@@ -533,7 +533,7 @@ public:
class cMacroORen : public cMacro {
public:
cMacroORen () : cMacro ("oren") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString par2 = params.section (' ', 1, -1, QString::SectionSkipEmpty);
if (par2.isEmpty()) {
@@ -574,7 +574,7 @@ public:
class cMacroOPriority : public cMacro {
public:
cMacroOPriority () : cMacro ("opriority") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString par2 = params.section (' ', 1, 1, QString::SectionSkipEmpty);
if (par2.isEmpty()) {
@@ -601,7 +601,7 @@ public:
class cMacroOEnable : public cMacro {
public:
cMacroOEnable () : cMacro ("oenable") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
int objId = cValue (par1).asInteger();
cListManager *lm = cListManager::self();
@@ -617,7 +617,7 @@ public:
class cMacroODisable : public cMacro {
public:
cMacroODisable () : cMacro ("odisable") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
int objId = cValue (par1).asInteger();
cListManager *lm = cListManager::self();
@@ -633,7 +633,7 @@ public:
class cMacroOSetBAttr : public cMacro {
public:
cMacroOSetBAttr () : cMacro ("osetbattr") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString par2 = params.section (' ', 1, 1, QString::SectionSkipEmpty);
QString par3 = params.section (' ', 2, 2, QString::SectionSkipEmpty);
@@ -657,7 +657,7 @@ public:
class cMacroOSetIAttr : public cMacro {
public:
cMacroOSetIAttr () : cMacro ("osetiattr") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString par2 = params.section (' ', 1, 1, QString::SectionSkipEmpty);
QString par3 = params.section (' ', 2, 2, QString::SectionSkipEmpty);
@@ -681,7 +681,7 @@ public:
class cMacroOSetSAttr : public cMacro {
public:
cMacroOSetSAttr () : cMacro ("osetsattr") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
QString par1 = params.section (' ', 0, 0, QString::SectionSkipEmpty);
QString par2 = params.section (' ', 1, 1, QString::SectionSkipEmpty);
QString par3 = params.section (' ', 2, -1, QString::SectionSkipEmpty);
@@ -704,7 +704,7 @@ public:
class cMacroTGroupOn : public cMacro {
public:
cMacroTGroupOn () : cMacro ("tgroupon") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
cListManager *lm = cListManager::self();
cList *list = lm->getList (sess, "triggers");
if (!list) return;
@@ -719,7 +719,7 @@ public:
class cMacroTGroupOff : public cMacro {
public:
cMacroTGroupOff () : cMacro ("tgroupoff") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
cListManager *lm = cListManager::self();
cList *list = lm->getList (sess, "triggers");
if (!list) return;
@@ -735,7 +735,7 @@ public:
class cMacroAGroupOn : public cMacro {
public:
cMacroAGroupOn () : cMacro ("agroupon") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
cListManager *lm = cListManager::self();
cList *list = lm->getList (sess, "aliases");
if (!list) return;
@@ -751,7 +751,7 @@ public:
class cMacroAGroupOff : public cMacro {
public:
cMacroAGroupOff () : cMacro ("agroupoff") {}
- virtual void eval (const QString ¶ms, int sess, cCmdQueue *) {
+ virtual void eval (const QString ¶ms, int sess, cCmdQueue *) override {
cListManager *lm = cListManager::self();
cList *list = lm->getList (sess, "aliases");
if (!list) return;
@@ -813,7 +813,7 @@ class cFunctionCount: public cFunction {
class cFunctionGlobal: public cFunction {
public:
cFunctionGlobal () : cFunction ("global") {}
- virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) {
+ virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) override \
{ if (params.size() == 0) return cValue::empty();
QString varName = (*params.begin()).asString();
cValue *val = varList(sess)->value (varName, 0);
@@ -837,7 +837,7 @@ class cFunctionLocal: public cFunction {
class cFunctionAttrib: public cFunction {
public:
cFunctionAttrib () : cFunction ("attrib") {}
- virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) {
+ virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) override \
{ if (params.size() < 2) return cValue::empty();
std::list<cValue>::iterator it = params.begin();
QString object = (*it).asString();
@@ -850,7 +850,7 @@ class cFunctionAttrib: public cFunction {
class cFunctionStrAttrib: public cFunction {
public:
cFunctionStrAttrib () : cFunction ("strattrib") {}
- virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) {
+ virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) override \
{ if (params.size() < 2) return cValue::empty();
std::list<cValue>::iterator it = params.begin();
QString object = (*it).asString();
@@ -863,7 +863,7 @@ class cFunctionStrAttrib: public cFunction {
class cFunctionObject: public cFunction {
public:
cFunctionObject () : cFunction ("object") {}
- virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) {
+ virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) override \
{ if (params.size() < 2) return cValue::empty();
std::list<cValue>::iterator it = params.begin();
QString listName = (*it).asString();
@@ -882,7 +882,7 @@ class cFunctionObject: public cFunction {
class cFunctionGroup: public cFunction {
public:
cFunctionGroup () : cFunction ("group") {}
- virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) {
+ virtual cValue eval (std::list<cValue> ¶ms, int sess, cCmdQueue *) override \
{ if (params.size() < 2) return cValue::empty();
std::list<cValue>::iterator it = params.begin();
QString listName = (*it).asString();
@@ -901,7 +901,7 @@ class cFunctionGroup: public cFunction {
class cFunctionOBAttr: public cFunction {
public:
cFunctionOBAttr () : cFunction ("obattr") {}
- virtual cValue eval (std::list<cValue> ¶ms, int, cCmdQueue *) {
+ virtual cValue eval (std::list<cValue> ¶ms, int, cCmdQueue *) override {
if (params.size() < 2) return cValue::empty();
std::list<cValue>::iterator it = params.begin();
int id = (*it).asInteger();
@@ -918,7 +918,7 @@ class cFunctionOBAttr: public cFunction {
class cFunctionOIAttr: public cFunction {
public:
cFunctionOIAttr () : cFunction ("oiattr") {}
- virtual cValue eval (std::list<cValue> ¶ms, int, cCmdQueue *) {
+ virtual cValue eval (std::list<cValue> ¶ms, int, cCmdQueue *) override {
if (params.size() < 2) return cValue::empty();
std::list<cValue>::iterator it = params.begin();
int id = (*it).asInteger();
@@ -935,7 +935,7 @@ class cFunctionOIAttr: public cFunction {
class cFunctionOSAttr: public cFunction {
public:
cFunctionOSAttr () : cFunction ("osattr") {}
- virtual cValue eval (std::list<cValue> ¶ms, int, cCmdQueue *) {
+ virtual cValue eval (std::list<cValue> ¶ms, int, cCmdQueue *) override {
if (params.size() < 2) return cValue::empty();
std::list<cValue>::iterator it = params.begin();
int id = (*it).asInteger();
diff --git a/kmuddy/main.cpp b/kmuddy/main.cpp
index 1f80de0..076396d 100644
--- a/kmuddy/main.cpp
+++ b/kmuddy/main.cpp
@@ -27,49 +27,54 @@
#include "kmuddy.h"
#include "cglobalsettings.h"
-#define DESCRIPTION ki18n("KMuddy is a MUD (Multi-User Dungeon) client for KDE with \
a variety of features.") +#define DESCRIPTION i18n("KMuddy is a MUD (Multi-User \
Dungeon) client for KDE with a variety of features.")
int main(int argc, char *argv[])
{
- KAboutData aboutData ("kmuddy", "", ki18n("KMuddy"),
- VERSION, DESCRIPTION, KAboutData::License_GPL,
- ki18n("(c) 2002-2009, Tomas Mecir"), KLocalizedString(), \
"http://www.kmuddy.com/", "kmuddy@kmuddy.com");
- aboutData.addAuthor(ki18n ("Tomas Mecir"),
- ki18n("Main developer and maintainer"), "kmuddy@kmuddy.com");
- aboutData.addCredit(ki18n("Alex Bache"),
- ki18n("Many improvements in external scripting, internal script parser, output \
view and aliases/triggers, bugfixes"), "alex.bache@ntlworld.com");
- aboutData.addCredit(ki18n("Alsherok staff"),
- ki18n("for releasing AFKMud codebase, used to test MCCP/MSP"));
- aboutData.addCredit(ki18n("Andrea Cascio"),
- ki18n("SuSE RPMs, speed-walking improvements"), "hacksaw@triangolo.it");
- aboutData.addCredit(ki18n("Orion Elder"),
- ki18n("KMuddy forum, many ideas"), "orion@mudplanet.org");
- aboutData.addCredit(ki18n("Scott Monachello"),
- ki18n("Improvements in scripting, bugfixes"), "smonachello@yahoo.com");
- aboutData.addCredit(ki18n("Tyler Montbriand"),
- ki18n("Help with SDL support"), "tsm@accesscomm.ca");
- aboutData.addCredit(ki18n("Marco Mastroddi"),
- ki18n("Tick timers"), "marco.mastroddi@libero.it");
- aboutData.addCredit (ki18n("Henrikki Almusa"),
- ki18n("Commands to enable/disable groups"), "hena@iki.fi");
- aboutData.addCredit(ki18n("Drossos Stamboulakis"),
- ki18n("Selection improvements, full screen mode, cross-tab commands"), \
"adsluard@tpg.com.au");
- aboutData.addCredit (ki18n("Antonio J. Soler Sanchez"),
- ki18n("Spanish translation"), "redtony@telefonica.net");
- aboutData.addCredit(ki18n("lontau"),
- ki18n("Code to access KMuddy variables in Ruby"));
- aboutData.addCredit (ki18n("Magnus Lundborg"), ki18n("Tab-expansion \
improvements"), "lundborg.magnus@gmail.com");
- aboutData.addCredit(ki18n("Vladimir Lazarenko"),
- ki18n("Many improvements. Hosting KMuddy CVS."), "vlad@lazarenko.net");
- aboutData.addCredit(ki18n("Stuart Henshall"),
- ki18n("Speed improvements."), "shenshall@blueyonder.co.uk");
- aboutData.addCredit(ki18n("Vadim Peretokin"),
- ki18n("Many improvements, website"), "vadimuses@gmail.com");
- aboutData.addCredit(ki18n("Heiko Koehn"),
- ki18n("Scripting improvements"), "koehnheiko@googlemail.com");
- aboutData.addCredit(ki18n("Robert Marmorstein"),
- ki18n("Systray icon support"), "robertandbeth@gmail.com");
+ QApplication a (argc, argv);
+ KLocalizedString::setApplicationDomain("foo");
+ QApplication::setApplicationDisplayName(i18n("KMuddy"));
+
+ KAboutData aboutData ("kmuddy", i18n("KMuddy"),
+ VERSION, DESCRIPTION, KAboutLicense::GPL,
+ i18n("(c) 2002-2018, Tomas Mecir"), QString(), "http://www.kmuddy.com/", \
"mecirt@gmail.com"); + aboutData.addAuthor(i18n ("Tomas Mecir"),
+ i18n("Main developer and maintainer"), "mecirt@gmail.com");
+ aboutData.addCredit(i18n("Alex Bache"),
+ i18n("Many improvements in external scripting, internal script parser, output \
view and aliases/triggers, bugfixes"), "alex.bache@ntlworld.com"); + \
aboutData.addCredit(i18n("Alsherok staff"), + i18n("for releasing AFKMud \
codebase, used to test MCCP/MSP")); + aboutData.addCredit(i18n("Andrea Cascio"),
+ i18n("SuSE RPMs, speed-walking improvements"), "hacksaw@triangolo.it");
+ aboutData.addCredit(i18n("Orion Elder"),
+ i18n("KMuddy forum, many ideas"), "orion@mudplanet.org");
+ aboutData.addCredit(i18n("Scott Monachello"),
+ i18n("Improvements in scripting, bugfixes"), "smonachello@yahoo.com");
+ aboutData.addCredit(i18n("Tyler Montbriand"),
+ i18n("Help with SDL support"), "tsm@accesscomm.ca");
+ aboutData.addCredit(i18n("Marco Mastroddi"),
+ i18n("Tick timers"), "marco.mastroddi@libero.it");
+ aboutData.addCredit (i18n("Henrikki Almusa"),
+ i18n("Commands to enable/disable groups"), "hena@iki.fi");
+ aboutData.addCredit(i18n("Drossos Stamboulakis"),
+ i18n("Selection improvements, full screen mode, cross-tab commands"), \
"adsluard@tpg.com.au"); + aboutData.addCredit (i18n("Antonio J. Soler Sanchez"),
+ i18n("Spanish translation"), "redtony@telefonica.net");
+ aboutData.addCredit(i18n("lontau"),
+ i18n("Code to access KMuddy variables in Ruby"));
+ aboutData.addCredit (i18n("Magnus Lundborg"), i18n("Tab-expansion improvements"), \
"lundborg.magnus@gmail.com"); + aboutData.addCredit(i18n("Vladimir Lazarenko"),
+ i18n("Many improvements. Hosting KMuddy CVS."), "vlad@lazarenko.net");
+ aboutData.addCredit(i18n("Stuart Henshall"),
+ i18n("Speed improvements."), "shenshall@blueyonder.co.uk");
+ aboutData.addCredit(i18n("Vadim Peretokin"),
+ i18n("Many improvements, website"), "vadimuses@gmail.com");
+ aboutData.addCredit(i18n("Heiko Koehn"),
+ i18n("Scripting improvements"), "koehnheiko@googlemail.com");
+ aboutData.addCredit(i18n("Robert Marmorstein"),
+ i18n("Systray icon support"), "robertandbeth@gmail.com");
KAboutData::setApplicationData (aboutData);
+ QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("kmuddy")));
//alarm signal is sometimes causing KMuddy to terminate incorrectly
//when switching tabs using Alt+number - ignoring the signal, hoping
@@ -84,8 +89,6 @@ int main(int argc, char *argv[])
migrator.setUiFiles(QStringList() << QStringLiteral("kmuddymapperpart.rc"));
migrator.migrate();
- KApplication a (argc, argv );
- QApplication::setApplicationDisplayName(i18n("KMuddy"));
KMuddy *kmuddy = 0;
/*
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic