diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:48 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:48 -0600 |
commit | 6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b (patch) | |
tree | a6a367ba18807833d8f90cb6b233e7bdb3f007cc /kgpg | |
parent | ba743d360eabb06e6ffbafd2c7bc833dd985aa0c (diff) | |
download | tdeutils-6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b.tar.gz tdeutils-6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kgpg')
-rw-r--r-- | kgpg/kgpg.cpp | 2 | ||||
-rw-r--r-- | kgpg/kgpg.h | 4 | ||||
-rw-r--r-- | kgpg/main.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index b6d9194..016988d 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -887,7 +887,7 @@ void KgpgAppletApp::wizardOver(TQString defaultKeyId) int KgpgAppletApp::newInstance() { kdDebug(2100)<<"New instance"<<endl; - args = KCmdLineArgs::parsedArgs(); + args = TDECmdLineArgs::parsedArgs(); if (running) { kdDebug(2100)<<"Already running"<<endl; kgpg_applet->show(); diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index 83395a2..2c3d682 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -141,7 +141,7 @@ private slots: void checkMenu(); }; -class KCmdLineArgs; +class TDECmdLineArgs; class KgpgAppletApp : public KUniqueApplication { @@ -157,7 +157,7 @@ public: KShortcut goHome; protected: - KCmdLineArgs *args; + TDECmdLineArgs *args; private: kgpgapplet *kgpg_applet; class listKeys *s_keyManager; diff --git a/kgpg/main.cpp b/kgpg/main.cpp index e0bce49..85bce3a 100644 --- a/kgpg/main.cpp +++ b/kgpg/main.cpp @@ -50,8 +50,8 @@ int main(int argc, char *argv[]) KAboutData about("kgpg", I18N_NOOP("KGpg"), version, description, KAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle"); about.addAuthor( "Jean-Baptiste Mardelle", 0, "bj@altern.org" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KUniqueApplication::addCmdLineOptions(); |