TDE
/
tdeaddons
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaddons
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KStandard for enhanced compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 854cb5dd9c
commit 30c894d73e
9 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File

4
kate/make/plugin_katemake.cpp
Unescape View File

@ -657,9 +657,9 @@ bool PluginKateMakeView::slotValidate()
} }
m_proc->setWorkingDirectory(document_dir); m_proc->setWorkingDirectory(document_dir);
TQString make = KStandardDirs::findExe( "gmake" ); TQString make = TDEStandardDirs::findExe( "gmake" );
if (make.isEmpty()) if (make.isEmpty())
make = KStandardDirs::findExe("make"); make = TDEStandardDirs::findExe("make");
*m_proc << make; *m_proc << make;
if( make.isEmpty() || ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) { if( make.isEmpty() || ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) {
KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").arg(make.isEmpty() ? KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").arg(make.isEmpty() ?

2
kate/xmlcheck/plugin_katexmlcheck.cpp
Unescape View File

@ -292,7 +292,7 @@ bool PluginKateXMLCheckView::slotValidate()
kdDebug() << "Warning (slotValidate()): temp file '" << m_tmp_file->name() << "' not deleted: " << m_tmp_file->status() << endl; kdDebug() << "Warning (slotValidate()): temp file '" << m_tmp_file->name() << "' not deleted: " << m_tmp_file->status() << endl;
} }
TQString exe = KStandardDirs::findExe("xmllint"); TQString exe = TDEStandardDirs::findExe("xmllint");
if( exe.isEmpty() ) { if( exe.isEmpty() ) {
exe = locate("exe", "xmllint"); exe = locate("exe", "xmllint");
} }

2
kicker-applets/mediacontrol/mediacontrolconfig.cpp
Unescape View File

@ -63,7 +63,7 @@ MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, c
_child->themeListBox->clear(); _child->themeListBox->clear();
// fill with available skins // fill with available skins
TDEGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "mediacontrol"); TDEGlobal::dirs()->addResourceType("themes", TDEStandardDirs::kde_default("data") + "mediacontrol");
TQStringList list = TDEGlobal::dirs()->resourceDirs("themes"); TQStringList list = TDEGlobal::dirs()->resourceDirs("themes");
for (TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) for (TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it)
readSkinDir(*it); readSkinDir(*it);

62
konq-plugins/arkplugin/arkplugin.cpp
Unescape View File

