TDE
/
tdenetwork
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork
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 7f8c2db2f6
commit 4c89929629
18 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
Unescape View File

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

4
filesharing/simple/fileshare.cpp
Unescape View File

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

2
kopete/kopete/config/appearance/appearanceconfig.cpp
Unescape View File

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

2
kopete/kopete/config/appearance/emoticonseditdialog.cpp
Unescape View File

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

2
kopete/libkopete/private/kopeteemoticons.cpp
Unescape View File

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

4
kopete/plugins/latex/latexplugin.cpp
Unescape View File

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

2
kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
Unescape View File

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

2
kopete/protocols/winpopup/wpeditaccount.cpp
Unescape View File

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

4
kopete/protocols/winpopup/wpprotocol.cpp
Unescape View File

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

4
kopete/protocols/yahoo/yahoocontact.cpp
Unescape View File

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

2
kppp/ChangeLog
Unescape View File

@ -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 <porten@kde.org>

2
krdc/vnc/kvncview.cpp
Unescape View File

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

10
ktalkd/kcmktalkd/soundpage.cpp
Unescape View File

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

2
ktalkd/ktalkd/readcfg++.cpp
Unescape View File

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

4
wifi/interface_wireless_wirelessextensions.cpp
Unescape View File

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

2
wifi/kwifimanager.cpp
Unescape View File

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

2
wifi/picture.cpp
Unescape View File

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

2
wifi/strength.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save