Rename KStandard for enhanced compatibility with KDE4

18 files changed, 27 insertions, 27 deletions

diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
index 96b1f198..41c3bd71 100644
--- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
@@ -101,7 +101,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
 void PropsDlgSharePlugin::slotConfigureFileSharing()
 {
     TDEProcess proc;
-    proc << KStandardDirs::findExe("tdesu") << locate("exe", "tdecmshell") << "fileshare";
+    proc << TDEStandardDirs::findExe("tdesu") << locate("exe", "tdecmshell") << "fileshare";
     proc.start( TDEProcess::DontCare );
 }
 
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 6f39975a..d2f49515 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -82,8 +82,8 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
 
   TQString path = TQString::fromLocal8Bit( getenv( "PATH" ) );
   path += TQString::fromLatin1(":/usr/sbin");
-  TQString sambaExec = KStandardDirs::findExe( TQString::fromLatin1("smbd"), path );
-  TQString nfsExec = KStandardDirs::findExe( TQString::fromLatin1("rpc.nfsd"), path );
+  TQString sambaExec = TDEStandardDirs::findExe( TQString::fromLatin1("smbd"), path );
+  TQString nfsExec = TDEStandardDirs::findExe( TQString::fromLatin1("rpc.nfsd"), path );
 
   if ( nfsExec.isEmpty() && sambaExec.isEmpty())
   {
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 56d5d3cf..869641e9 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -504,7 +504,7 @@ void AppearanceConfig::slotLoadChatStyles()
 void AppearanceConfig::updateEmoticonlist()
 {
 	KopetePrefs *p = KopetePrefs::prefs();
-	KStandardDirs dir;
+	TDEStandardDirs dir;
 
 	d->mPrfsEmoticons->icon_theme_list->clear(); // Wipe out old list
 	// Get a list of directories in our icon theme dir
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
index f0510a5f..1330b566 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
@@ -196,7 +196,7 @@ void EmoticonsEditDialog::slotEditClicked()
         copy = false;
         TQString f = mMainWidget->klvEmoticons->selectedItem()->text(2);
 
-        KStandardDirs *dir = TDEGlobal::dirs();
+        TDEStandardDirs *dir = TDEGlobal::dirs();
         emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f );
 
         if( emo.isNull() )
diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp
index 8ea3dad4..2109a3d8 100644
--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@@ -296,7 +296,7 @@ Emoticons::~Emoticons(  )
 
 void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList &emoticons )
 {
-	KStandardDirs *dir = TDEGlobal::dirs();
+	TDEStandardDirs *dir = TDEGlobal::dirs();
 	TQString pic;
 
 	//maybe an extension was given, so try to find the exact file
diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp
index dd9046a2..17ef8c15 100644
--- a/kopete/plugins/latex/latexplugin.cpp
+++ b/kopete/plugins/latex/latexplugin.cpp
@@ -55,7 +55,7 @@ LatexPlugin::LatexPlugin( TQObject *parent, const char *name, const TQStringList
 	connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ),
 			 this, TQT_SLOT( slotNewChatSession( Kopete::ChatSession * ) ) );
 	
-	m_convScript = KStandardDirs::findExe("kopete_latexconvert.sh");
+	m_convScript = TDEStandardDirs::findExe("kopete_latexconvert.sh");
 	slotSettingsChanged();
 
 		//Add GUI action to all already existing kmm (if the plugin is launched when kopete already rining)
@@ -84,7 +84,7 @@ void LatexPlugin::slotNewChatSession( Kopete::ChatSession *KMM )
 
 void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg )
 {
-	TQString mMagick = KStandardDirs::findExe("convert");
+	TQString mMagick = TDEStandardDirs::findExe("convert");
 	if ( mMagick.isEmpty() )
 	{
 		// show just once
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index 72ec92d0..64d5ffd2 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -55,7 +55,7 @@ SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* parent, const char* name, WFlags fl)
 	}
 
     // if netstat is NOT available, disable the option and set to SMPPPD