@ -46,7 +46,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
m_compAsMapper( 0 ), m_addToMapper( 0 ), m_conf( 0 ) m_compAsMapper( 0 ), m_addToMapper( 0 ), m_conf( 0 )
{ {
if ( ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) ) if ( ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) )
|| ( KStandardDirs::findExe( "ark" ).isNull() ) ) || ( TDEStandardDirs::findExe( "ark" ).isNull() ) )
return; return;
m_conf = new TDEConfig( "arkrc" ); m_conf = new TDEConfig( "arkrc" );
@ -262,7 +262,7 @@ void ArkMenu::compMimeTypes()
unsigned int itemCount = m_urlList.count(); unsigned int itemCount = m_urlList.count();
bool havegz = false; bool havegz = false;
if ( !KStandardDirs::findExe( "gzip" ).isNull() && m_conf->readBoolEntry( "UseGz", true ) ) if ( !TDEStandardDirs::findExe( "gzip" ).isNull() && m_conf->readBoolEntry( "UseGz", true ) )
{ {
havegz = true; havegz = true;
//.gz can only compress one file, not multiple //.gz can only compress one file, not multiple
@ -270,7 +270,7 @@ void ArkMenu::compMimeTypes()
} }
bool havebz2 = false; bool havebz2 = false;
if ( !KStandardDirs::findExe( "bzip2" ).isNull() && m_conf->readBoolEntry( "UseBzip2", true ) ) if ( !TDEStandardDirs::findExe( "bzip2" ).isNull() && m_conf->readBoolEntry( "UseBzip2", true ) )
{ {
havebz2 = true; havebz2 = true;
//.bz2 can only compress one file, not multiple //.bz2 can only compress one file, not multiple
@ -278,27 +278,27 @@ void ArkMenu::compMimeTypes()
} }
bool havelzop = false; bool havelzop = false;
if ( !KStandardDirs::findExe( "lzop" ).isNull() && m_conf->readBoolEntry( "UseLzop", false ) ) if ( !TDEStandardDirs::findExe( "lzop" ).isNull() && m_conf->readBoolEntry( "UseLzop", false ) )
{ {
havelzop = true; havelzop = true;
m_archiveMimeTypes << "application/x-lzop"; m_archiveMimeTypes << "application/x-lzop";
} }
bool havelzma = false; bool havelzma = false;
if ( !KStandardDirs::findExe( "lzma" ).isNull() && m_conf->readBoolEntry( "UseLzma", true ) ) if ( !TDEStandardDirs::findExe( "lzma" ).isNull() && m_conf->readBoolEntry( "UseLzma", true ) )
{ {
havelzma = true; havelzma = true;
m_archiveMimeTypes << "application/x-lzma"; m_archiveMimeTypes << "application/x-lzma";
} }
bool havexz = false; bool havexz = false;
if ( !KStandardDirs::findExe( "xz" ).isNull() && m_conf->readBoolEntry( "UseXz", true ) ) if ( !TDEStandardDirs::findExe( "xz" ).isNull() && m_conf->readBoolEntry( "UseXz", true ) )
{ {
havexz = true; havexz = true;
m_archiveMimeTypes << "application/x-xz"; m_archiveMimeTypes << "application/x-xz";
} }
if ( !KStandardDirs::findExe( "tar" ).isNull() && m_conf->readBoolEntry( "UseTar", true ) ) if ( !TDEStandardDirs::findExe( "tar" ).isNull() && m_conf->readBoolEntry( "UseTar", true ) )
{ {
m_archiveMimeTypes << "application/x-tar"; m_archiveMimeTypes << "application/x-tar";
if ( havegz ) if ( havegz )
@ -316,10 +316,10 @@ void ArkMenu::compMimeTypes()
m_archiveMimeTypes << "application/x-txz"; m_archiveMimeTypes << "application/x-txz";
} }
if ( !KStandardDirs::findExe( "lha" ).isNull() && m_conf->readBoolEntry( "UseLha", false ) ) if ( !TDEStandardDirs::findExe( "lha" ).isNull() && m_conf->readBoolEntry( "UseLha", false ) )
m_archiveMimeTypes << "application/x-lha"; m_archiveMimeTypes << "application/x-lha";
if ( !KStandardDirs::findExe( "zip" ).isNull() && m_conf->readBoolEntry( "UseZip", true ) ) if ( !TDEStandardDirs::findExe( "zip" ).isNull() && m_conf->readBoolEntry( "UseZip", true ) )
{ {
m_archiveMimeTypes << "application/x-zip"; m_archiveMimeTypes << "application/x-zip";
@ -327,26 +327,26 @@ void ArkMenu::compMimeTypes()
m_archiveMimeTypes << "application/x-jar"; m_archiveMimeTypes << "application/x-jar";
} }
if ( !KStandardDirs::findExe( "rar" ).isNull() && m_conf->readBoolEntry( "UseRar", true ) ) if ( !TDEStandardDirs::findExe( "rar" ).isNull() && m_conf->readBoolEntry( "UseRar", true ) )
m_archiveMimeTypes << "application/x-rar" << "application/x-rar-compressed"; m_archiveMimeTypes << "application/x-rar" << "application/x-rar-compressed";
if ( !KStandardDirs::findExe( "7z" ).isNull() && m_conf->readBoolEntry( "Use7z", true ) ) if ( !TDEStandardDirs::findExe( "7z" ).isNull() && m_conf->readBoolEntry( "Use7z", true ) )
m_archiveMimeTypes << "application/x-7z"; m_archiveMimeTypes << "application/x-7z";
else if ( !KStandardDirs::findExe( "7za" ).isNull() && m_conf->readBoolEntry( "Use7za", true ) ) else if ( !TDEStandardDirs::findExe( "7za" ).isNull() && m_conf->readBoolEntry( "Use7za", true ) )
m_archiveMimeTypes << "application/x-7z"; m_archiveMimeTypes << "application/x-7z";
else if ( !KStandardDirs::findExe( "7zr" ).isNull() && m_conf->readBoolEntry( "Use7zr", true ) ) else if ( !TDEStandardDirs::findExe( "7zr" ).isNull() && m_conf->readBoolEntry( "Use7zr", true ) )
m_archiveMimeTypes << "application/x-7z"; m_archiveMimeTypes << "application/x-7z";
if ( !KStandardDirs::findExe( "zoo" ).isNull() && m_conf->readBoolEntry( "UseZoo", false ) ) if ( !TDEStandardDirs::findExe( "zoo" ).isNull() && m_conf->readBoolEntry( "UseZoo", false ) )
m_archiveMimeTypes << "application/x-zoo"; m_archiveMimeTypes << "application/x-zoo";
if ( !KStandardDirs::findExe( "compress" ).isNull() && m_conf->readBoolEntry( "UseCompress", false ) ) if ( !TDEStandardDirs::findExe( "compress" ).isNull() && m_conf->readBoolEntry( "UseCompress", false ) )
m_archiveMimeTypes << "application/x-compress"; m_archiveMimeTypes << "application/x-compress";
if ( !KStandardDirs::findExe( "bzip" ).isNull() && m_conf->readBoolEntry( "UseBzip", false ) ) if ( !TDEStandardDirs::findExe( "bzip" ).isNull() && m_conf->readBoolEntry( "UseBzip", false ) )
m_archiveMimeTypes << "application/x-bzip"; m_archiveMimeTypes << "application/x-bzip";
if ( !KStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", false ) ) if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", false ) )
m_archiveMimeTypes << "application/x-archive"; m_archiveMimeTypes << "application/x-archive";
} }
@ -354,7 +354,7 @@ void ArkMenu::compMimeTypes()
void ArkMenu::extMimeTypes() void ArkMenu::extMimeTypes()
{ {
bool havegz = false; bool havegz = false;
if ( !KStandardDirs::findExe( "gunzip" ).isNull() ) if ( !TDEStandardDirs::findExe( "gunzip" ).isNull() )
{ {
havegz = true; havegz = true;
m_extractMimeTypes << "application/x-gzip"; m_extractMimeTypes << "application/x-gzip";
@ -362,34 +362,34 @@ void ArkMenu::extMimeTypes()
} }
bool havebz2 = false; bool havebz2 = false;
if ( !KStandardDirs::findExe( "bunzip2" ).isNull() ) if ( !TDEStandardDirs::findExe( "bunzip2" ).isNull() )
{ {
havebz2 = true; havebz2 = true;
m_extractMimeTypes << "application/x-bzip2"; m_extractMimeTypes << "application/x-bzip2";
} }
bool havelzop = false; bool havelzop = false;
if ( !KStandardDirs::findExe( "lzop" ).isNull() ) if ( !TDEStandardDirs::findExe( "lzop" ).isNull() )
{ {
havelzop = true; havelzop = true;
m_extractMimeTypes << "application/x-lzop"; m_extractMimeTypes << "application/x-lzop";
} }
bool havelzma = false; bool havelzma = false;
if ( !KStandardDirs::findExe( "lzma" ).isNull() ) if ( !TDEStandardDirs::findExe( "lzma" ).isNull() )
{ {
havelzma = true; havelzma = true;
m_archiveMimeTypes << "application/x-lzma"; m_archiveMimeTypes << "application/x-lzma";
} }
bool havexz = false; bool havexz = false;
if ( !KStandardDirs::findExe( "xz" ).isNull() ) if ( !TDEStandardDirs::findExe( "xz" ).isNull() )
{ {
havexz = true; havexz = true;
m_archiveMimeTypes << "application/x-xz"; m_archiveMimeTypes << "application/x-xz";
} }
if ( !KStandardDirs::findExe( "tar" ).isNull() ) if ( !TDEStandardDirs::findExe( "tar" ).isNull() )
{ {
m_extractMimeTypes << "application/x-tar"; m_extractMimeTypes << "application/x-tar";
if ( havegz ) if ( havegz )
@ -407,28 +407,28 @@ void ArkMenu::extMimeTypes()
m_extractMimeTypes << "application/x-txz"; m_extractMimeTypes << "application/x-txz";
} }
if ( !KStandardDirs::findExe( "lha" ).isNull() ) if ( !TDEStandardDirs::findExe( "lha" ).isNull() )
m_extractMimeTypes << "application/x-lha"; m_extractMimeTypes << "application/x-lha";
if ( !KStandardDirs::findExe( "zip" ).isNull() ) if ( !TDEStandardDirs::findExe( "zip" ).isNull() )
m_extractMimeTypes << "application/x-zip" << "application/x-jar"; m_extractMimeTypes << "application/x-zip" << "application/x-jar";
if ( !KStandardDirs::findExe( "unrar" ).isNull() ) if ( !TDEStandardDirs::findExe( "unrar" ).isNull() )
m_extractMimeTypes << "application/x-rar" << "application/x-rar-compressed"; m_extractMimeTypes << "application/x-rar" << "application/x-rar-compressed";
if ( !KStandardDirs::findExe( "7z" ).isNull() || !KStandardDirs::findExe( "7za" ).isNull() || !KStandardDirs::findExe( "7zr" ).isNull() ) if ( !TDEStandardDirs::findExe( "7z" ).isNull() || !TDEStandardDirs::findExe( "7za" ).isNull() || !TDEStandardDirs::findExe( "7zr" ).isNull() )
m_extractMimeTypes << "application/x-7z"; m_extractMimeTypes << "application/x-7z";
if ( !KStandardDirs::findExe( "zoo" ).isNull() ) if ( !TDEStandardDirs::findExe( "zoo" ).isNull() )
m_extractMimeTypes << "application/x-zoo"; m_extractMimeTypes << "application/x-zoo";
if ( !KStandardDirs::findExe( "uncompress" ).isNull() ) if ( !TDEStandardDirs::findExe( "uncompress" ).isNull() )
m_extractMimeTypes << "application/x-compress"; m_extractMimeTypes << "application/x-compress";
if ( !KStandardDirs::findExe( "bunzip" ).isNull() ) if ( !TDEStandardDirs::findExe( "bunzip" ).isNull() )
m_extractMimeTypes << "application/x-bzip"; m_extractMimeTypes << "application/x-bzip";
if ( !KStandardDirs::findExe( "ar" ).isNull() ) if ( !TDEStandardDirs::findExe( "ar" ).isNull() )
m_extractMimeTypes << "application/x-archive"; m_extractMimeTypes << "application/x-archive";
} }

