diff options
author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:47 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:47 -0600 |
commit | 32b66c9ae78f439199a6d281cc33218e57c5106d (patch) | |
tree | e92cf1651596c736188317c75eeb1ce5662d57bd /certmanager | |
parent | d29a9ff5829fa930c466b98cb93a4cbdd24b1fa2 (diff) | |
download | tdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.tar.gz tdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'certmanager')
-rw-r--r-- | certmanager/kwatchgnupg/main.cpp | 4 | ||||
-rw-r--r-- | certmanager/lib/tests/test_cryptoconfig.cpp | 2 | ||||
-rw-r--r-- | certmanager/lib/tests/test_gnupgprocessbase.cpp | 2 | ||||
-rw-r--r-- | certmanager/lib/tests/test_jobs.cpp | 2 | ||||
-rw-r--r-- | certmanager/lib/tests/test_keygen.cpp | 2 | ||||
-rw-r--r-- | certmanager/lib/tests/test_keylister.cpp | 2 | ||||
-rw-r--r-- | certmanager/lib/tests/test_keyselectiondialog.cpp | 2 | ||||
-rw-r--r-- | certmanager/lib/tests/test_verify.cpp | 2 | ||||
-rw-r--r-- | certmanager/main.cpp | 6 |
9 files changed, 12 insertions, 12 deletions
diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp index cbd0dd178..e05345330 100644 --- a/certmanager/kwatchgnupg/main.cpp +++ b/certmanager/kwatchgnupg/main.cpp @@ -78,11 +78,11 @@ int main( int argc, char** argv ) { AboutData aboutData; - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); static const KCmdLineOptions options[] = { KCmdLineLastOption// End of options. }; - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KWatchGnuPGApplication::addCmdLineOptions(); #if 0 diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp index f3c27d0ce..8eb998915 100644 --- a/certmanager/lib/tests/test_cryptoconfig.cpp +++ b/certmanager/lib/tests/test_cryptoconfig.cpp @@ -43,7 +43,7 @@ using namespace std; int main( int argc, char** argv ) { KAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app( false, false ); Kleo::CryptoConfig * config = new QGpgMECryptoConfig(); diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index c65afffc4..c1ac90b96 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -120,7 +120,7 @@ int main( int argc, char** argv ) { return 1; } KAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" ); - KCmdLineArgs::init( &aboutData ); + TDECmdLineArgs::init( &aboutData ); KApplication app; Kleo::GnuPGProcessBase gpg; diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp index 95b8dcc97..ba07792f8 100644 --- a/certmanager/lib/tests/test_jobs.cpp +++ b/certmanager/lib/tests/test_jobs.cpp @@ -101,7 +101,7 @@ int main( int argc, char** argv ) { argc = 1; // hide from KDE } KAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; testSign(); diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index 7e3fa8876..a17404fa3 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -147,7 +147,7 @@ int main( int argc, char** argv ) { argc = 1; // hide from KDE } KAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; KeyGenerator * keygen = new KeyGenerator( 0, "KeyGenerator top-level" ); diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index 363ec26a9..1947d1d66 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -131,7 +131,7 @@ void CertListView::slotStart() { int main( int argc, char** argv ) { KAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; CertListView * clv = new CertListView( 0, "CertListView top-level" ); diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp index f4c574da5..1af2184a1 100644 --- a/certmanager/lib/tests/test_keyselectiondialog.cpp +++ b/certmanager/lib/tests/test_keyselectiondialog.cpp @@ -45,7 +45,7 @@ int main( int argc, char ** argv ) { KAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; KGlobal::iconLoader()->addAppDir( "libkleopatra" ); diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp index 4edd8c7f2..15eacfec7 100644 --- a/certmanager/lib/tests/test_verify.cpp +++ b/certmanager/lib/tests/test_verify.cpp @@ -54,7 +54,7 @@ int main( int argc, char **argv ) setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-unit-test" ), 1); KAboutData aboutData( "test_verify", "verify job test", "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app( false, false ); const TQString sigFileName = TDESRCDIR "/test.data.sig"; diff --git a/certmanager/main.cpp b/certmanager/main.cpp index 85f989007..4db304c24 100644 --- a/certmanager/main.cpp +++ b/certmanager/main.cpp @@ -50,18 +50,18 @@ int main( int argc, char** argv ) { AboutData aboutData; - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); static const KCmdLineOptions options[] = { { "external" , I18N_NOOP("Search for external certificates initially"), 0 }, { "query " , I18N_NOOP("Initial query string"), 0 }, { "import-certificate ", I18N_NOOP("Name of certificate file to import"), 0 }, KCmdLineLastOption// End of options. }; - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KGlobal::locale()->insertCatalogue( "libkleopatra" ); KGlobal::iconLoader()->addAppDir( "libkleopatra" ); |