Rename TDEApplication::kApplication() to TDEApplication::tdeApplication() and kapp to tdeApp.

Signed-off-by: Michele Calgaro <[email protected]>

15 files changed, 28 insertions, 28 deletions

diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index 07538003e..3a0c711bd 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -639,7 +639,7 @@ DrMain* KMCupsManager::loadFileDriver(const TQString& filename)
 DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
 {
 	TQStringList	comps = TQStringList::split('/', drname, false);
-	TQString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
+	TQString	tmpFile = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8));
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/local/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
 #else
@@ -807,7 +807,7 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename)
 
 bool KMCupsManager::savePrinterDriver(KMPrinter *p, DrMain *d)
 {
-	TQString	tmpfilename = locateLocal("tmp","print_") + kapp->randomString(8);
+	TQString	tmpfilename = locateLocal("tmp","print_") + tdeApp->randomString(8);
 
 	// first save the driver in a temporary file
 	saveDriverFile(d,tmpfilename);
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index f0afae75b..7a305345c 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -253,7 +253,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	connect(m_collate,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked()));
 	connect(m_order,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked()));
 
-	if (!kapp->authorize("print/copies"))
+	if (!tdeApp->authorize("print/copies"))
 	{
 		setTitle(i18n("Pages"));
 		m_copybox->hide();
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 25691e673..18e5f8628 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -410,9 +410,9 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	connect( d->m_file, TQ_SIGNAL( openFileDialog( KURLRequester* ) ), TQ_SLOT( slotOpenFileDialog() ) );
 	connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 
-	d->b_optionsEnabled = kapp->authorize("print/options") && kapp->authorize("print/selection");
-	d->b_propertiesEnabled = kapp->authorize("print/properties") && kapp->authorize("print/selection");
-	d->b_systemEnabled = kapp->authorize("print/system") && kapp->authorize("print/selection");
+	d->b_optionsEnabled = tdeApp->authorize("print/options") && tdeApp->authorize("print/selection");
+	d->b_propertiesEnabled = tdeApp->authorize("print/properties") && tdeApp->authorize("print/selection");
+	d->b_systemEnabled = tdeApp->authorize("print/system") && tdeApp->authorize("print/selection");
 	                
 	if (!d->b_systemEnabled)
 	{
@@ -430,7 +430,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 		d->m_wizard->hide();
 	}
 
-	if (!kapp->authorize("print/selection"))
+	if (!tdeApp->authorize("print/selection"))
 	{
 		d->m_extbtn->hide();
 		m_pbox->hide();
@@ -914,7 +914,7 @@ void KPrintDialog::slotToggleFilter(bool on)
 
 void KPrintDialog::slotHelp()
 {
-	kapp->invokeHelp(TQString::null, "tdeprint");
+	tdeApp->invokeHelp(TQString::null, "tdeprint");
 }
 
 void KPrintDialog::slotOutputFileSelected(const TQString& txt)
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 1f6d51a07..518a0a903 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -218,7 +218,7 @@ void KPrinter::saveSettings()
 
 bool KPrinter::setup(TQWidget *parent, const TQString& caption, bool forceExpand)
 {
-	if (!kapp->authorize("print/dialog"))
+	if (!tdeApp->authorize("print/dialog"))
 	{
 		autoConfigure(TQString::null, parent);
 		return true; // Just print it
@@ -409,7 +409,7 @@ bool KPrinter::printFiles(const TQStringList& l, bool flag, bool startviewer)
 					args << "-d";
 					args << printerName();
 					args << "--noshow";
-					kapp->tdeinitExec("kjobviewer", args);
+					tdeApp->tdeinitExec("kjobviewer", args);
 				}
 			}
 		}
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index c61feadd8..2318a09a0 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -197,7 +197,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool
 	kdDebug(500) << "tdeprint: print command: " << cmd << endl;
 
 	int result = 0;
-	DCOPClient	*dclient = kapp->dcopClient();
+	DCOPClient	*dclient = tdeApp->dcopClient();
 	if (!dclient || (!dclient->isAttached() && !dclient->attach()))
 	{
 		return result;
@@ -232,7 +232,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
 	if (printer && !msg.isEmpty())
 		message.prepend(i18n("Printing document: %1").arg(printer->docName())+"\n");
 
-	DCOPClient	*dclient = kapp->dcopClient();
+	DCOPClient	*dclient = tdeApp->dcopClient();
 	if (!dclient || (!dclient->isAttached() && !dclient->attach()))
 	{
 		return;
@@ -242,7 +242,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
 	TQDataStream arg( data, IO_WriteOnly );
 	arg << message;
 	arg << (int)getpid();
-	arg << kapp->caption();
+	arg << tdeApp->caption();
 	dclient->send( "kded", "tdeprintd", "statusMessage(TQString,int,TQString)", data );
 }
 
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index e2642e514..abd41c213 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -56,7 +56,7 @@ bool KPreviewProc::startPreview()
 {
 	if (start())
 	{
-		kapp->enter_loop();
+		tdeApp->enter_loop();
 		return m_bOk;
 	}
 	else
@@ -65,7 +65,7 @@ bool KPreviewProc::startPreview()
 
 void KPreviewProc::slotProcessExited(TDEProcess* proc)
 {
-	kapp->exit_loop();
+	tdeApp->exit_loop();
 	if ( proc->normalExit() && proc->exitStatus() == 0 )
 		m_bOk = true;
 	else
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index 8d7bf0b37..aae4bbe03 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -224,7 +224,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool)
 	// is not self-contained. If the printer is removed (when
 	// changing printer name), the template would be also removed
 	TQString	origfilename = maticFile(entry);
-	TQString	filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
+	TQString	filename = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8));
 	::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename)));
 	DrMain	*driver = Foomatic2Loader::loadDriver(filename);
 	if (driver)
