From d41050ea3f6904e5156d35f664346b816b9e4d12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:43 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- ksmserver/main.cpp | 6 +++--- ksmserver/test.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ksmserver') 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()) diff --git a/ksmserver/test.cpp b/ksmserver/test.cpp index 8f248725f..5a5e114c4 100644 --- a/ksmserver/test.cpp +++ b/ksmserver/test.cpp @@ -8,7 +8,7 @@ int main(int argc, char *argv[]) { KAboutData about("kapptest", "kapptest", "version"); - KCmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::init(argc, argv, &about); KApplication a; a.iconLoader()->addAppDir("ksmserver"); -- cgit v1.2.1