From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- tdeprint/cups/cupsdconf2/main.cpp | 2 +- tdeprint/kmmanager.cpp | 2 +- tdeprint/kprinterimpl.cpp | 2 +- tdeprint/management/kaddprinterwizard.cpp | 2 +- tdeprint/management/kmwdrivertest.cpp | 2 +- tdeprint/tests/drawdemo.cpp | 2 +- tdeprint/tests/main.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tdeprint') diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp index 5be5e9330..aba9b3905 100644 --- a/tdeprint/cups/cupsdconf2/main.cpp +++ b/tdeprint/cups/cupsdconf2/main.cpp @@ -36,7 +36,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) I18N_NOOP("A CUPS configuration tool"), I18N_NOOP("A CUPS configuration tool"),"0.0.1"); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL configfile; diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index c9730adba..115f3fd02 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -362,7 +362,7 @@ bool KMManager::uncompressFile(const TQString& filename, TQString& destname) if ((uchar)(buf[0]) == 037 && (uchar)(buf[1]) == 0213) { f.close(); - destname = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); + destname = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8); f.setName(destname); if (f.open(IO_WriteOnly)) diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 05e1aa0df..171daf45d 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -296,7 +296,7 @@ TQString KPrinterImpl::tempFile() { TQString f; // be sure the file doesn't exist - do f = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); while (TQFile::exists(f)); + do f = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8); while (TQFile::exists(f)); return f; } diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp index 26a0d8e96..2bfebcfa4 100644 --- a/tdeprint/management/kaddprinterwizard.cpp +++ b/tdeprint/management/kaddprinterwizard.cpp @@ -21,7 +21,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) KGlobal::locale()->setMainCatalogue("tdelibs"); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool doConfig = args->isSet("tdeconfig"); bool doSrvConfig = args->isSet("serverconfig"); diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 545d3b94d..d4652878f 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -133,7 +133,7 @@ void KMWDriverTest::slotTest() { if (!m_printer) return; - TQString name = "tmpprinter_"+KApplication::randomString(8); + TQString name = "tmpprinter_"+TDEApplication::randomString(8); // save printer name (can be non empty when modifying a printer) TQString oldname = m_printer->name(); diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index 443cc89e8..3f04c9196 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -245,7 +245,7 @@ void DrawView::resizeEvent( TQResizeEvent * ) int main( int argc, char **argv ) { - KApplication app( argc, argv, "drawdemo" ); + TDEApplication app( argc, argv, "drawdemo" ); DrawView draw; app.setMainWidget( &draw ); draw.show(); diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp index a1dc6b5e0..332ba1fc4 100644 --- a/tdeprint/tests/main.cpp +++ b/tdeprint/tests/main.cpp @@ -17,7 +17,7 @@ int main( int argc, char ** argv ) { - KApplication a(argc, argv, "helpviewer"); + TDEApplication a(argc, argv, "helpviewer"); TQString home; if (argc > 1) -- cgit v1.2.1