diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:43 -0600 |
| commit | d41050ea3f6904e5156d35f664346b816b9e4d12 (patch) | |
| tree | 7b3ff517432a631adc61a2a93080dc3bacfab604 /ksmserver/main.cpp | |
| parent | c16d0f2191af1e4810391dbd1a06d7713fb38666 (diff) | |
| download | tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver/main.cpp')
| -rw-r--r-- | ksmserver/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 5108716f3..65c43253a 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -186,15 +186,15 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData.addAuthor("Luboš Luňák", I18N_NOOP( "Maintainer" ), "l.lunak@kde.org" ); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); putenv((char*)"SESSION_MANAGER="); KApplication a(KApplication::openX11RGBADisplay(), false); // Disable styles until we need them. fcntl(ConnectionNumber(tqt_xdisplay()), F_SETFD, 1); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); kapp->dcopClient()->registerAs("ksmserver", false); if (!kapp->dcopClient()->isRegistered()) |