Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent ccfaeb9b83
commit 48087e1d56

@ -111,7 +111,7 @@ option( BUILD_DCOPRSS "Build dcoprss" ${BUILD_ALL} )
option( BUILD_DOC "Build doc" ${BUILD_ALL} )
option( BUILD_FILESHARING "Build filesharing" ${BUILD_ALL} )
option( BUILD_KDICT "Build kdict" ${BUILD_ALL} )
option( BUILD_KDNSSD "Build kdnssd" ${BUILD_ALL} )
option( BUILD_KDNSSD "Build tdednssd" ${BUILD_ALL} )
option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
option( BUILD_KGET "Build kget" ${BUILD_ALL} )
option( BUILD_KNEWSTICKER "Build knewsticker" ${BUILD_ALL} )
@ -149,7 +149,7 @@ tde_conditional_add_subdirectory( BUILD_DCOPRSS dcoprss )
tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_FILESHARING filesharing )
tde_conditional_add_subdirectory( BUILD_KDICT kdict )
tde_conditional_add_subdirectory( BUILD_KDNSSD kdnssd )
tde_conditional_add_subdirectory( BUILD_KDNSSD tdednssd )
tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
tde_conditional_add_subdirectory( BUILD_KGET kget )
tde_conditional_add_subdirectory( BUILD_KNEWSTICKER knewsticker )

@ -18,7 +18,7 @@ kcm_kcmsambaconf_la_LIBADD = \
-ltdeprint \
libfilesharesamba.la
kcm_kcmsambaconf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kcmsambaconf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libfilesharesamba_la_SOURCES = \
sambafile.cpp \

@ -17,7 +17,7 @@ fileshare_propsdlgplugin_la_LIBADD = \
../kcm_sambaconf/libfilesharesamba.la \
$(LIB_KIO)
fileshare_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
fileshare_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
AM_CPPFLAGS = -I../kcm_sambaconf $(all_includes)

@ -39,5 +39,5 @@ tde_add_tdeinit_executable( kdict AUTOMOC
SOURCES
dcopinterface.skel main.cpp actions.cpp dict.cpp options.cpp
queryview.cpp toplevel.cpp sets.cpp matchview.cpp application.cpp
LINK khtml-shared pthread
LINK tdehtml-shared pthread
)

@ -12,7 +12,7 @@ lnk_DATA = kdictapplet.desktop
EXTRA_DIST = $(lnk_DATA)
kdict_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdict_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kdict_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
messages: rc.cpp

@ -25,8 +25,8 @@
#include <kpopupmenu.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <khtml_events.h>
#include <khtmlview.h>
#include <tdehtml_events.h>
#include <tdehtmlview.h>
#include "actions.h"
#include "options.h"
@ -118,12 +118,12 @@ DictHTMLPart::~DictHTMLPart()
{}
void DictHTMLPart::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *event)
void DictHTMLPart::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event)
{
if (event->qmouseEvent()->button()==Qt::MidButton)
emit(middleButtonClicked());
else
KHTMLPart::khtmlMouseReleaseEvent(event);
KHTMLPart::tdehtmlMouseReleaseEvent(event);
}

@ -20,7 +20,7 @@
#define _QUERYVIEW_H_
#include <tqvbox.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
class TQFile;
class KTempFile;
@ -89,7 +89,7 @@ signals:
protected:
virtual void khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *event);
virtual void tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event);
};

@ -9,7 +9,7 @@ noinst_HEADERS = kfile_torrent.h bbase.h bdict.h bytetape.h \
kde_module_LTLIBRARIES = kfile_torrent.la
kfile_torrent_la_SOURCES = bytetape.cpp bint.cpp bstring.cpp blist.cpp bdict.cpp kfile_torrent.cpp
kfile_torrent_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kfile_torrent_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kfile_torrent_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)

