diff options
author | Timothy Pearson <[email protected]> | 2013-02-06 19:46:01 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-06 19:46:01 -0600 |
commit | 5466d52073af147d100482cbf633087bb9fb631b (patch) | |
tree | 80fee1fa39c51e63dfb213f52514fbec95c331bc /tdecore/kapplication.cpp | |
parent | 84341c04865b27eaf78e082e1cca79a2c9d05262 (diff) | |
download | tdelibs-5466d52073af147d100482cbf633087bb9fb631b.tar.gz tdelibs-5466d52073af147d100482cbf633087bb9fb631b.zip |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kapplication.cpp')
-rw-r--r-- | tdecore/kapplication.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index 25dc61e15..15c8a132b 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -1505,7 +1505,7 @@ void TDEApplication::dcopFailure(const TQString &msg) } } -static const KCmdLineOptions qt_options[] = +static const TDECmdLineOptions qt_options[] = { //FIXME: Check if other options are specific to Qt/X11 #ifdef Q_WS_X11 @@ -1539,10 +1539,10 @@ static const KCmdLineOptions qt_options[] = { "qws", I18N_NOOP("forces the application to run as QWS Server"), 0}, #endif { "reverse", I18N_NOOP("mirrors the whole layout of widgets"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; -static const KCmdLineOptions kde_options[] = +static const TDECmdLineOptions kde_options[] = { { "caption <caption>", I18N_NOOP("Use 'caption' as name in the titlebar"), 0}, { "icon <icon>", I18N_NOOP("Use 'icon' as the application icon"), 0}, @@ -1556,7 +1556,7 @@ static const KCmdLineOptions kde_options[] = { "smkey <sessionKey>", 0, 0}, // this option is obsolete and exists only to allow smooth upgrades from sessions // saved under Qt 3.0.x -- Qt 3.1.x includes the session key now automatically in // the session id (Simon) - KCmdLineLastOption + TDECmdLineLastOption }; void |