From 32b66c9ae78f439199a6d281cc33218e57c5106d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:47 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- karm/main.cpp | 8 ++++---- karm/test/locking.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'karm') diff --git a/karm/main.cpp b/karm/main.cpp index bc8183bb..e8ebc7e1 100644 --- a/karm/main.cpp +++ b/karm/main.cpp @@ -47,11 +47,11 @@ int main( int argc, char *argv[] ) aboutData.addAuthor( "Tomas Pospisek", 0, "tpo_deb@sourcepole.ch" ); aboutData.addAuthor( "Willi Richert", 0, "w.richert@gmx.net" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication myApp; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); MainWindow *mainWindow; if ( args->count() > 0 ) @@ -68,7 +68,7 @@ int main( int argc, char *argv[] ) } else { - icsfile = KCmdLineArgs::cwd() + "/" + icsfile; + icsfile = TDECmdLineArgs::cwd() + "/" + icsfile; } mainWindow = new MainWindow( icsfile ); } diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp index 7a1d6ad5..6f9cd183 100644 --- a/karm/test/locking.cpp +++ b/karm/test/locking.cpp @@ -138,7 +138,7 @@ int main( int argc, char *argv[] ) // Copied from Till's test in libkcal. Not sure what this is for. KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"testresourcelocking", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"testresourcelocking", 0, 0, 0, 0); KApplication app( false, false ); -- cgit v1.2.3