@ -26,13 +26,13 @@ tde_install_icons( )
install( FILES
kget_plug_in.rc kget_plug_in.desktop
DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins )
DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins )
##### khtml_kget (module) #######################
##### tdehtml_kget (module) #######################
tde_add_kpart( khtml_kget AUTOMOC
tde_add_kpart( tdehtml_kget AUTOMOC
SOURCES kget_plug_in.cpp kget_linkview.cpp links.cpp
LINK khtml-shared
LINK tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -1,13 +1,13 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = khtml_kget.la
kde_module_LTLIBRARIES = tdehtml_kget.la
khtml_kget_la_METASOURCES = AUTO
khtml_kget_la_SOURCES = kget_plug_in.cpp kget_linkview.cpp links.cpp
khtml_kget_la_LIBADD = $(LIB_KHTML)
khtml_kget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
tdehtml_kget_la_METASOURCES = AUTO
tdehtml_kget_la_SOURCES = kget_plug_in.cpp kget_linkview.cpp links.cpp
tdehtml_kget_la_LIBADD = $(LIB_KHTML)
tdehtml_kget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
KDE_ICON = AUTO
part_DATA = kget_plug_in.rc kget_plug_in.desktop
partdir = $(kde_datadir)/khtml/kpartplugins
partdir = $(kde_datadir)/tdehtml/kpartplugins

Before

Width:  |  Height:  |  Size: 978 B

After

Width:  |  Height:  |  Size: 978 B

@ -23,7 +23,7 @@
#include <dcopref.h>
#include <kdatastream.h>
#include <kdebug.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <kiconloader.h>
#include <kglobal.h>
#include <kaction.h>
@ -37,7 +37,7 @@
#include <dom/html_misc.h>
#include <dom/dom_element.h>
#include <kparts/partmanager.h>
#include <tdeparts/partmanager.h>
#include <set>
@ -176,7 +176,7 @@ KPluginFactory::~KPluginFactory()
extern "C"
{
KDE_EXPORT void* init_khtml_kget()
KDE_EXPORT void* init_tdehtml_kget()
{
TDEGlobal::locale()->insertCatalogue("kget");
return new KPluginFactory;

@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-Library=khtml_kget
X-TDE-Library=tdehtml_kget
X-TDE-PluginInfo-Author=Patrick Charbonnier, Carsten Pfeiffer
X-TDE-PluginInfo-Email=pch@valleeurope.net, pfeiffer@kde.org
X-TDE-PluginInfo-Name=kget
@ -73,5 +73,5 @@ Comment[uz@cyrillic]=Ёзиб олиш бошқарувчиси
Comment[zh_CN]=下载管理器
Comment[zh_HK]=下載管理員
Comment[zh_TW]=下載管理員
Icon=khtml_kget
Icon=tdehtml_kget

@ -17,7 +17,7 @@
#ifndef __plugin_kget_plug_in_h
#define __plugin_kget_plug_in_h
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
#include <klibloader.h>
#include <dcopclient.h>
#include <kurl.h>

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
<kpartgui library="khtml_kget" name="khtml_kget" version="3" >
<kpartgui library="tdehtml_kget" name="tdehtml_kget" version="3" >
<MenuBar>
<Menu name="tools"><Text>&amp;Tools</Text>
<Action name="kget_menu"/>

@ -1134,7 +1134,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile)
else // destURL was given, check whether the file exists already
{
// simply delete it, the calling process should have asked if you
// really want to delete (at least khtml does)
// really want to delete (at least tdehtml does)
if(TDEIO::NetAccess::exists(destURL, false, this))
SafeDelete::deleteFile( destURL );
}

@ -11,7 +11,7 @@ knewsticker_panelapplet_la_SOURCES = newsscroller.cpp \
knewsticker.cpp knewsticker.skel \
knewstickerconfig.cpp knewstickerconfigwidget.ui \
newssourcedlgimpl.cpp newssourcedlg.ui
knewsticker_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knewsticker_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
knewsticker_panelapplet_la_LIBADD = common/libknewstickercommon.la \
$(LIB_KIO) $(LIB_TDEUI)

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkntsrcfilepropsdlg.la
libkntsrcfilepropsdlg_la_SOURCES = kntsrcfilepropsdlg.cpp \
kntsrcfilepropsdlgwidget.ui
libkntsrcfilepropsdlg_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkntsrcfilepropsdlg_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libkntsrcfilepropsdlg_la_LIBADD = $(LIB_KIO) ../common/libknewstickercommon.la ../../librss/librss.la
libkntsrcfilepropsdlg_la_METASOURCES = AUTO

@ -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_TDECORE) -ltdefx -lDCOP
kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -ltdetexteditor $(LIB_QT) $(LIB_TDECORE) -ltdefx -lDCOP
kopete_LDADD = \
addcontactwizard/libkopeteaddcontactwizard.la \
addaccountwizard/libkopeteaddaccountwizard.la \

@ -46,7 +46,7 @@ tde_add_kpart( libkrichtexteditpart AUTOMOC
tde_add_kpart( kopete_chatwindow AUTOMOC
SOURCES
chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp
LINK kopeteui-static kopetechatwindow-static kopete-shared khtml-shared
LINK kopeteui-static kopetechatwindow-static kopete-shared tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@ -56,7 +56,7 @@ tde_add_kpart( kopete_chatwindow AUTOMOC
tde_add_kpart( kopete_emailwindow AUTOMOC
SOURCES
kopeteemailwindow.cpp
LINK kopeteui-static kopetechatwindow-static kopete-shared khtml-shared
LINK kopeteui-static kopetechatwindow-static kopete-shared tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -6,21 +6,21 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) -I$(top_srcdir)/kopet
kopete_chatwindow_la_SOURCES = chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp
kopete_chatwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
kopete_emailwindow_la_SOURCES = kopeteemailwindow.cpp
kopete_emailwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
libkrichtexteditpart_la_SOURCES = krichtexteditpart.cpp
libkrichtexteditpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_TDEPRINT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_TDEPRINT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libkopetechatwindow_la_SOURCES = chatmessagepart.cpp emoticonselector.cpp kopeteemoticonaction.cpp \
chattexteditpart.cpp krichtexteditpart.cpp kopetechatwindowstylemanager.cpp \
kopetechatwindowstyle.cpp
libkopetechatwindow_la_LDFLAGS = $(all_libraries) -no-undefined
libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
partdir = $(kde_datadir)/kopeterichtexteditpart
part_DATA = kopeterichtexteditpartfull.rc

@ -29,7 +29,7 @@
#include <kabc/addressee.h>
#include <kabc/vcardconverter.h>
#include <kdebug.h>
#include <kmultipledrag.h>
#include <tdemultipledrag.h>
#include <kpopupmenu.h>
#include <tqheader.h>

@ -51,10 +51,10 @@
#include <kdebug.h>
#include <tdeversion.h>
#include <kfiledialog.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmultipledrag.h>
#include <tdemultipledrag.h>
#include <kpopupmenu.h>
#include <krun.h>
#include <kstringhandler.h>
@ -86,7 +86,7 @@
#include "kopetechatwindowstylemanager.h"
#if !(KDE_IS_VERSION(3,3,90))
//From tdelibs/khtml/misc/htmltags.h
//From tdelibs/tdehtml/misc/htmltags.h
// used in ChatMessagePart::copy()
#define ID_BLOCKQUOTE 12
#define ID_BR 14
@ -972,9 +972,9 @@ void ChatMessagePart::print()
view()->print();
}
void ChatMessagePart::khtmlDrawContentsEvent( khtml::DrawContentsEvent * event) //virtual
void ChatMessagePart::tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * event) //virtual
{
KHTMLPart::khtmlDrawContentsEvent(event);
KHTMLPart::tdehtmlDrawContentsEvent(event);
//copy(true /*selection only*/); not needed anymore.
}
void ChatMessagePart::slotCloseView( bool force )

@ -19,7 +19,7 @@
#ifndef CHATMESSAGEPART_H
#define CHATMESSAGEPART_H
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <dom/html_element.h>
#include <tqvaluelist.h>
@ -166,7 +166,7 @@ private slots:
void slotUpdateHeaderPhoto();
protected:
virtual void khtmlDrawContentsEvent( khtml::DrawContentsEvent * );
virtual void tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * );
private:
void readOverrides();

@ -43,7 +43,7 @@
#include <kurldrag.h>
#include <kglobalsettings.h>
#include <kgenericfactory.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <ksyntaxhighlighter.h>
#include <tqscrollview.h>
#include <tqtimer.h>
@ -122,7 +122,7 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch
setView(viewDock);
//It is possible to drag and drop on this widget.
// I had to disable the acceptDrop in the khtml widget to be able to intercept theses events.
// I had to disable the acceptDrop in the tdehtml widget to be able to intercept theses events.
setAcceptDrops(true);
viewDock->setAcceptDrops(false);

@ -19,7 +19,7 @@
#ifndef KOPETECHATWINDOW_H
#define KOPETECHATWINDOW_H
#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>
#include <tqmovie.h>
#include "kopetecontact.h"
#include "tdeversion.h"

@ -41,7 +41,7 @@
#include <kedittoolbar.h>
#include <kfontdialog.h>
#include <kglobalsettings.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <kkeydialog.h>
#include <klibloader.h>

@ -23,7 +23,7 @@
#include "kopeteview.h"
#include "kopeteviewplugin.h"
#include <kmainwindow.h>
#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>
namespace KParts { struct URLArgs; }
class EmailWindowPlugin;

@ -9,7 +9,7 @@
#include <tqapplication.h>
#include <tqclipboard.h>
#include <tqevent.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <tqrichtext_p.h>
#include "krichtexteditpart.h"

@ -3,7 +3,7 @@
#ifndef KRICHTEXTEDITPART_H
#define KRICHTEXTEDITPART_H
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <tqfont.h>
#include <tqcolor.h>

@ -1,17 +1,17 @@
AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST -DQT_NO_COMPAT \
$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/kopete/chatwindow -I$(top_srcdir)/kopete/libkopete $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/kopete/chatwindow/tests\"
METASOURCES = AUTO
check_LTLIBRARIES = kunittest_chatwindowstyle_test.la kunittest_chatwindowstylerendering_test.la
check_LTLIBRARIES = tdeunittest_chatwindowstyle_test.la tdeunittest_chatwindowstylerendering_test.la
kunittest_chatwindowstyle_test_la_SOURCES = chatwindowstyle_test.cpp
kunittest_chatwindowstyle_test_la_LIBADD = -lkunittest ../libkopetechatwindow.la
kunittest_chatwindowstyle_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_chatwindowstyle_test_la_SOURCES = chatwindowstyle_test.cpp
tdeunittest_chatwindowstyle_test_la_LIBADD = -ltdeunittest ../libkopetechatwindow.la
tdeunittest_chatwindowstyle_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
kunittest_chatwindowstylerendering_test_la_SOURCES = chatwindowstylerendering_test.cpp
kunittest_chatwindowstylerendering_test_la_LIBADD = -lkunittest ../../../libkopete/libkopete.la ../libkopetechatwindow.la
kunittest_chatwindowstylerendering_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_chatwindowstylerendering_test_la_SOURCES = chatwindowstylerendering_test.cpp
tdeunittest_chatwindowstylerendering_test_la_LIBADD = -ltdeunittest ../../../libkopete/libkopete.la ../libkopetechatwindow.la
tdeunittest_chatwindowstylerendering_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local:
kunittestmodrunner
tdeunittestmodrunner
guicheck:
kunittestmod $(PWD)
tdeunittestmod $(PWD)

@ -15,7 +15,7 @@
*************************************************************************
*/
#include <kunittest/module.h>
#include <tdeunittest/module.h>
#include "chatwindowstyle_test.h"
#include <stdlib.h>
@ -25,7 +25,7 @@
#include <kopetechatwindowstyle.h>
KUNITTEST_MODULE( kunittest_chatwindowstyle_test, "KopeteChatWindowTestSuite");
KUNITTEST_MODULE( tdeunittest_chatwindowstyle_test, "KopeteChatWindowTestSuite");
KUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyle_Test );
void ChatWindowStyle_Test::allTests()

@ -17,7 +17,7 @@
#ifndef CHATWINDOWSTYLE_TEST_H
#define CHATWINDOWSTYLE_TEST_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class ChatWindowStyle;

@ -28,7 +28,7 @@
// KDE includes
#include <kapplication.h>
#include <kunittest/module.h>
#include <tdeunittest/module.h>
#include <kinstance.h>
#include <kdebug.h>
#include <kglobal.h>
@ -46,7 +46,7 @@
using namespace Kopete;
KUNITTEST_MODULE( kunittest_chatwindowstylerendering_test, "KopeteChatWindowTestSuite");
KUNITTEST_MODULE( tdeunittest_chatwindowstylerendering_test, "KopeteChatWindowTestSuite");
KUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyleRendering_Test );
// Reimplement Kopete::Contact and its abstract method

