TDE
/
tdesdk
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesdk
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent f8069e2ea0
commit 1515a4f2eb
102 changed files with 217 additions and 217 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape View File

@ -65,7 +65,7 @@ option( BUILD_KPROFILEMETHOD "Build kprofilemethod" ${BUILD_ALL} )
option( BUILD_KSPY "Build kspy" ${BUILD_ALL} ) option( BUILD_KSPY "Build kspy" ${BUILD_ALL} )
option( BUILD_KSTARTPERF "Build kstartperf" ${BUILD_ALL} ) option( BUILD_KSTARTPERF "Build kstartperf" ${BUILD_ALL} )
option( BUILD_KUIVIEWER "Build kuiviewer" ${BUILD_ALL} ) option( BUILD_KUIVIEWER "Build kuiviewer" ${BUILD_ALL} )
option( BUILD_KUNITTEST "Build kunittest" ${BUILD_ALL} ) option( BUILD_KUNITTEST "Build tdeunittest" ${BUILD_ALL} )
option( BUILD_POXML "Build poxml" ${BUILD_ALL} ) option( BUILD_POXML "Build poxml" ${BUILD_ALL} )
option( BUILD_SCHECK "Build scheck" ${BUILD_ALL} ) option( BUILD_SCHECK "Build scheck" ${BUILD_ALL} )
option( BUILD_SCRIPTS "Build scripts" ${BUILD_ALL} ) option( BUILD_SCRIPTS "Build scripts" ${BUILD_ALL} )
@ -105,7 +105,7 @@ tde_conditional_add_subdirectory( BUILD_KPROFILEMETHOD kprofilemethod )
tde_conditional_add_subdirectory( BUILD_KSPY kspy ) tde_conditional_add_subdirectory( BUILD_KSPY kspy )
tde_conditional_add_subdirectory( BUILD_KSTARTPERF kstartperf ) tde_conditional_add_subdirectory( BUILD_KSTARTPERF kstartperf )
tde_conditional_add_subdirectory( BUILD_KUIVIEWER kuiviewer ) tde_conditional_add_subdirectory( BUILD_KUIVIEWER kuiviewer )
tde_conditional_add_subdirectory( BUILD_KUNITTEST kunittest ) tde_conditional_add_subdirectory( BUILD_KUNITTEST tdeunittest )
tde_conditional_add_subdirectory( BUILD_POXML poxml ) tde_conditional_add_subdirectory( BUILD_POXML poxml )
tde_conditional_add_subdirectory( BUILD_SCHECK scheck ) tde_conditional_add_subdirectory( BUILD_SCHECK scheck )
tde_conditional_add_subdirectory( BUILD_SCRIPTS scripts ) tde_conditional_add_subdirectory( BUILD_SCRIPTS scripts )

4
cervisia/CMakeLists.txt
Unescape View File

