summaryrefslogtreecommitdiffstats
path: root/kopete
diff options
context:
space:
mode:
Diffstat (limited to 'kopete')
-rw-r--r--kopete/kopete/Makefile.am2
-rw-r--r--kopete/kopete/contactlist/Makefile.am2
-rw-r--r--kopete/kopete/contactlist/configure.in.in2
-rw-r--r--kopete/kopete/kconf_update/CMakeLists.txt2
-rw-r--r--kopete/kopete/kconf_update/Makefile.am6
-rw-r--r--kopete/libkopete/Makefile.am2
-rw-r--r--kopete/libkopete/avdevice/CMakeLists.txt2
-rw-r--r--kopete/libkopete/avdevice/Makefile.am2
-rw-r--r--kopete/libkopete/compat/kpixmapregionselectorwidget.cpp4
-rw-r--r--kopete/libkopete/compat/kpixmapregionselectorwidget.h4
-rw-r--r--kopete/plugins/smpppdcs/unittest/Makefile.am2
-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
15 files changed, 24 insertions, 24 deletions
diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am
index 3035e8a6..c5b22ac2 100644
--- a/kopete/kopete/Makefile.am
+++ b/kopete/kopete/Makefile.am
@@ -33,7 +33,7 @@ kopete_SOURCES = main.cpp kopeteapplication.cpp kopeteiface.cpp \
kimiface_DIR = $(kde_includes)
-kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor $(LIB_QT) $(LIB_KDECORE) -lkdefx -lDCOP
+kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor $(LIB_QT) $(LIB_KDECORE) -ltdefx -lDCOP
kopete_LDADD = \
addcontactwizard/libkopeteaddcontactwizard.la \
addaccountwizard/libkopeteaddaccountwizard.la \
diff --git a/kopete/kopete/contactlist/Makefile.am b/kopete/kopete/contactlist/Makefile.am
index 4a8c23e3..9061eb86 100644
--- a/kopete/kopete/contactlist/Makefile.am
+++ b/kopete/kopete/contactlist/Makefile.am
@@ -18,7 +18,7 @@ libkopetecontactlist_la_SOURCES = kopetemetacontactlvi.cpp \
customnotificationprops.cpp kopetegrouplistaction.cpp kabcexport.cpp \
kabcexport_base.ui
-libkopetecontactlist_la_LDFLAGS = $(all_libraries) -lkdefx
+libkopetecontactlist_la_LDFLAGS = $(all_libraries) -ltdefx
libkopetecontactlist_la_LIBADD = -lkabc ../../libkopete/libkopete.la ../addcontactwizard/libkopeteaddcontactwizard.la $(LIB_KDEUI) $(LIB_XRENDER)
noinst_HEADERS = kopeteaddrbookexport.h customnotificationprops.h kabcexport.h
diff --git a/kopete/kopete/contactlist/configure.in.in b/kopete/kopete/contactlist/configure.in.in
index 900224ea..eeaa09b0 100644
--- a/kopete/kopete/contactlist/configure.in.in
+++ b/kopete/kopete/contactlist/configure.in.in
@@ -1,6 +1,6 @@
dnl -----------------------------------------------------
-dnl XRender check - stolen from kdelibs/kdefx
+dnl XRender check - stolen from kdelibs/tdefx
dnl -----------------------------------------------------
LIB_XRENDER=
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
diff --git a/kopete/kopete/kconf_update/CMakeLists.txt b/kopete/kopete/kconf_update/CMakeLists.txt
index 1317d824..b708b42c 100644
--- a/kopete/kopete/kconf_update/CMakeLists.txt
+++ b/kopete/kopete/kconf_update/CMakeLists.txt
@@ -59,6 +59,6 @@ tde_add_executable( kopete_pluginloader2_kconf_update
tde_add_executable( kopete_nameTracking_kconf_update
SOURCES kopete-nameTracking.cpp
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
)
diff --git a/kopete/kopete/kconf_update/Makefile.am b/kopete/kopete/kconf_update/Makefile.am
index 3dd58c64..6b7db7d5 100644
--- a/kopete/kopete/kconf_update/Makefile.am
+++ b/kopete/kopete/kconf_update/Makefile.am
@@ -17,15 +17,15 @@ kconf_PROGRAMS = kopete-account-kconf_update kopete-pluginloader2-kconf_update \
kconfdir = $(libdir)/kconf_update_bin
kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp
-kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_account_kconf_update_LDADD = $(LIB_QT)
kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp
-kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT)
kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp
-kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_KDECORE)
# vim: set noet:
diff --git a/kopete/libkopete/Makefile.am b/kopete/libkopete/Makefile.am
index 11355aa2..7e90bfc7 100644
--- a/kopete/libkopete/Makefile.am
+++ b/kopete/libkopete/Makefile.am
@@ -5,7 +5,7 @@ endif
include ../../admin/Doxyfile.am
-DOXYGEN_REFERENCES = kio kdecore kdeui
+DOXYGEN_REFERENCES = kio tdecore tdeui
DOXYGEN_EXCLUDE = compat
DOXYGEN_SET_PROJECT_NAME = libkopete
diff --git a/kopete/libkopete/avdevice/CMakeLists.txt b/kopete/libkopete/avdevice/CMakeLists.txt
index 8e37773f..fb3f77c4 100644
--- a/kopete/libkopete/avdevice/CMakeLists.txt
+++ b/kopete/libkopete/avdevice/CMakeLists.txt
@@ -41,6 +41,6 @@ tde_add_library( kopete_videodevice SHARED AUTOMOC
videodevicepool.cpp videoinput.cpp bayer.cpp
sonix_compress.cpp
VERSION 1.0.0
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kopete/libkopete/avdevice/Makefile.am b/kopete/libkopete/avdevice/Makefile.am
index 65c88c30..5000288c 100644
--- a/kopete/libkopete/avdevice/Makefile.am
+++ b/kopete/libkopete/avdevice/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CA
METASOURCES = AUTO
lib_LTLIBRARIES = libkopete_videodevice.la
noinst_LTLIBRARIES = libkvideoio.la
-libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \
videodevicemodelpool.h videodevicepool.h videoinput.h \
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
index 8c561b99..453ca98b 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
@@ -18,8 +18,8 @@
*/
/* NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim
- * This is because kdepim has to remain backwards compatible. Any changes
+ * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim
+ * This is because tdepim has to remain backwards compatible. Any changes
* to either file should be made to the other.
*/
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.h b/kopete/libkopete/compat/kpixmapregionselectorwidget.h
index 7143576d..5cbb067c 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.h
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.h
@@ -34,8 +34,8 @@ class KPopupMenu;
* user with a friendly way to select a rectangular subregion of the pixmap.
*
* NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim
- * This is because kdepim has to remain backwards compatible. Any changes
+ * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim
+ * This is because tdepim has to remain backwards compatible. Any changes
* to either file should be made to the other.
*
* @author Antonio Larrosa <larrosa@kde.org>
diff --git a/kopete/plugins/smpppdcs/unittest/Makefile.am b/kopete/plugins/smpppdcs/unittest/Makefile.am
index 7080412c..89718cd6 100644
--- a/kopete/plugins/smpppdcs/unittest/Makefile.am
+++ b/kopete/plugins/smpppdcs/unittest/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
check_PROGRAMS = smpppdcstests
smpppdcstests_SOURCES = main.cpp clienttest.cpp
-smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui
noinst_HEADERS = clienttest.h
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"));
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 05:59:18 +0000