6 files changed, 12 insertions, 12 deletions
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index c63833e8..cdd0acfd 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -40,7 +40,7 @@ void HistoryPlugin::convertOldHistory()
 		i18n( "Would you like to remove old history files?" ) , i18n( "History Converter" ), KStdGuiItem::del(), i18n("Keep") ) == KMessageBox::Yes;
 
 	KProgressDialog *progressDlg=new KProgressDialog(Kopete::UI::Global::mainWidget() , "history_progress_dlg" , i18n( "History converter" ) ,
-		 TQString() , true); //modal  to  make sure the user will not doing stupid things (we have a kapp->processEvents())
+		 TQString() , true); //modal  to  make sure the user will not doing stupid things (we have a tdeApp->processEvents())
 	progressDlg->setAllowCancel(false); //because i am too lazy to allow to cancel
 
 
@@ -123,7 +123,7 @@ void HistoryPlugin::convertOldHistory()
 				if(!contactId.isEmpty() )
 				{
 					progressDlg->setLabel(i18n("Parsing old history in %1:\n%2").arg(fi->fileName()).arg(contactId));
-					kapp->processEvents(0); //make sure the text is updated in the progressDlg
+					tdeApp->processEvents(0); //make sure the text is updated in the progressDlg
 
 					int month=0;
 					int year=0;
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 4842db32..6df41a26 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -596,18 +596,18 @@ void HistoryDialog::slotCopy()
 	qsSelection = mHtmlPart->selectedText();
 	if ( qsSelection.isEmpty() ) return;
 	
-	disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
+	disconnect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
 	TQApplication::clipboard()->setText(qsSelection, TQClipboard::Clipboard);
 	TQApplication::clipboard()->setText(qsSelection, TQClipboard::Selection);
-	connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
+	connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
 }
 
 void HistoryDialog::slotCopyURL()
 {
-	disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
+	disconnect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
 	TQApplication::clipboard()->setText( mURL, TQClipboard::Clipboard);
 	TQApplication::clipboard()->setText( mURL, TQClipboard::Selection);
-	connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
+	connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
 }
 
 #include "historydialog.moc"
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index 0a0457c2..0b3f5fcc 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -107,7 +107,7 @@ NowListeningPlugin::NowListeningPlugin( TQObject *parent, const char* name, cons
 	  slotNewKMM( *it );
 
 	// get a pointer to the dcop client
-	d->m_client = kapp->dcopClient(); //new DCOPClient();
+	d->m_client = tdeApp->dcopClient(); //new DCOPClient();
 
 	// set up known media players
 	d->m_mediaPlayerList.setAutoDelete( true );
diff --git a/kopete/plugins/smpppdcs/detectordcop.cpp b/kopete/plugins/smpppdcs/detectordcop.cpp
index 931d5e3a..f3e84c96 100644
--- a/kopete/plugins/smpppdcs/detectordcop.cpp
+++ b/kopete/plugins/smpppdcs/detectordcop.cpp
@@ -34,7 +34,7 @@ DetectorDCOP::~DetectorDCOP() {}
     \fn DetectorDCOP::getKInternetDCOP()
  */
 TQCString DetectorDCOP::getKInternetDCOP() const {
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
     if(m_kinternetApp.isEmpty() && client && client->isAttached()) {
         // get all registered dcop apps and search for kinternet
         QCStringList apps = client->registeredApplications();
@@ -56,7 +56,7 @@ DetectorDCOP::KInternetDCOPState DetectorDCOP::getConnectionStatusDCOP() const {
     kdDebug(14312) << k_funcinfo << "Start inquiring " << m_kinternetApp << " via DCOP" << endl;
 	
 	
-	KInternetIface_stub stub = KInternetIface_stub(kapp->dcopClient(), m_kinternetApp, "KInternetIface");
+	KInternetIface_stub stub = KInternetIface_stub(tdeApp->dcopClient(), m_kinternetApp, "KInternetIface");
 	
 	bool status = stub.isOnline();
 	
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index 009780c8..8e24a08c 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -38,7 +38,7 @@ void DetectorSMPPPD::checkStatus() const {
 
 #ifndef NOKINTERNETDCOP
     m_kinternetApp = getKInternetDCOP();
-    if(kapp->dcopClient() && m_kinternetApp != "") {
+    if(tdeApp->dcopClient() && m_kinternetApp != "") {
         switch(getConnectionStatusDCOP()) {
         case CONNECTED:
             m_connector->setConnectedStatus(true);
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index ca4462e8..4beb20f5 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -72,7 +72,7 @@ void SMPPPDCSPrefs::determineCSType() {
 
     // while we search, we'll disable the button
     autoCSTest->setEnabled(false);
-    //kapp->processEvents();
+    //tdeApp->processEvents();
 
     /* broadcast network for a smpppd.
        If one is available set to smpppd method */
@@ -109,7 +109,7 @@ void SMPPPDCSPrefs::scanStarted(uint total) {
 
 void SMPPPDCSPrefs::scanProgress(uint cur) {
     m_scanProgressDlg->progressBar()->setProgress(cur);
-    kapp->processEvents();
+    tdeApp->processEvents();
 }
 
 void SMPPPDCSPrefs::cancelScanning() {