@ -102,7 +102,7 @@ tde_add_kpart( libcervisiapart AUTOMOC
updateview_visitors.cpp entry.cpp entry_status.cpp stringmatcher.cpp updateview_visitors.cpp entry.cpp entry_status.cpp stringmatcher.cpp
cvsinitdlg.cpp ignorelistbase.cpp dirignorelist.cpp cvsinitdlg.cpp ignorelistbase.cpp dirignorelist.cpp
globalignorelist.cpp editwithmenu.cpp logmessageedit.cpp globalignorelist.cpp editwithmenu.cpp logmessageedit.cpp
LINK cervisia-static cvsservice-shared kutils-shared LINK cervisia-static cvsservice-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -112,7 +112,7 @@ tde_add_kpart( libcervisiapart AUTOMOC
tde_add_tdeinit_executable( cervisia AUTOMOC tde_add_tdeinit_executable( cervisia AUTOMOC
SOURCES SOURCES
main.cpp cervisiashell.cpp main.cpp cervisiashell.cpp
LINK cervisia-static cvsservice-shared kutils-shared LINK cervisia-static cvsservice-shared tdeutils-shared
) )

2
cervisia/Makefile.am
Unescape View File

@ -61,7 +61,7 @@ messages: rc.cpp
$(XGETTEXT) -C *.cpp *.h -o $(podir)/cervisia.pot $(XGETTEXT) -C *.cpp *.h -o $(podir)/cervisia.pot
srcdoc: srcdoc:
$(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -ltdecore -ltdeui -lkparts $(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -ltdecore -ltdeui -ltdeparts
cervisia.1: $(srcdir)/cervisia.1.in cervisia.1: $(srcdir)/cervisia.1.in
sed -e 's%_KDEHTMLDIR_%'${kde_htmldir}'%g;' \ sed -e 's%_KDEHTMLDIR_%'${kde_htmldir}'%g;' \

8
cervisia/cervisiapart.h
Unescape View File

@ -22,10 +22,10 @@
#ifndef CERVISIAPART_H #ifndef CERVISIAPART_H
#define CERVISIAPART_H #define CERVISIAPART_H
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include "addremovedlg.h" #include "addremovedlg.h"
#include "commitdlg.h" #include "commitdlg.h"

2
cervisia/cervisiashell.h
Unescape View File

@ -22,7 +22,7 @@
#ifndef CERVISIASHELL_H #ifndef CERVISIASHELL_H
#define CERVISIASHELL_H #define CERVISIASHELL_H
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
class KRecentFilesAction; class KRecentFilesAction;

2
doc/kbabel/preferences.docbook
Unescape View File

@ -924,7 +924,7 @@ translating to. Below are the items to consider setting:</para>
Here you choose the encoding for your text. This option is passed Here you choose the encoding for your text. This option is passed
to the spellchecker, and is used as the encoding for your words to the spellchecker, and is used as the encoding for your words
dictionary. dictionary.
See the <ulink url="help:/kspell">kspell</ulink> documentation for See the <ulink url="help:/tdespell">tdespell</ulink> documentation for
more details. more details.
</para> </para>
<note><para> <note><para>

2
kapptemplate/ChangeLog
Unescape View File

@ -116,7 +116,7 @@ May-30-2000 - Kurt Granroth (v0.6.2)
Mar-14-2000 - Kurt Granroth (v0.6.1) Mar-14-2000 - Kurt Granroth (v0.6.1)
o Added toolbar editor o Added toolbar editor
o Changed sample html code to reflect khtml changes o Changed sample html code to reflect tdehtml changes
Feb-26-2000 - Kurt Granroth (v0.6) Feb-26-2000 - Kurt Granroth (v0.6)
o Converted to use the new XML UI framework (big change!) o Converted to use the new XML UI framework (big change!)

2
kapptemplate/kapp/appview.h
Unescape View File

@ -4,7 +4,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}view.h
#define ${APP_NAME_UC}VIEW_H #define ${APP_NAME_UC}VIEW_H
#include <tqwidget.h> #include <tqwidget.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <${APP_NAME_LC}iface.h> #include <${APP_NAME_LC}iface.h>
class TQPainter; class TQPainter;

2
kapptemplate/kpartapp/app.h
Unescape View File

@ -8,7 +8,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}.h
#endif #endif
#include <kapplication.h> #include <kapplication.h>
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
/** /**
* This is the application "Shell". It has a menubar, toolbar, and * This is the application "Shell". It has a menubar, toolbar, and

2
kapptemplate/kpartapp/app_part.cpp
Unescape View File

@ -8,7 +8,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp
#include <kaction.h> #include <kaction.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kfiledialog.h> #include <kfiledialog.h>
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <tqtextstream.h>

2
kapptemplate/kpartapp/app_part.h
Unescape View File

@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.h
#ifndef ${APP_NAME_UC}PART_H #ifndef ${APP_NAME_UC}PART_H
#define ${APP_NAME_UC}PART_H #define ${APP_NAME_UC}PART_H
#include <kparts/part.h> #include <tdeparts/part.h>
class TQWidget; class TQWidget;
class TQPainter; class TQPainter;

2
kapptemplate/kpartplugin/plugin-Makefile.am
Unescape View File

@ -16,5 +16,5 @@ lib${APP_NAME_LC}plugin_la_LDFLAGS = -module \$(KDE_PLUGIN) \$(all_libraries)
# Install the .rc file in the Part's directory (in this case, the part # Install the .rc file in the Part's directory (in this case, the part
# is KHTMLPart) # is KHTMLPart)
pluginsdir = \$(kde_datadir)/khtml/kpartplugins pluginsdir = \$(kde_datadir)/tdehtml/kpartplugins
plugins_DATA = plugin_${APP_NAME_LC}.rc plugins_DATA = plugin_${APP_NAME_LC}.rc

2
kapptemplate/kpartplugin/plugin_app.cpp
Unescape View File

@ -2,7 +2,7 @@ echo "Creating $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp...";
cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp
#include "plugin_${APP_NAME_LC}.h" #include "plugin_${APP_NAME_LC}.h"
#include <khtml_part.h> #include <tdehtml_part.h>
#include <kaction.h> #include <kaction.h>
#include <kinstance.h> #include <kinstance.h>
#include <kmessagebox.h> #include <kmessagebox.h>

2
kapptemplate/kpartplugin/plugin_app.h
Unescape View File

@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.h
#ifndef PLUGIN_${APP_NAME_UC}_H #ifndef PLUGIN_${APP_NAME_UC}_H
#define PLUGIN_${APP_NAME_UC}_H #define PLUGIN_${APP_NAME_UC}_H
#include <kparts/plugin.h> #include <tdeparts/plugin.h>
class Plugin${APP_NAME} : public KParts::Plugin class Plugin${APP_NAME} : public KParts::Plugin
{ {

2
kbabel/README
Unescape View File

@ -49,7 +49,7 @@ Credits:
and useful feature requests and useful feature requests
- Thomas Diehl for many useful hints to the GUI design and the - Thomas Diehl for many useful hints to the GUI design and the
behaviour of KBabel behaviour of KBabel
- Wolfram Diestel for fixing kspell and many useful hints. - Wolfram Diestel for fixing tdespell and many useful hints.
- Stephan Kulow for helping keeping KBabel in sync with - Stephan Kulow for helping keeping KBabel in sync with
the frequently changing KDE api and for often giving me a helping hand. the frequently changing KDE api and for often giving me a helping hand.
- Andrea Rizzi for writing the dictionary plugin for searching in a database - Andrea Rizzi for writing the dictionary plugin for searching in a database

4
kbabel/catalogmanager/Makefile.am
Unescape View File

@ -27,14 +27,14 @@ libcatalogmanager_la_SOURCES = catalogmanageriface.skel \
libcatalogmanager_la_LIBADD = ../commonui/libkbabelcommonui.la \ libcatalogmanager_la_LIBADD = ../commonui/libkbabelcommonui.la \
../kbabeldict/libkbabeldict.la ./libcvs/libcatalogmanagercvs.la \ ../kbabeldict/libkbabeldict.la ./libcvs/libcatalogmanagercvs.la \
./libsvn/libcatalogmanagersvn.la $(LIB_KIO) ./libsvn/libcatalogmanagersvn.la $(LIB_KIO)
libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
catalogmanager_SOURCES = main.cpp catalogmanager_SOURCES = main.cpp
# the libraries to link against. # the libraries to link against.
catalogmanager_LDADD = libcatalogmanager.la catalogmanager_LDADD = libcatalogmanager.la
catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = catalogmanageriface.h catalogmanager.h \ noinst_HEADERS = catalogmanageriface.h catalogmanager.h \

2
kbabel/catalogmanager/markpatterndialog.cpp
Unescape View File

@ -41,7 +41,7 @@
#include <kconfig.h> #include <kconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h> #include <kregexpeditorinterface.h>
#include "markpatterndialog.h" #include "markpatterndialog.h"

2
kbabel/common/kbproject.cpp
Unescape View File

@ -42,7 +42,7 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kspell.h> #include <tdespell.h>
namespace KBabel namespace KBabel
{ {

2
kbabel/common/projectsettings.cpp
Unescape View File

@ -40,7 +40,7 @@
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kspell.h> #include <tdespell.h>
TQString KBabel::Defaults::Spellcheck::ignoreURL() TQString KBabel::Defaults::Spellcheck::ignoreURL()
{ {

2
kbabel/commonui/Makefile.am
Unescape View File

@ -19,7 +19,7 @@ libkbabelcommonui_la_SOURCES = klisteditor.ui context.cpp kactionselector.cpp \
cmdedit.cpp \ cmdedit.cpp \
diffpreferences.ui diffpreferences.ui
libkbabelcommonui_la_LIBADD = $(LIB_KIO) -lktexteditor ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict.la libkbabelcommonui_la_LIBADD = $(LIB_KIO) -ltdetexteditor ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict.la
libkbabelcommonui_la_LDFLAGS = $(all_libraries) libkbabelcommonui_la_LDFLAGS = $(all_libraries)

8
kbabel/commonui/context.cpp
Unescape View File

@ -57,10 +57,10 @@
#include <klibloader.h> #include <klibloader.h>
#include <ktrader.h> #include <ktrader.h>
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <ktexteditor/selectioninterface.h> #include <tdetexteditor/selectioninterface.h>
#include <ktexteditor/viewcursorinterface.h> #include <tdetexteditor/viewcursorinterface.h>
SourceContext::SourceContext(TQWidget *parent, KBabel::Project::Ptr project): TQWidget(parent) SourceContext::SourceContext(TQWidget *parent, KBabel::Project::Ptr project): TQWidget(parent)
, m_parent( parent ) , m_parent( parent )

4
kbabel/commonui/context.h
Unescape View File

@ -36,8 +36,8 @@
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <kbproject.h> #include <kbproject.h>

2
kbabel/commonui/finddialog.cpp
Unescape View File

@ -47,7 +47,7 @@
#include <kconfig.h> #include <kconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h> #include <kregexpeditorinterface.h>
using namespace KBabel; using namespace KBabel;

2
kbabel/commonui/projectprefwidgets.cpp
Unescape View File

@ -52,7 +52,7 @@
#include <kurlcompletion.h> #include <kurlcompletion.h>
#include <kfontdialog.h> #include <kfontdialog.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h> #include <kregexpeditorinterface.h>
#include <ksconfig.h> #include <ksconfig.h>
#include <kurldrag.h> #include <kurldrag.h>

2
kbabel/kbabel/CMakeLists.txt
Unescape View File

@ -44,7 +44,7 @@ tde_add_executable( kbabel
main.cpp main.cpp
LINK LINK
kbabel-static kbabelcommonui-static kbabeldict-static kbabel-static kbabelcommonui-static kbabeldict-static
kbabelcommon-shared kbabeldictplugin-shared ktexteditor-shared kbabelcommon-shared kbabeldictplugin-shared tdetexteditor-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

4
kbabel/kbabel/Makefile.am
Unescape View File

@ -38,14 +38,14 @@ libkbabel_la_SOURCES = kbbookmarkhandler.cpp \
kde_kcfg_DATA=kbabel.kcfg kde_kcfg_DATA=kbabel.kcfg
libkbabel_la_LIBADD = ../commonui/libkbabelcommonui.la ../kbabeldict/libkbabeldict.la $(LIB_KIO) $(LIB_KSPELL) libkbabel_la_LIBADD = ../commonui/libkbabelcommonui.la ../kbabeldict/libkbabeldict.la $(LIB_KIO) $(LIB_KSPELL)
libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
kbabel_SOURCES = main.cpp kbabel_SOURCES = main.cpp
# the libraries to link against. # the libraries to link against.
kbabel_LDADD = libkbabel.la kbabel_LDADD = libkbabel.la
kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = kbabel.h kbabelview.h \ noinst_HEADERS = kbabel.h kbabelview.h \

2
kbabel/kbabel/kbabel.cpp
Unescape View File

@ -79,7 +79,7 @@
#include <twin.h> #include <twin.h>
#include <kaction.h> #include <kaction.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kspelldlg.h> #include <tdespelldlg.h>
#include <ksqueezedtextlabel.h> #include <ksqueezedtextlabel.h>
#include <kurldrag.h> #include <kurldrag.h>

2
kbabel/kbabel/kbabel.h
Unescape View File

@ -44,7 +44,7 @@
#include <kdockwidget.h> #include <kdockwidget.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kmdimainfrm.h> #include <tdemdimainfrm.h>
#include "kbabelview.h" #include "kbabelview.h"
#include "kbproject.h" #include "kbproject.h"

60
kbabel/kbabel/kbabelview.cpp
Unescape View File

@ -73,7 +73,7 @@
#include <kio/netaccess.h> #include <kio/netaccess.h>
#include <knotifyclient.h> #include <knotifyclient.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kspell.h> #include <tdespell.h>
#include <twin.h> #include <twin.h>
#include <kstdaccel.h> #include <kstdaccel.h>
#include <kurldrag.h> #include <kurldrag.h>
@ -172,7 +172,7 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project
spell.posDict.setAutoDelete(true); spell.posDict.setAutoDelete(true);
spell.active=false; spell.active=false;
spell2.kspell = 0; spell2.tdespell = 0;
spell2.config = 0; spell2.config = 0;
setAcceptDrops(true); setAcceptDrops(true);
@ -293,9 +293,9 @@ KBabelView::~KBabelView()
delete _argExtractor; delete _argExtractor;
delete _tagExtractor; delete _tagExtractor;
if( spell2.kspell ) if( spell2.tdespell )
{ {
spell2.kspell = 0; spell2.tdespell = 0;
delete spell2.config; delete spell2.config;
spell2.config = 0; spell2.config = 0;
} }
@ -389,7 +389,7 @@ of the currently displayed entry.</p></qt>"));
if( pf < 1 ) if( pf < 1 )
pf = 1; pf = 1;
msgstrEdit = new HidingMsgEdit( pf,this,spell2.kspell,tempWidget,"msgstrEdit"); msgstrEdit = new HidingMsgEdit( pf,this,spell2.tdespell,tempWidget,"msgstrEdit");
msgstrEdit->installEventFilter(this); msgstrEdit->installEventFilter(this);
KCursor::setAutoHideCursor(msgstrEdit,true); KCursor::setAutoHideCursor(msgstrEdit,true);
@ -751,16 +751,16 @@ void KBabelView::readProject(Project::Ptr project)
{ {
// if there is a spellchecker already, free it // if there is a spellchecker already, free it
if( spell2.kspell ) if( spell2.tdespell )
{ {
// ensure the spellchecker is not used anymore // ensure the spellchecker is not used anymore
msgstrEdit->setSpellChecker(0L); msgstrEdit->setSpellChecker(0L);
// free it // free it
spell2.kspell->cleanUp(); spell2.tdespell->cleanUp();
delete spell2.kspell; delete spell2.tdespell;
spell2.kspell = 0; spell2.tdespell = 0;
} }
spell2.config = new KSpellConfig(0L, "tempSpellConfig"); spell2.config = new KSpellConfig(0L, "tempSpellConfig");
@ -770,18 +770,18 @@ void KBabelView::readProject(Project::Ptr project)
spell2.config->setEncoding(_spellcheckSettings.spellEncoding); spell2.config->setEncoding(_spellcheckSettings.spellEncoding);
spell2.config->setDictionary(_spellcheckSettings.spellDict); spell2.config->setDictionary(_spellcheckSettings.spellDict);
spell2.kspell= new KSpell(this, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)), spell2.tdespell= new KSpell(this, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)),
spell2.config, false, false); spell2.config, false, false);
if(spell2.kspell->status() == KSpell::Error) if(spell2.tdespell->status() == KSpell::Error)
kdWarning(KBABEL) << "Something's wrong with KSpell, can't start on-the-fly checking" << endl; kdWarning(KBABEL) << "Something's wrong with KSpell, can't start on-the-fly checking" << endl;
else else
{ {
kdDebug() << "On the fly spellchecker: " kdDebug() << "On the fly spellchecker: "
<< spell2.kspell << endl; << spell2.tdespell << endl;
msgstrEdit->setSpellChecker(spell2.kspell); msgstrEdit->setSpellChecker(spell2.tdespell);
} }
// spell2.kspell->setAutoDelete(true); // let KSpell handle delete // spell2.tdespell->setAutoDelete(true); // let KSpell handle delete
//on-the-fly spellcheck end //on-the-fly spellcheck end
} }
else else
@ -3942,31 +3942,31 @@ void KBabelView::spellcheck()
spell.active=true; spell.active=true;
_dontBeep=true; _dontBeep=true;
spell.kspell= new KSpell (this, i18n("Spellcheck"), spell.tdespell= new KSpell (this, i18n("Spellcheck"),
TQT_TQOBJECT(this), TQT_SLOT(spellStart(KSpell *)), spell.config, true, true); TQT_TQOBJECT(this), TQT_SLOT(spellStart(KSpell *)), spell.config, true, true);
if( spell.kspell->status() == KSpell::Error ) if( spell.tdespell->status() == KSpell::Error )
{ {
KMessageBox::error( this, i18n("KBabel cannot start spell checker. " KMessageBox::error( this, i18n("KBabel cannot start spell checker. "
"Please check your TDE installation.") ); "Please check your TDE installation.") );
return; return;
} }
connect(spell.kspell, TQT_SIGNAL(death()),this, TQT_SLOT(spellCleanDone())); connect(spell.tdespell, TQT_SIGNAL(death()),this, TQT_SLOT(spellCleanDone()));
connect(spell.kspell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList & connect(spell.tdespell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList &
, unsigned int)), this , unsigned int)), this
, TQT_SLOT(spellMisspelled(const TQString &, const TQStringList &, unsigned int))); , TQT_SLOT(spellMisspelled(const TQString &, const TQStringList &, unsigned int)));
connect(spell.kspell, TQT_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)) connect(spell.tdespell, TQT_SIGNAL(corrected(const TQString &, const TQString &, unsigned int))
, this, TQT_SLOT(spellCorrected(const TQString &, const TQString &, unsigned int))); , this, TQT_SLOT(spellCorrected(const TQString &, const TQString &, unsigned int)));
connect(spell.kspell,TQT_SIGNAL(ignoreall(const TQString &)) connect(spell.tdespell,TQT_SIGNAL(ignoreall(const TQString &))
, this, TQT_SLOT(spellAddIgnore(const TQString &))); , this, TQT_SLOT(spellAddIgnore(const TQString &)));
connect(spell.kspell, TQT_SIGNAL(done(bool)) connect(spell.tdespell, TQT_SIGNAL(done(bool))
, this, TQT_SLOT(spellResult(bool))); , this, TQT_SLOT(spellResult(bool)));
spell.kspell->setAutoDelete(true); // let KSpell handle delete spell.tdespell->setAutoDelete(true); // let KSpell handle delete
} }
else else
{ {
@ -4034,14 +4034,14 @@ void KBabelView::spellStart(KSpell *)
kapp->processEvents(100); kapp->processEvents(100);
} }
spell.kspell->ignore(*it); spell.tdespell->ignore(*it);
} }
emit signalClearProgressBar(); emit signalClearProgressBar();
} }
} }
spell.kspell->checkList(&spell.wordList); spell.tdespell->checkList(&spell.wordList);
} }
@ -4364,8 +4364,8 @@ void KBabelView::spellResult(bool flag)
undo(); undo();
} }
int s=spell.kspell->dlgResult(); int s=spell.tdespell->dlgResult();
spell.kspell->cleanUp(); spell.tdespell->cleanUp();
emit signalSpellcheckDone(s); emit signalSpellcheckDone(s);
TQTimer::singleShot(0,this,TQT_SLOT(cleanUpSpellStruct())); TQTimer::singleShot(0,this,TQT_SLOT(cleanUpSpellStruct()));
@ -4377,9 +4377,9 @@ void KBabelView::spellCleanDone()
kdDebug(KBABEL) << "spellCleanDone" << endl; kdDebug(KBABEL) << "spellCleanDone" << endl;
// if the pointer is cleared, you have finished correcly // if the pointer is cleared, you have finished correcly
if( !spell.kspell ) return; if( !spell.tdespell ) return;
KSpell::spellStatus status = spell.kspell->status(); KSpell::spellStatus status = spell.tdespell->status();
if(status == KSpell::Error || status == KSpell::Crashed) if(status == KSpell::Error || status == KSpell::Crashed)
{ {
@ -4401,8 +4401,8 @@ void KBabelView::spellCleanDone()
void KBabelView::cleanUpSpellStruct() void KBabelView::cleanUpSpellStruct()
{ {
kdDebug(KBABEL) << "Cleaning structure" << endl; kdDebug(KBABEL) << "Cleaning structure" << endl;
// spell.kspell is set to be autodeleted // spell.tdespell is set to be autodeleted
spell.kspell = 0; spell.tdespell = 0;
delete spell.config; delete spell.config;
spell.config=0; spell.config=0;
spell.wordList.clear(); spell.wordList.clear();

4
kbabel/kbabel/kbabelview.h
Unescape View File

@ -623,7 +623,7 @@ private:
struct struct
{ {
KSpell *kspell; KSpell *tdespell;
KSpellConfig* config; KSpellConfig* config;
TQStringList wordList; TQStringList wordList;
bool active; bool active;
@ -648,7 +648,7 @@ private:
} spell; } spell;
struct { struct {
KSpell *kspell; KSpell *tdespell;
KSpellConfig* config; KSpellConfig* config;
} spell2; // on-the-fly spellchecking } spell2; // on-the-fly spellchecking

6
kbabel/kbabel/kbhighlighting.cpp
Unescape View File

@ -44,7 +44,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kbabelsettings.h> #include <kbabelsettings.h>
#include <kspell.h> #include <tdespell.h>
#include "kbhighlighting.h" #include "kbhighlighting.h"
#include "resources.h" #include "resources.h"
@ -255,7 +255,7 @@ bool KBabelHighlighter::isMisspelled(const TQString& wordRaw)
kdDebug(KBABEL) << "isMisspelled: checking: " << word << endl; kdDebug(KBABEL) << "isMisspelled: checking: " << word << endl;
// Normally isMisspelled would look up a dictionary and return // Normally isMisspelled would look up a dictionary and return
// true or false, but kspell is asynchronous and slow so things // true or false, but tdespell is asynchronous and slow so things
// get tricky... // get tricky...
// "dict" is used as a cache to store the results of KSpell // "dict" is used as a cache to store the results of KSpell
@ -277,7 +277,7 @@ void KBabelHighlighter::slotMisspelling(const TQString & originalword,
kdDebug(KBABEL) << "Misspelled " << originalword << ", " << suggestions << endl; kdDebug(KBABEL) << "Misspelled " << originalword << ", " << suggestions << endl;
dict.replace( originalword, NotOkay ); dict.replace( originalword, NotOkay );
// this is slow but since kspell is async this will have to do for now // this is slow but since tdespell is async this will have to do for now
highlight(); highlight();
} }

8
kbabel/kbabeldict/Makefile.am
Unescape View File

@ -19,20 +19,20 @@ INCLUDES = -I$(srcdir)/../common -I$(top_builddir)/kbabel/common $(all_i
lib_LTLIBRARIES = libkbabeldictplugin.la lib_LTLIBRARIES = libkbabeldictplugin.la
libkbabeldictplugin_la_SOURCES = searchengine.cpp libkbabeldictplugin_la_SOURCES = searchengine.cpp
libkbabeldictplugin_la_LIBADD = $(LIB_TDECORE) libkbabeldictplugin_la_LIBADD = $(LIB_TDECORE)
libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libkbabeldict_la_SOURCES = kbabeldictbox.cpp \ libkbabeldict_la_SOURCES = kbabeldictbox.cpp \
kbabeldictiface.skel dictionarymenu.cpp dictchooser.cpp \ kbabeldictiface.skel dictionarymenu.cpp dictchooser.cpp \
aboutmoduledlg.cpp aboutmoduledlg.cpp
libkbabeldict_la_LIBADD = ../common/libkbabelcommon.la libkbabeldictplugin.la $(LIB_TDEUI) libkbabeldict_la_LIBADD = ../common/libkbabelcommon.la libkbabeldictplugin.la $(LIB_TDEUI)
libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp
# the libraries to link against. # the libraries to link against.
kbabeldict_LDADD = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kbabeldict_LDADD = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h

4
kbugbuster/CMakeLists.txt
Unescape View File

@ -12,7 +12,7 @@
add_subdirectory( backend ) add_subdirectory( backend )
add_subdirectory( gui ) add_subdirectory( gui )
add_subdirectory( pics ) add_subdirectory( pics )
tde_conditional_add_subdirectory( WITH_KCAL kresources ) tde_conditional_add_subdirectory( WITH_KCAL tderesources )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
@ -39,6 +39,6 @@ tde_add_executable( kbugbuster
SOURCES main.cpp SOURCES main.cpp
LINK LINK
kbbmainwindow-static kbbbackend_nopic-static kbbmainwindow-static kbbbackend_nopic-static
kutils-shared kio-shared khtml-shared tdeutils-shared kio-shared tdehtml-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

6
kbugbuster/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
if include_kcalresource if include_kcalresource
KRESOURCES_SUBDIR = kresources KRESOURCES_SUBDIR = tderesources
LIBKCAL_INCLUDES= $(KDE_INCLUDES)/libkcal LIBKCAL_INCLUDES= $(KDE_INCLUDES)/libkcal
endif endif
@ -10,9 +10,9 @@ SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR)
bin_PROGRAMS = kbugbuster bin_PROGRAMS = kbugbuster
kbugbuster_SOURCES = main.cpp kbugbuster_SOURCES = main.cpp
kbugbuster_LDADD = -lkutils gui/libkbbmainwindow.la \ kbugbuster_LDADD = -ltdeutils gui/libkbbmainwindow.la \
backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) -ltdefx $(LIB_KUTILS) backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) -ltdefx $(LIB_KUTILS)
kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS) kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS)
xdg_apps_DATA = kbugbuster.desktop xdg_apps_DATA = kbugbuster.desktop

2
kbugbuster/backend/bugdetails.cpp
Unescape View File

@ -131,7 +131,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri
#ifdef DEBUG_EXTRACT #ifdef DEBUG_EXTRACT
kdDebug() << "Line: " << *it << endl; kdDebug() << "Line: " << *it << endl;
#endif #endif
if ( (*it).startsWith( " Content-Type" ) ) // ## leading space comes from khtml if ( (*it).startsWith( " Content-Type" ) ) // ## leading space comes from tdehtml
{ {
#ifdef DEBUG_EXTRACT #ifdef DEBUG_EXTRACT
//kdDebug() << "BugDetails::extractAttachments going back, looking for empty or boundary=" << boundary << endl; //kdDebug() << "BugDetails::extractAttachments going back, looking for empty or boundary=" << boundary << endl;

4
kbugbuster/gui/cwbugdetails.cpp
Unescape View File

@ -24,8 +24,8 @@
#include "bugsystem.h" #include "bugsystem.h"
#include "bugserver.h" #include "bugserver.h"
#include <khtml_part.h> #include <tdehtml_part.h>
#include <khtmlview.h> #include <tdehtmlview.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <krun.h> #include <krun.h>

2
kbugbuster/gui/cwbugdetails.h
Unescape View File

@ -22,7 +22,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
class KHTMLPart; class KHTMLPart;

4
kbugbuster/kresources/CMakeLists.txt → kbugbuster/tderesources/CMakeLists.txt
Unescape View File

@ -29,7 +29,7 @@ link_directories(
install( FILES install( FILES
bugzilla.desktop bugzilla.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
##### kcal_bugzilla (module) #################### ##### kcal_bugzilla (module) ####################
@ -38,6 +38,6 @@ tde_add_kpart( kcal_bugzilla AUTOMOC
SOURCES SOURCES
kcalresource.cpp kcalresourceconfig.cpp kcalresource.cpp kcalresourceconfig.cpp
kcalresource_plugin.cpp resourceprefs.kcfgc kcalresource_plugin.cpp resourceprefs.kcfgc
LINK kbbbackend_pic-static tdecore-shared kio-shared kabc kcal kresources LINK kbbbackend_pic-static tdecore-shared kio-shared kabc kcal tderesources
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

0
kbugbuster/kresources/ConfigureChecks.cmake → kbugbuster/tderesources/ConfigureChecks.cmake
Unescape View File

2
kbugbuster/kresources/Makefile.am → kbugbuster/tderesources/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ kcal_bugzilla_la_SOURCES = kcalresource.cpp kcalresourceconfig.cpp \
kcal_bugzilla_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_bugzilla_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcal_bugzilla_la_LIBADD = ../backend/libkbbbackend.la -lkcal kcal_bugzilla_la_LIBADD = ../backend/libkbbbackend.la -lkcal
servicedir = $(kde_servicesdir)/kresources/kcal servicedir = $(kde_servicesdir)/tderesources/kcal
service_DATA = bugzilla.desktop service_DATA = bugzilla.desktop
METASOURCES = AUTO METASOURCES = AUTO

0
kbugbuster/kresources/bugzilla.desktop → kbugbuster/tderesources/bugzilla.desktop
Unescape View File

4
kbugbuster/kresources/kcalresource.cpp → kbugbuster/tderesources/kcalresource.cpp
Unescape View File

@ -44,7 +44,7 @@
#include <kabc/locknull.h> #include <kabc/locknull.h>
#include <kresources/configwidget.h> #include <tderesources/configwidget.h>
#include "bugsystem.h" #include "bugsystem.h"
#include "bugserver.h" #include "bugserver.h"
@ -119,7 +119,7 @@ void KCalResource::writeConfig( TDEConfig *config )
TQString KCalResource::cacheFile() TQString KCalResource::cacheFile()
{ {
TQString file = locateLocal( "cache", "kcal/kresources/" + identifier() ); TQString file = locateLocal( "cache", "kcal/tderesources/" + identifier() );
kdDebug() << "KCalResource::cacheFile(): " << file << endl; kdDebug() << "KCalResource::cacheFile(): " << file << endl;
return file; return file;
} }

0
kbugbuster/kresources/kcalresource.h → kbugbuster/tderesources/kcalresource.h
Unescape View File

0
kbugbuster/kresources/kcalresource_plugin.cpp → kbugbuster/tderesources/kcalresource_plugin.cpp
Unescape View File

0
kbugbuster/kresources/kcalresourceconfig.cpp → kbugbuster/tderesources/kcalresourceconfig.cpp
Unescape View File

4
kbugbuster/kresources/kcalresourceconfig.h → kbugbuster/tderesources/kcalresourceconfig.h
Unescape View File

@ -21,8 +21,8 @@
#ifndef KCALRESOURCECONFIG_H #ifndef KCALRESOURCECONFIG_H
#define KCALRESOURCECONFIG_H #define KCALRESOURCECONFIG_H
#include <kresources/resource.h> #include <tderesources/resource.h>
#include <kresources/configwidget.h> #include <tderesources/configwidget.h>
class KLineEdit; class KLineEdit;

2
kbugbuster/kresources/resourceprefs.kcfgc → kbugbuster/tderesources/resourceprefs.kcfgc
Unescape View File

@ -1,5 +1,5 @@
# Code generation options for kconfig_compiler # Code generation options for kconfig_compiler
File=kresources_kcal_bugzilla.kcfg File=tderesources_kcal_bugzilla.kcfg
ClassName=ResourcePrefs ClassName=ResourcePrefs
NameSpace=KBB NameSpace=KBB
Singleton=false Singleton=false

2
kbugbuster/kresources/kresources_kcal_bugzilla.kcfg → kbugbuster/tderesources/tderesources_kcal_bugzilla.kcfg
Unescape View File

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_kcal_bugzillarc"/> <kcfgfile name="tderesources_kcal_bugzillarc"/>
<group name="General"> <group name="General">
<entry type="String" name="Server"> <entry type="String" name="Server">

4
kioslave/svn/ksvnd/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
#INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes) #INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
kde_module_LTLIBRARIES = kded_ksvnd.la kde_module_LTLIBRARIES = kded_ksvnd.la
@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kded_ksvnd.la
kded_ksvnd_la_SOURCES = commitdlg.ui ksvnd.cpp ksvnd.skel kded_ksvnd_la_SOURCES = commitdlg.ui ksvnd.cpp ksvnd.skel
kded_ksvnd_la_METASOURCES = AUTO kded_ksvnd_la_METASOURCES = AUTO
kded_ksvnd_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_ksvnd_la_LDFLAGS = $(all_libraries) -module -avoid-version
#kded_ksvnd_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) #kded_ksvnd_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO)
kded_ksvnd_la_LIBADD = $(LIB_KIO) kded_ksvnd_la_LIBADD = $(LIB_KIO)
kded_DATA = ksvnd.desktop kded_DATA = ksvnd.desktop

6
kmtrace/Makefile.am
Unescape View File

@ -23,13 +23,13 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kmtrace demangle kmmatch bin_PROGRAMS = kmtrace demangle kmmatch
kmtrace_SOURCES = kmtrace.cpp kmtrace_SOURCES = kmtrace.cpp
kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
demangle_SOURCES = demangle.cpp demangle_SOURCES = demangle.cpp
demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kmmatch_SOURCES = match.cpp kmmatch_SOURCES = match.cpp
kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
bin_SCRIPTS = kminspector bin_SCRIPTS = kminspector

2
kompare/CMakeLists.txt
Unescape View File

@ -50,6 +50,6 @@ tde_add_executable( kompare AUTOMOC
main.cpp kompare_shell.cpp kompareurldialog.cpp main.cpp kompare_shell.cpp kompareurldialog.cpp
LINK LINK
dialogpages-static kompareinterface-shared kio-shared dialogpages-static kompareinterface-shared kio-shared
kparts-shared ktexteditor-shared tdeparts-shared tdetexteditor-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

4
kompare/Makefile.am
Unescape View File

@ -26,11 +26,11 @@ bin_PROGRAMS = kompare
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp
kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kompare_LDADD = $(LIB_KPARTS) \ kompare_LDADD = $(LIB_KPARTS) \
$(top_builddir)/kompare/interfaces/libkompareinterface.la \ $(top_builddir)/kompare/interfaces/libkompareinterface.la \
$(top_builddir)/kompare/libdialogpages/libdialogpages.la \ $(top_builddir)/kompare/libdialogpages/libdialogpages.la \
-lktexteditor -ltdetexteditor
# this is where the desktop file will go # this is where the desktop file will go
xdg_apps_DATA = kompare.desktop xdg_apps_DATA = kompare.desktop

8
kompare/kompare_shell.cpp
Unescape View File

@ -17,9 +17,9 @@
** **
***************************************************************************/ ***************************************************************************/
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <kdebug.h> #include <kdebug.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <kencodingfiledialog.h> #include <kencodingfiledialog.h>
@ -28,7 +28,7 @@
#include <klibloader.h> #include <klibloader.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <ksqueezedtextlabel.h> #include <ksqueezedtextlabel.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>

2
kompare/kompare_shell.h
Unescape View File

@ -21,7 +21,7 @@
#define KOMPARESHELL_H #define KOMPARESHELL_H
#include <kapplication.h> #include <kapplication.h>
#include <kparts/dockmainwindow.h> #include <tdeparts/dockmainwindow.h>
#include "kompare.h" #include "kompare.h"

2
kompare/komparenavtreepart/CMakeLists.txt
Unescape View File

@ -31,6 +31,6 @@ install( FILES komparenavtreepart.desktop
tde_add_kpart( libkomparenavtreepart AUTOMOC tde_add_kpart( libkomparenavtreepart AUTOMOC
SOURCES komparenavtreepart.cpp SOURCES komparenavtreepart.cpp
LINK diff2-static kparts-shared LINK diff2-static tdeparts-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

4
kompare/komparenavtreepart/komparenavtreepart.h
Unescape View File

@ -25,8 +25,8 @@
#include <tqsplitter.h> #include <tqsplitter.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <kparts/factory.h> #include <tdeparts/factory.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include "kompare.h" #include "kompare.h"
#include "diffmodellist.h" #include "diffmodellist.h"

2
kompare/komparepart/CMakeLists.txt
Unescape View File

@ -41,6 +41,6 @@ tde_add_kpart( libkomparepart AUTOMOC
komparesaveoptionswidget.cpp komparesaveoptionswidget.cpp
LINK LINK
dialogpages-static diff2-static kompareinterface-shared dialogpages-static diff2-static kompareinterface-shared
kparts-shared tdeparts-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

2
kompare/komparepart/kompare_part.cpp
Unescape View File

@ -34,7 +34,7 @@
#include <kstdaction.h> #include <kstdaction.h>
#include <kinstance.h> #include <kinstance.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
//#include <ktempdir.h> //#include <ktempdir.h>
#include <kio/netaccess.h> #include <kio/netaccess.h>

4
kompare/komparepart/kompare_part.h
Unescape View File

@ -22,8 +22,8 @@
#ifndef KOMPAREPART_H #ifndef KOMPAREPART_H
#define KOMPAREPART_H #define KOMPAREPART_H
#include <kparts/factory.h> #include <tdeparts/factory.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include "kompare.h" #include "kompare.h"

2
kompare/libdialogpages/diffpage.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <kurlcombobox.h> #include <kurlcombobox.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h> #include <kregexpeditorinterface.h>
#include "diffsettings.h" #include "diffsettings.h"

2
kompare/tests/subversion/contextm.diff
Unescape View File

@ -93,7 +93,7 @@ Index: README
! turns out that it is not necessary to have a native Vim. ! turns out that it is not necessary to have a native Vim.
! !
! !
! I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature. The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and ktexteditor. ! I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature. The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and tdetexteditor.
! !
! As far as I can tell, the part is race-condition free. If you issue many sendNormalCmd and many evalExpr, they are guaranted to be executed sequentially. This has caused me enough problems when it wasn't the case! ! As far as I can tell, the part is race-condition free. If you issue many sendNormalCmd and many evalExpr, they are guaranted to be executed sequentially. This has caused me enough problems when it wasn't the case!
! !

2
kompare/tests/subversion/normalm.diff
Unescape View File

@ -87,7 +87,7 @@ Index: README
< turns out that it is not necessary to have a native Vim. < turns out that it is not necessary to have a native Vim.
< <
< <
< I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature. The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and ktexteditor. < I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature. The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and tdetexteditor.
< <
< As far as I can tell, the part is race-condition free. If you issue many sendNormalCmd and many evalExpr, they are guaranted to be executed sequentially. This has caused me enough problems when it wasn't the case! < As far as I can tell, the part is race-condition free. If you issue many sendNormalCmd and many evalExpr, they are guaranted to be executed sequentially. This has caused me enough problems when it wasn't the case!
< <

2
kompare/tests/subversion/unifiedm.diff
Unescape View File

@ -90,7 +90,7 @@ Index: README
-turns out that it is not necessary to have a native Vim. -turns out that it is not necessary to have a native Vim.
- -
- -
-I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature. The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and ktexteditor. -I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature. The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and tdetexteditor.
- -
-As far as I can tell, the part is race-condition free. If you issue many sendNormalCmd and many evalExpr, they are guaranted to be executed sequentially. This has caused me enough problems when it wasn't the case! -As far as I can tell, the part is race-condition free. If you issue many sendNormalCmd and many evalExpr, they are guaranted to be executed sequentially. This has caused me enough problems when it wasn't the case!
- -

4
kuiviewer/CMakeLists.txt
Unescape View File

@ -46,7 +46,7 @@ install( FILES
tde_add_kpart( libkuiviewerpart AUTOMOC tde_add_kpart( libkuiviewerpart AUTOMOC
SOURCES kuiviewer_part.cpp SOURCES kuiviewer_part.cpp
LINK ktexteditor-shared ${TQTQUI_LIBRARIES} LINK tdetexteditor-shared ${TQTQUI_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -64,6 +64,6 @@ tde_add_kpart( quithumbnail
tde_add_executable( kuiviewer AUTOMOC tde_add_executable( kuiviewer AUTOMOC
SOURCES main.cpp kuiviewer.cpp SOURCES main.cpp kuiviewer.cpp
LINK ktexteditor-shared LINK tdetexteditor-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

2
kuiviewer/Makefile.am
Unescape View File

@ -25,7 +25,7 @@ bin_PROGRAMS = kuiviewer
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
kuiviewer_SOURCES = main.cpp kuiviewer.cpp kuiviewer_SOURCES = main.cpp kuiviewer.cpp
kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kuiviewer_LDADD = $(LIB_KPARTS) kuiviewer_LDADD = $(LIB_KPARTS)
xdg_apps_DATA =kuiviewer.desktop xdg_apps_DATA =kuiviewer.desktop

2
kuiviewer/kuiviewer.h
Unescape View File

@ -28,7 +28,7 @@
#endif #endif
#include <kapplication.h> #include <kapplication.h>
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
class KToggleAction; class KToggleAction;
class KListView; class KListView;

2
kuiviewer/kuiviewer_part.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <kinstance.h> #include <kinstance.h>
#include <kio/netaccess.h> #include <kio/netaccess.h>
#include <klistview.h> #include <klistview.h>
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kstyle.h> #include <kstyle.h>
#include <tqmetaobject.h> #include <tqmetaobject.h>

2
kuiviewer/kuiviewer_part.h
Unescape View File

@ -23,7 +23,7 @@
#define KUIVIEWERPART_H #define KUIVIEWERPART_H
#include <tqguardedptr.h> #include <tqguardedptr.h>
#include <kparts/part.h> #include <tdeparts/part.h>
class TQWidget; class TQWidget;
class KURL; class KURL;

21
kunittest/Makefile.am
Unescape View File

@ -1,21 +0,0 @@
SUBDIRS = example
INCLUDES = $(all_includes)
METASOURCES = AUTO
lib_LTLIBRARIES = libkunittestgui.la
libkunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel
libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkunittest
libkunittestgui_la_LIBADD = -lkunittest $(LIB_TDECORE)
runnergui.lo : testerwidget.h
bin_PROGRAMS = kunittestguimodrunner
kunittestguimodrunner_SOURCES = guimodrunner.cpp
kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkunittest
kunittestguimodrunner_LDADD = libkunittestgui.la $(LIB_TDECORE) $(LIB_KIO)
noinst_HEADERS = dcopinterface.h
libkunittestinclude_HEADERS = runnergui.h
libkunittestincludedir = $(includedir)/kunittest
bin_SCRIPTS = kunittest kunittestmod kunittest_debughelper

20
kunittest/example/module/Makefile.am
Unescape View File

@ -1,20 +0,0 @@
INCLUDES = -I$(top_srcdir)/include $(all_includes)
METASOURCES = AUTO
noinst_HEADERS = samplemodule.h sampleextra.h sampletests.h
check_LTLIBRARIES = kunittest_samplemodule.la kunittest_samplemodule2.la
kunittest_samplemodule_la_SOURCES = samplemodule.cpp sampletests.cpp sampleextra.cpp
kunittest_samplemodule_la_LIBADD = -lkunittest
kunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
kunittest_samplemodule2_la_SOURCES = samplemodule2.cpp
kunittest_samplemodule2_la_LIBADD = -lkunittest
kunittest_samplemodule2_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local:
kunittestmodrunner
guicheck:
$(srcdir)/../../kunittestmod $(PWD)

10
poxml/Makefile.am
Unescape View File

@ -7,23 +7,23 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
SUBDIRS = antlr SUBDIRS = antlr
split2po_SOURCES = split.cpp parser.cpp split2po_SOURCES = split.cpp parser.cpp
split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
split2po_LDADD = $(LIB_QT) split2po_LDADD = $(LIB_QT)
xml2pot_SOURCES = xml2pot.cpp parser.cpp xml2pot_SOURCES = xml2pot.cpp parser.cpp
xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
xml2pot_LDADD = $(LIB_QT) xml2pot_LDADD = $(LIB_QT)
po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp
po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT) po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT)
swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp
swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
swappo_LDADD = antlr/src/libantlr.la $(LIB_QT) swappo_LDADD = antlr/src/libantlr.la $(LIB_QT)
transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp
transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
transxx_LDADD = antlr/src/libantlr.la $(LIB_QT) transxx_LDADD = antlr/src/libantlr.la $(LIB_QT)
parser: parser:

2
scripts/kde-spellcheck.pl
Unescape View File

@ -954,7 +954,7 @@ klicking clicking
knowlege knowledge knowlege knowledge
Konquerer Konqueror Konquerer Konqueror
konstants constants konstants constants
kscreensave kscreensaver kscreensave tdescreensaver
labelling labeling labelling labeling
Labelling Labeling Labelling Labeling
lauching launching lauching launching

2
scripts/tdesvn-build
Unescape View File

@ -4242,7 +4242,7 @@ eval
# Do some necessary adjusting. Right now this is used for supporting # Do some necessary adjusting. Right now this is used for supporting
# the command-line option shortcut to where you can enter e.g. # the command-line option shortcut to where you can enter e.g.
# tdelibs/khtml, and the script will only try to update that part of # tdelibs/tdehtml, and the script will only try to update that part of
# the module. # the module.
munge_lists(); munge_lists();

2
scripts/tdesvn-buildrc-sample
Unescape View File

@ -71,7 +71,7 @@ global
# the per-module "prefix" option. Note that when doing this you need to # the per-module "prefix" option. Note that when doing this you need to
# set TDEDIRS, PATH and LD_LIBRARY_PATH to point to both directories, # set TDEDIRS, PATH and LD_LIBRARY_PATH to point to both directories,
# and that you should use separate test users or TDEHOME values to separate # and that you should use separate test users or TDEHOME values to separate
# the ksycoca databases. Only set prefix if you know what you're doing. # the tdesycoca databases. Only set prefix if you know what you're doing.
# If you would like install TDE to the system (DO NOT INSTALL *over* a prior # If you would like install TDE to the system (DO NOT INSTALL *over* a prior
# installation!), then you'll probably need to use sudo to install everything. # installation!), then you'll probably need to use sudo to install everything.

2
tdecachegrind/tdecachegrind/Makefile.am
Unescape View File

@ -44,7 +44,7 @@ INCLUDES= $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
tdecachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor tdecachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/tdecachegrind rcdir = $(kde_datadir)/tdecachegrind
rc_DATA = tdecachegrindui.rc rc_DATA = tdecachegrindui.rc

16
kunittest/CMakeLists.txt → tdeunittest/CMakeLists.txt
Unescape View File

@ -24,27 +24,27 @@ link_directories(
install( FILES install( FILES
runnergui.h runnergui.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kunittest ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdeunittest )
install( PROGRAMS install( PROGRAMS
kunittest kunittestmod kunittest_debughelper tdeunittest tdeunittestmod tdeunittest_debughelper
DESTINATION ${BIN_INSTALL_DIR} ) DESTINATION ${BIN_INSTALL_DIR} )
##### kunittestgui (shared) ##################### ##### tdeunittestgui (shared) #####################
tde_add_library( kunittestgui SHARED AUTOMOC tde_add_library( tdeunittestgui SHARED AUTOMOC
SOURCES testerwidget.ui runnergui.cpp dcopinterface.skel SOURCES testerwidget.ui runnergui.cpp dcopinterface.skel
VERSION 0.0.0 VERSION 0.0.0
LINK kunittest-shared LINK tdeunittest-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
##### kunittestguimodrunner (executable) ######## ##### tdeunittestguimodrunner (executable) ########
tde_add_executable( kunittestguimodrunner tde_add_executable( tdeunittestguimodrunner
SOURCES guimodrunner.cpp SOURCES guimodrunner.cpp
LINK kunittestgui-shared LINK tdeunittestgui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

21
tdeunittest/Makefile.am
Unescape View File

@ -0,0 +1,21 @@
SUBDIRS = example
INCLUDES = $(all_includes)
METASOURCES = AUTO
lib_LTLIBRARIES = libtdeunittestgui.la
libtdeunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel
libtdeunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeunittest
libtdeunittestgui_la_LIBADD = -ltdeunittest $(LIB_TDECORE)
runnergui.lo : testerwidget.h
bin_PROGRAMS = tdeunittestguimodrunner
tdeunittestguimodrunner_SOURCES = guimodrunner.cpp
tdeunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeunittest
tdeunittestguimodrunner_LDADD = libtdeunittestgui.la $(LIB_TDECORE) $(LIB_KIO)
noinst_HEADERS = dcopinterface.h
libtdeunittestinclude_HEADERS = runnergui.h
libtdeunittestincludedir = $(includedir)/tdeunittest
bin_SCRIPTS = tdeunittest tdeunittestmod tdeunittest_debughelper

0
kunittest/dcopinterface.h → tdeunittest/dcopinterface.h
Unescape View File

0
kunittest/example/Makefile.am → tdeunittest/example/Makefile.am
Unescape View File

20
tdeunittest/example/module/Makefile.am
Unescape View File

@ -0,0 +1,20 @@
INCLUDES = -I$(top_srcdir)/include $(all_includes)
METASOURCES = AUTO
noinst_HEADERS = samplemodule.h sampleextra.h sampletests.h
check_LTLIBRARIES = tdeunittest_samplemodule.la tdeunittest_samplemodule2.la
tdeunittest_samplemodule_la_SOURCES = samplemodule.cpp sampletests.cpp sampleextra.cpp
tdeunittest_samplemodule_la_LIBADD = -ltdeunittest
tdeunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_samplemodule2_la_SOURCES = samplemodule2.cpp
tdeunittest_samplemodule2_la_LIBADD = -ltdeunittest
tdeunittest_samplemodule2_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local:
tdeunittestmodrunner
guicheck:
$(srcdir)/../../tdeunittestmod $(PWD)

2
kunittest/example/module/sampleextra.cpp → tdeunittest/example/module/sampleextra.cpp
Unescape View File

@ -24,7 +24,7 @@
*/ */
#include <kdebug.h> #include <kdebug.h>
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
#include "sampleextra.h" #include "sampleextra.h"

2
kunittest/example/module/sampleextra.h → tdeunittest/example/module/sampleextra.h
Unescape View File

@ -26,7 +26,7 @@
#ifndef _SAMPLEEXTRA_H_ #ifndef _SAMPLEEXTRA_H_
#define _SAMPLEEXTRA_H_ #define _SAMPLEEXTRA_H_
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
class SomeExtraTester : public KUnitTest::Tester class SomeExtraTester : public KUnitTest::Tester
{ {

6
kunittest/example/module/samplemodule.cpp → tdeunittest/example/module/samplemodule.cpp
Unescape View File

@ -23,15 +23,15 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <kunittest/runner.h> #include <tdeunittest/runner.h>
#include <kunittest/module.h> #include <tdeunittest/module.h>
#include "sampletests.h" #include "sampletests.h"
#include "sampleextra.h" #include "sampleextra.h"
using namespace KUnitTest; using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_samplemodule, "Suite1" ) KUNITTEST_MODULE( tdeunittest_samplemodule, "Suite1" )
KUNITTEST_MODULE_REGISTER_TESTER( SlotSampleTester ) KUNITTEST_MODULE_REGISTER_TESTER( SlotSampleTester )
KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester )
KUNITTEST_MODULE_REGISTER_TESTER( SomeExtraTester ) KUNITTEST_MODULE_REGISTER_TESTER( SomeExtraTester )

2
kunittest/example/module/samplemodule.h → tdeunittest/example/module/samplemodule.h
Unescape View File

@ -26,7 +26,7 @@
#ifndef SAMPLETESTMODULE_H #ifndef SAMPLETESTMODULE_H
#define SAMPLETESTMODULE_H #define SAMPLETESTMODULE_H
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
class SimpleSampleTester : public KUnitTest::Tester class SimpleSampleTester : public KUnitTest::Tester
{ {

6
kunittest/example/module/samplemodule2.cpp → tdeunittest/example/module/samplemodule2.cpp
Unescape View File

@ -26,14 +26,14 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <kdebug.h> #include <kdebug.h>
#include <kunittest/runner.h> #include <tdeunittest/runner.h>
#include <kunittest/module.h> #include <tdeunittest/module.h>
#include "samplemodule.h" #include "samplemodule.h"
using namespace KUnitTest; using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_samplemodule2, "Suite2::Sub" ) KUNITTEST_MODULE( tdeunittest_samplemodule2, "Suite2::Sub" )
KUNITTEST_MODULE_REGISTER_TESTER( SimpleSampleTester ) KUNITTEST_MODULE_REGISTER_TESTER( SimpleSampleTester )
KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester )

2
kunittest/example/module/samplemodule2.h → tdeunittest/example/module/samplemodule2.h
Unescape View File

@ -26,7 +26,7 @@
#ifndef SAMPLETESTMODULE_H #ifndef SAMPLETESTMODULE_H
#define SAMPLETESTMODULE_H #define SAMPLETESTMODULE_H
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
class SimpleSampleTester : public KUnitTest::Tester class SimpleSampleTester : public KUnitTest::Tester
{ {

4
kunittest/example/module/sampletests.cpp → tdeunittest/example/module/sampletests.cpp
Unescape View File

@ -26,8 +26,8 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <kdebug.h> #include <kdebug.h>
#include <kunittest/runner.h> #include <tdeunittest/runner.h>
#include <kunittest/module.h> #include <tdeunittest/module.h>
#include "sampletests.h" #include "sampletests.h"
#include "sampleextra.h" #include "sampleextra.h"

2
kunittest/example/module/sampletests.h → tdeunittest/example/module/sampletests.h
Unescape View File

@ -26,7 +26,7 @@
#ifndef SAMPLETESTMODULE_H #ifndef SAMPLETESTMODULE_H
#define SAMPLETESTMODULE_H #define SAMPLETESTMODULE_H
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
class SlotSampleTester : public KUnitTest::SlotTester class SlotSampleTester : public KUnitTest::SlotTester
{ {

12
kunittest/example/simple/Makefile.am → tdeunittest/example/simple/Makefile.am
Unescape View File

@ -4,19 +4,19 @@ METASOURCES = AUTO
check_PROGRAMS = sampletests sampletestsgui check_PROGRAMS = sampletests sampletestsgui
sampletests_SOURCES = main.cpp sampletest.cpp sampletests_SOURCES = main.cpp sampletest.cpp
sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
sampletests_LDADD = -lkunittest sampletests_LDADD = -ltdeunittest
sampletestsgui_SOURCES = maingui.cpp sampletest.cpp sampletestsgui_SOURCES = maingui.cpp sampletest.cpp
sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# Normally you would write -lkunittestgui here, but since the examples # Normally you would write -ltdeunittestgui here, but since the examples
# are bundled with the library source code itself we don't want to # are bundled with the library source code itself we don't want to
# have you install the libraries before you can compile the examples. # have you install the libraries before you can compile the examples.
sampletestsgui_LDADD = ../../libkunittestgui.la sampletestsgui_LDADD = ../../libtdeunittestgui.la
noinst_HEADERS = sampletest.h noinst_HEADERS = sampletest.h
TESTS = sampletests TESTS = sampletests
guicheck: sampletestsgui guicheck: sampletestsgui
kunittest ./sampletestsgui SampleTests tdeunittest ./sampletestsgui SampleTests

2
kunittest/example/simple/main.cpp → tdeunittest/example/simple/main.cpp
Unescape View File

@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "kunittest/runner.h" #include "tdeunittest/runner.h"
int main( int /*argc*/, char** /*argv*/ ) int main( int /*argc*/, char** /*argv*/ )
{ {

2
kunittest/example/simple/maingui.cpp → tdeunittest/example/simple/maingui.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <klocale.h> #include <klocale.h>
#include "kunittest/runnergui.h" #include "tdeunittest/runnergui.h"
static const char description[] = static const char description[] =
I18N_NOOP("A simple sample."); I18N_NOOP("A simple sample.");

2
kunittest/example/simple/sampletest.cpp → tdeunittest/example/simple/sampletest.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <kdebug.h> #include <kdebug.h>
#include <kunittest/runner.h> #include <tdeunittest/runner.h>
#include "sampletest.h" #include "sampletest.h"

2
kunittest/example/simple/sampletest.h → tdeunittest/example/simple/sampletest.h
Unescape View File

@ -26,7 +26,7 @@
#ifndef SAMPLETEST_H #ifndef SAMPLETEST_H
#define SAMPLETEST_H #define SAMPLETEST_H
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
class SimpleSampleTester : public KUnitTest::Tester class SimpleSampleTester : public KUnitTest::Tester
{ {

2
kunittest/guimodrunner.cpp → tdeunittest/guimodrunner.cpp
Unescape View File

@ -40,7 +40,7 @@ static const char version[] = "0.1";
static KCmdLineOptions options[] = static KCmdLineOptions options[] =
{ {
{"query [regexp]", I18N_NOOP("Only run modules which filename match the regexp."), "^kunittest_.*\\.la$"}, {"query [regexp]", I18N_NOOP("Only run modules which filename match the regexp."), "^tdeunittest_.*\\.la$"},
{"folder [folder]", I18N_NOOP("Only run tests modules which are found in the folder. Use the query option to select modules."), "."}, {"folder [folder]", I18N_NOOP("Only run tests modules which are found in the folder. Use the query option to select modules."), "."},
{ "enable-dbgcap", I18N_NOOP("Enables debug capturing. You typically use this option when you use the GUI."), 0}, { "enable-dbgcap", I18N_NOOP("Enables debug capturing. You typically use this option when you use the GUI."), 0},
KCmdLineLastOption KCmdLineLastOption

2
kunittest/runnergui.cpp → tdeunittest/runnergui.cpp
Unescape View File

@ -37,7 +37,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
#include "dcopinterface.h" #include "dcopinterface.h"
#include "runnergui.h" #include "runnergui.h"

4
kunittest/runnergui.h → tdeunittest/runnergui.h
Unescape View File

@ -29,8 +29,8 @@
#include <tqlistview.h> #include <tqlistview.h>
#include <tqhbox.h> #include <tqhbox.h>
#include <kunittest/runner.h> #include <tdeunittest/runner.h>
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
#include <kdemacros.h> #include <kdemacros.h>

4
kunittest/kunittest → tdeunittest/tdeunittest
Unescape View File

@ -9,10 +9,10 @@ then
exit 1; exit 1;
fi fi
DEBUGHELPER=`which kunittest_debughelper` DEBUGHELPER=`which tdeunittest_debughelper`
if [ -z $DEBUGHELPER ] if [ -z $DEBUGHELPER ]
then then
kdialog --error "Sorry, couldn't find the kunittest_debughelper script." kdialog --error "Sorry, couldn't find the tdeunittest_debughelper script."
exit 3 exit 3
fi fi

0
kunittest/kunittest_debughelper → tdeunittest/tdeunittest_debughelper
Unescape View File

6
kunittest/kunittestmod → tdeunittest/tdeunittestmod
Unescape View File

@ -19,17 +19,17 @@ do
shift shift
done done
APP=`which kunittestguimodrunner` APP=`which tdeunittestguimodrunner`
if [ ! -x $APP ] if [ ! -x $APP ]
then then
kdialog --error "Sorry, $APP is not a valid executable file." kdialog --error "Sorry, $APP is not a valid executable file."
exit 1; exit 1;
fi fi
DEBUGHELPER=`which kunittest_debughelper` DEBUGHELPER=`which tdeunittest_debughelper`
if [ -z $DEBUGHELPER ] if [ -z $DEBUGHELPER ]
then then
kdialog --error "Sorry, couldn't find the kunittest_debughelper script." kdialog --error "Sorry, couldn't find the tdeunittest_debughelper script."
exit 3 exit 3
fi fi

0
kunittest/testerwidget.ui → tdeunittest/testerwidget.ui
Unescape View File

0
kunittest/testerwidget.ui.h → tdeunittest/testerwidget.ui.h
Unescape View File

2
umbrello/umbrello/docgenerators/Makefile.am
Unescape View File

@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbr
METASOURCES = AUTO METASOURCES = AUTO
bin_PROGRAMS = umbodoc bin_PROGRAMS = umbodoc
AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
umbodoc_COMPILE_FIRST = version.h umbodoc_COMPILE_FIRST = version.h
umbodoc_SOURCES = main.cpp umbodoc_SOURCES = main.cpp
umbodoc_LDADD = $(LIB_TDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS) umbodoc_LDADD = $(LIB_TDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)

Write Preview
Loading…
Cancel
Save