diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:43 -0600 |
| commit | d41050ea3f6904e5156d35f664346b816b9e4d12 (patch) | |
| tree | 7b3ff517432a631adc61a2a93080dc3bacfab604 /khotkeys | |
| parent | c16d0f2191af1e4810391dbd1a06d7713fb38666 (diff) | |
| download | tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys')
| -rw-r--r-- | khotkeys/app/app.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/update/update.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp index c95043c9e..670b39b1b 100644 --- a/khotkeys/app/app.cpp +++ b/khotkeys/app/app.cpp @@ -144,7 +144,7 @@ int KDE_EXPORT kdemain( int argc, char** argv ) appname.sprintf("khotkeys-screen-%d", khotkeys_screen_number); // no need to i18n these, no GUI - KCmdLineArgs::init( argc, argv, appname, I18N_NOOP( "KHotKeys" ), + TDECmdLineArgs::init( argc, argv, appname, I18N_NOOP( "KHotKeys" ), I18N_NOOP( "KHotKeys daemon" ), KHOTKEYS_VERSION ); KUniqueApplication::addCmdLineOptions(); if( !KHotKeysApp::start()) // already running diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp index 91456ed70..5387382fa 100644 --- a/khotkeys/update/update.cpp +++ b/khotkeys/update/update.cpp @@ -34,11 +34,11 @@ static const KCmdLineOptions options[] = int main( int argc, char* argv[] ) { - KCmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update", + TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update", "KHotKeys update utility", "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/ - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TQCString id = args->getOption( "id" ); TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" ); if( file.isEmpty()) |