@ -17,7 +17,7 @@
#ifndef CHATWINDOWSTYLERENDERING_TEST_H
#define CHATWINDOWSTYLERENDERING_TEST_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
// HACK: Needed to access private methods of ChatMessagePart.
#define private public

@ -8,7 +8,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) $(all_includes) -I$(k
kde_module_LTLIBRARIES = kcm_kopete_accountconfig.la
kcm_kopete_accountconfig_la_SOURCES = kopeteaccountconfigbase.ui kopeteaccountconfig.cpp
kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_accountconfig_la_LIBADD = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
service_DATA = kopete_accountconfig.desktop

@ -38,6 +38,6 @@ tde_add_kpart( kcm_kopete_appearanceconfig AUTOMOC
appearanceconfig_emoticons.ui emoticonseditdialog.cpp
emoticonseditwidget.ui tooltipeditdialog.cpp
tooltipeditwidget.ui
LINK kopetechatwindow-static kopete-shared khtml-shared knewstuff-shared
LINK kopetechatwindow-static kopete-shared tdehtml-shared knewstuff-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -13,7 +13,7 @@ kcm_kopete_appearanceconfig_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
$(all_libraries)
kcm_kopete_appearanceconfig_la_LIBADD = ../../../libkopete/libkopete.la \
../../../kopete/chatwindow/libkopetechatwindow.la \
-lktexteditor $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_KNEWSTUFF)
-ltdetexteditor $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_KNEWSTUFF)
service_DATA = kopete_appearanceconfig.desktop
servicedir = $(kde_servicesdir)

@ -48,7 +48,7 @@
#include <kfontrequester.h>
#include <kgenericfactory.h>
#include <kio/netaccess.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <klineedit.h>
#include <klocale.h>
#include <kmessagebox.h>

@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kcm_kopete_avdeviceconfig.la
kcm_kopete_avdeviceconfig_la_SOURCES = avdeviceconfig.cpp \
avdeviceconfig_videoconfig.ui
kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_avdeviceconfig_la_LIBADD = ../../../libkopete/libkopete.la \
../../../libkopete/avdevice/libkopete_videodevice.la \

@ -7,7 +7,7 @@ kcm_kopete_behaviorconfig_la_SOURCES = \
kopeteawayconfigbase.ui \
behaviorconfig_chat.ui behaviorconfig_general.ui behaviorconfig_events.ui behaviorconfig.cpp
kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_behaviorconfig_la_LIBADD = ../../../libkopete/libkopete.la \
$(LIB_KOPETECOMPAT) $(LIB_KUTILS)

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_kopete_identityconfig.la
kcm_kopete_identityconfig_la_SOURCES = kopeteidentityconfigbase.ui \
kopeteidentityconfig.cpp globalidentitiesmanager.cpp kopeteidentityconfigpreferences.kcfgc
kcm_kopete_identityconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
kcm_kopete_identityconfig_la_LIBADD = -lkabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_identityconfig_la_LIBADD = -lkabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
service_DATA = kopete_identityconfig.desktop
servicedir = $(kde_servicesdir)

@ -42,7 +42,7 @@
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <kurldrag.h>
#include <kmultipledrag.h>
#include <tdemultipledrag.h>
#include <kabc/stdaddressbook.h>
#include <kabc/vcardconverter.h>

@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE)
# vim: set noet:

@ -86,6 +86,6 @@ tde_add_library( kopete SHARED AUTOMOC
kopeteprefs.cpp kopetepicture.cpp webcamwidget.cpp
VERSION 1.0.0
EMBED kopeteui-static
LINK kopeteprivate-static kabc-shared kutils-shared khtml-shared
LINK kopeteprivate-static kabc-shared tdeutils-shared tdehtml-shared
DESTINATION ${LIB_INSTALL_DIR}
)

@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \
videodevicemodelpool.h videodevicepool.h videoinput.h \

