diff options
Diffstat (limited to 'kopete')
51 files changed, 55 insertions, 55 deletions
diff --git a/kopete/ChangeLog b/kopete/ChangeLog index 53392915..7c922c9f 100644 --- a/kopete/ChangeLog +++ b/kopete/ChangeLog @@ -124,7 +124,7 @@ * Make the decodeMessage function more fast for empty CString. As a side effect it fix possible attempt to decode null string using - KStringHandler::isUtf8 wich make kopete crash with kdelibs prior + KStringHandler::isUtf8 wich make kopete crash with tdelibs prior to 3.2.92. 2004-08-23 12:54 Gustavo P. Boiko <boiko@conectiva.com.br> diff --git a/kopete/INSTALL b/kopete/INSTALL index 0d901f47..1fc6e9d4 100644 --- a/kopete/INSTALL +++ b/kopete/INSTALL @@ -202,7 +202,7 @@ please read on. KDE applications by default look in all directories listed in the /etc/kderc file, the $KDEDIRS environment variable, in $KDEDIR if this variable doesn't exist, and ultimately in the directory where -kdelibs is installed. Unless you take special precautions applications +tdelibs is installed. Unless you take special precautions applications will _NOT_ look in other directories, even if you install additional software (like Kopete) there. diff --git a/kopete/configure.in.in b/kopete/configure.in.in index 802dd84d..261f4f6f 100644 --- a/kopete/configure.in.in +++ b/kopete/configure.in.in @@ -16,7 +16,7 @@ KDE_CHECK_HEADERS(knotifydialog.h) KOPETE_INCLUDES='-I$(top_srcdir)/kopete/libkopete -I$(top_builddir)/kopete/libkopete -I$(top_srcdir)/kopete/libkopete/avdevice -I$(top_srcdir)/kopete/libkopete/ui -I$(top_builddir)/kopete/libkopete/ui' -AC_MSG_CHECKING([for kdelibs newer than 3.3.x]) +AC_MSG_CHECKING([for tdelibs newer than 3.3.x]) AC_LANG_SAVE AC_LANG_CPLUSPLUS kcompat_save_CXXFLAGS="$CXXFLAGS" @@ -25,7 +25,7 @@ LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" AC_TRY_COMPILE([ -#include <kdeversion.h> +#include <tdeversion.h> #if !( KDE_IS_VERSION( 3, 3, 90 ) ) #error Kopete compatibility with KDE 3.3 needs to be enabled #endif diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp index 9332204e..1a0f1a4f 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp @@ -50,7 +50,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinputdialog.h> #include <kinputdialog.h> diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index 6336185c..5bb4f204 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -49,7 +49,7 @@ // KDE includes #include <kapplication.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kfiledialog.h> #include <khtmlview.h> #include <klocale.h> @@ -86,7 +86,7 @@ #include "kopetechatwindowstylemanager.h" #if !(KDE_IS_VERSION(3,3,90)) -//From kdelibs/khtml/misc/htmltags.h +//From tdelibs/khtml/misc/htmltags.h // used in ChatMessagePart::copy() #define ID_BLOCKTQUOTE 12 #define ID_BR 14 diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h index f43fccdb..0e101fc3 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.h +++ b/kopete/kopete/chatwindow/kopetechatwindow.h @@ -22,7 +22,7 @@ #include <kparts/mainwindow.h> #include <tqmovie.h> #include "kopetecontact.h" -#include "kdeversion.h" +#include "tdeversion.h" class KAction; class KToggleAction; diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index 12772ddb..bd726cb8 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -37,7 +37,7 @@ #include <kconfig.h> #include <kcursor.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kedittoolbar.h> #include <kfontdialog.h> #include <kglobalsettings.h> diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index 08d19240..ff86940d 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -5,7 +5,7 @@ #include <kfontdialog.h> #include <kdebug.h> #include <kconfig.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <tqapplication.h> #include <tqclipboard.h> #include <tqevent.h> diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index e415d349..ac6c4a27 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -37,7 +37,7 @@ #include <tqslider.h> #include <tqlabel.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinputdialog.h> #include <kapplication.h> diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.h b/kopete/kopete/config/plugins/kopetepluginconfig.h index dc5d1736..c235a699 100644 --- a/kopete/kopete/config/plugins/kopetepluginconfig.h +++ b/kopete/kopete/config/plugins/kopetepluginconfig.h @@ -23,7 +23,7 @@ class KopetePluginConfigPrivate; /** - * Plugin selector. See KPluginSelector in kdelibs for documentation. + * Plugin selector. See KPluginSelector in tdelibs for documentation. * * @author Martijn Klingens <klingens@kde.org> */ diff --git a/kopete/kopete/contactlist/configure.in.in b/kopete/kopete/contactlist/configure.in.in index eeaa09b0..f95ae667 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/tdefx +dnl XRender check - stolen from tdelibs/tdefx dnl ----------------------------------------------------- LIB_XRENDER= if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index d95e4cb1..d3459c07 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -46,7 +46,7 @@ #include <kabc/stdaddressbook.h> #include <kabc/vcardconverter.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinputdialog.h> #include "addcontactwizard.h" diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index 39b00849..b1047dff 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -521,7 +521,7 @@ void KopeteMetaLVIProps::slotFromKABCClicked() void KopeteMetaLVIProps::slotOpenSoundDialog( KURLRequester *requester ) { - // taken from kdelibs/kio/kfile/knotifydialog.cpp + // taken from tdelibs/kio/kfile/knotifydialog.cpp // only need to init this once requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), this, TQT_SLOT( slotOpenSoundDialog( KURLRequester * ))); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index a85a8aa8..2afe4fe9 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -40,7 +40,7 @@ #include <kabc/addressbook.h> #include <kabc/addressee.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinputdialog.h> diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp index a42a4e8e..decfb2cd 100644 --- a/kopete/kopete/kopeteballoon.cpp +++ b/kopete/kopete/kopeteballoon.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kglobalsettings.h> #include <kapplication.h> diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 525744fa..619679d3 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -46,7 +46,7 @@ #include <kstatusbar.h> #include <kglobalaccel.h> #include <twin.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinputdialog.h> #include <kplugininfo.h> #include <ksqueezedtextlabel.h> diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index 453ca98b..25f99824 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp @@ -18,7 +18,7 @@ */ /* NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * One copy is in tdelibs/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 5cbb067c..5a9ec050 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.h +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.h @@ -34,7 +34,7 @@ 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/tdeui, and the other copy is in tdepim/libtdepim + * One copy is in tdelibs/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/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index 6dbc1bac..bb28bb0e 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net) + * Copyright (C) 2003 Benjamin C Meyer (ben+tdelibs at meyerhome dot net) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,7 +25,7 @@ #include <tqobjectlist.h> #include <kconfig.h> #include <kapplication.h> -#include <kdeversion.h> +#include <tdeversion.h> /** * Macro function to warn developers when they are making calls diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index ea781976..6be452b0 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net) + * Copyright (C) 2003 Benjamin C Meyer (ben+tdelibs at meyerhome dot net) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -83,7 +83,7 @@ class TQWidget; * * @see KAutoConfigDialog * @since 3.2 - * @author Benjamin C Meyer <ben+kdelibs at meyerhome dot net> + * @author Benjamin C Meyer <ben+tdelibs at meyerhome dot net> */ class KOPETE_EXPORT KAutoConfig : public TQObject { diff --git a/kopete/libkopete/kopete_export.h b/kopete/libkopete/kopete_export.h index df184b57..2c1e35cf 100644 --- a/kopete/libkopete/kopete_export.h +++ b/kopete/libkopete/kopete_export.h @@ -19,7 +19,7 @@ #define KOPETE_EXPORT_H #include <kdemacros.h> -#include <kdeversion.h> +#include <tdeversion.h> #if KDE_IS_VERSION(3,3,2) #define KOPETE_EXPORT KDE_EXPORT diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index 9f7b2516..ab9d7624 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -21,7 +21,7 @@ #include <kconfig.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdialogbase.h> #include <klocale.h> #include <kiconloader.h> diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp index ac656fbb..537b01fd 100644 --- a/kopete/libkopete/kopeteawayaction.cpp +++ b/kopete/libkopete/kopeteawayaction.cpp @@ -16,7 +16,7 @@ */ #include <klocale.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinputdialog.h> #include <kstringhandler.h> diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h index 707750f6..25121850 100644 --- a/kopete/libkopete/kopeteawayaction.h +++ b/kopete/libkopete/kopeteawayaction.h @@ -18,7 +18,7 @@ #ifndef KOPETEAWAYACTION_H #define KOPETEAWAYACTION_H -#include <kdeversion.h> +#include <tdeversion.h> #include <kactionclasses.h> #include <kaction.h> diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp index 9c19ebb5..d49e135c 100644 --- a/kopete/libkopete/kopetechatsession.cpp +++ b/kopete/libkopete/kopetechatsession.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kglobal.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index 04153e86..ec2618bc 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <klocale.h> #include <kprocess.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kxmlguiclient.h> #include <kaction.h> #include <tqdom.h> diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index 66ecf11f..44eb7c4b 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinputdialog.h> #include <kabcpersistence.h> diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp index 1db7b1e5..9ec2704c 100644 --- a/kopete/libkopete/kopetemetacontact.cpp +++ b/kopete/libkopete/kopetemetacontact.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "kabcpersistence.h" #include "kopetecontactlist.h" diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h index e22e1b37..cae084ee 100644 --- a/kopete/libkopete/kopeteplugin.h +++ b/kopete/libkopete/kopeteplugin.h @@ -177,7 +177,7 @@ public: signals: /** * Notify that the settings of a plugin were changed. - * These changes are passed on from the new KCDialog code in kdelibs/kutils. + * These changes are passed on from the new KCDialog code in tdelibs/kutils. */ void settingsChanged(); diff --git a/kopete/libkopete/kopeteprefs.h b/kopete/libkopete/kopeteprefs.h index c2d6e291..e27eff55 100644 --- a/kopete/libkopete/kopeteprefs.h +++ b/kopete/libkopete/kopeteprefs.h @@ -18,7 +18,7 @@ #define __KOPETEPREFS_H__ #include <tqobject.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <tqcolor.h> #include <tqfont.h> diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index 26375517..502504f2 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -30,7 +30,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <set> #include <algorithm> diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index ec9604a8..710d56f1 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinputdialog.h> #include <kpushbutton.h> diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp index b1283a79..e09cdeb4 100644 --- a/kopete/libkopete/ui/kopetestdaction.cpp +++ b/kopete/libkopete/ui/kopetestdaction.cpp @@ -21,7 +21,7 @@ #include <tqapplication.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kguiitem.h> #include <klocale.h> #include <ksettings/dialog.h> diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 425b1be8..0fa64a4e 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinputdialog.h> #include <kpushbutton.h> #include <kactivelabel.h> diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 4605391f..135cf636 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -23,7 +23,7 @@ #include <kaction.h> #include <kconfig.h> #include <kgenericfactory.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaboutdata.h> #include "kopetemetacontact.h" diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index 493f3575..5e990386 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -31,7 +31,7 @@ #include <tqapplication.h> #include <tqlabel.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <klistview.h> #include <kprocess.h> #include <kprocio.h> diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp index 5e8da39c..eead8241 100644 --- a/kopete/plugins/highlight/highlightpreferences.cpp +++ b/kopete/plugins/highlight/highlightpreferences.cpp @@ -245,7 +245,7 @@ void HighlightPreferences::slotEditRegExp() TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" ); if ( editorDialog ) { - // kdeutils was installed, so the dialog was found fetch the editor interface + // tdeutils was installed, so the dialog was found fetch the editor interface KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->qt_cast( "KRegExpEditorInterface" ) ); Q_ASSERT( editor ); // This should not fail! // now use the editor. diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index f1401c85..8cd76682 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -21,7 +21,7 @@ #include <kmessagebox.h> //#include <kconfig.h> #include <kplugininfo.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "kopetechatsessionmanager.h" #include "kopetemetacontact.h" diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index 2d71c257..075fd04f 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kaction.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaboutdata.h> #include "kopetepluginmanager.h" diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp index 8f25623e..0862d22b 100644 --- a/kopete/plugins/statistics/statisticsdb.cpp +++ b/kopete/plugins/statistics/statisticsdb.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "statisticsdb.h" diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index 79135598..b28ce8ce 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -23,7 +23,7 @@ #include <kaction.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "kopetechatsessionmanager.h" #include "kopetemetacontact.h" diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp index d2584328..e567f1a8 100644 --- a/kopete/plugins/texteffect/texteffectpreferences.cpp +++ b/kopete/plugins/texteffect/texteffectpreferences.cpp @@ -26,7 +26,7 @@ #include <kautoconfig.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "texteffectprefs.h" #include "texteffectpreferences.h" diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index 751b8294..64f2e8e7 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -30,7 +30,7 @@ #include <kgenericfactory.h> #include <kglobal.h> #include <kconfig.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaboutdata.h> #include "kopetemetacontact.h" diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp index d9d5f8e2..43febda9 100644 --- a/kopete/protocols/irc/ircguiclient.cpp +++ b/kopete/protocols/irc/ircguiclient.cpp @@ -16,7 +16,7 @@ #include <klocale.h> -#include <kdeversion.h> +#include <tdeversion.h> #if KDE_IS_VERSION( 3, 1, 90 ) #include <kactioncollection.h> #else diff --git a/kopete/protocols/irc/kcodecaction.h b/kopete/protocols/irc/kcodecaction.h index b2e4dd55..d0c07594 100644 --- a/kopete/protocols/irc/kcodecaction.h +++ b/kopete/protocols/irc/kcodecaction.h @@ -17,7 +17,7 @@ #ifndef KCODECACTION_H #define KCODECACTION_H -#include <kdeversion.h> +#include <tdeversion.h> #include <tqintdict.h> #if KDE_IS_VERSION( 3, 1, 90 ) diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h index 872c6bc1..1be8651c 100644 --- a/kopete/protocols/irc/libkirc/kircengine.h +++ b/kopete/protocols/irc/libkirc/kircengine.h @@ -25,7 +25,7 @@ #include "kircmessageredirector.h" #include "kirctransfer.h" -#include <kdeversion.h> +#include <tdeversion.h> // FIXME: Move the following kdedebug class to the *.cpp. #include <kdebug.h> diff --git a/kopete/protocols/irc/libkirc/kircentity.h b/kopete/protocols/irc/libkirc/kircentity.h index a8dc8fff..37a5b986 100644 --- a/kopete/protocols/irc/libkirc/kircentity.h +++ b/kopete/protocols/irc/libkirc/kircentity.h @@ -18,7 +18,7 @@ #ifndef KIRCENTITY_H #define KIRCENTITY_H -#include <kdeversion.h> +#include <tdeversion.h> #include <kresolver.h> #include <ksharedptr.h> diff --git a/kopete/protocols/jabber/libiris/002_offline_event.patch b/kopete/protocols/jabber/libiris/002_offline_event.patch index dfaa1f8e..a97400e1 100644 --- a/kopete/protocols/jabber/libiris/002_offline_event.patch +++ b/kopete/protocols/jabber/libiris/002_offline_event.patch @@ -1,7 +1,7 @@ ? 002_offline_event.patch Index: iris/xmpp-im/types.cpp =================================================================== -RCS file: /home/kde/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp,v +RCS file: /home/kde/tdenetwork/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp,v retrieving revision 1.3 diff -u -p -r1.3 types.cpp --- iris/xmpp-im/types.cpp 21 May 2004 14:35:44 -0000 1.3 diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 88ad1528..93dc2f0e 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -33,7 +33,7 @@ #include <tqdom.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <klocale.h> #include <kmdcodec.h> #include <kmessagebox.h> diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index 407550f3..a3ab2532 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kconfig.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaboutdata.h> #include "kopeteaccountmanager.h" diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index 3ee9ffed..ada01291 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "kopeteaccount.h" #include "kopetechatsessionmanager.h" |