Browse Source

Rename KStandard for enhanced compatibility with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
01c60a2678
76 changed files with 114 additions and 114 deletions
  1. +1
    -1
      drkonqi/backtrace.cpp
  2. +2
    -2
      kcontrol/background/bgdialog.h
  3. +1
    -1
      kcontrol/background/bgrender.cpp
  4. +2
    -2
      kcontrol/background/bgrender.h
  5. +3
    -3
      kcontrol/background/bgsettings.cpp
  6. +4
    -4
      kcontrol/background/bgsettings.h
  7. +1
    -1
      kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
  8. +1
    -1
      kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
  9. +1
    -1
      kcontrol/input/xcursor/themepage.cpp
  10. +1
    -1
      kcontrol/kcontrol/modules.cpp
  11. +1
    -1
      kcontrol/kfontinst/lib/Misc.cpp
  12. +4
    -4
      kcontrol/kicker/main.cpp
  13. +1
    -1
      kcontrol/konq/rootopts.cpp
  14. +1
    -1
      kcontrol/krdb/krdb.cpp
  15. +2
    -2
      kcontrol/kthememanager/ktheme.h
  16. +1
    -1
      kcontrol/kthememanager/kthememanager.cpp
  17. +1
    -1
      kcontrol/screensaver/scrnsave.cpp
  18. +1
    -1
      kcontrol/style/kcmstyle.cpp
  19. +3
    -3
      kdesktop/kdiconview.cc
  20. +2
    -2
      kdesktop/lock/lockprocess.cc
  21. +3
    -3
      kdesktop/lockeng.cc
  22. +1
    -1
      kdesktop/minicli.cpp
  23. +1
    -1
      kfind/kftabdlg.cpp
  24. +1
    -1
      khelpcenter/docentry.cpp
  25. +1
    -1
      khelpcenter/docmetainfo.cpp
  26. +1
    -1
      khelpcenter/htmlsearch/htmlsearch.cpp
  27. +1
    -1
      khelpcenter/searchhandler.cpp
  28. +1
    -1
      khotkeys/shared/khotkeysglobal.cpp
  29. +1
    -1
      kicker/extensions/dockbar/dockbarextension.cpp
  30. +1
    -1
      kicker/kicker/core/kicker.cpp
  31. +1
    -1
      kicker/kicker/ui/exe_dlg.cpp
  32. +4
    -4
      kicker/kicker/ui/k_new_mnu.cpp
  33. +2
    -2
      kicker/kicker/ui/service_mnu.cpp
  34. +1
    -1
      kicker/menuext/konsole/konsolebookmarkhandler.cpp
  35. +1
    -1
      kicker/menuext/remote/remotemenu.cpp
  36. +1
    -1
      kicker/proxy/appletproxy.cpp
  37. +1
    -1
      kicker/proxy/extensiondebugger.cpp
  38. +1
    -1
      kicker/proxy/extensionproxy.cpp
  39. +1
    -1
      knetattach/knetattach.ui.h
  40. +4
    -4
      konqueror/sidebar/sidebar_widget.cpp
  41. +1
    -1
      konqueror/sidebar/trees/konq_sidebartree.cpp
  42. +1
    -1
      konqueror/sidebar/trees/konqsidebar_tree.cpp
  43. +1
    -1
      konqueror/sidebar/web_module/web_module.cpp
  44. +1
    -1
      konsole/konsole/main.cpp
  45. +1
    -1
      kpersonalizer/kospage.cpp
  46. +3
    -3
      kpersonalizer/kstylepage.cpp
  47. +1
    -1
      ksplashml/kcmksplash/installer.cpp
  48. +1
    -1
      ksplashml/kcmksplash/main.cpp
  49. +2
    -2
      ksysguard/gui/KSysGuardApplet.cc
  50. +2
    -2
      ksysguard/gui/Workspace.cc
  51. +1
    -1
      ksysguard/gui/ksysguard.cc
  52. +1
    -1
      tdeinit/phase1.cpp
  53. +1
    -1
      tdeioslave/cgi/cgi.cpp
  54. +3
    -3
      tdeioslave/fish/fish.cpp
  55. +2
    -2
      tdeioslave/man/tdeio_man.cpp
  56. +2
    -2
      tdeioslave/media/mediamanager/fstabbackend.cpp
  57. +4
    -4
      tdeioslave/media/mediamanager/halbackend.cpp
  58. +1
    -1
      tdeioslave/media/mediamanager/mediamanager.cpp
  59. +1
    -1
      tdeioslave/media/mediamanager/removablebackend.cpp
  60. +1
    -1
      tdeioslave/media/medianotifier/medianotifier.cpp
  61. +1
    -1
      tdeioslave/remote/kdedmodule/remotedirnotify.cpp
  62. +1
    -1
      tdeioslave/remote/remoteimpl.cpp
  63. +1
    -1
      tdeioslave/sftp/ksshprocess.cpp
  64. +1
    -1
      tdeioslave/sftp/process.cpp
  65. +1
    -1
      tdeioslave/smb/tdeio_smb_mount.cpp
  66. +1
    -1
      tdeioslave/system/kdedmodule/systemdirnotify.cpp
  67. +1
    -1
      tdeioslave/system/systemimpl.cpp
  68. +2
    -2
      tdeioslave/trash/trashimpl.cpp
  69. +1
    -1
      tdeprint/tdeprintfax/defcmds.cpp
  70. +2
    -2
      tdescreensaver/random.cpp
  71. +1
    -1
      tdesu/tdesu/tdesu.cpp
  72. +1
    -1
      tdm/kfrontend/kgreeter.cpp
  73. +2
    -2
      tdm/kfrontend/themer/tdmpixmap.cpp
  74. +2
    -2
      twin/client.cpp
  75. +1
    -1
      twin/clients/PORTING
  76. +1
    -1
      twin/kcmtwin/twindecoration/twindecoration.cpp