-    if(KStandardDirs::findExe("netstat") == TQString()) {
+    if(TDEStandardDirs::findExe("netstat") == TQString()) {
         autoCSTest->setEnabled(FALSE);
         useNetstat->setEnabled(FALSE);
         useNetstat->setChecked(FALSE);
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index 414a1af6..5673ed69 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -52,7 +52,7 @@ WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount)
 
 	mProtocol = WPProtocol::protocol();
 
-	TQString tmpSmbcPath = KStandardDirs::findExe("smbclient");
+	TQString tmpSmbcPath = TDEStandardDirs::findExe("smbclient");
 
 	if(account()) {
 		mHostName->setText(account()->accountId());
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index 5d4f708a..1c52f2ee 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -138,8 +138,8 @@ void WPProtocol::installSamba()
 //	kdDebug(14170) <<  "WPProtocol::installSamba()" endl;
 
 	TQStringList args;
-	args += KStandardDirs::findExe("winpopup-install.sh");
-	args += KStandardDirs::findExe("winpopup-send.sh");
+	args += TDEStandardDirs::findExe("winpopup-install.sh");
+	args += TDEStandardDirs::findExe("winpopup-send.sh");
 	if (TDEApplication::tdeinitExecWait("tdesu", args) == 0)
 		KMessageBox::information(Kopete::UI::Global::mainWidget(), i18n("The Samba configuration file is modified."), i18n("Configuration Succeeded"));
 	else
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index f827bba3..62b7c6c9 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -603,7 +603,7 @@ void YahooContact::inviteConference()
 
 void YahooContact::inviteWebcam()
 {
-	if ( !KStandardDirs::findExe("jasper") )
+	if ( !TDEStandardDirs::findExe("jasper") )
 	{
 		KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error,
 			i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images."
@@ -658,7 +658,7 @@ void YahooContact::initWebcamViewer()
 
 void YahooContact::requestWebcam()
 {
-	if ( !KStandardDirs::findExe("jasper") )
+	if ( !TDEStandardDirs::findExe("jasper") )
 	{
 		KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error,
 			i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images."
diff --git a/kppp/ChangeLog b/kppp/ChangeLog
index a956c949..da15d27e 100644
--- a/kppp/ChangeLog
+++ b/kppp/ChangeLog
@@ -271,7 +271,7 @@
 	* connect.cpp: skip setting the volume if command is empty
 	* switched from KWizard to QWizard
 	* adaption to new TDEConfig iterators
-	* partly switched to KStandardDirs
+	* partly switched to TDEStandardDirs
 
 1999-05-07  Harri Porten  <[email protected]>
 
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 0394f2c6..531a0a35 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -96,7 +96,7 @@ KVncView::KVncView(TQWidget *parent,
 	connect(m_cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
 	connect(m_cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
 
-	KStandardDirs *dirs = TDEGlobal::dirs();
+	TDEStandardDirs *dirs = TDEGlobal::dirs();
 	TQBitmap cursorBitmap(dirs->findResource("appdata",
 						"pics/pointcursor.png"));
 	TQBitmap cursorMask(dirs->findResource("appdata",
diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp
index f69d90b0..0752f7d7 100644
--- a/ktalkd/kcmktalkd/soundpage.cpp
+++ b/ktalkd/kcmktalkd/soundpage.cpp
@@ -273,8 +273,8 @@ void KSoundPageConfig::soundOnOff()
 
 void KSoundPageConfig::defaults() {
 
-    extprg_edit->lineEdit()->setText(KStandardDirs::findExe("ktalkdlg"));
-    client_edit->lineEdit()->setText(KStandardDirs::findExe("konsole")+" -e talk");
+    extprg_edit->lineEdit()->setText(TDEStandardDirs::findExe("ktalkdlg"));
+    client_edit->lineEdit()->setText(TDEStandardDirs::findExe("konsole")+" -e talk");
        // will be ktalk when ktalk is in CVS.
     sound_cb->setChecked(true);
 
@@ -287,13 +287,13 @@ void KSoundPageConfig::load() {
     config->setGroup("ktalkd");
     announceconfig->setGroup("ktalkannounce");
 
-    setenv("TDEBINDIR",TQFile::encodeName(KStandardDirs::kde_default("exe")),false/*don't overwrite*/);
+    setenv("TDEBINDIR",TQFile::encodeName(TDEStandardDirs::kde_default("exe")),false/*don't overwrite*/);
            // for the first reading of  the config file
 
     extprg_edit->lineEdit()->setText(config->readPathEntry("ExtPrg",
-	KStandardDirs::findExe("ktalkdlg")));
+	TDEStandardDirs::findExe("ktalkdlg")));
     client_edit->lineEdit()->setText(announceconfig->readPathEntry("talkprg",
-	KStandardDirs::findExe("konsole")+" -e talk")); // will be ktalk when ktalk is in CVS
+	TDEStandardDirs::findExe("konsole")+" -e talk")); // will be ktalk when ktalk is in CVS
 
     bool b = announceconfig->readBoolEntry("Sound",true/*default value*/);
     sound_cb->setChecked(b);
diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp
index 66eb1d79..4061431a 100644
--- a/ktalkd/ktalkd/readcfg++.cpp
+++ b/ktalkd/ktalkd/readcfg++.cpp
@@ -249,7 +249,7 @@ int process_config_file(void)
     tqstrncpy(Options.extprg,TQFile::encodeName(result),S_CFGLINE);
     ktalk_debug("Ext prg = %s",Options.extprg); }
   else {   /* has to work even without config file at all */
-    KStandardDirs stddirs;
+    TDEStandardDirs stddirs;
     tqstrncpy(Options.extprg, TQFile::encodeName(stddirs.findResource("exe","ktalkdlg")), S_CFGLINE-1);
   }
 
diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp
index 7521391e..f14d375b 100644
--- a/wifi/interface_wireless_wirelessextensions.cpp
+++ b/wifi/interface_wireless_wirelessextensions.cpp
@@ -531,9 +531,9 @@ TQTable* Interface_wireless_wirelessextensions::get_available_networks ()
     networks->horizontalHeader()->setLabel( 3, i18n("WEP") );
 
     KProcIO *iwlist = new KProcIO;
-    TQString iwlist_bin = KStandardDirs::findExe("iwlist");
+    TQString iwlist_bin = TDEStandardDirs::findExe("iwlist");
     if(iwlist_bin.isEmpty())
-      iwlist_bin = KStandardDirs::findExe("iwlist", "/usr/local/sbin:/usr/sbin:/sbin");
+      iwlist_bin = TDEStandardDirs::findExe("iwlist", "/usr/local/sbin:/usr/sbin:/sbin");
     if(iwlist_bin.isEmpty())
       iwlist_bin = "iwlist"; // try our best ;/
 
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 9c3472da..40efb22f 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -142,7 +142,7 @@ KWiFiManagerApp::~KWiFiManagerApp ()
 void
 KWiFiManagerApp::init_whois_db ()
 {
-  KStandardDirs finder;
+  TDEStandardDirs finder;
   TQString tdedir =
     finder.findResourceDir ("data", "kwifimanager/locations/NOWHERE.loc");
   tdedir += "kwifimanager/locations/";
diff --git a/wifi/picture.cpp b/wifi/picture.cpp
index 1edc9b9b..4c808e3f 100644
--- a/wifi/picture.cpp
+++ b/wifi/picture.cpp
@@ -29,7 +29,7 @@ Picture::Picture (TQWidget * parent, Interface_wireless * device):TQWidget (pare
 	 "picture")
 {
   this->device = device;
-  KStandardDirs finder;
+  TDEStandardDirs finder;
   tdedir = finder.findResourceDir ("data", "kwifimanager/pics/no_card.png");
   tdedir += "kwifimanager/pics/";
   NO_CARD = new TQPixmap (tdedir + "no_card.png");
diff --git a/wifi/strength.cpp b/wifi/strength.cpp
index a448cfdb..35d156bd 100644
--- a/wifi/strength.cpp
+++ b/wifi/strength.cpp
@@ -31,7 +31,7 @@ Strength::Strength (TQWidget * parent, Interface_wireless * device):TQWidget (pa
 	 "strength")
 {
   this->device = device;
-  KStandardDirs finder;
+  TDEStandardDirs finder;
   tdedir = finder.findResourceDir ("data", "kwifimanager/pics/no_card.png");
   tdedir += "kwifimanager/pics/";
   NOT_CON_OFFLINE_ADHOC = new TQPixmap (tdedir + "offline.png");