2
noatun-plugins/nexscope/noatunplugin.cpp
Unescape View File

@ -28,7 +28,7 @@ NexPlugin::~NexPlugin()
void NexPlugin::init() void NexPlugin::init()
{ {
process << KStandardDirs::findExe("nexscope.bin"); process << TDEStandardDirs::findExe("nexscope.bin");
// Note that process.start() will fail if findExe fails, so there's no real need // Note that process.start() will fail if findExe fails, so there's no real need
// for two separate checks. // for two separate checks.

2
noatun-plugins/synaescope/synaescope.cpp
Unescape View File

@ -48,7 +48,7 @@ void SynaeScope::init()
mPrefs->save(); mPrefs->save();
connect(mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig())); connect(mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()));
scopeExePath = KStandardDirs::findExe("noatunsynaescope.bin"); scopeExePath = TDEStandardDirs::findExe("noatunsynaescope.bin");
if (scopeExePath.isEmpty()) if (scopeExePath.isEmpty())
{ {
KMessageBox::error(0, i18n("Unable to locate noatunsynaescope.bin in your path. Check your installation.")); KMessageBox::error(0, i18n("Unable to locate noatunsynaescope.bin in your path. Check your installation."));

2
noatun-plugins/tippercanoe/synaescope.cpp
Unescape View File

@ -54,7 +54,7 @@ void SynaeScope::init()
connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(read(TDEProcess *, char *, int))); connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(read(TDEProcess *, char *, int)));
pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void))); pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void)));
process << KStandardDirs::findExe("noatuntippecanoe.bin"); process << TDEStandardDirs::findExe("noatuntippecanoe.bin");
// Note that process.start() will fail if findExe fails, so there's no real need // Note that process.start() will fail if findExe fails, so there's no real need
// for two separate checks. // for two separate checks.

