summaryrefslogtreecommitdiffstats
path: root/karm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:47 -0600
commit32b66c9ae78f439199a6d281cc33218e57c5106d (patch)
treee92cf1651596c736188317c75eeb1ce5662d57bd /karm
parentd29a9ff5829fa930c466b98cb93a4cbdd24b1fa2 (diff)
downloadtdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.tar.gz
tdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'karm')
-rw-r--r--karm/main.cpp8
-rw-r--r--karm/test/locking.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/karm/main.cpp b/karm/main.cpp
index bc8183bb8..e8ebc7e1c 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 7a1d6ad53..6f9cd1834 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 );