diff options
| author | Timothy Pearson <[email protected]> | 2013-01-31 13:29:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-31 13:29:01 -0600 |
| commit | 4c899296290a7499b75b1bd88267d53d7d690ffe (patch) | |
| tree | c08d380471f924338a10031b9d810d38af7c852a /ktalkd | |
| parent | 7f8c2db2f66cc2bc671bc92e0fc4efa967ff2351 (diff) | |
| download | tdenetwork-4c899296290a7499b75b1bd88267d53d7d690ffe.tar.gz tdenetwork-4c899296290a7499b75b1bd88267d53d7d690ffe.zip | |
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'ktalkd')
| -rw-r--r-- | ktalkd/kcmktalkd/soundpage.cpp | 10 | ||||
| -rw-r--r-- | ktalkd/ktalkd/readcfg++.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index f69d90b0..0752f7d7 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -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); diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp index 66eb1d79..4061431a 100644 --- a/ktalkd/ktalkd/readcfg++.cpp +++ b/ktalkd/ktalkd/readcfg++.cpp @@ -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); } |