+ 1
- 1
drkonqi/backtrace.cpp View File

@@ -70,7 +70,7 @@ BackTrace::~BackTrace()
void BackTrace::start()
{
TQString exec = m_krashconf->tryExec();
if ( !exec.isEmpty() && KStandardDirs::findExe(exec).isEmpty() )
if ( !exec.isEmpty() && TDEStandardDirs::findExe(exec).isEmpty() )
{
TQObject * o = parent();



+ 2
- 2
kcontrol/background/bgdialog.h View File

@@ -30,7 +30,7 @@
#include "bgdefaults.h"

class BGMonitorArrangement;
class KStandardDirs;
class TDEStandardDirs;

class BGDialog : public BGDialog_UI
{
@@ -84,7 +84,7 @@ protected slots:
protected:
void getEScreen();
TDEGlobalBackgroundSettings *m_pGlobals;
KStandardDirs *m_pDirs;
TDEStandardDirs *m_pDirs;
bool m_multidesktop;
bool m_useViewports;
int m_curDesk;


+ 1
- 1
kcontrol/background/bgrender.cpp View File

@@ -990,7 +990,7 @@ void KBackgroundRenderer::saveCacheFile()
if( m_Image.isNull())
fullWallpaperBlend(); // generate from m_Pixmap
TQString f = cacheFileName();
if( KStandardDirs::exists( f ) || m_Cached )
if( TDEStandardDirs::exists( f ) || m_Cached )
utime( TQFile::encodeName( f ), NULL );
else {
m_Image.save( f, "PNG" );


+ 2
- 2
kcontrol/background/bgrender.h View File

@@ -27,7 +27,7 @@ class TDEConfig;
class TDEProcess;
class KTempFile;
class KShellProcess;
class KStandardDirs;
class TDEStandardDirs;

/**
* This class renders a desktop background to a TQImage. The operation is
@@ -109,7 +109,7 @@ private:
TQPixmap m_Pixmap;
TQTimer *m_pTimer;

KStandardDirs *m_pDirs;
TDEStandardDirs *m_pDirs;
KShellProcess *m_pProc;
};


+ 3
- 3
kcontrol/background/bgsettings.cpp View File

@@ -182,7 +182,7 @@ int KBackgroundPattern::hash()
/* static */
TQStringList KBackgroundPattern::list()
{
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_pattern", dirs->kde_default("data") +
"kdesktop/patterns");
TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop",
@@ -393,7 +393,7 @@ int KBackgroundProgram::hash()
/* static */
TQStringList KBackgroundProgram::list()
{
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_program", dirs->kde_default("data") +
"kdesktop/programs");
TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop",
@@ -651,7 +651,7 @@ void KBackgroundSettings::setWallpaperMode(int mode)

void KBackgroundSettings::setWallpaperList(TQStringList list)
{
KStandardDirs *d = TDEGlobal::dirs();
TDEStandardDirs *d = TDEGlobal::dirs();
if (m_WallpaperList == list)
return;



+ 4
- 4
kcontrol/background/bgsettings.h View File

@@ -17,7 +17,7 @@
#include <tqvaluevector.h>

template <class TQString, class T> class TQMap;
class KStandardDirs;
class TDEStandardDirs;
class KSimpleConfig;
class TDEConfig;
class TQString;
@@ -66,7 +66,7 @@ private:
int m_Hash;
TQString m_Name, m_Comment;
TQString m_Pattern, m_File;
KStandardDirs *m_pDirs;
TDEStandardDirs *m_pDirs;
KSimpleConfig *m_pConfig;
};

@@ -137,7 +137,7 @@ private:
TQString m_Name, m_Command;
TQString m_PreviewCommand, m_Comment;
TQString m_Executable, m_File;
KStandardDirs *m_pDirs;
TDEStandardDirs *m_pDirs;
KSimpleConfig *m_pConfig;
};

@@ -283,7 +283,7 @@ private:
TQString m_CurrentWallpaperName;

TDEConfig *m_pConfig;
KStandardDirs *m_pDirs;
TDEStandardDirs *m_pDirs;
bool m_bDeleteConfig;
bool m_bEnabled;



+ 1
- 1
kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp View File

@@ -76,7 +76,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const

if( !(host == last_host && last_time > time( NULL ) - 5 ) ) {

TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" ));
TQString helper = TDEStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" ));
if( helper.isEmpty())
return last_result = false;



+ 1
- 1
kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp View File

@@ -441,7 +441,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// line arguments or options that might have been supplied.
TQString exe = removeArgs( cmd );
//kdDebug() << k_funcinfo << "findExe with " << exe << endl;
if( data.checkForExecutables() && !KStandardDirs::findExe( exe ).isNull() )
if( data.checkForExecutables() && !TDEStandardDirs::findExe( exe ).isNull() )
{
//kdDebug() << "EXECUTABLE exe=" << exe << endl;
setFilteredURI( data, KURL( exe ));


+ 1
- 1
kcontrol/input/xcursor/themepage.cpp View File

@@ -298,7 +298,7 @@ bool ThemePage::installThemes( const TQString &file )
return false;

const TQString destDir = TQDir::homeDirPath() + "/.icons/";
KStandardDirs::makeDir( destDir ); // Make sure the directory exists
TDEStandardDirs::makeDir( destDir ); // Make sure the directory exists

for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it )
{


+ 1
- 1
kcontrol/kcontrol/modules.cpp View File

@@ -186,7 +186,7 @@ void ConfigModule::runAsRoot()
}

// run the process
TQString tdesu = KStandardDirs::findExe("tdesu");
TQString tdesu = TDEStandardDirs::findExe("tdesu");
if (!tdesu.isEmpty())
{
_rootProcess = new TDEProcess;


+ 1
- 1
kcontrol/kfontinst/lib/Misc.cpp View File

@@ -125,7 +125,7 @@ bool createDir(const TQString &dir)
//
// Clear any umask before dir is created
mode_t oldMask=umask(0000);
bool status=KStandardDirs::makeDir(dir, DIR_PERMS);
bool status=TDEStandardDirs::makeDir(dir, DIR_PERMS);
// Reset umask
::umask(oldMask);
return status;


+ 4
- 4
kcontrol/kicker/main.cpp View File

@@ -383,14 +383,14 @@ extern "C"

KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
{
TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
"kicker/extensions");
return new PositionConfig(parent, "kcmkicker");
}

KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
{
TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
"kicker/extensions");
return new HidingConfig(parent, "kcmkicker");
}
@@ -403,9 +403,9 @@ extern "C"
KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
{
KImageIO::registerFormats();
TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("tiles", TDEStandardDirs::kde_default("data") +
"kicker/tiles");
TDEGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("hb_pics", TDEStandardDirs::kde_default("data") +
"kcmkicker/pics");
return new LookAndFeelConfig(parent, "kcmkicker");
}


+ 1
- 1
kcontrol/konq/rootopts.cpp View File

@@ -230,7 +230,7 @@ void DesktopPathConfig::save()
TQString path = urDocument->url();
if (!TQDir(path).exists())
{
if (!KStandardDirs::makeDir(path))
if (!TDEStandardDirs::makeDir(path))
{
KMessageBox::sorry(this, TDEIO::buildErrorString(TDEIO::ERR_COULD_NOT_MKDIR, path));
urDocument->setURL(documentURL.path());


+ 1
- 1
kcontrol/krdb/krdb.cpp View File

@@ -444,7 +444,7 @@ void runRdb( uint flags )
// Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps)
if (exportColors)
{
TDEGlobal::dirs()->addResourceType("appdefaults", KStandardDirs::kde_default("data") + "kdisplay/app-defaults/");
TDEGlobal::dirs()->addResourceType("appdefaults", TDEStandardDirs::kde_default("data") + "kdisplay/app-defaults/");
TQColorGroup cg = newPal.active();
TDEGlobal::locale()->insertCatalogue("krdb");
createGtkrc( true, cg, 1 );


+ 2
- 2
kcontrol/kthememanager/ktheme.h View File

@@ -27,7 +27,7 @@

#include <kurl.h>

class KStandardDirs;
class TDEStandardDirs;
class TDEConfig;

/// defines the syntax version used by the XML
@@ -216,7 +216,7 @@ private:
/// "general" section
TQDomElement m_general;

KStandardDirs * m_kgd;
TDEStandardDirs * m_kgd;

TQGuardedPtr<TQWidget> m_parent;
};


+ 1
- 1
kcontrol/kthememanager/kthememanager.cpp View File

@@ -106,7 +106,7 @@ kthememanager::~kthememanager()

void kthememanager::init()
{
TDEGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType( "themes", TDEStandardDirs::kde_default("data") +
"kthememanager/themes/" );
}



+ 1
- 1
kcontrol/screensaver/scrnsave.cpp View File

@@ -66,7 +66,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_screensaver, KSSFactory("kcmscreensaver") )
static TQString findExe(const TQString &exe) {
TQString result = locate("exe", exe);
if (result.isEmpty())
result = KStandardDirs::findExe(exe);
result = TDEStandardDirs::findExe(exe);
return result;
}



+ 1
- 1
kcontrol/style/kcmstyle.cpp View File

@@ -128,7 +128,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
m_bToolbarsDirty = false;

TDEGlobal::dirs()->addResourceType("themes",
KStandardDirs::kde_default("data") + "kstyle/themes");
TDEStandardDirs::kde_default("data") + "kstyle/themes");

TDEAboutData *about =
new TDEAboutData( I18N_NOOP("kcmstyle"),


+ 3
- 3
kdesktop/kdiconview.cc View File

@@ -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;
}



+ 2
- 2
kdesktop/lock/lockprocess.cc View File

@@ -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();


+ 3
- 3
kdesktop/lockeng.cc View File

@@ -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;


+ 1
- 1
kdesktop/minicli.cpp View File

@@ -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


+ 1
- 1
kfind/kftabdlg.cpp View File

@@ -76,7 +76,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
subdirsCb->setChecked(true);
caseSensCb->setChecked(false);
useLocateCb->setChecked(false);
if(KStandardDirs::findExe("locate")==NULL)
if(TDEStandardDirs::findExe("locate")==NULL)
useLocateCb->setEnabled(false);

nameBox->setDuplicatesEnabled(FALSE);


+ 1
- 1
khelpcenter/docentry.cpp View File

@@ -251,7 +251,7 @@ bool DocEntry::docExists() const
{
if ( !mUrl.isEmpty() ) {
KURL docUrl( mUrl );
if ( docUrl.isLocalFile() && !KStandardDirs::exists( docUrl.path() ) ) {
if ( docUrl.isLocalFile() && !TDEStandardDirs::exists( docUrl.path() ) ) {
// kdDebug(1400) << "URL not found: " << docUrl.url() << endl;
return false;
}


+ 1
- 1
khelpcenter/docmetainfo.cpp View File

@@ -137,7 +137,7 @@ void DocMetaInfo::scanMetaInfo( bool force )
TQStringList metaInfos = config.readListEntry( "MetaInfoDirs" );

if ( metaInfos.isEmpty() ) {
KStandardDirs* kstd = TDEGlobal::dirs();
TDEStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/khelpcenter" );
metaInfos = kstd->findDirs( "data", "plugins" );
}


+ 1
- 1
khelpcenter/htmlsearch/htmlsearch.cpp View File

@@ -32,7 +32,7 @@ void HTMLSearch::scanDir(const TQString& dir)

TQStringList::ConstIterator it;

if ( KStandardDirs::exists( dir + "index.docbook" ) ) {
if ( TDEStandardDirs::exists( dir + "index.docbook" ) ) {
_files.append(dir + "index.docbook");
progress->setFilesScanned(++_filesScanned);
} else {


+ 1
- 1
khelpcenter/searchhandler.cpp View File

@@ -87,7 +87,7 @@ bool SearchHandler::checkBinary( const TQString &cmd ) const
if ( pos < 0 ) binary = cmd;
else binary = cmd.left( pos );

return !KStandardDirs::findExe( binary ).isEmpty();
return !TDEStandardDirs::findExe( binary ).isEmpty();
}

void SearchHandler::search( DocEntry *entry, const TQStringList &words,


+ 1
- 1
khotkeys/shared/khotkeysglobal.cpp View File

@@ -57,7 +57,7 @@ bool khotkeys_active()
return _khotkeys_active;
}
// does the opposite of KStandardDirs::findResource() i.e. e.g.
// does the opposite of TDEStandardDirs::findResource() i.e. e.g.
// "/opt/kde2/share/applnk/System/konsole.desktop" -> "System/konsole.desktop"
TQString get_menu_entry_from_path( const TQString& path_P )
{


+ 1
- 1
kicker/extensions/dockbar/dockbarextension.cpp View File

@@ -205,7 +205,7 @@ void DockBarExtension::embedWindow(WId win, TQString command, TQString resName,
if (container == 0) {
TQString cmd = command.isNull() ? resClass : command;
if (KStandardDirs::findExe(KShell::splitArgs(cmd).front()).isEmpty())
if (TDEStandardDirs::findExe(KShell::splitArgs(cmd).front()).isEmpty())
ncmd = true;
container = new DockContainer(cmd, this, resName, resClass);
addContainer(container);


+ 1
- 1
kicker/kicker/core/kicker.cpp View File

@@ -95,7 +95,7 @@ Kicker::Kicker()

dcopClient()->setDefaultObject("Panel");
disableSessionManagement();
TQString dataPathBase = KStandardDirs::kde_default("data").append("kicker/");
TQString dataPathBase = TDEStandardDirs::kde_default("data").append("kicker/");
TDEGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini");
TDEGlobal::dirs()->addResourceType("icon", dataPathBase + "pics");
TDEGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins");


+ 1
- 1
kicker/kicker/ui/exe_dlg.cpp View File

@@ -128,7 +128,7 @@ void PanelExeDialog::updateIcon()
void PanelExeDialog::fillCompletion()
{
KCompletion *comp = ui->m_exec->completionObject();
TQStringList exePaths = KStandardDirs::systemPaths();
TQStringList exePaths = TDEStandardDirs::systemPaths();

for (TQStringList::ConstIterator it = exePaths.begin(); it != exePaths.end(); it++)
{


+ 4
- 4
kicker/kicker/ui/k_new_mnu.cpp View File

@@ -122,7 +122,7 @@
static TQString 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(exp), TDEProcess::quote(bc));
else
@@ -302,7 +302,7 @@ KMenu::KMenu()
m_searchInternet->setPixmap(0,icon);
setTabOrder(m_kcommand, m_searchResultsWidget);

m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty();
m_kerryInstalled = !TDEStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty();
m_isShowing = false;

if (!m_kerryInstalled) {
@@ -1353,7 +1353,7 @@ void KMenu::insertStaticItems()
m_systemView->insertItem( "folder_home", i18n( "Home Folder" ),
TQDir::homeDirPath(), "file://"+TQDir::homeDirPath(), nId++, index++ );

if ( KStandardDirs::exists( TDEGlobalSettings::documentPath() + "/" ) )
if ( TDEStandardDirs::exists( TDEGlobalSettings::documentPath() + "/" ) )
{
TQString documentPath = TDEGlobalSettings::documentPath();
if ( documentPath.endsWith( "/" ) )
@@ -2934,7 +2934,7 @@ void KMenu::slotContextMenu(int selected)
case EditMenu:
accept();
proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
proc->start();
break;


+ 2
- 2
kicker/kicker/ui/service_mnu.cpp View File

@@ -695,7 +695,7 @@ void PanelServiceMenu::slotContextMenu(int selected)

case EditItem:
proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
proc->start();
break;
@@ -739,7 +739,7 @@ void PanelServiceMenu::slotContextMenu(int selected)

case EditMenu:
proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
proc->start();
break;


+ 1
- 1
kicker/menuext/konsole/konsolebookmarkhandler.cpp View File

@@ -28,7 +28,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
file = locateLocal( "data", "konsole/bookmarks.xml" );

// import old bookmarks
if ( !KStandardDirs::exists( file ) ) {
if ( !TDEStandardDirs::exists( file ) ) {
TQString oldFile = locate( "data", "tdefile/bookmarks.html" );
if ( !oldFile.isEmpty() )
importOldBookmarks( oldFile, file );


+ 1
- 1
kicker/menuext/remote/remotemenu.cpp View File

@@ -43,7 +43,7 @@ RemoteMenu::RemoteMenu(TQWidget *parent, const char *name,
: KPanelMenu(parent, name), KDirNotify()
{
TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
TDEStandardDirs::kde_default("data") + "remoteview");

TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");



+ 1
- 1
kicker/proxy/appletproxy.cpp View File

@@ -84,7 +84,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDEApplication a;
a.disableSessionManagement();

TDEGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("applets", TDEStandardDirs::kde_default("data") +
"kicker/applets");

// setup proxy object


+ 1
- 1
kicker/proxy/extensiondebugger.cpp View File

@@ -88,7 +88,7 @@ int main( int argc, char ** argv )
TDEApplication a;
a.disableSessionManagement();

TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
"kicker/extensions");

TQString df;


+ 1
- 1
kicker/proxy/extensionproxy.cpp View File

@@ -70,7 +70,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDEApplication a;
a.disableSessionManagement();

TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
"kicker/extensions");

// setup proxy object


+ 1
- 1
knetattach/knetattach.ui.h View File

@@ -170,7 +170,7 @@ void KNetAttach::finished()

if (_createIcon->isChecked()) {
TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
TDEStandardDirs::kde_default("data") + "remoteview");

TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
path += name + ".desktop";


+ 4
- 4
konqueror/sidebar/sidebar_widget.cpp View File

@@ -67,7 +67,7 @@ void addBackEnd::aboutToShowAddMenu()
{
if (!menu)
return;
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
TQStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true);
libNames.setAutoDelete(true);
libNames.resize(0);
@@ -122,7 +122,7 @@ void addBackEnd::doRollBack()
{
if (KMessageBox::warningContinueCancel(m_parent, i18n("<qt>This removes all your entries from the sidebar and adds the system default ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"))==KMessageBox::Continue)
{
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
TQString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true);
TQDir dir(loc);
TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
@@ -139,7 +139,7 @@ void addBackEnd::doRollBack()

static TQString findFileName(const TQString* tmpl,bool universal, const TQString &profile) {
TQString myFile, filename;
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
TQString tmp = *tmpl;

if (universal) {
@@ -331,7 +331,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
// << " [" << name << "]" << endl;

// Look for existing ones with this URL
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
TQString list;
dirs->saveLocation("data", m_relPath, true);
list = locateLocal("data", m_relPath);


+ 1
- 1
konqueror/sidebar/trees/konq_sidebartree.cpp View File

@@ -87,7 +87,7 @@ void KonqSidebarTree::loadModuleFactories()
{
pluginFactories.clear();
pluginInfo.clear();
KStandardDirs *dirs=TDEGlobal::dirs();
TDEStandardDirs *dirs=TDEGlobal::dirs();
TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);




+ 1
- 1
konqueror/sidebar/trees/konqsidebar_tree.cpp View File

@@ -134,7 +134,7 @@ extern "C"
{
KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
{
KStandardDirs *dirs=TDEGlobal::dirs();
TDEStandardDirs *dirs=TDEGlobal::dirs();
TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
TQStringList names;
for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)


+ 1
- 1
konqueror/sidebar/web_module/web_module.cpp View File

@@ -191,7 +191,7 @@ extern "C" {
extern "C" {
KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
Q_UNUSED(param);
TDEGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
TDEGlobal::dirs()->addResourceType("websidebardata", TDEStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
KURL url;
url.setProtocol("file");
TQStringList paths = TDEGlobal::dirs()->resourceDirs("websidebardata");


+ 1
- 1
konsole/konsole/main.cpp View File

@@ -255,7 +255,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
a = new TDEApplication;
#endif

TQString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");
TQString dataPathBase = TDEStandardDirs::kde_default("data").append("konsole/");
TDEGlobal::dirs()->addResourceType("wallpaper", dataPathBase + "wallpapers");

KImageIO::registerFormats(); // add io for additional image formats


+ 1
- 1
kpersonalizer/kospage.cpp View File

@@ -105,7 +105,7 @@ void KOSPage::save(bool currSettings){
void KOSPage::saveCheckState(bool currSettings){
if(currSettings){
// Set the path for the keysscheme resource files
TDEGlobal::dirs()->addResourceType("keys", KStandardDirs::kde_default("data")+"kcmkeys");
TDEGlobal::dirs()->addResourceType("keys", TDEStandardDirs::kde_default("data")+"kcmkeys");
// write the settings to the configfiles, depending on wich radiobutton is checked
if(rb_kde->isChecked()){
writeKDE();


+ 3
- 3
kpersonalizer/kstylepage.cpp View File

@@ -118,7 +118,7 @@ void KStylePage::saveKWin(bool curSettings){
TQString twin = origKWinStyle;
if(curSettings) {
KDesktopFile* kdf = 0L;
KStandardDirs* kstd = TDEGlobal::dirs();
TDEStandardDirs* kstd = TDEGlobal::dirs();
if (cde->isSelected() && twin_cde_exist)
kdf = new KDesktopFile(kstd->findResource("data", "twin/cde.desktop"));
else if (win->isSelected() && twin_win_exist)
@@ -324,7 +324,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){
bool deleteConfig = false;
// get the color scheme file and go to the color scheme group
if(colorfile){
TDEGlobal::dirs()->addResourceType("colors", KStandardDirs::kde_default("data")+"kdisplay/color-schemes");
TDEGlobal::dirs()->addResourceType("colors", TDEStandardDirs::kde_default("data")+"kdisplay/color-schemes");
// set the style
if (kde->isSelected()) {
set->bgMode="Flat";
@@ -439,7 +439,7 @@ void KStylePage::getAvailability() {
twin_keramik_exist = twin_system_exist = twin_plastik_exist
= twin_default_exist = twin_win_exist
= twin_cde_exist = twin_quartz_exist = false;
KStandardDirs* kstd = TDEGlobal::dirs();
TDEStandardDirs* kstd = TDEGlobal::dirs();
if (!kstd->findResource("data", "twin/keramik.desktop").isNull())
twin_keramik_exist = true;
if (!kstd->findResource("data", "twin/plastik.desktop").isNull())


+ 1
- 1
ksplashml/kcmksplash/installer.cpp View File

@@ -88,7 +88,7 @@ void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aInit)
: TQWidget(aParent, aName), mGui(!aInit)
{
TDEGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
TDEGlobal::dirs()->addResourceType("ksplashthemes", TDEStandardDirs::kde_default("data") + "ksplash/Themes");

if (!mGui)
return;


+ 1
- 1
ksplashml/kcmksplash/main.cpp View File

@@ -86,7 +86,7 @@ TQString KSplashThemeMgr::quickHelp() const

void KSplashThemeMgr::init()
{
TDEGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
TDEGlobal::dirs()->addResourceType("ksplashthemes", TDEStandardDirs::kde_default("data") + "ksplash/Themes");
}

void KSplashThemeMgr::save()


+ 2
- 2
ksysguard/gui/KSysGuardApplet.cc View File

@@ -309,7 +309,7 @@ void KSysGuardApplet::resizeDocks( uint newDockCount )

bool KSysGuardApplet::load()
{
KStandardDirs* kstd = TDEGlobal::dirs();
TDEStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
TQString fileName = kstd->findResource( "data", "KSysGuardApplet.xml" );

@@ -458,7 +458,7 @@ bool KSysGuardApplet::save()
((KSGRD::SensorDisplay*)mDockList[ i ])->saveSettings( doc, element );
}

KStandardDirs* kstd = TDEGlobal::dirs();
TDEStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
TQString fileName = kstd->saveLocation( "data", "ksysguard" );
fileName += "/KSysGuardApplet.xml";


+ 2
- 2
ksysguard/gui/Workspace.cc View File

@@ -91,7 +91,7 @@ void Workspace::readProperties( TDEConfig *cfg )
/* If workDir is not specified in the config file, it's
* probably the first time the user has started KSysGuard. We
* then "restore" a special default configuration. */
KStandardDirs* kstd = TDEGlobal::dirs();
TDEStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );

mWorkDir = kstd->saveLocation( "data", "ksysguard" );
@@ -440,7 +440,7 @@ void Workspace::applyStyle()

void Workspace::showProcesses()
{
KStandardDirs* kstd = TDEGlobal::dirs();
TDEStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );

TQString file = kstd->findResource( "data", "ProcessTable.sgrd" );


+ 1
- 1
ksysguard/gui/ksysguard.cc View File

@@ -162,7 +162,7 @@ void TopLevel::resetWorkSheets()

mWorkSpace->removeAllWorkSheets();

KStandardDirs* kstd = TDEGlobal::dirs();
TDEStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );

TQString workDir = kstd->saveLocation( "data", "ksysguard" );


+ 1
- 1
tdeinit/phase1.cpp View File

@@ -68,7 +68,7 @@ int main(int argc, char **argv)
}

// Make sure the specified WM exists
if (KStandardDirs::findExe(wmToLaunch) == TQString::null) {
if (TDEStandardDirs::findExe(wmToLaunch) == TQString::null) {
wmToLaunch = "";
}


+ 1
- 1
tdeioslave/cgi/cgi.cpp View File

@@ -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;


+ 3
- 3
tdeioslave/fish/fish.cpp View File

@@ -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;


+ 2
- 2
tdeioslave/man/tdeio_man.cpp View File

@@ -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) + ".*");


+ 2
- 2
tdeioslave/media/mediamanager/fstabbackend.cpp View File

@@ -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("/", "")


+ 4
- 4
tdeioslave/media/mediamanager/halbackend.cpp View File

@@ -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())


+ 1
- 1
tdeioslave/media/mediamanager/mediamanager.cpp View File

@@ -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;


+ 1
- 1
tdeioslave/media/mediamanager/removablebackend.cpp View File

@@ -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("/", "");


+ 1
- 1
tdeioslave/media/medianotifier/medianotifier.cpp View File

@@ -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 ) )
{


+ 1
- 1
tdeioslave/remote/kdedmodule/remotedirnotify.cpp View File

@@ -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);


+ 1
- 1
tdeioslave/remote/remoteimpl.cpp View File

@@ -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");



+ 1
- 1
tdeioslave/sftp/ksshprocess.cpp View File

@@ -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;


+ 1
- 1
tdeioslave/sftp/process.cpp View File

@@ -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";


+ 1
- 1
tdeioslave/smb/tdeio_smb_mount.cpp View File

@@ -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;
}


+ 1
- 1
tdeioslave/system/kdedmodule/systemdirnotify.cpp View File

@@ -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");


+ 1
- 1
tdeioslave/system/systemimpl.cpp View File

@@ -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)


+ 2
- 2
tdeioslave/trash/trashimpl.cpp View File

@@ -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() );


+ 1
- 1
tdeprint/tdeprintfax/defcmds.cpp View File

@@ -29,7 +29,7 @@ TQString defaultCommand(const TQString& cmd)
int p(-1);
if ((p=r.search(str)) != -1)
{
TQString exe = KStandardDirs::findExe(r.cap(1));
TQString exe = TDEStandardDirs::findExe(r.cap(1));
if (exe.isEmpty())
exe = "/usr/bin/"+r.cap(1);
str.replace(p, r.matchedLength(), exe);


+ 2
- 2
tdescreensaver/random.cpp View File

@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
bool opengl = type.readBoolEntry("OpenGL", hasDirectRendering());
kdDebug() << "hasOPEN " << opengl << endl;
bool manipulatescreen = type.readBoolEntry("ManipulateScreen");
bool fortune = !KStandardDirs::findExe("fortune").isEmpty();
bool fortune = !TDEStandardDirs::findExe("fortune").isEmpty();
TQStringList defaults = type.readListEntry( "Defaults" );
TQMap<TQString, int> def_numbers;
for ( TQStringList::ConstIterator it = defaults.begin(); it != defaults.end(); ++it ) {
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
TQTextStream ts(&cmd, IO_ReadOnly);
TQString word;
ts >> word;
TQString exeFile = KStandardDirs::findExe(word);
TQString exeFile = TDEStandardDirs::findExe(word);

if (!exeFile.isEmpty())
{


+ 1
- 1
tdesu/tdesu/tdesu.cpp View File

@@ -181,7 +181,7 @@ static int startApp()
{
if (file.at(0) != '/')
{
KStandardDirs dirs;
TDEStandardDirs dirs;
dirs.addKDEDefaults();
file = dirs.findResource("config", file);
if (file.isEmpty())


+ 1
- 1
tdm/kfrontend/kgreeter.cpp View File

@@ -641,7 +641,7 @@ KGreeter::insertSessions()
dsk.readEntry( "Name" ),
(dsk.readBoolEntry( "Hidden", false ) ||
(dsk.hasKey( "TryExec" ) &&
KStandardDirs::findExe( dsk.readEntry( "TryExec" ) ).isEmpty())),
TDEStandardDirs::findExe( dsk.readEntry( "TryExec" ) ).isEmpty())),
dsk.readEntry( "Exec" ).latin1() );
}
}


+ 2
- 2
tdm/kfrontend/themer/tdmpixmap.cpp View File

@@ -72,7 +72,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
if ((_compositor.isEmpty()) || (!argb_visual_available)) {
// Software blend only (no compositing support)
// Use the preset TDM background...
KStandardDirs *m_pDirs = TDEGlobal::dirs();
TDEStandardDirs *m_pDirs = TDEGlobal::dirs();
KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) );
config->setGroup("Desktop0");
pixmap.normal.fullpath = m_pDirs->findResource("wallpaper", config->readPathEntry("Wallpaper"));
@@ -179,7 +179,7 @@ KdmPixmap::loadPixmap( PixmapStruct::PixmapClass *pClass )
kdDebug() << timestamp() << " ext " << ext << " " << fullpath << endl;
TQString testpath = TQString("-%1x%2").arg(area.width()).arg(area.height()) + ext;
kdDebug() << timestamp() << " testing for " << fullpath + testpath << endl;
if (KStandardDirs::exists(fullpath + testpath))
if (TDEStandardDirs::exists(fullpath + testpath))
pClass->pixmap.load(fullpath + testpath);
else
pClass->pixmap.load( fullpath + ext );


+ 2
- 2
twin/client.cpp View File

@@ -1829,7 +1829,7 @@ void Client::killProcess( bool ask, Time timestamp )
else
{ // SELI TODO handle the window created by handler specially (on top,urgent?)
process_killer = new TDEProcess( this );
*process_killer << KStandardDirs::findExe( "twin_killer_helper" )
*process_killer << TDEStandardDirs::findExe( "twin_killer_helper" )
<< "--pid" << TQCString().setNum( pid ) << "--hostname" << machine
<< "--windowname" << caption().utf8()
<< "--applicationname" << resourceClass()
@@ -1958,7 +1958,7 @@ bool Client::queryUserSuspendedResume()
}
// FIXME We should display a busy cursor until twin_resumer_helper loads
process_resumer = new TDEProcess( this );
*process_resumer << KStandardDirs::findExe( "twin_resumer_helper" )
*process_resumer << TDEStandardDirs::findExe( "twin_resumer_helper" )
<< "--pid" << TQCString().setNum( info->pid() ) << "--hostname" << wmClientMachine( true )
<< "--windowname" << caption().utf8()
<< "--applicationname" << resourceClass()


+ 1
- 1
twin/clients/PORTING View File

@@ -153,7 +153,7 @@ extern "C"
(usually 'widget()->resize( s );' is enough).
- Review mousePosition() if it's implemented. Position constants need 'Position' prepended,
e.g. Top -> PositionTop.
- Note that you cannot use "appdata" with KStandardDirs, as the decoration will be used
- Note that you cannot use "appdata" with TDEStandardDirs, as the decoration will be used
also in other applications than twin.
- Implement all missing pure virtual functions. For mousePosition(), you may call
KDecoration::mousePosition() if it's sufficient.

+ 1
- 1
twin/kcmtwin/twindecoration/twindecoration.cpp View File

@@ -465,7 +465,7 @@ void KWinDecorationModule::createThirdPartyWMList()
if (descStart >= 0) {
wmExecutable.truncate(descStart);
}
if (KStandardDirs::findExe(wmExecutable) != TQString::null) {
if (TDEStandardDirs::findExe(wmExecutable) != TQString::null) {
wmAvailableNames.append(*it);
}
}


Loading…
Cancel
Save