@ -19,7 +19,7 @@
#include "kopetepassworddialog.h"
#include "kopetewalletmanager.h"
#include <kwallet.h>
#include <tdewallet.h>
#include <tqapplication.h>
#include <tqlabel.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 tdelibs/kutils.
* These changes are passed on from the new KCDialog code in tdelibs/tdeutils.
*/
void settingsChanged();

@ -35,7 +35,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kplugininfo.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>

@ -20,7 +20,7 @@
#include <kdebug.h>
#include <kstaticdeleter.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <tqtimer.h>
#include <tqwidget.h>

@ -3,22 +3,22 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST -DQT_NO_COMPAT \
$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/tests/mock $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/libkopete/tests\"
METASOURCES = AUTO
check_LTLIBRARIES = kunittest_kopetemessage_test.la kunittest_kopetepropertiestest.la kunittest_kopetecontactlist_test.la
noinst_LTLIBRARIES = kunittest_kopeteemoticontest.la
check_LTLIBRARIES = tdeunittest_kopetemessage_test.la tdeunittest_kopetepropertiestest.la tdeunittest_kopetecontactlist_test.la
noinst_LTLIBRARIES = tdeunittest_kopeteemoticontest.la
check_PROGRAMS = kopetewallettest_program kopetepasswordtest_program
kunittest_kopetepropertiestest_la_SOURCES = kopetepropertiestest.cpp ../kopeteproperties.cpp
kunittest_kopetepropertiestest_la_LIBADD = -lkunittest ../libkopete.la
kunittest_kopetepropertiestest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kopetepropertiestest_la_SOURCES = kopetepropertiestest.cpp ../kopeteproperties.cpp
tdeunittest_kopetepropertiestest_la_LIBADD = -ltdeunittest ../libkopete.la
tdeunittest_kopetepropertiestest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
kunittest_kopeteemoticontest_la_SOURCES = kopeteemoticontest.cpp
kunittest_kopeteemoticontest_la_LIBADD = -lkunittest ../libkopete.la
kunittest_kopeteemoticontest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kopeteemoticontest_la_SOURCES = kopeteemoticontest.cpp
tdeunittest_kopeteemoticontest_la_LIBADD = -ltdeunittest ../libkopete.la
tdeunittest_kopeteemoticontest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
kunittest_kopetemessage_test_la_SOURCES = kopetemessage_test.cpp
kunittest_kopetemessage_test_la_LIBADD = -lkunittest mock/libkopete_mock.la
kunittest_kopetemessage_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kopetemessage_test_la_SOURCES = kopetemessage_test.cpp
tdeunittest_kopetemessage_test_la_LIBADD = -ltdeunittest mock/libkopete_mock.la
tdeunittest_kopetemessage_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
kopetewallettest_program_SOURCES = kopetewallettest_program.cpp
kopetewallettest_program_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH)
@ -28,14 +28,14 @@ kopetepasswordtest_program_SOURCES = kopetepasswordtest_program.cpp
kopetepasswordtest_program_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH)
kopetepasswordtest_program_LDADD = ../libkopete.la
kunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp
kunittest_kopetecontactlist_test_la_LIBADD = -lkunittest mock/libkopete_mock.la
kunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp
tdeunittest_kopetecontactlist_test_la_LIBADD = -ltdeunittest mock/libkopete_mock.la
tdeunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
noinst_HEADERS = kopetepropertiestest.h kopeteemoticontest.h
check-local:
kunittestmodrunner
tdeunittestmodrunner
guicheck:
kunittestmod $(PWD)
tdeunittestmod $(PWD)

@ -42,6 +42,6 @@ Add a new test quickly:
Creating test for class Kopete::ContactList
kopetecontactlist_test.h and kopetecontactlist_test.cpp writen.
Please add the following to Makefile.am:
kunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp
kunittest_kopetecontactlist_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la
kunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp
tdeunittest_kopetecontactlist_test_la_LIBADD = -ltdeunittest ../mock/libkopete_mock.la
tdeunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)

@ -37,7 +37,7 @@ fileCpp.gsub!(/template/, className.downcase.gsub(/::/,""))
fileCpp.gsub!(/Template/, className.gsub(/::/,""))
fileCpp.gsub!(/some requirement/, className + " class.")
makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n"
makefileAm = "tdeunittest_template_test_la_SOURCES = template_test.cpp\ntdeunittest_template_test_la_LIBADD = -ltdeunittest ../mock/libkopete_mock.la\ntdeunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n"
makefileAm.gsub!(/template/, className.downcase.gsub(/::/,""))
hNew = hBase.gsub(/template/, className.downcase.gsub(/::/,""))

@ -18,12 +18,12 @@
#include <tqfile.h>
#include <tqdir.h>
#include <kstandarddirs.h>
#include <kunittest/module.h>
#include <tdeunittest/module.h>
#include "kopetecontactlist_test.h"
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kopetecontactlist_test, "KopeteSuite");
KUNITTEST_MODULE( tdeunittest_kopetecontactlist_test, "KopeteSuite");
KUNITTEST_MODULE_REGISTER_TESTER( KopeteContactList_Test );
void KopeteContactList_Test::allTests()

@ -18,7 +18,7 @@
#ifndef KOPETECONTACTLIST_TEST_H
#define KOPETECONTACTLIST_TEST_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
// change to SlotTester when it works
class KopeteContactList_Test : public KUnitTest::Tester

@ -27,14 +27,14 @@
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kunittest/module.h>
#include <tdeunittest/module.h>
#include "kopeteemoticontest.h"
#include "kopetemessage.h"
#include "kopeteemoticons.h"
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kopeteemoticontest, "KopeteSuite");
KUNITTEST_MODULE( tdeunittest_kopeteemoticontest, "KopeteSuite");
KUNITTEST_MODULE_REGISTER_TESTER( KopeteEmoticonTest );
/*

@ -19,7 +19,7 @@
#ifndef KOPETE_EMOTICON_TEST_H
#define KOPETE_EMOTICON_TEST_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
// change to SlotTester when it works
class KopeteEmoticonTest : public KUnitTest::Tester

@ -25,7 +25,7 @@
#include <kstandarddirs.h>
#include <kinstance.h>
#include <kprocess.h>
#include <kunittest/module.h>
#include <tdeunittest/module.h>
#include <kdebug.h>
#include "kopetemessage_test.h"
@ -37,7 +37,7 @@
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kopetemessage_test, "KopeteSuite");
KUNITTEST_MODULE( tdeunittest_kopetemessage_test, "KopeteSuite");
KUNITTEST_MODULE_REGISTER_TESTER( KopeteMessage_Test );
/*

@ -19,7 +19,7 @@
#ifndef KOPETEMESSAGE_TEST_H
#define KOPETEMESSAGE_TEST_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
#define private public
#include "kopetemessage.h"

@ -16,7 +16,7 @@
*************************************************************************
*/
#include <kunittest/module.h>
#include <tdeunittest/module.h>
#include "kopeteproperties.h"
@ -32,7 +32,7 @@
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kopetepropertiestest, "KopeteSuite");
KUNITTEST_MODULE( tdeunittest_kopetepropertiestest, "KopeteSuite");
KUNITTEST_MODULE_REGISTER_TESTER( KopetePropertiesTest );
using namespace Kopete::Properties;

