summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-31 13:26:45 -0600
committerTimothy Pearson <[email protected]>2013-01-31 13:26:45 -0600
commit01c60a267846a8712bca34218ecf7da57566c049 (patch)
treee851781b4ff0487aad8a48739ac0061186343e49 /kdesktop
parent5e5409d89552fa6839ab6cd52a47306eb4d650f0 (diff)
downloadtdebase-01c60a267846a8712bca34218ecf7da57566c049.tar.gz
tdebase-01c60a267846a8712bca34218ecf7da57566c049.zip
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/kdiconview.cc6
-rw-r--r--kdesktop/lock/lockprocess.cc4
-rw-r--r--kdesktop/lockeng.cc6
-rw-r--r--kdesktop/minicli.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 57287014a..ba772c39d 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -996,9 +996,9 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
{
KURL u( item->url() );
u.addPath( ".directory" );
- // using KStandardDirs as this one checks for path being
+ // using TDEStandardDirs as this one checks for path being
// a file instead of a directory
- if ( KStandardDirs::exists( u.path() ) )
+ if ( TDEStandardDirs::exists( u.path() ) )
desktopFile = u.path();
}
else if ( isDesktopFile( item ) )
@@ -1029,7 +1029,7 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
}
if (cfg.hasKey("TryExec"))
{
- if (KStandardDirs::findExe( cfg.readEntry( "TryExec" ) ).isEmpty())
+ if (TDEStandardDirs::findExe( cfg.readEntry( "TryExec" ) ).isEmpty())
return false;
}
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index a3f5fb56f..c8fc7c3a4 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -1586,7 +1586,7 @@ bool LockProcess::startHack()
TQTextStream ts(&mSaverExec, IO_ReadOnly);
TQString word;
ts >> word;
- TQString path = KStandardDirs::findExe(word);
+ TQString path = TDEStandardDirs::findExe(word);
if (!path.isEmpty())
{
@@ -2345,7 +2345,7 @@ void LockProcess::showVkbd()
int status = system( "hal-find-by-property --key system.formfactor.subtype --string tabletpc" );
// status = 0; // enable for testing
run_vkbd = ( WIFEXITED( status ) && WEXITSTATUS( status ) == 0
- && !KStandardDirs::findExe( "xvkbd" ).isEmpty()) ? 1 : 0;
+ && !TDEStandardDirs::findExe( "xvkbd" ).isEmpty()) ? 1 : 0;
}
if( run_vkbd ) {
mVkbdWindows.clear();
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index 8a9e7cf88..9caf6f29b 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -95,7 +95,7 @@ SaverEngine::SaverEngine()
configure();
mLockProcess.clearArguments();
- TQString path = KStandardDirs::findExe( "kdesktop_lock" );
+ TQString path = TDEStandardDirs::findExe( "kdesktop_lock" );
if( path.isEmpty())
{
kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
@@ -361,7 +361,7 @@ bool SaverEngine::startLockProcess( LockType lock_type )
if (!mLockProcess.isRunning()) {
mLockProcess.clearArguments();
- TQString path = KStandardDirs::findExe( "kdesktop_lock" );
+ TQString path = TDEStandardDirs::findExe( "kdesktop_lock" );
if( path.isEmpty())
{
kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
@@ -467,7 +467,7 @@ void SaverEngine::lockProcessExited()
// Restart the lock process
if (!mLockProcess.isRunning()) {
mLockProcess.clearArguments();
- TQString path = KStandardDirs::findExe( "kdesktop_lock" );
+ TQString path = TDEStandardDirs::findExe( "kdesktop_lock" );
if( path.isEmpty())
{
kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 6f940a5b2..ce6d20e34 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -1072,7 +1072,7 @@ void Minicli::slotPriority(int priority)
TQString Minicli::calculate(const TQString &exp)
{
TQString result, cmd;
- const TQString bc = KStandardDirs::findExe("bc");
+ const TQString bc = TDEStandardDirs::findExe("bc");
if ( !bc.isEmpty() )
cmd = TQString("echo %1 | %2").arg(TDEProcess::quote(TQString("scale=8; ")+exp), TDEProcess::quote(bc));
else