@@ -246,7 +246,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
 		return NULL;
 	}
 
-	TQString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
+	TQString	tmpFile = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8));
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
 	TQString	exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
@@ -291,7 +291,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
 
 bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMain *driver, bool*)
 {
-	TQFile	tmpFile(locateLocal("tmp", "foomatic_" + kapp->randomString(8)));
+	TQFile	tmpFile(locateLocal("tmp", "foomatic_" + tdeApp->randomString(8)));
 	TQFile	inFile(driver->get("template"));
 	TQString	outFile = maticFile(entry);
 	bool	result(false);
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 720b213a3..50020aec9 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -51,7 +51,7 @@ KMDBCreator::~KMDBCreator()
 bool KMDBCreator::checkDriverDB(const TQString& dirname, const TQDateTime& d)
 {
 	// don't block GUI
-	kapp->processEvents();
+	tdeApp->processEvents();
 
 	// first check current directory
 	TQFileInfo	dfi(dirname);
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index 80c44a5a8..11c717ff4 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -177,7 +177,7 @@ void KMDriverDB::insertEntry(KMDBEntry *entry)
 	}
 
 	// don't block GUI
-	kapp->processEvents();
+	tdeApp->processEvents();
 }
 
 /*
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index c64f765a8..5f0c6756b 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -324,7 +324,7 @@ void KMJobViewer::initActions()
 	}
 	else
 	{// stand-alone application
-		KStdAction::quit(kapp,TQ_SLOT(quit()),actionCollection());
+		KStdAction::quit(tdeApp,TQ_SLOT(quit()),actionCollection());
 		KStdAction::close(this,TQ_SLOT(slotClose()),actionCollection());
 		KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection());
 
@@ -674,7 +674,7 @@ void KMJobViewer::reload()
 
 void KMJobViewer::closeEvent(TQCloseEvent *e)
 {
-	if (m_standalone && !kapp->sessionSaving())
+	if (m_standalone && !tdeApp->sessionSaving())
 	{
 		hide();
 		e->ignore();
diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp
index 87f2e21f2..6d7b20399 100644
--- a/tdeprint/management/kmwizard.cpp
+++ b/tdeprint/management/kmwizard.cpp
@@ -244,7 +244,7 @@ void KMWizard::slotNext()
 
 void KMWizard::slotHelp()
 {
-	kapp->invokeHelp(TQString::null, "tdeprint");
+	tdeApp->invokeHelp(TQString::null, "tdeprint");
 }
 
 void KMWizard::enableWizard()
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index 27c7bba47..7467440e8 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -178,7 +178,7 @@ bool KMWSocketUtil::scanNetwork(TQProgressBar *bar)
 		if (bar)
 		{
 			bar->setProgress(i);
-			kapp->flushX();
+			tdeApp->flushX();
 		}
 	}
 	return true;
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 1b0ecb183..a052c69d8 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -403,7 +403,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent
 		TQString	namestr = git.current()->name();
 		if (namestr.isEmpty())
 		{
-			namestr = "group_"+kapp->randomString(4);
+			namestr = "group_"+tdeApp->randomString(4);
 		}
 		git.current()->setName(namestr);
 		item = new TQListViewItem(parent, item, git.current()->get("text"), git.current()->name());
@@ -420,7 +420,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent
 		TQString	namestr = oit.current()->name().mid(m_xmlcmd->name().length()+6);
 		if (namestr.isEmpty())
 		{
-			namestr = "option_"+kapp->randomString(4);
+			namestr = "option_"+tdeApp->randomString(4);
 		}
 		oit.current()->setName(namestr);
 		item = new TQListViewItem(parent, item, oit.current()->get("text"), namestr);
diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp
index ba3d69c8b..a676e1cd6 100644
--- a/tdeprint/messagewindow.cpp
+++ b/tdeprint/messagewindow.cpp
@@ -65,7 +65,7 @@ void MessageWindow::slotTimer()
 	if ( !isVisible() )
 	{
 		show();
-		kapp->processEvents();
+		tdeApp->processEvents();
 	}
 }
 
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 402f30824..fee09c62e 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -123,7 +123,7 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla
 		KURL url( re.cap( 1 ) );
 		if ( !url.isLocalFile() )
 		{
-			TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) );
+			TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + tdeApp->randomString( 8 ) );
 			command.replace( re, TDEProcess::quote( tmpFilename ) );
 			proc->setOutput( re.cap( 1 ) );
 			proc->setTempOutput( tmpFilename );