@ -19,7 +19,7 @@
#ifndef KOPETE_PROPERTIES_TEST_H
#define KOPETE_PROPERTIES_TEST_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
// change to SlotTester when it works
class KopetePropertiesTest : public KUnitTest::Tester

@ -24,7 +24,7 @@
#include <kglobal.h>
#include <kstandarddirs.h>
#include <dcopclient.h>
#include <kwallet.h>
#include <tdewallet.h>
#include "kopetewalletmanager.h"
#include "kopetewallettest_program.h"

@ -15,12 +15,12 @@
*************************************************************************
*/
#include <kunittest/module.h>
#include <tdeunittest/module.h>
#include "template_test.h"
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_template_test, "KopeteSuite");
KUNITTEST_MODULE( tdeunittest_template_test, "KopeteSuite");
KUNITTEST_MODULE_REGISTER_TESTER( Template_Test );
void Template_Test::allTests()

@ -18,7 +18,7 @@
#ifndef TEMPLATE_TEST_H
#define TEMPLATE_TEST_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
// change to SlotTester when it works
class Template_Test : public KUnitTest::Tester

@ -18,7 +18,7 @@
#include "userinfodialog.h"
#include "kopeteuiglobal.h"
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <ktextbrowser.h>
#include <kapplication.h>
#include <klineedit.h>

@ -6,11 +6,11 @@ noinst_HEADERS = addbookmarksplugin.h addbookmarkspreferences.h \
kde_module_LTLIBRARIES = kopete_addbookmarks.la kcm_kopete_addbookmarks.la
kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la
kopete_addbookmarks_la_SOURCES = addbookmarksplugin.cpp addbookmarksprefssettings.cpp
kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
kcm_kopete_addbookmarks_la_SOURCES = addbookmarkspreferences.cpp addbookmarksprefsui.ui \
addbookmarksprefssettings.cpp

@ -4,11 +4,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_alias.la kcm_kopete_alias.la
kopete_alias_la_SOURCES = aliasplugin.cpp
kopete_alias_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_alias_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_alias_la_LIBADD = ../../libkopete/libkopete.la
kcm_kopete_alias_la_SOURCES = aliaspreferences.cpp aliasdialogbase.ui aliasdialog.ui editaliasdialog.cpp
kcm_kopete_alias_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_alias_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_alias_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) ../../libkopete/libkopete.la
service_DATA = kopete_alias.desktop

@ -6,11 +6,11 @@ SUBDIRS = icons
kde_module_LTLIBRARIES = kopete_autoreplace.la kcm_kopete_autoreplace.la
kopete_autoreplace_la_SOURCES = autoreplaceplugin.cpp autoreplaceconfig.cpp
kopete_autoreplace_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_autoreplace_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_autoreplace_la_LIBADD = ../../libkopete/libkopete.la
kcm_kopete_autoreplace_la_SOURCES = autoreplacepreferences.cpp autoreplaceconfig.cpp autoreplaceprefs.ui
kcm_kopete_autoreplace_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_autoreplace_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_autoreplace_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_autoreplace.desktop

@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_connectionstatus.la
kopete_connectionstatus_la_SOURCES = connectionstatusplugin.cpp
kopete_connectionstatus_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_connectionstatus_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_connectionstatus_la_LIBADD = ../../libkopete/libkopete.la
service_DATA = kopete_connectionstatus.desktop

@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_contactnotes.la
kopete_contactnotes_la_SOURCES = contactnotesplugin.cpp contactnotesedit.cpp
kopete_contactnotes_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_contactnotes_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_contactnotes_la_LIBADD = ../../libkopete/libkopete.la -lkio
service_DATA = kopete_contactnotes.desktop

@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_cryptography.la kcm_kopete_cryptography.la
kopete_cryptography_la_SOURCES = cryptographyplugin.cpp kgpginterface.cpp cryptographyguiclient.cpp cryptographyselectuserkey.cpp cryptographyuserkey_ui.ui popuppublic.cpp kgpgselkey.cpp
kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_cryptography_la_LIBADD = ../../libkopete/libkopete.la
kcm_kopete_cryptography_la_SOURCES = cryptographypreferences.cpp cryptographyprefsbase.ui kgpgselkey.cpp
kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_cryptography_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_cryptography.desktop

@ -47,6 +47,6 @@ tde_add_kpart( kcm_kopete_highlight AUTOMOC
SOURCES
highlightprefsbase.ui highlightpreferences.cpp
filter.cpp highlightconfig.cpp
LINK kutils-shared
LINK tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_highlight.la kcm_kopete_highlight.la
kopete_highlight_la_SOURCES = highlightplugin.cpp highlightconfig.cpp filter.cpp
kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_highlight_la_LIBADD = ../../libkopete/libkopete.la
kcm_kopete_highlight_la_SOURCES = highlightprefsbase.ui highlightpreferences.cpp filter.cpp highlightconfig.cpp
kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_highlight_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
service_DATA = kopete_highlight.desktop

@ -20,7 +20,7 @@
#include <kcombobox.h>
#include <klineedit.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <klocale.h>
#include <klistview.h>
#include <kgenericfactory.h>

@ -39,7 +39,7 @@ tde_add_kpart( kopete_history AUTOMOC
historyplugin.cpp historydialog.cpp historyviewer.ui
historylogger.cpp converter.cpp historyguiclient.cpp
historyconfig.kcfgc
LINK kopete-shared khtml-shared
LINK kopete-shared tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -7,11 +7,11 @@ kde_module_LTLIBRARIES = kopete_history.la kcm_kopete_history.la
kopete_history_la_SOURCES = historyplugin.cpp historydialog.cpp historyviewer.ui\
historylogger.cpp converter.cpp historyguiclient.cpp historyconfig.kcfgc
kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KHTML) $(LIB_KUTILS)
kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML) $(LIB_KUTILS)
kopete_history_la_LIBADD = ../../libkopete/libkopete.la
kcm_kopete_history_la_SOURCES = historyprefsui.ui historypreferences.cpp historyconfig.kcfgc
kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KHTML) $(LIB_KUTILS)
kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML) $(LIB_KUTILS)
kcm_kopete_history_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_history.desktop

@ -29,8 +29,8 @@
#include <dom/dom_element.h>
#include <dom/html_document.h>
#include <dom/html_element.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <tqpushbutton.h>
#include <tqlineedit.h>

