summaryrefslogtreecommitdiffstats
path: root/kopete/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols')
-rw-r--r--kopete/protocols/irc/kcodecaction.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/Makefile.am2
-rw-r--r--kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp12
-rw-r--r--kopete/protocols/winpopup/wpprotocol.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp
index f7e4ee24..5dca8771 100644
--- a/kopete/protocols/irc/kcodecaction.cpp
+++ b/kopete/protocols/irc/kcodecaction.cpp
@@ -56,7 +56,7 @@ void KCodecAction::setCodec( const TQTextCodec *codec )
/* Create a list of supported encodings, and keep only one of each encoding
* mime name.
*
- * This piece of code from kdepim/kmail/kmmsgbase.cpp
+ * This piece of code from tdepim/kmail/kmmsgbase.cpp
*/
TQStringList KCodecAction::supportedEncodings(bool usAscii)
diff --git a/kopete/protocols/oscar/liboscar/tests/Makefile.am b/kopete/protocols/oscar/liboscar/tests/Makefile.am
index 10c3e473..14b0e3af 100644
--- a/kopete/protocols/oscar/liboscar/tests/Makefile.am
+++ b/kopete/protocols/oscar/liboscar/tests/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
check_PROGRAMS = kunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest
kunittest_SOURCES = main.cpp kunittest.cpp chatnavtests.cpp
-kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kunittest_LDADD = $(LIB_KDECORE) ../liboscar.la
clientstream_test_SOURCES = clientstream_test.cpp
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index a3ee592e..15440eda 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -110,8 +110,8 @@ bool WinPopupLib::checkMessageDir()
"Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR),
TQString::tqfromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
if (tmpYesNo == KMessageBox::Yes) {
- TQStringList kdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR));
- if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true;
+ TQStringList tdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR));
+ if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
}
} else {
KFileItem tmpFileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(WP_POPUP_DIR));
@@ -129,8 +129,8 @@ bool WinPopupLib::checkMessageDir()
"Fix? (May need root password)").tqarg(WP_POPUP_DIR),
TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
if (tmpYesNo == KMessageBox::Yes) {
- TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR));
- if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true;
+ TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR));
+ if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
}
} else {
return true;
@@ -305,8 +305,8 @@ void WinPopupLib::readMessages(const KFileItemList &items)
"Fix? (May need root password)"),
TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
if (tmpYesNo == KMessageBox::Yes) {
- TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path()));
- if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) {
+ TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path()));
+ if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) {
if (!messageFile.remove())
KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("Still cannot remove it; please fix manually."));
}
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index a6805a7e..d16c8e6a 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -140,7 +140,7 @@ void WPProtocol::installSamba()
TQStringList args;
args += KStandardDirs::findExe("winpopup-install.sh");
args += KStandardDirs::findExe("winpopup-send.sh");
- if (KApplication::kdeinitExecWait("kdesu", args) == 0)
+ if (KApplication::tdeinitExecWait("tdesu", args) == 0)
KMessageBox::information(Kopete::UI::Global::mainWidget(), i18n("The Samba configuration file is modified."), i18n("Configuration Succeeded"));
else
KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("Updating the Samba configuration file failed."), i18n("Configuration Failed"));