diff options
author | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /tdeprint | |
parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint')
-rw-r--r-- | tdeprint/kprinter/main.cpp | 2 | ||||
-rw-r--r-- | tdeprint/slave/kio_print.cpp | 2 | ||||
-rw-r--r-- | tdeprint/tdeprintfax/main.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp index 8a36512c9..7381f53b9 100644 --- a/tdeprint/kprinter/main.cpp +++ b/tdeprint/kprinter/main.cpp @@ -46,7 +46,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) { TDECmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1"); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; PrintWrapper *wrap = new PrintWrapper; app.setMainWidget(wrap); TQTimer::singleShot(10,wrap,TQT_SLOT(slotPrint())); diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp index d337b11a6..74142c994 100644 --- a/tdeprint/slave/kio_print.cpp +++ b/tdeprint/slave/kio_print.cpp @@ -148,7 +148,7 @@ int kdemain(int argc, char **argv) KAboutData about( "kio_print", "kio_print", "fake_version", "TDEPrint IO slave", KAboutData::License_GPL, "(c) 2003, Michael Goffioul" ); TDECmdLineArgs::init( &about ); - KApplication app; + TDEApplication app; KIO_Print slave(argv[2], argv[3]); slave.dispatchLoop(); diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp index 0732505b4..219321907 100644 --- a/tdeprint/tdeprintfax/main.cpp +++ b/tdeprint/tdeprintfax/main.cpp @@ -53,9 +53,9 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Michael Goffioul",0, "[email protected]"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); - KApplication a; + TDEApplication a; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KdeprintFax *w = new KdeprintFax; |