Rename KStandard for enhanced compatibility with KDE4

16 files changed, 24 insertions, 24 deletions

diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp
index e0e03e454..b17ab6209 100644
--- a/tdeioslave/cgi/cgi.cpp
+++ b/tdeioslave/cgi/cgi.cpp
@@ -132,7 +132,7 @@ void CgiProtocol::get( const KURL& url )
     if ( !(*it).endsWith("/") )
         cmd += "/";
     cmd += file;
-    if ( KStandardDirs::exists( cmd ) ) {
+    if ( TDEStandardDirs::exists( cmd ) ) {
       forwardFile = false;
       stripHeader = true;
       break;
diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp
index 30f033753..2fc837f58 100644
--- a/tdeioslave/fish/fish.cpp
+++ b/tdeioslave/fish/fish.cpp
@@ -254,12 +254,12 @@ fishProtocol::fishProtocol(const TQCString &pool_socket, const TQCString &app_so
         // disabled: currently not needed. Didn't work reliably.
         // isOpenSSH = !system("ssh -V 2>&1 | grep OpenSSH > /dev/null");
 	if (isNXFish)
-            sshPath = strdup(TQFile::encodeName(KStandardDirs::findExe("nxfish")));
+            sshPath = strdup(TQFile::encodeName(TDEStandardDirs::findExe("nxfish")));
 	else
-            sshPath = strdup(TQFile::encodeName(KStandardDirs::findExe("ssh")));
+            sshPath = strdup(TQFile::encodeName(TDEStandardDirs::findExe("ssh")));
     }
     if (suPath == NULL) {
-        suPath = strdup(TQFile::encodeName(KStandardDirs::findExe("su")));
+        suPath = strdup(TQFile::encodeName(TDEStandardDirs::findExe("su")));
     }
     childPid = 0;
     connectionPort = 0;
diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index 4c4f1945c..032de3ecf 100644
--- a/tdeioslave/man/tdeio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -83,7 +83,7 @@ bool parseUrl(const TQString& _url, TQString &title, TQString &section)
 
     TQString url = _url;
     if (url.at(0) == '/') {
-        if (KStandardDirs::exists(url)) {
+        if (TDEStandardDirs::exists(url)) {
             title = url;
             return true;
         } else
@@ -559,7 +559,7 @@ char *MANProtocol::readManPage(const char *_filename)
         if (TQDir::isRelativePath(filename)) {
             kdDebug(7107) << "relative " << filename << endl;
             filename = TQDir::cleanDirPath(lastdir + "/" + filename).utf8();
-            if (!KStandardDirs::exists(filename)) { // exists perhaps with suffix
+            if (!TDEStandardDirs::exists(filename)) { // exists perhaps with suffix
                 lastdir = filename.left(filename.findRev('/'));
                 TQDir mandir(lastdir);
                 mandir.setNameFilter(filename.mid(filename.findRev('/') + 1) + ".*");
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 0069a8e8e..2f5bea220 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -313,8 +313,8 @@ void FstabBackend::handleFstabChange(bool allowNotification)
 TQString FstabBackend::generateId(const TQString &devNode,
                                  const TQString &mountPoint)
 {
-	TQString d = KStandardDirs::realFilePath(devNode);
-	TQString m = KStandardDirs::realPath(mountPoint);
+	TQString d = TDEStandardDirs::realFilePath(devNode);
+	TQString m = TDEStandardDirs::realPath(mountPoint);
 
 	return "/org/kde/mediamanager/fstab/"
 	      +d.replace("/", "")
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index 1022b36be..1e168e13f 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -1164,12 +1164,12 @@ TQString startPrivilegedProcess(const TQString& command, const TQString& dialogC
 {
     TQString error;
 
-    TQString tdesudoPath = KStandardDirs::findExe("tdesudo");
+    TQString tdesudoPath = TDEStandardDirs::findExe("tdesudo");
 
     if (!tdesudoPath.isEmpty())
         error = startKdeSudoProcess(tdesudoPath, command, dialogCaption, dialogComment);
     else {
-        TQString tdesuPath = KStandardDirs::findExe("tdesu");
+        TQString tdesuPath = TDEStandardDirs::findExe("tdesu");
 
         if (!tdesuPath.isEmpty())
             error = startKdeSuProcess(tdesuPath, command, dialogCaption);
@@ -1184,7 +1184,7 @@ TQString privilegedMount(const char* udi, const char* mountPoint, const char** o
  
     kdDebug() << "run privileged mount for " << udi << endl;
 
-    TQString dbusSendPath = KStandardDirs::findExe("dbus-send");
+    TQString dbusSendPath = TDEStandardDirs::findExe("dbus-send");
 
     // @todo return error message
     if (dbusSendPath.isEmpty())
@@ -1219,7 +1219,7 @@ TQString privilegedUnmount(const char* udi)
  
     kdDebug() << "run privileged unmount for " << udi << endl;
 
-    TQString dbusSendPath = KStandardDirs::findExe("dbus-send");
+    TQString dbusSendPath = TDEStandardDirs::findExe("dbus-send");
 
     // @todo return error message
     if (dbusSendPath.isEmpty())
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index 511eb6c64..295f4269a 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -188,7 +188,7 @@ TQStringList MediaManager::properties(const TQString &name)
 
                 for (; it!=end; ++it)
                 {
-                    path = KStandardDirs::realFilePath(u.path());
+                    path = TDEStandardDirs::realFilePath(u.path());
                     kdDebug() << "comparing " << (*it)->mountPoint()  << " " << path << " " <<  (*it)->deviceNode() << endl;
                     if ((*it)->mountPoint() == path || (*it)->deviceNode() == path) {
 			m = *it;
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index 6b83ae1ea..dc619701a 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -166,7 +166,7 @@ void RemovableBackend::handleMtabChange()
 
 TQString RemovableBackend::generateId(const TQString &devNode)
 {
-	TQString dev = KStandardDirs::realFilePath(devNode);
+	TQString dev = TDEStandardDirs::realFilePath(devNode);
 
 	return "/org/kde/mediamanager/removable/"
 	      +dev.replace("/", "");
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index de6a56645..74cf1c08e 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -230,7 +230,7 @@ bool MediaNotifier::execAutoopen( const KFileItem &medium, const TQString &path,
 	// The desktop environment MUST verify that the relative path points
 	// to a file that is actually located on the medium [...]
 	TQString resolved_path
-		= KStandardDirs::realFilePath( path+"/"+relative_path );
+		= TDEStandardDirs::realFilePath( path+"/"+relative_path );
 
 	if ( !resolved_path.startsWith( path ) )
 	{
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
index fa880b78b..7ed66ce06 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
@@ -31,7 +31,7 @@
 RemoteDirNotify::RemoteDirNotify()
 {
 	TDEGlobal::dirs()->addResourceType("remote_entries",
-		KStandardDirs::kde_default("data") + "remoteview");
+		TDEStandardDirs::kde_default("data") + "remoteview");
 
 	TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
 	m_baseURL.setPath(path);
diff --git a/tdeioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp
index 2ca263768..d977781ea 100644
--- a/tdeioslave/remote/remoteimpl.cpp
+++ b/tdeioslave/remote/remoteimpl.cpp
@@ -37,7 +37,7 @@
 RemoteImpl::RemoteImpl()
 {
 	TDEGlobal::dirs()->addResourceType("remote_entries",
-		KStandardDirs::kde_default("data") + "remoteview");
+		TDEStandardDirs::kde_default("data") + "remoteview");
 
 	TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
 
diff --git a/tdeioslave/sftp/ksshprocess.cpp b/tdeioslave/sftp/ksshprocess.cpp
index 3393f8934..678806605 100644
--- a/tdeioslave/sftp/ksshprocess.cpp
+++ b/tdeioslave/sftp/ksshprocess.cpp
@@ -206,7 +206,7 @@ void KSshProcess::removeSignalHandlers() {
 KSshProcess::KSshProcess() 
             : mVersion(UNKNOWN_VER), mConnected(false), 
         mRunning(false), mConnectState(0) {
-    mSshPath = KStandardDirs::findExe(TQString::fromLatin1("ssh"));
+    mSshPath = TDEStandardDirs::findExe(TQString::fromLatin1("ssh"));
     kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" << 
 		mSshPath << "]" << endl;
         
diff --git a/tdeioslave/sftp/process.cpp b/tdeioslave/sftp/process.cpp
index 885fe7636..bcb686df0 100644
--- a/tdeioslave/sftp/process.cpp
+++ b/tdeioslave/sftp/process.cpp
@@ -264,7 +264,7 @@ int MyPtyProcess::exec(TQCString command, QCStringList args)
 	    path = command;
     else 
     {
-	    TQString file = KStandardDirs::findExe(command);
+	    TQString file = TDEStandardDirs::findExe(command);
     	if (file.isEmpty())
 	    {
 	        kdError(PTYPROC) << k_lineinfo << command << " not found\n";
diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp
index 1cda7f5f4..0cf9775d0 100644
--- a/tdeioslave/smb/tdeio_smb_mount.cpp
+++ b/tdeioslave/smb/tdeio_smb_mount.cpp
@@ -64,7 +64,7 @@ void SMBSlave::special( const TQByteArray & data)
          kdDebug(KIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl;
 
          if (tmp==3) {
-             if (!KStandardDirs::makeDir(mountPoint)) {
+             if (!TDEStandardDirs::makeDir(mountPoint)) {
                  error(TDEIO::ERR_COULD_NOT_MKDIR, mountPoint);
                  return;
              }
diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
index 3a6f029e6..bd27af597 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
@@ -42,7 +42,7 @@ void SystemDirNotify::init()
 		return;
 	mInited = true;
 	TDEGlobal::dirs()->addResourceType("system_entries",
-		KStandardDirs::kde_default("data") + "systemview");
+		TDEStandardDirs::kde_default("data") + "systemview");
 
 	TQStringList names_found;
 	TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 12732767c..84f7c9866 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -34,7 +34,7 @@
 SystemImpl::SystemImpl() : TQObject()
 {
 	TDEGlobal::dirs()->addResourceType("system_entries",
-		KStandardDirs::kde_default("data") + "systemview");
+		TDEStandardDirs::kde_default("data") + "systemview");
 }
 
 bool SystemImpl::listRoot(TQValueList<TDEIO::UDSEntry> &list)
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index b78427d12..d49123572 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -133,7 +133,7 @@ bool TrashImpl::init()
     m_initStatus = InitError;
     // $XDG_DATA_HOME/Trash, i.e. ~/.local/share/Trash by default.
     const TQString xdgDataDir = TDEGlobal::dirs()->localxdgdatadir();
-    if ( !KStandardDirs::makeDir( xdgDataDir, 0700 ) ) {
+    if ( !TDEStandardDirs::makeDir( xdgDataDir, 0700 ) ) {
         kdWarning() << "failed to create " << xdgDataDir << endl;
         return false;
     }
@@ -282,7 +282,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi
 
 TQString TrashImpl::makeRelativePath( const TQString& topdir, const TQString& path )
 {
-    const TQString realPath = KStandardDirs::realFilePath( path );
+    const TQString realPath = TDEStandardDirs::realFilePath( path );
     // topdir ends with '/'
     if ( realPath.startsWith( topdir ) ) {
         const TQString rel = realPath.mid( topdir.length() );