4
noatun-plugins/tyler/file.cpp
Unescape View File

@ -28,14 +28,14 @@ extern "C"
static TQString getDataPath(void) static TQString getDataPath(void)
{ {
KStandardDirs &dirs = *TDEGlobal::dirs(); TDEStandardDirs &dirs = *TDEGlobal::dirs();
return dirs.findResource("data", "noatun/tylerstates"); return dirs.findResource("data", "noatun/tylerstates");
} }
static TQString getSavePath(void) static TQString getSavePath(void)
{ {
KStandardDirs &dirs = *TDEGlobal::dirs(); TDEStandardDirs &dirs = *TDEGlobal::dirs();
return dirs.saveLocation("data", "noatun/") + "tylerstates"; return dirs.saveLocation("data", "noatun/") + "tylerstates";
} }

2
noatun-plugins/tyler/tyler.cpp
Unescape View File

@ -36,7 +36,7 @@ Tyler::~Tyler()
void Tyler::init() void Tyler::init()
{ {
process << KStandardDirs::findExe("noatuntyler.bin"); process << TDEStandardDirs::findExe("noatuntyler.bin");
connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *)));
// Note that process.start() will fail if findExe fails, so there's no real need // Note that process.start() will fail if findExe fails, so there's no real need

Write Preview
Loading…
Cancel
Save