summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:28 -0600
commit68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (patch)
tree2960e9f2a6227456ee4d6f1b135f6daa30929eac /lib
parent7e1f33d9f50dcae3eeed6143c602303ac360ba8d (diff)
downloadkoffice-68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2.tar.gz
koffice-68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'lib')
-rw-r--r--lib/kformula/main.cc6
-rw-r--r--lib/kofficecore/KoApplication.cpp6
-rw-r--r--lib/koproperty/test/main.cpp6
-rw-r--r--lib/koproperty/test/test.cpp2
-rw-r--r--lib/kotext/tests/kobordertest.cpp2
-rw-r--r--lib/kross/runner/main.cpp8
-rw-r--r--lib/kross/test/main.cpp6
-rw-r--r--lib/store/tests/storage_test.cpp2
-rw-r--r--lib/store/tests/storedroptest.cpp2
9 files changed, 20 insertions, 20 deletions
diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc
index 56a9e837..a08cecd9 100644
--- a/lib/kformula/main.cc
+++ b/lib/kformula/main.cc
@@ -241,8 +241,8 @@ int main(int argc, char** argv)
"(c) 2003, Ulrich Kuettler");
aboutData.addAuthor("Ulrich Kuettler",0, "ulrich.kuettler@gmx.de");
- KCmdLineArgs::init(argc, argv, &aboutData);
- KCmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs::init(argc, argv, &aboutData);
+ TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
@@ -261,7 +261,7 @@ int main(int argc, char** argv)
scrollview1a->setCaption("Test1a of the formula engine");
scrollview1a->show();
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
for ( int i = 0; i < args->count(); ++i ) {
TQFileInfo fi( args->url( i ).path() );
if ( fi.extension() == "mml" )
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index b4cfd2c4..5346ff0a 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -73,7 +73,7 @@ KoApplication::KoApplication()
// This gets called before entering KApplication::KApplication
bool KoApplication::initHack()
{
- KCmdLineArgs::addCmdLineOptions( options, I18N_NOOP("KOffice"), "koffice", "kde" );
+ TDECmdLineArgs::addCmdLineOptions( options, I18N_NOOP("KOffice"), "koffice", "kde" );
return true;
}
@@ -102,10 +102,10 @@ bool KoApplication::start()
}
// Get the command line arguments which we have to parse
- KCmdLineArgs *args= KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args= TDECmdLineArgs::parsedArgs();
int argsCount = args->count();
- KCmdLineArgs *koargs = KCmdLineArgs::parsedArgs("koffice");
+ TDECmdLineArgs *koargs = TDECmdLineArgs::parsedArgs("koffice");
TQCString dpiValues = koargs->getOption( "dpi" );
if ( !dpiValues.isEmpty() ) {
int sep = dpiValues.find( TQRegExp( "[x, ]" ) );
diff --git a/lib/koproperty/test/main.cpp b/lib/koproperty/test/main.cpp
index 83370cfd..b28a8034 100644
--- a/lib/koproperty/test/main.cpp
+++ b/lib/koproperty/test/main.cpp
@@ -39,8 +39,8 @@ int main(int argc, char **argv)
KAboutData about("proptest", "KoProperty Test", version, description,
KAboutData::License_GPL, "(C) 2005 Cedric Pasteur", 0, 0, "cedric.pasteur@free.fr");
about.addAuthor( "Cedric Pasteur", 0, "cedric.pasteur@free.fr" );
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app;
Test *mainWin = 0;
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
else
{
// no session.. just start up normally
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
/// @todo do something with the command line args here
diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp
index 1c4678c9..ecf41473 100644
--- a/lib/koproperty/test/test.cpp
+++ b/lib/koproperty/test/test.cpp
@@ -39,7 +39,7 @@ using namespace KoProperty;
Test::Test()
: KMainWindow(0,"koproperty_test")
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
const bool flat = args->isSet("flat");
const bool readOnly = args->isSet("ro");
diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp
index 356b0158..6dd37aa4 100644
--- a/lib/kotext/tests/kobordertest.cpp
+++ b/lib/kotext/tests/kobordertest.cpp
@@ -48,7 +48,7 @@ private:
int main (int argc, char ** argv)
{
KApplication::disableAutoDcopRegistration();
- KCmdLineArgs::init(argc,argv,"kobordertest", 0, 0, 0, 0);
+ TDECmdLineArgs::init(argc,argv,"kobordertest", 0, 0, 0, 0);
KApplication app;
KoZoomHandler* zh = new KoZoomHandler();
diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp
index 1093a47b..fcff2bb0 100644
--- a/lib/kross/runner/main.cpp
+++ b/lib/kross/runner/main.cpp
@@ -110,18 +110,18 @@ int main(int argc, char **argv)
about.addAuthor("Sebastian Sauer", "Author", "mail@dipe.org");
// Initialize command line args
- KCmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::init(argc, argv, &about);
// Tell which options are supported and parse them.
static KCmdLineOptions options[] = {
{ "+file", I18N_NOOP("Scriptfile"), 0 },
KCmdLineLastOption
};
- KCmdLineArgs::addCmdLineOptions(options);
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
// If no options are defined.
if(args->count() < 1) {
- std::cout << "Syntax: " << KCmdLineArgs::appName() << " scriptfile1 [scriptfile2] [scriptfile3] ..." << std::endl;
+ std::cout << "Syntax: " << TDECmdLineArgs::appName() << " scriptfile1 [scriptfile2] [scriptfile3] ..." << std::endl;
return ERROR_HELP;
}
diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp
index 7f304ba6..f8caf2d8 100644
--- a/lib/kross/test/main.cpp
+++ b/lib/kross/test/main.cpp
@@ -155,10 +155,10 @@ int main(int argc, char **argv)
"kross@dipe.org");
about.addAuthor("Sebastian Sauer", "Author", "mail@dipe.org");
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions(options);
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQString interpretername = args->getOption("interpreter");
TQString scriptfilename = args->getOption("scriptfile");
diff --git a/lib/store/tests/storage_test.cpp b/lib/store/tests/storage_test.cpp
index 1c7269ad..fdb56b1d 100644
--- a/lib/store/tests/storage_test.cpp
+++ b/lib/store/tests/storage_test.cpp
@@ -205,7 +205,7 @@ int test( const char* testName, KoStore::Backend backend, const TQString& testFi
int main( int argc, char **argv )
{
- KCmdLineArgs::init( argc, argv, "storage_test", "A test for the KoStore classes", "1" );
+ TDECmdLineArgs::init( argc, argv, "storage_test", "A test for the KoStore classes", "1" );
KApplication app( argc, argv );
// KZip (due to KSaveFile) doesn't support relative filenames
diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp
index 09e30826..2845e590 100644
--- a/lib/store/tests/storedroptest.cpp
+++ b/lib/store/tests/storedroptest.cpp
@@ -25,7 +25,7 @@ private:
int main( int argc, char** argv )
{
KApplication::disableAutoDcopRegistration();
- KCmdLineArgs::init(argc, argv, "storedroptest", 0, 0, 0, 0);
+ TDECmdLineArgs::init(argc, argv, "storedroptest", 0, 0, 0, 0);
KApplication app;
StoreDropTest* window = new StoreDropTest( 0 );