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 --- tdeprint/kjobviewer/kjobviewer.cpp | 2 +- tdeprint/kjobviewer/main.cpp | 4 ++-- tdeprint/kprinter/main.cpp | 4 ++-- tdeprint/kprinter/printwrapper.cpp | 2 +- tdeprint/slave/kio_print.cpp | 2 +- tdeprint/tdeprintfax/main.cpp | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tdeprint') diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index 7d72dbd5b..bd104c72f 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -108,7 +108,7 @@ int KJobViewerApp::newInstance() void KJobViewerApp::initialize() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool showIt = args->isSet("show"); bool all = args->isSet("all"); QString prname = args->getOption("d"); diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp index e75a00e13..417929339 100644 --- a/tdeprint/kjobviewer/main.cpp +++ b/tdeprint/kjobviewer/main.cpp @@ -37,8 +37,8 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) { KAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org"); aboutData.addAuthor("Michael Goffioul",0,"tdeprint@swing.be"); - KCmdLineArgs::init(argc,argv,&aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KJobViewerApp::addCmdLineOptions(); if (!KJobViewerApp::start()) diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp index 7505127ec..8a36512c9 100644 --- a/tdeprint/kprinter/main.cpp +++ b/tdeprint/kprinter/main.cpp @@ -44,8 +44,8 @@ static KCmdLineOptions options[] = extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) { - KCmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1"); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1"); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; PrintWrapper *wrap = new PrintWrapper; app.setMainWidget(wrap); diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp index e0862271c..97e2cad8f 100644 --- a/tdeprint/kprinter/printwrapper.cpp +++ b/tdeprint/kprinter/printwrapper.cpp @@ -135,7 +135,7 @@ PrintWrapper::PrintWrapper() void PrintWrapper::slotPrint() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) struct sigaction action; diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp index 89d784434..d337b11a6 100644 --- a/tdeprint/slave/kio_print.cpp +++ b/tdeprint/slave/kio_print.cpp @@ -147,7 +147,7 @@ int kdemain(int argc, char **argv) /* create fake KApplicatiom object, needed for job stuffs */ KAboutData about( "kio_print", "kio_print", "fake_version", "TDEPrint IO slave", KAboutData::License_GPL, "(c) 2003, Michael Goffioul" ); - KCmdLineArgs::init( &about ); + TDECmdLineArgs::init( &about ); KApplication app; KIO_Print slave(argv[2], argv[3]); diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp index 4fe22a3b6..0732505b4 100644 --- a/tdeprint/tdeprintfax/main.cpp +++ b/tdeprint/tdeprintfax/main.cpp @@ -51,12 +51,12 @@ int main(int argc, char *argv[]) "1.0", description, KAboutData::License_GPL, "(c), 2001 Michael Goffioul", 0, "http://printing.kde.org"); aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication::addCmdLineOptions(); KApplication a; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KdeprintFax *w = new KdeprintFax; a.setMainWidget(w); -- cgit v1.2.3