@ -48,6 +48,6 @@ tde_add_kpart( kopete_latex AUTOMOC
tde_add_kpart( kcm_kopete_latex AUTOMOC
SOURCES
latexprefsbase.ui latexpreferences.cpp latexconfig.kcfgc
LINK kutils-shared
LINK tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_latex.la kcm_kopete_latex.la
kopete_latex_la_SOURCES = latexplugin.cpp latexconfig.kcfgc latexguiclient.cpp
kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_latex_la_LIBADD = ../../libkopete/libkopete.la
kcm_kopete_latex_la_SOURCES = latexprefsbase.ui latexpreferences.cpp latexconfig.kcfgc
kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_latex_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
service_DATA = kopete_latex.desktop

@ -16,7 +16,7 @@
*/
#include <tqlayout.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <klocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>

@ -46,6 +46,6 @@ tde_add_kpart( kcm_kopete_motionaway AUTOMOC
SOURCES
motionawayprefs.ui motionawaypreferences.cpp
motionawayconfig.kcfgc
LINK kutils-shared
LINK tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -51,6 +51,6 @@ tde_add_kpart( kopete_netmeeting AUTOMOC
tde_add_kpart( kcm_kopete_netmeeting AUTOMOC
SOURCES
netmeetingprefs_ui.ui netmeetingpreferences.cpp
LINK kutils-shared
LINK tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/protocols/msn $(all_incl
kde_module_LTLIBRARIES = kopete_netmeeting.la kcm_kopete_netmeeting.la
kopete_netmeeting_la_SOURCES = netmeetingplugin.cpp netmeetinginvitation.cpp netmeetingguiclient.cpp
kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_netmeeting_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la $(top_builddir)/kopete/protocols/msn/libkopete_msn_shared.la
service_DATA = kopete_netmeeting.desktop
@ -15,7 +15,7 @@ mydatadir = $(kde_datadir)/kopete_netmeeting
mydata_DATA = netmeetingchatui.rc
kcm_kopete_netmeeting_la_SOURCES = netmeetingprefs_ui.ui netmeetingpreferences.cpp
kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_netmeeting_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)

@ -19,7 +19,7 @@
#include <kcombobox.h>
#include <klineedit.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <klocale.h>
#include <kconfig.h>
#include <kglobal.h>

@ -52,6 +52,6 @@ tde_add_kpart( kcm_kopete_nowlistening AUTOMOC
SOURCES
nowlisteningprefs.ui nowlisteningpreferences.cpp
nowlisteningconfig.kcfgc
LINK kutils-shared
LINK tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -5,11 +5,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(XMMS_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la
kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_nowlistening_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
service_DATA = kopete_nowlistening.desktop

@ -5,11 +5,11 @@ METASOURCES = AUTO
check_PROGRAMS = smpppdcstests
smpppdcstests_SOURCES = main.cpp clienttest.cpp
smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui
smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -ltdeunittestgui
noinst_HEADERS = clienttest.h
check:
kunittest ./smpppdcstests ClientTest
tdeunittest ./smpppdcstests ClientTest

@ -17,7 +17,7 @@
#ifndef CLIENTTEST_H
#define CLIENTTEST_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
/**
@author Heiko Sch&auml;fer <heiko@rangun.de>

@ -19,7 +19,7 @@
#include <kcmdlineargs.h>
#include <kcmdlineargs.h>
#include <klocale.h>
#include <kunittest/runnergui.h>
#include <tdeunittest/runnergui.h>
#include "clienttest.h"

@ -40,6 +40,6 @@ tde_add_kpart( kopete_statistics AUTOMOC
SOURCES
statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp
statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel
LINK kopete-shared khtml-shared ${SQLITE_LIBRARIES}
LINK kopete-shared tdehtml-shared ${SQLITE_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kopete_statistics.la
kopete_statistics_la_SOURCES = statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel
kopete_statistics_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KHTML)
kopete_statistics_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML)
kopete_statistics_la_LIBADD = ../../libkopete/libkopete.la -lsqlite3
service_DATA = kopete_statistics.desktop

@ -26,7 +26,7 @@
#include "kdialogbase.h"
#include "klocale.h"
#include "klistview.h"
#include "khtml_part.h"
#include "tdehtml_part.h"
#include "kstandarddirs.h"
#include "kdatepicker.h"
#include "ktimewidget.h"

@ -6,11 +6,11 @@ INCLUDES = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_texteffect.la kcm_kopete_texteffect.la
kopete_texteffect_la_SOURCES = texteffectplugin.cpp texteffectconfig.cpp
kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_texteffect_la_LIBADD = ../../libkopete/libkopete.la
kcm_kopete_texteffect_la_SOURCES = texteffectconfig.cpp texteffectprefs.ui texteffectpreferences.cpp
kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_texteffect_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_texteffect.desktop

@ -6,11 +6,11 @@ kde_module_LTLIBRARIES = kopete_translator.la kcm_kopete_translator.la
kopete_translator_la_SOURCES = translatorplugin.cpp \
translatordialog.cpp translatorguiclient.cpp translatorlanguages.cpp
kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_translator_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KIO)
kcm_kopete_translator_la_SOURCES = translatorprefsbase.ui translatorprefs.cpp translatorlanguages.cpp
kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_translator_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_translator.desktop

@ -6,11 +6,11 @@ kde_module_LTLIBRARIES = kopete_webpresence.la kcm_kopete_webpresence.la
kopete_webpresence_la_SOURCES = webpresenceplugin.cpp
kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_webpresence_la_LIBADD = ../../libkopete/libkopete.la $(LIBXML_LIBS) $(LIBXSLT_LIBS)
kcm_kopete_webpresence_la_SOURCES = webpresencepreferences.cpp webpresenceprefs.ui
kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_webpresence_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_webpresence.desktop

@ -22,7 +22,7 @@ kopete_gadu_la_SOURCES = gaduaway.cpp gadueditcontact.cpp gaducommands.cpp \
gaducontactlist.cpp gadurichtextformat.cpp \
gadudccserver.cpp gadudcctransaction.cpp gadudcc.cpp
kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lgadu
kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lgadu
kopete_gadu_la_LIBADD = ./ui/libgaduui.la \
$(top_builddir)/kopete/libkopete/libkopete.la \
$(GG_LIBS)

@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kopete_groupwise.la
kopete_groupwise_la_SOURCES = gwprotocol.cpp gwcontact.cpp gwaccount.cpp \
gwbytestream.cpp gwconnector.cpp gwmessagemanager.cpp gwcontactlist.cpp
kopete_groupwise_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
$(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
$(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_groupwise_la_LIBADD = ui/libkopetegroupwiseui.la \
libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_KIO)

@ -22,7 +22,7 @@ kopete_irc_la_SOURCES = \
kcodecaction.cpp \
ksparser.cpp
kopete_irc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KHTML)
kopete_irc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML)
kopete_irc_la_LIBADD = ../../libkopete/libkopete.la \
./ui/libkopeteircui.la \
./libkirc/libkirc.la \

@ -44,7 +44,7 @@ kopete_jabber_la_SOURCES = \
jabbertransport.cpp\
jabberbookmarks.cpp
kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_jabber_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \
ui/libkopetejabberui.la \
libiris/iris/include/libiris.la \

@ -14,7 +14,7 @@ kde_module_LTLIBRARIES = kio_jabberdisco.la
kio_jabberdisco_la_SOURCES = jabberdisco.cpp
kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO)
kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = jabberdisco.h

@ -28,7 +28,7 @@ kopete_meanwhile_la_SOURCES = \
meanwhileplugin.cpp
kopete_meanwhile_la_LDFLAGS = -no-undefined -module \
$(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
$(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_meanwhile_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \
ui/libkopetemeanwhileui.la $(MEANWHILE_LIBS)

@ -26,12 +26,12 @@ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp \
webcam.cpp
libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la $(LIB_KIO)
libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkopete_videodevice -L../../libkopete/avdevice/
libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
kopete_msn_la_SOURCES = dummy.cpp webcam.cpp
kopete_msn_la_LIBADD = libkopete_msn_shared.la
kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkopete_videodevice -L../../libkopete/avdevice/
kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
dummy.cpp: $(srcdir)/Makefile.am
echo '#include "kdemacros.h"' > $@

@ -4,7 +4,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kcm_kopete_msn.la
kcm_kopete_msn_la_SOURCES = msnprefs.ui msnpreferences.cpp
kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_msn_config.desktop

@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = kopete_aim.la
kopete_aim_la_SOURCES = aimprotocol.cpp aimaccount.cpp aimcontact.cpp aimuserinfo.cpp aimjoinchat.cpp aimchatsession.cpp
kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_aim_la_LIBADD = ../libkopete_oscar.la ui/libkopeteaimui.la \
$(top_builddir)/kopete/libkopete/libkopete.la

@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kopete_icq.la
kopete_icq_la_SOURCES = icqpresence.cpp icqaccount.cpp icqcontact.cpp icqprotocol.cpp
# icquserinfo.cpp icqreadaway.cpp icqsendsmsdialog.cpp
kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_icq_la_LIBADD = ../libkopete_oscar.la \
$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteicqui.la

@ -1,10 +1,10 @@
INCLUDES = $(all_includes) $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/protocols/oscar/liboscar
METASOURCES = AUTO
check_PROGRAMS = kunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest
check_PROGRAMS = tdeunittest 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kunittest_LDADD = $(LIB_TDECORE) ../liboscar.la
tdeunittest_SOURCES = main.cpp tdeunittest.cpp chatnavtests.cpp
tdeunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
tdeunittest_LDADD = $(LIB_TDECORE) ../liboscar.la
clientstream_test_SOURCES = clientstream_test.cpp
clientstream_test_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
@ -24,5 +24,5 @@ redirecttest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
ipaddrtest_SOURCES = ipaddrtest.cpp
ipaddrtest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
check: kunittest
@./kunittest 2>&1 | grep "tests:"
check: tdeunittest
@./tdeunittest 2>&1 | grep "tests:"

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "kunittest.h"
#include "tdeunittest.h"
int main( int argc, char** argv )
{

@ -1,5 +1,5 @@
/**
* kunittest.cpp
* tdeunittest.cpp
*
* Copyright (C) 2004 Zack Rusin <zack@kde.org>
*
@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "kunittest.h"
#include "tdeunittest.h"
#include "tester.h"
#include "chatnavtests.h"
@ -164,4 +164,4 @@ void KUnitTest::qtesterDone( TQObject *obj )
// tqApp->quit();
}
#include "kunittest.moc"
#include "tdeunittest.moc"

@ -1,5 +1,5 @@
/**
* kunittest.h
* tdeunittest.h
*
* Copyright (C) 2004 Zack Rusin <zack@kde.org>
*

@ -7,7 +7,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(srcdir)/ui -Iui $(all_includes)
noinst_HEADERS = testbedprotocol.h testbedcontact.h testbedaccount.h testbedaddcontactpage.h testbededitaccountwidget.h testbedfakeserver.h testbedincomingmessage.h
kde_module_LTLIBRARIES = kopete_testbed.la
kopete_testbed_la_SOURCES = testbedprotocol.cpp testbedcontact.cpp testbedaccount.cpp testbedaddcontactpage.cpp testbedaddui.ui testbededitaccountwidget.cpp testbedaccountpreferences.ui testbedfakeserver.cpp testbedincomingmessage.cpp
kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_testbed_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \
ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_KIO)

@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kopete_wp.la
noinst_HEADERS = wpprotocol.h wpeditaccount.h wpaccount.h wpuserinfo.h wpcontact.h wpaddcontact.h
kopete_wp_la_SOURCES = wpprotocol.cpp wpcontact.cpp wpaddcontact.cpp wpeditaccount.cpp wpaccount.cpp wpuserinfo.cpp
kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_wp_la_LIBADD = ../../libkopete/libkopete.la ./ui/libkopetewpui.la \
./libwinpopup/libwinpopup.la $(LIB_KIO)

@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kopete_yahoo.la
kopete_yahoo_la_SOURCES = yahooprotocol.cpp yahoocontact.cpp \
yahooaddcontact.cpp yahooaccount.cpp yahooeditaccount.cpp yahooconferencemessagemanager.cpp \
yahoochatsession.cpp yahooverifyaccount.cpp yahoowebcam.cpp
kopete_yahoo_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_yahoo_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kopete_yahoo_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \
$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteyahooui.la libkyahoo/libkyahoo.la

@ -35,7 +35,7 @@ tde_add_kpart( kpf_panelapplet AUTOMOC
ErrorMessageConfigDialog.cpp ActiveMonitor.cpp ActiveMonitorItem.cpp
ActiveMonitorWindow.cpp BandwidthGraph.cpp ServerWizard.cpp
AppletItem.cpp Applet.cpp Defaults.cpp Help.cpp
LINK kdnssd-shared kio-shared
LINK tdednssd-shared kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@ -46,6 +46,6 @@ tde_add_kpart( kpfpropertiesdialog AUTOMOC
SOURCES
PropertiesDialogPlugin.cpp StartingKPFDialog.cpp WebServer.stub
WebServerManager.stub Defaults.cpp Help.cpp
LINK kdnssd-shared kio-shared
LINK tdednssd-shared kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -37,9 +37,9 @@ kpf_panelapplet_la_SOURCES = \
Defaults.cpp \
Help.cpp
kpf_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kpf_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kpf_panelapplet_la_LIBADD = $(LIB_KIO) -lkdnssd
kpf_panelapplet_la_LIBADD = $(LIB_KIO) -ltdednssd
kpfpropertiesdialog_la_SOURCES = \
PropertiesDialogPlugin.cpp \
@ -49,9 +49,9 @@ kpfpropertiesdialog_la_SOURCES = \
Defaults.cpp \
Help.cpp
kpfpropertiesdialog_la_LIBADD = $(LIB_KIO) -lkdnssd
kpfpropertiesdialog_la_LIBADD = $(LIB_KIO) -ltdednssd
kpfpropertiesdialog_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kpfpropertiesdialog_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = \
Utils.h \

@ -60,6 +60,6 @@ tde_add_executable( krdc AUTOMOC
maindialogbase.ui keycapturewidget.ui kservicelocator.cpp
keycapturedialog.cpp kremoteview.cpp smartptr.cpp hostpreferences.cpp
preferencesdialog.cpp maindialogwidget.cpp maindialog.cpp
LINK vnc-static rdp-static tdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext ${LIB_SLP}
LINK vnc-static rdp-static tdeui-shared tdednssd-shared tdewalletclient-shared jpeg Xext ${LIB_SLP}
DESTINATION ${BIN_INSTALL_DIR}
)

@ -23,7 +23,7 @@ appdata_DATA = pointcursor.png pointcursormask.png pinup.png pindown.png \
dnssddatadir = $(kde_datadir)/zeroconf
dnssddata_DATA = _rfb._tcp
krdc_LDADD = vnc/libvnc.la rdp/librdp.la $(LIB_TDEUI) $(LIBXF86VIDMODE) $(LIB_SLP) $(LIB_KDNSSD) $(X_LDFLAGS) $(LIB_X11) -lkwalletclient -lDCOP
krdc_LDADD = vnc/libvnc.la rdp/librdp.la $(LIB_TDEUI) $(LIBXF86VIDMODE) $(LIB_SLP) $(LIB_KDNSSD) $(X_LDFLAGS) $(LIB_X11) -ltdewalletclient -lDCOP
krdc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE)
xdg_apps_DATA = krdc.desktop

@ -23,7 +23,7 @@
#include <kmessagebox.h>
#include <kconfig.h>
#include <kdebug.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <tqwindowdefs.h>
#include <tqtimer.h>
#include <tqfile.h>

@ -8,4 +8,4 @@ librdp_la_SOURCES = krdpview.cpp rdphostpref.cpp rdpprefs.ui
noinst_HEADERS = krdpview.h rdphostpref.h
librdp_la_LIBADD = $(LIB_TDEUI) $(LIBJPEG)
librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

@ -24,7 +24,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kprocess.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <kpassdlg.h>
#include <tqvbox.h>
@ -165,7 +165,7 @@ bool KRdpView::editPreferences( HostPrefPtr host )
int hv = hp->height();
int cd = hp->colorDepth();
TQString kl = hp->layout();
bool kwallet = hp->useKWallet();
bool tdewallet = hp->useKWallet();
// show preferences dialog
KDialogBase *dlg = new KDialogBase( 0L, "dlg", true,
@ -183,7 +183,7 @@ bool KRdpView::editPreferences( HostPrefPtr host )
prefs->setColorDepth(cd);
prefs->setKbLayout( keymap2int( kl ) );
prefs->setShowPrefs( true );
prefs->setUseKWallet(kwallet);
prefs->setUseKWallet(tdewallet);
if ( dlg->exec() == TQDialog::Rejected )
return false;

@ -26,7 +26,7 @@
#include <kstandarddirs.h>
#include <kpassdlg.h>
#include <kdialogbase.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <tqdatastream.h>
#include <dcopclient.h>
@ -232,7 +232,7 @@ bool KVncView::editPreferences( HostPrefPtr host )
SmartPtr<VncHostPref> hp( host );
int ci = hp->quality();
bool kwallet = hp->useKWallet();
bool tdewallet = hp->useKWallet();
// show preferences dialog
KDialogBase *dlg = new KDialogBase( 0L, "dlg", true,
@ -246,7 +246,7 @@ bool KVncView::editPreferences( HostPrefPtr host )
prefs->setQuality( ci );
prefs->setShowPrefs(true);
prefs->setUseKWallet(kwallet);
prefs->setUseKWallet(tdewallet);
if ( dlg->exec() == TQDialog::Rejected )
return false;

@ -30,6 +30,6 @@ install( FILES kcmkrfb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_krfb AUTOMOC
SOURCES configurationwidget.ui kcm_krfb.cpp
LINK krfbconfig-static srvloc-static kdnssd-shared kio-shared
LINK krfbconfig-static srvloc-static tdednssd-shared kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -4,7 +4,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_krfb.la
kcm_krfb_la_SOURCES = configurationwidget.ui kcm_krfb.cpp
kcm_krfb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_krfb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_krfb_la_LIBADD = ../krfb/libkrfbconfig.la $(LIB_TDEUI) -lkio
# Services

@ -33,6 +33,6 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kinetd )
tde_add_kpart( kded_kinetd AUTOMOC
SOURCES kinetd.cpp kinetd.skel
LINK
srvloc-static kdnssd-shared tdeinit_kded-shared
srvloc-static tdednssd-shared tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -15,6 +15,6 @@ check_PROGRAMS = ksttest
ksttest_SOURCES = ksttest.cpp
ksttest_LDADD = libksticker.la ../ksopts.lo ../nickColourMaker.lo $(LIB_TDEUI)
ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

@ -13,11 +13,11 @@ check_PROGRAMS = testview dccMgrTest
testview_SOURCES = kstextviewtest.cpp
testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_TDEUI)
testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
dccMgrTest_SOURCES = dccMgrTest.cpp
dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_TDEUI)
dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
bin_PROGRAMS =
lib_LTLIBRARIES =

@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kcm_ktalkd.la
kcm_ktalkd_la_SOURCES = main.cpp soundpage.cpp answmachpage.cpp \
forwmachpage.cpp
kcm_ktalkd_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_ktalkd_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_ktalkd_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
#for extra warnings during compilation :

@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_lanbrowser.la
kcm_lanbrowser_la_SOURCES = main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmkiolan.cpp portsettingsbar.cpp findnic.cpp
kcm_lanbrowser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcm_lanbrowser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_lanbrowser_la_LIBADD = -ltdeui
INCLUDES= $(all_includes)

@ -39,6 +39,6 @@ install( FILES
tde_add_kpart( kio_zeroconf AUTOMOC
SOURCES dnssd.cpp
LINK kdnssd-shared kio-shared
LINK tdednssd-shared kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kio_zeroconf.la
kio_zeroconf_la_SOURCES = dnssd.cpp
kio_zeroconf_la_LIBADD = $(LIB_KDNSSD) $(LIB_KIO)
kio_zeroconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kio_zeroconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
protocol_DATA = zeroconf.protocol invitation.protocol
protocoldir = $(kde_servicesdir)

@ -29,6 +29,6 @@ install( FILES dnssdwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
tde_add_kpart( kded_dnssdwatcher AUTOMOC
SOURCES dnssdwatcher.cpp dnssdwatcher.skel watcher.cpp
LINK kdnssd-shared tdeinit_kded-shared
LINK tdednssd-shared tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
Loading…
Cancel
Save