diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:59 -0600 |
| commit | 1515a4f2eb9cf023ed7f9c2e10106b5e93164a08 (patch) | |
| tree | d5617734090b254659ff331ce7d1e574c4807caf | |
| parent | f8069e2ea048f2657cc417d83820576ec55c181b (diff) | |
| download | tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.tar.gz tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
102 files changed, 217 insertions, 217 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c6f7d3de..23f3d9d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ option( BUILD_KPROFILEMETHOD "Build kprofilemethod" ${BUILD_ALL} ) option( BUILD_KSPY "Build kspy" ${BUILD_ALL} ) option( BUILD_KSTARTPERF "Build kstartperf" ${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_SCHECK "Build scheck" ${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_KSTARTPERF kstartperf ) 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_SCHECK scheck ) tde_conditional_add_subdirectory( BUILD_SCRIPTS scripts ) diff --git a/cervisia/CMakeLists.txt b/cervisia/CMakeLists.txt index b4f6f7c3..2a0b4523 100644 --- a/cervisia/CMakeLists.txt +++ b/cervisia/CMakeLists.txt @@ -102,7 +102,7 @@ tde_add_kpart( libcervisiapart AUTOMOC updateview_visitors.cpp entry.cpp entry_status.cpp stringmatcher.cpp cvsinitdlg.cpp ignorelistbase.cpp dirignorelist.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} ) @@ -112,7 +112,7 @@ tde_add_kpart( libcervisiapart AUTOMOC tde_add_tdeinit_executable( cervisia AUTOMOC SOURCES main.cpp cervisiashell.cpp - LINK cervisia-static cvsservice-shared kutils-shared + LINK cervisia-static cvsservice-shared tdeutils-shared ) diff --git a/cervisia/Makefile.am b/cervisia/Makefile.am index 4b11e4ef..8d2b87a4 100644 --- a/cervisia/Makefile.am +++ b/cervisia/Makefile.am @@ -61,7 +61,7 @@ messages: rc.cpp $(XGETTEXT) -C *.cpp *.h -o $(podir)/cervisia.pot 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 sed -e 's%_KDEHTMLDIR_%'${kde_htmldir}'%g;' \ diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h index 6d1d097b..84f70585 100644 --- a/cervisia/cervisiapart.h +++ b/cervisia/cervisiapart.h @@ -22,10 +22,10 @@ #ifndef CERVISIAPART_H #define CERVISIAPART_H -#include <kparts/part.h> -#include <kparts/browserextension.h> -#include <kparts/genericfactory.h> -#include <kparts/statusbarextension.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/genericfactory.h> +#include <tdeparts/statusbarextension.h> #include "addremovedlg.h" #include "commitdlg.h" diff --git a/cervisia/cervisiashell.h b/cervisia/cervisiashell.h index 2a676d76..a8591e24 100644 --- a/cervisia/cervisiashell.h +++ b/cervisia/cervisiashell.h @@ -22,7 +22,7 @@ #ifndef CERVISIASHELL_H #define CERVISIASHELL_H -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> class KRecentFilesAction; diff --git a/doc/kbabel/preferences.docbook b/doc/kbabel/preferences.docbook index 7e8291bd..eb0ac5e9 100644 --- a/doc/kbabel/preferences.docbook +++ b/doc/kbabel/preferences.docbook @@ -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 to the spellchecker, and is used as the encoding for your words dictionary. - See the <ulink url="help:/kspell">kspell</ulink> documentation for + See the <ulink url="help:/tdespell">tdespell</ulink> documentation for more details. </para> <note><para> diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog index e1cde76a..0e9e42f8 100644 --- a/kapptemplate/ChangeLog +++ b/kapptemplate/ChangeLog @@ -116,7 +116,7 @@ May-30-2000 - Kurt Granroth (v0.6.2) Mar-14-2000 - Kurt Granroth (v0.6.1) 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) o Converted to use the new XML UI framework (big change!) diff --git a/kapptemplate/kapp/appview.h b/kapptemplate/kapp/appview.h index d7866b36..19799996 100644 --- a/kapptemplate/kapp/appview.h +++ b/kapptemplate/kapp/appview.h @@ -4,7 +4,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}view.h #define ${APP_NAME_UC}VIEW_H #include <tqwidget.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <${APP_NAME_LC}iface.h> class TQPainter; diff --git a/kapptemplate/kpartapp/app.h b/kapptemplate/kpartapp/app.h index deb38136..b0b571b6 100644 --- a/kapptemplate/kpartapp/app.h +++ b/kapptemplate/kpartapp/app.h @@ -8,7 +8,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}.h #endif #include <kapplication.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> /** * This is the application "Shell". It has a menubar, toolbar, and diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp index a95c0711..07843be0 100644 --- a/kapptemplate/kpartapp/app_part.cpp +++ b/kapptemplate/kpartapp/app_part.cpp @@ -8,7 +8,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp #include <kaction.h> #include <kstdaction.h> #include <kfiledialog.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/kapptemplate/kpartapp/app_part.h b/kapptemplate/kpartapp/app_part.h index 1150a21d..2601e8fd 100644 --- a/kapptemplate/kpartapp/app_part.h +++ b/kapptemplate/kpartapp/app_part.h @@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.h #ifndef ${APP_NAME_UC}PART_H #define ${APP_NAME_UC}PART_H -#include <kparts/part.h> +#include <tdeparts/part.h> class TQWidget; class TQPainter; diff --git a/kapptemplate/kpartplugin/plugin-Makefile.am b/kapptemplate/kpartplugin/plugin-Makefile.am index cdb7d510..21b5ccdd 100644 --- a/kapptemplate/kpartplugin/plugin-Makefile.am +++ b/kapptemplate/kpartplugin/plugin-Makefile.am @@ -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 # is KHTMLPart) -pluginsdir = \$(kde_datadir)/khtml/kpartplugins +pluginsdir = \$(kde_datadir)/tdehtml/kpartplugins plugins_DATA = plugin_${APP_NAME_LC}.rc diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp index 0ec7a273..98a44cad 100644 --- a/kapptemplate/kpartplugin/plugin_app.cpp +++ b/kapptemplate/kpartplugin/plugin_app.cpp @@ -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 #include "plugin_${APP_NAME_LC}.h" -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kaction.h> #include <kinstance.h> #include <kmessagebox.h> diff --git a/kapptemplate/kpartplugin/plugin_app.h b/kapptemplate/kpartplugin/plugin_app.h index a480a187..5f0e655c 100644 --- a/kapptemplate/kpartplugin/plugin_app.h +++ b/kapptemplate/kpartplugin/plugin_app.h @@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.h #ifndef 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 { diff --git a/kbabel/README b/kbabel/README index adeaac88..b81853af 100644 --- a/kbabel/README +++ b/kbabel/README @@ -49,7 +49,7 @@ Credits: and useful feature requests - Thomas Diehl for many useful hints to the GUI design and the 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 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 diff --git a/kbabel/catalogmanager/Makefile.am b/kbabel/catalogmanager/Makefile.am index f33f29f9..5f88bf70 100644 --- a/kbabel/catalogmanager/Makefile.am +++ b/kbabel/catalogmanager/Makefile.am @@ -27,14 +27,14 @@ libcatalogmanager_la_SOURCES = catalogmanageriface.skel \ libcatalogmanager_la_LIBADD = ../commonui/libkbabelcommonui.la \ ../kbabeldict/libkbabeldict.la ./libcvs/libcatalogmanagercvs.la \ ./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 # the libraries to link against. 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 noinst_HEADERS = catalogmanageriface.h catalogmanager.h \ diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp index 458611ab..21e5eadc 100644 --- a/kbabel/catalogmanager/markpatterndialog.cpp +++ b/kbabel/catalogmanager/markpatterndialog.cpp @@ -41,7 +41,7 @@ #include <kconfig.h> #include <kglobal.h> #include <klocale.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> #include "markpatterndialog.h" diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp index ab9d81cc..f876627f 100644 --- a/kbabel/common/kbproject.cpp +++ b/kbabel/common/kbproject.cpp @@ -42,7 +42,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kmimetype.h> -#include <kspell.h> +#include <tdespell.h> namespace KBabel { diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp index 774d1ede..08204054 100644 --- a/kbabel/common/projectsettings.cpp +++ b/kbabel/common/projectsettings.cpp @@ -40,7 +40,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <kspell.h> +#include <tdespell.h> TQString KBabel::Defaults::Spellcheck::ignoreURL() { diff --git a/kbabel/commonui/Makefile.am b/kbabel/commonui/Makefile.am index e0ca94ce..65fd166b 100644 --- a/kbabel/commonui/Makefile.am +++ b/kbabel/commonui/Makefile.am @@ -19,7 +19,7 @@ libkbabelcommonui_la_SOURCES = klisteditor.ui context.cpp kactionselector.cpp \ cmdedit.cpp \ 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) diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index 6f4f16a7..cf79f4b1 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -57,10 +57,10 @@ #include <klibloader.h> #include <ktrader.h> -#include <ktexteditor/document.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/viewcursorinterface.h> SourceContext::SourceContext(TQWidget *parent, KBabel::Project::Ptr project): TQWidget(parent) , m_parent( parent ) diff --git a/kbabel/commonui/context.h b/kbabel/commonui/context.h index cb641c67..512bd741 100644 --- a/kbabel/commonui/context.h +++ b/kbabel/commonui/context.h @@ -36,8 +36,8 @@ #include <tqvaluelist.h> #include <tqwidget.h> -#include <ktexteditor/document.h> -#include <ktexteditor/view.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/view.h> #include <kbproject.h> diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index 02a1b2c3..222fbea1 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -47,7 +47,7 @@ #include <kconfig.h> #include <kglobal.h> #include <klocale.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> using namespace KBabel; diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index d9f7a051..d4785445 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -52,7 +52,7 @@ #include <kurlcompletion.h> #include <kfontdialog.h> #include <kcolorbutton.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> #include <ksconfig.h> #include <kurldrag.h> diff --git a/kbabel/kbabel/CMakeLists.txt b/kbabel/kbabel/CMakeLists.txt index 6b263b55..34bb4bc5 100644 --- a/kbabel/kbabel/CMakeLists.txt +++ b/kbabel/kbabel/CMakeLists.txt @@ -44,7 +44,7 @@ tde_add_executable( kbabel main.cpp LINK kbabel-static kbabelcommonui-static kbabeldict-static - kbabelcommon-shared kbabeldictplugin-shared ktexteditor-shared + kbabelcommon-shared kbabeldictplugin-shared tdetexteditor-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kbabel/kbabel/Makefile.am b/kbabel/kbabel/Makefile.am index 3f5fffee..fd67a78d 100644 --- a/kbabel/kbabel/Makefile.am +++ b/kbabel/kbabel/Makefile.am @@ -38,14 +38,14 @@ libkbabel_la_SOURCES = kbbookmarkhandler.cpp \ kde_kcfg_DATA=kbabel.kcfg 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 # the libraries to link against. 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 noinst_HEADERS = kbabel.h kbabelview.h \ diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 26f33911..4935f9dd 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -79,7 +79,7 @@ #include <twin.h> #include <kaction.h> #include <kstdaction.h> -#include <kspelldlg.h> +#include <tdespelldlg.h> #include <ksqueezedtextlabel.h> #include <kurldrag.h> diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h index b1b63122..3f8dd42b 100644 --- a/kbabel/kbabel/kbabel.h +++ b/kbabel/kbabel/kbabel.h @@ -44,7 +44,7 @@ #include <kdockwidget.h> #include <tqstringlist.h> #include <tqptrlist.h> -#include <kmdimainfrm.h> +#include <tdemdimainfrm.h> #include "kbabelview.h" #include "kbproject.h" diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index 1b8795e2..830d17ce 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -73,7 +73,7 @@ #include <kio/netaccess.h> #include <knotifyclient.h> #include <ktempfile.h> -#include <kspell.h> +#include <tdespell.h> #include <twin.h> #include <kstdaccel.h> #include <kurldrag.h> @@ -172,7 +172,7 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project spell.posDict.setAutoDelete(true); spell.active=false; - spell2.kspell = 0; + spell2.tdespell = 0; spell2.config = 0; setAcceptDrops(true); @@ -293,9 +293,9 @@ KBabelView::~KBabelView() delete _argExtractor; delete _tagExtractor; - if( spell2.kspell ) + if( spell2.tdespell ) { - spell2.kspell = 0; + spell2.tdespell = 0; delete spell2.config; spell2.config = 0; } @@ -389,7 +389,7 @@ of the currently displayed entry.</p></qt>")); if( 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); KCursor::setAutoHideCursor(msgstrEdit,true); @@ -751,16 +751,16 @@ void KBabelView::readProject(Project::Ptr project) { // if there is a spellchecker already, free it - if( spell2.kspell ) + if( spell2.tdespell ) { // ensure the spellchecker is not used anymore msgstrEdit->setSpellChecker(0L); // free it - spell2.kspell->cleanUp(); + spell2.tdespell->cleanUp(); - delete spell2.kspell; - spell2.kspell = 0; + delete spell2.tdespell; + spell2.tdespell = 0; } spell2.config = new KSpellConfig(0L, "tempSpellConfig"); @@ -770,18 +770,18 @@ void KBabelView::readProject(Project::Ptr project) spell2.config->setEncoding(_spellcheckSettings.spellEncoding); 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); - 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; else { kdDebug() << "On the fly spellchecker: " - << spell2.kspell << endl; - msgstrEdit->setSpellChecker(spell2.kspell); + << spell2.tdespell << endl; + 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 } else @@ -3942,31 +3942,31 @@ void KBabelView::spellcheck() spell.active=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); - if( spell.kspell->status() == KSpell::Error ) + if( spell.tdespell->status() == KSpell::Error ) { KMessageBox::error( this, i18n("KBabel cannot start spell checker. " "Please check your TDE installation.") ); 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 , 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))); - connect(spell.kspell,TQT_SIGNAL(ignoreall(const TQString &)) + connect(spell.tdespell,TQT_SIGNAL(ignoreall(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))); - spell.kspell->setAutoDelete(true); // let KSpell handle delete + spell.tdespell->setAutoDelete(true); // let KSpell handle delete } else { @@ -4034,14 +4034,14 @@ void KBabelView::spellStart(KSpell *) kapp->processEvents(100); } - spell.kspell->ignore(*it); + spell.tdespell->ignore(*it); } emit signalClearProgressBar(); } } - spell.kspell->checkList(&spell.wordList); + spell.tdespell->checkList(&spell.wordList); } @@ -4364,8 +4364,8 @@ void KBabelView::spellResult(bool flag) undo(); } - int s=spell.kspell->dlgResult(); - spell.kspell->cleanUp(); + int s=spell.tdespell->dlgResult(); + spell.tdespell->cleanUp(); emit signalSpellcheckDone(s); TQTimer::singleShot(0,this,TQT_SLOT(cleanUpSpellStruct())); @@ -4377,9 +4377,9 @@ void KBabelView::spellCleanDone() kdDebug(KBABEL) << "spellCleanDone" << endl; // 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) { @@ -4401,8 +4401,8 @@ void KBabelView::spellCleanDone() void KBabelView::cleanUpSpellStruct() { kdDebug(KBABEL) << "Cleaning structure" << endl; - // spell.kspell is set to be autodeleted - spell.kspell = 0; + // spell.tdespell is set to be autodeleted + spell.tdespell = 0; delete spell.config; spell.config=0; spell.wordList.clear(); diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h index 5e9c280a..6af2da00 100644 --- a/kbabel/kbabel/kbabelview.h +++ b/kbabel/kbabel/kbabelview.h @@ -623,7 +623,7 @@ private: struct { - KSpell *kspell; + KSpell *tdespell; KSpellConfig* config; TQStringList wordList; bool active; @@ -648,7 +648,7 @@ private: } spell; struct { - KSpell *kspell; + KSpell *tdespell; KSpellConfig* config; } spell2; // on-the-fly spellchecking diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index deaaf704..0240153d 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -44,7 +44,7 @@ #include <kglobal.h> #include <kglobalsettings.h> #include <kbabelsettings.h> -#include <kspell.h> +#include <tdespell.h> #include "kbhighlighting.h" #include "resources.h" @@ -255,7 +255,7 @@ bool KBabelHighlighter::isMisspelled(const TQString& wordRaw) kdDebug(KBABEL) << "isMisspelled: checking: " << word << endl; // 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... // "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; 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(); } diff --git a/kbabel/kbabeldict/Makefile.am b/kbabel/kbabeldict/Makefile.am index 0503b819..afcf95b9 100644 --- a/kbabel/kbabeldict/Makefile.am +++ b/kbabel/kbabeldict/Makefile.am @@ -19,20 +19,20 @@ INCLUDES = -I$(srcdir)/../common -I$(top_builddir)/kbabel/common $(all_i lib_LTLIBRARIES = libkbabeldictplugin.la libkbabeldictplugin_la_SOURCES = searchengine.cpp 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 \ kbabeldictiface.skel dictionarymenu.cpp dictchooser.cpp \ aboutmoduledlg.cpp 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 # the libraries to link against. -kbabeldict_LDADD = libkbabeldict.la $(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) -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) -ltdetexteditor # these are the headers for your project noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h diff --git a/kbugbuster/CMakeLists.txt b/kbugbuster/CMakeLists.txt index 67e702b1..6cac4696 100644 --- a/kbugbuster/CMakeLists.txt +++ b/kbugbuster/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory( backend ) add_subdirectory( gui ) add_subdirectory( pics ) -tde_conditional_add_subdirectory( WITH_KCAL kresources ) +tde_conditional_add_subdirectory( WITH_KCAL tderesources ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} @@ -39,6 +39,6 @@ tde_add_executable( kbugbuster SOURCES main.cpp LINK kbbmainwindow-static kbbbackend_nopic-static - kutils-shared kio-shared khtml-shared + tdeutils-shared kio-shared tdehtml-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am index 8aa545ed..727c0b69 100644 --- a/kbugbuster/Makefile.am +++ b/kbugbuster/Makefile.am @@ -1,5 +1,5 @@ if include_kcalresource -KRESOURCES_SUBDIR = kresources +KRESOURCES_SUBDIR = tderesources LIBKCAL_INCLUDES= $(KDE_INCLUDES)/libkcal endif @@ -10,9 +10,9 @@ SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR) bin_PROGRAMS = kbugbuster 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) -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 diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp index 6b0ded58..0cc7fb7d 100644 --- a/kbugbuster/backend/bugdetails.cpp +++ b/kbugbuster/backend/bugdetails.cpp @@ -131,7 +131,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri #ifdef DEBUG_EXTRACT kdDebug() << "Line: " << *it << endl; #endif - if ( (*it).startsWith( " Content-Type" ) ) // ## leading space comes from khtml + if ( (*it).startsWith( " Content-Type" ) ) // ## leading space comes from tdehtml { #ifdef DEBUG_EXTRACT //kdDebug() << "BugDetails::extractAttachments going back, looking for empty or boundary=" << boundary << endl; diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp index 2eccbbce..0ab78ff2 100644 --- a/kbugbuster/gui/cwbugdetails.cpp +++ b/kbugbuster/gui/cwbugdetails.cpp @@ -24,8 +24,8 @@ #include "bugsystem.h" #include "bugserver.h" -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kdebug.h> #include <kglobal.h> #include <krun.h> diff --git a/kbugbuster/gui/cwbugdetails.h b/kbugbuster/gui/cwbugdetails.h index 88712210..5067b953 100644 --- a/kbugbuster/gui/cwbugdetails.h +++ b/kbugbuster/gui/cwbugdetails.h @@ -22,7 +22,7 @@ #include <tqwidget.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> class KHTMLPart; diff --git a/kbugbuster/kresources/CMakeLists.txt b/kbugbuster/tderesources/CMakeLists.txt index b100a022..ec5956a3 100644 --- a/kbugbuster/kresources/CMakeLists.txt +++ b/kbugbuster/tderesources/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( install( FILES bugzilla.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) ##### kcal_bugzilla (module) #################### @@ -38,6 +38,6 @@ tde_add_kpart( kcal_bugzilla AUTOMOC SOURCES kcalresource.cpp kcalresourceconfig.cpp 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} ) diff --git a/kbugbuster/kresources/ConfigureChecks.cmake b/kbugbuster/tderesources/ConfigureChecks.cmake index b12337a1..b12337a1 100644 --- a/kbugbuster/kresources/ConfigureChecks.cmake +++ b/kbugbuster/tderesources/ConfigureChecks.cmake diff --git a/kbugbuster/kresources/Makefile.am b/kbugbuster/tderesources/Makefile.am index b411e3c8..ebd63550 100644 --- a/kbugbuster/kresources/Makefile.am +++ b/kbugbuster/tderesources/Makefile.am @@ -11,7 +11,7 @@ kcal_bugzilla_la_SOURCES = kcalresource.cpp kcalresourceconfig.cpp \ kcal_bugzilla_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_bugzilla_la_LIBADD = ../backend/libkbbbackend.la -lkcal -servicedir = $(kde_servicesdir)/kresources/kcal +servicedir = $(kde_servicesdir)/tderesources/kcal service_DATA = bugzilla.desktop METASOURCES = AUTO diff --git a/kbugbuster/kresources/bugzilla.desktop b/kbugbuster/tderesources/bugzilla.desktop index 767b06cd..767b06cd 100644 --- a/kbugbuster/kresources/bugzilla.desktop +++ b/kbugbuster/tderesources/bugzilla.desktop diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/tderesources/kcalresource.cpp index bdad0381..62051bc5 100644 --- a/kbugbuster/kresources/kcalresource.cpp +++ b/kbugbuster/tderesources/kcalresource.cpp @@ -44,7 +44,7 @@ #include <kabc/locknull.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include "bugsystem.h" #include "bugserver.h" @@ -119,7 +119,7 @@ void KCalResource::writeConfig( TDEConfig *config ) TQString KCalResource::cacheFile() { - TQString file = locateLocal( "cache", "kcal/kresources/" + identifier() ); + TQString file = locateLocal( "cache", "kcal/tderesources/" + identifier() ); kdDebug() << "KCalResource::cacheFile(): " << file << endl; return file; } diff --git a/kbugbuster/kresources/kcalresource.h b/kbugbuster/tderesources/kcalresource.h index cfa4e2a6..cfa4e2a6 100644 --- a/kbugbuster/kresources/kcalresource.h +++ b/kbugbuster/tderesources/kcalresource.h diff --git a/kbugbuster/kresources/kcalresource_plugin.cpp b/kbugbuster/tderesources/kcalresource_plugin.cpp index 7cf81289..7cf81289 100644 --- a/kbugbuster/kresources/kcalresource_plugin.cpp +++ b/kbugbuster/tderesources/kcalresource_plugin.cpp diff --git a/kbugbuster/kresources/kcalresourceconfig.cpp b/kbugbuster/tderesources/kcalresourceconfig.cpp index 58466642..58466642 100644 --- a/kbugbuster/kresources/kcalresourceconfig.cpp +++ b/kbugbuster/tderesources/kcalresourceconfig.cpp diff --git a/kbugbuster/kresources/kcalresourceconfig.h b/kbugbuster/tderesources/kcalresourceconfig.h index d28deb1f..f0eae40e 100644 --- a/kbugbuster/kresources/kcalresourceconfig.h +++ b/kbugbuster/tderesources/kcalresourceconfig.h @@ -21,8 +21,8 @@ #ifndef KCALRESOURCECONFIG_H #define KCALRESOURCECONFIG_H -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> class KLineEdit; diff --git a/kbugbuster/kresources/resourceprefs.kcfgc b/kbugbuster/tderesources/resourceprefs.kcfgc index 0f41bdb1..88125829 100644 --- a/kbugbuster/kresources/resourceprefs.kcfgc +++ b/kbugbuster/tderesources/resourceprefs.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_kcal_bugzilla.kcfg +File=tderesources_kcal_bugzilla.kcfg ClassName=ResourcePrefs NameSpace=KBB Singleton=false diff --git a/kbugbuster/kresources/kresources_kcal_bugzilla.kcfg b/kbugbuster/tderesources/tderesources_kcal_bugzilla.kcfg index ce23c969..360a2144 100644 --- a/kbugbuster/kresources/kresources_kcal_bugzilla.kcfg +++ b/kbugbuster/tderesources/tderesources_kcal_bugzilla.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kcal_bugzillarc"/> + <kcfgfile name="tderesources_kcal_bugzillarc"/> <group name="General"> <entry type="String" name="Server"> diff --git a/kioslave/svn/ksvnd/Makefile.am b/kioslave/svn/ksvnd/Makefile.am index a466be08..54eb2bee 100644 --- a/kioslave/svn/ksvnd/Makefile.am +++ b/kioslave/svn/ksvnd/Makefile.am @@ -1,4 +1,4 @@ -#INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes) +#INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes) INCLUDES= $(all_includes) 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_METASOURCES = AUTO 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_DATA = ksvnd.desktop diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am index b749ac29..f0718598 100644 --- a/kmtrace/Makefile.am +++ b/kmtrace/Makefile.am @@ -23,13 +23,13 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kmtrace demangle kmmatch 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_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_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 diff --git a/kompare/CMakeLists.txt b/kompare/CMakeLists.txt index 42d5d457..2f35d2a6 100644 --- a/kompare/CMakeLists.txt +++ b/kompare/CMakeLists.txt @@ -50,6 +50,6 @@ tde_add_executable( kompare AUTOMOC main.cpp kompare_shell.cpp kompareurldialog.cpp LINK dialogpages-static kompareinterface-shared kio-shared - kparts-shared ktexteditor-shared + tdeparts-shared tdetexteditor-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kompare/Makefile.am b/kompare/Makefile.am index 883cdf8b..6413c160 100644 --- a/kompare/Makefile.am +++ b/kompare/Makefile.am @@ -26,11 +26,11 @@ bin_PROGRAMS = kompare # the application source, library search path, and link libraries 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) \ $(top_builddir)/kompare/interfaces/libkompareinterface.la \ $(top_builddir)/kompare/libdialogpages/libdialogpages.la \ - -lktexteditor + -ltdetexteditor # this is where the desktop file will go xdg_apps_DATA = kompare.desktop diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index 94e9747d..5e6522cf 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -17,9 +17,9 @@ ** ***************************************************************************/ -#include <ktexteditor/document.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/view.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/view.h> #include <kdebug.h> #include <kedittoolbar.h> #include <kencodingfiledialog.h> @@ -28,7 +28,7 @@ #include <klibloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <ksqueezedtextlabel.h> #include <kstatusbar.h> #include <kstdaction.h> diff --git a/kompare/kompare_shell.h b/kompare/kompare_shell.h index 6e51c0eb..5b7a5abe 100644 --- a/kompare/kompare_shell.h +++ b/kompare/kompare_shell.h @@ -21,7 +21,7 @@ #define KOMPARESHELL_H #include <kapplication.h> -#include <kparts/dockmainwindow.h> +#include <tdeparts/dockmainwindow.h> #include "kompare.h" diff --git a/kompare/komparenavtreepart/CMakeLists.txt b/kompare/komparenavtreepart/CMakeLists.txt index 32af4732..732d27d5 100644 --- a/kompare/komparenavtreepart/CMakeLists.txt +++ b/kompare/komparenavtreepart/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES komparenavtreepart.desktop tde_add_kpart( libkomparenavtreepart AUTOMOC SOURCES komparenavtreepart.cpp - LINK diff2-static kparts-shared + LINK diff2-static tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h index 0f670295..f535f676 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.h +++ b/kompare/komparenavtreepart/komparenavtreepart.h @@ -25,8 +25,8 @@ #include <tqsplitter.h> #include <tqlistview.h> -#include <kparts/factory.h> -#include <kparts/part.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> #include "kompare.h" #include "diffmodellist.h" diff --git a/kompare/komparepart/CMakeLists.txt b/kompare/komparepart/CMakeLists.txt index 00fe0e04..10083566 100644 --- a/kompare/komparepart/CMakeLists.txt +++ b/kompare/komparepart/CMakeLists.txt @@ -41,6 +41,6 @@ tde_add_kpart( libkomparepart AUTOMOC komparesaveoptionswidget.cpp LINK dialogpages-static diff2-static kompareinterface-shared - kparts-shared + tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index c9e1f19b..52de1f5f 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -34,7 +34,7 @@ #include <kstdaction.h> #include <kinstance.h> #include <ktempfile.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> //#include <ktempdir.h> #include <kio/netaccess.h> diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h index 721d7afc..f853fa36 100644 --- a/kompare/komparepart/kompare_part.h +++ b/kompare/komparepart/kompare_part.h @@ -22,8 +22,8 @@ #ifndef KOMPAREPART_H #define KOMPAREPART_H -#include <kparts/factory.h> -#include <kparts/part.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> #include "kompare.h" diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index 705f32b0..a70e3f44 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -35,7 +35,7 @@ #include <kurlcombobox.h> #include <kurlrequester.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> #include "diffsettings.h" diff --git a/kompare/tests/subversion/contextm.diff b/kompare/tests/subversion/contextm.diff index 5d331bcc..6d63c9fe 100644 --- a/kompare/tests/subversion/contextm.diff +++ b/kompare/tests/subversion/contextm.diff @@ -93,7 +93,7 @@ Index: README ! 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! ! diff --git a/kompare/tests/subversion/normalm.diff b/kompare/tests/subversion/normalm.diff index c3249ccc..6ea65004 100644 --- a/kompare/tests/subversion/normalm.diff +++ b/kompare/tests/subversion/normalm.diff @@ -87,7 +87,7 @@ Index: README < 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! < diff --git a/kompare/tests/subversion/unifiedm.diff b/kompare/tests/subversion/unifiedm.diff index 4ac8f769..1c5c873c 100644 --- a/kompare/tests/subversion/unifiedm.diff +++ b/kompare/tests/subversion/unifiedm.diff @@ -90,7 +90,7 @@ Index: README -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! - diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt index 5c0fcaa0..c38517d3 100644 --- a/kuiviewer/CMakeLists.txt +++ b/kuiviewer/CMakeLists.txt @@ -46,7 +46,7 @@ install( FILES tde_add_kpart( libkuiviewerpart AUTOMOC SOURCES kuiviewer_part.cpp - LINK ktexteditor-shared ${TQTQUI_LIBRARIES} + LINK tdetexteditor-shared ${TQTQUI_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -64,6 +64,6 @@ tde_add_kpart( quithumbnail tde_add_executable( kuiviewer AUTOMOC SOURCES main.cpp kuiviewer.cpp - LINK ktexteditor-shared + LINK tdetexteditor-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kuiviewer/Makefile.am b/kuiviewer/Makefile.am index 7f31a16d..d3ba9a11 100644 --- a/kuiviewer/Makefile.am +++ b/kuiviewer/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kuiviewer # the application source, library search path, and link libraries 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) xdg_apps_DATA =kuiviewer.desktop diff --git a/kuiviewer/kuiviewer.h b/kuiviewer/kuiviewer.h index 7ac3ed9a..e404b66a 100644 --- a/kuiviewer/kuiviewer.h +++ b/kuiviewer/kuiviewer.h @@ -28,7 +28,7 @@ #endif #include <kapplication.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> class KToggleAction; class KListView; diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index b14d2412..dcd33c30 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -31,7 +31,7 @@ #include <kinstance.h> #include <kio/netaccess.h> #include <klistview.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kstdaction.h> #include <kstyle.h> #include <tqmetaobject.h> diff --git a/kuiviewer/kuiviewer_part.h b/kuiviewer/kuiviewer_part.h index 779a51cd..a0dd6d8b 100644 --- a/kuiviewer/kuiviewer_part.h +++ b/kuiviewer/kuiviewer_part.h @@ -23,7 +23,7 @@ #define KUIVIEWERPART_H #include <tqguardedptr.h> -#include <kparts/part.h> +#include <tdeparts/part.h> class TQWidget; class KURL; diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am deleted file mode 100644 index 5af6f67a..00000000 --- a/kunittest/Makefile.am +++ /dev/null @@ -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 diff --git a/kunittest/example/module/Makefile.am b/kunittest/example/module/Makefile.am deleted file mode 100644 index 17404d06..00000000 --- a/kunittest/example/module/Makefile.am +++ /dev/null @@ -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) diff --git a/poxml/Makefile.am b/poxml/Makefile.am index bd73dfb4..a17a445c 100644 --- a/poxml/Makefile.am +++ b/poxml/Makefile.am @@ -7,23 +7,23 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS) SUBDIRS = antlr 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) 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) 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) 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) 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) parser: diff --git a/scripts/kde-spellcheck.pl b/scripts/kde-spellcheck.pl index f49c6df2..e1f28e4e 100755 --- a/scripts/kde-spellcheck.pl +++ b/scripts/kde-spellcheck.pl @@ -954,7 +954,7 @@ klicking clicking knowlege knowledge Konquerer Konqueror konstants constants -kscreensave kscreensaver +kscreensave tdescreensaver labelling labeling Labelling Labeling lauching launching diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build index 17efa128..05c1b655 100755 --- a/scripts/tdesvn-build +++ b/scripts/tdesvn-build @@ -4242,7 +4242,7 @@ eval # Do some necessary adjusting. Right now this is used for supporting # 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. munge_lists(); diff --git a/scripts/tdesvn-buildrc-sample b/scripts/tdesvn-buildrc-sample index d62c8b56..460e0b5d 100644 --- a/scripts/tdesvn-buildrc-sample +++ b/scripts/tdesvn-buildrc-sample @@ -71,7 +71,7 @@ global # 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, # 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 # installation!), then you'll probably need to use sudo to install everything. diff --git a/tdecachegrind/tdecachegrind/Makefile.am b/tdecachegrind/tdecachegrind/Makefile.am index 53cd35d8..f7c1bf8c 100644 --- a/tdecachegrind/tdecachegrind/Makefile.am +++ b/tdecachegrind/tdecachegrind/Makefile.am @@ -44,7 +44,7 @@ INCLUDES= $(all_includes) METASOURCES = AUTO # 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 rc_DATA = tdecachegrindui.rc diff --git a/kunittest/CMakeLists.txt b/tdeunittest/CMakeLists.txt index 8eb4cae0..2a4e1f5a 100644 --- a/kunittest/CMakeLists.txt +++ b/tdeunittest/CMakeLists.txt @@ -24,27 +24,27 @@ link_directories( install( FILES runnergui.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kunittest ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeunittest ) install( PROGRAMS - kunittest kunittestmod kunittest_debughelper + tdeunittest tdeunittestmod tdeunittest_debughelper 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 VERSION 0.0.0 - LINK kunittest-shared + LINK tdeunittest-shared DESTINATION ${LIB_INSTALL_DIR} ) -##### kunittestguimodrunner (executable) ######## +##### tdeunittestguimodrunner (executable) ######## -tde_add_executable( kunittestguimodrunner +tde_add_executable( tdeunittestguimodrunner SOURCES guimodrunner.cpp - LINK kunittestgui-shared + LINK tdeunittestgui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdeunittest/Makefile.am b/tdeunittest/Makefile.am new file mode 100644 index 00000000..5393f517 --- /dev/null +++ b/tdeunittest/Makefile.am @@ -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 diff --git a/kunittest/dcopinterface.h b/tdeunittest/dcopinterface.h index 50f15d3d..50f15d3d 100644 --- a/kunittest/dcopinterface.h +++ b/tdeunittest/dcopinterface.h diff --git a/kunittest/example/Makefile.am b/tdeunittest/example/Makefile.am index d008ca22..d008ca22 100644 --- a/kunittest/example/Makefile.am +++ b/tdeunittest/example/Makefile.am diff --git a/tdeunittest/example/module/Makefile.am b/tdeunittest/example/module/Makefile.am new file mode 100644 index 00000000..6d1b7961 --- /dev/null +++ b/tdeunittest/example/module/Makefile.am @@ -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) diff --git a/kunittest/example/module/sampleextra.cpp b/tdeunittest/example/module/sampleextra.cpp index fa17aa6c..e4574c09 100644 --- a/kunittest/example/module/sampleextra.cpp +++ b/tdeunittest/example/module/sampleextra.cpp @@ -24,7 +24,7 @@ */ #include <kdebug.h> -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> #include "sampleextra.h" diff --git a/kunittest/example/module/sampleextra.h b/tdeunittest/example/module/sampleextra.h index f27a6bd9..dbd19dc8 100644 --- a/kunittest/example/module/sampleextra.h +++ b/tdeunittest/example/module/sampleextra.h @@ -26,7 +26,7 @@ #ifndef _SAMPLEEXTRA_H_ #define _SAMPLEEXTRA_H_ -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class SomeExtraTester : public KUnitTest::Tester { diff --git a/kunittest/example/module/samplemodule.cpp b/tdeunittest/example/module/samplemodule.cpp index 3b6665fd..4ffadb6c 100644 --- a/kunittest/example/module/samplemodule.cpp +++ b/tdeunittest/example/module/samplemodule.cpp @@ -23,15 +23,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include "sampletests.h" #include "sampleextra.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_samplemodule, "Suite1" ) +KUNITTEST_MODULE( tdeunittest_samplemodule, "Suite1" ) KUNITTEST_MODULE_REGISTER_TESTER( SlotSampleTester ) KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) KUNITTEST_MODULE_REGISTER_TESTER( SomeExtraTester ) diff --git a/kunittest/example/module/samplemodule.h b/tdeunittest/example/module/samplemodule.h index b09002c6..953c0816 100644 --- a/kunittest/example/module/samplemodule.h +++ b/tdeunittest/example/module/samplemodule.h @@ -26,7 +26,7 @@ #ifndef SAMPLETESTMODULE_H #define SAMPLETESTMODULE_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class SimpleSampleTester : public KUnitTest::Tester { diff --git a/kunittest/example/module/samplemodule2.cpp b/tdeunittest/example/module/samplemodule2.cpp index 672ec08a..1e08f102 100644 --- a/kunittest/example/module/samplemodule2.cpp +++ b/tdeunittest/example/module/samplemodule2.cpp @@ -26,14 +26,14 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include "samplemodule.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_samplemodule2, "Suite2::Sub" ) +KUNITTEST_MODULE( tdeunittest_samplemodule2, "Suite2::Sub" ) KUNITTEST_MODULE_REGISTER_TESTER( SimpleSampleTester ) KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) diff --git a/kunittest/example/module/samplemodule2.h b/tdeunittest/example/module/samplemodule2.h index b09002c6..953c0816 100644 --- a/kunittest/example/module/samplemodule2.h +++ b/tdeunittest/example/module/samplemodule2.h @@ -26,7 +26,7 @@ #ifndef SAMPLETESTMODULE_H #define SAMPLETESTMODULE_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class SimpleSampleTester : public KUnitTest::Tester { diff --git a/kunittest/example/module/sampletests.cpp b/tdeunittest/example/module/sampletests.cpp index 89e7516a..4a38642d 100644 --- a/kunittest/example/module/sampletests.cpp +++ b/tdeunittest/example/module/sampletests.cpp @@ -26,8 +26,8 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include "sampletests.h" #include "sampleextra.h" diff --git a/kunittest/example/module/sampletests.h b/tdeunittest/example/module/sampletests.h index 08cc1ec0..1f032f92 100644 --- a/kunittest/example/module/sampletests.h +++ b/tdeunittest/example/module/sampletests.h @@ -26,7 +26,7 @@ #ifndef SAMPLETESTMODULE_H #define SAMPLETESTMODULE_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class SlotSampleTester : public KUnitTest::SlotTester { diff --git a/kunittest/example/simple/Makefile.am b/tdeunittest/example/simple/Makefile.am index 5d7e3d57..0ee63452 100644 --- a/kunittest/example/simple/Makefile.am +++ b/tdeunittest/example/simple/Makefile.am @@ -4,19 +4,19 @@ METASOURCES = AUTO check_PROGRAMS = sampletests sampletestsgui sampletests_SOURCES = main.cpp sampletest.cpp -sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -sampletests_LDADD = -lkunittest +sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +sampletests_LDADD = -ltdeunittest sampletestsgui_SOURCES = maingui.cpp sampletest.cpp -sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -# Normally you would write -lkunittestgui here, but since the examples +sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +# Normally you would write -ltdeunittestgui here, but since the examples # are bundled with the library source code itself we don't want to # have you install the libraries before you can compile the examples. -sampletestsgui_LDADD = ../../libkunittestgui.la +sampletestsgui_LDADD = ../../libtdeunittestgui.la noinst_HEADERS = sampletest.h TESTS = sampletests guicheck: sampletestsgui - kunittest ./sampletestsgui SampleTests + tdeunittest ./sampletestsgui SampleTests diff --git a/kunittest/example/simple/main.cpp b/tdeunittest/example/simple/main.cpp index a750587c..7f6edb1e 100644 --- a/kunittest/example/simple/main.cpp +++ b/tdeunittest/example/simple/main.cpp @@ -23,7 +23,7 @@ * 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*/ ) { diff --git a/kunittest/example/simple/maingui.cpp b/tdeunittest/example/simple/maingui.cpp index b292d780..419aacd9 100644 --- a/kunittest/example/simple/maingui.cpp +++ b/tdeunittest/example/simple/maingui.cpp @@ -28,7 +28,7 @@ #include <kcmdlineargs.h> #include <klocale.h> -#include "kunittest/runnergui.h" +#include "tdeunittest/runnergui.h" static const char description[] = I18N_NOOP("A simple sample."); diff --git a/kunittest/example/simple/sampletest.cpp b/tdeunittest/example/simple/sampletest.cpp index 846d514f..04be74de 100644 --- a/kunittest/example/simple/sampletest.cpp +++ b/tdeunittest/example/simple/sampletest.cpp @@ -26,7 +26,7 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <kunittest/runner.h> +#include <tdeunittest/runner.h> #include "sampletest.h" diff --git a/kunittest/example/simple/sampletest.h b/tdeunittest/example/simple/sampletest.h index a4d85266..b5c50b43 100644 --- a/kunittest/example/simple/sampletest.h +++ b/tdeunittest/example/simple/sampletest.h @@ -26,7 +26,7 @@ #ifndef SAMPLETEST_H #define SAMPLETEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class SimpleSampleTester : public KUnitTest::Tester { diff --git a/kunittest/guimodrunner.cpp b/tdeunittest/guimodrunner.cpp index 11a3532b..91757a5e 100644 --- a/kunittest/guimodrunner.cpp +++ b/tdeunittest/guimodrunner.cpp @@ -40,7 +40,7 @@ static const char version[] = "0.1"; 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."), "."}, { "enable-dbgcap", I18N_NOOP("Enables debug capturing. You typically use this option when you use the GUI."), 0}, KCmdLineLastOption diff --git a/kunittest/runnergui.cpp b/tdeunittest/runnergui.cpp index 7dc67e09..8e31dac2 100644 --- a/kunittest/runnergui.cpp +++ b/tdeunittest/runnergui.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <kmessagebox.h> -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> #include "dcopinterface.h" #include "runnergui.h" diff --git a/kunittest/runnergui.h b/tdeunittest/runnergui.h index dc1e5f2a..73d8863c 100644 --- a/kunittest/runnergui.h +++ b/tdeunittest/runnergui.h @@ -29,8 +29,8 @@ #include <tqlistview.h> #include <tqhbox.h> -#include <kunittest/runner.h> -#include <kunittest/tester.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/tester.h> #include <kdemacros.h> diff --git a/kunittest/kunittest b/tdeunittest/tdeunittest index fbb8424f..c56f6c3a 100755 --- a/kunittest/kunittest +++ b/tdeunittest/tdeunittest @@ -9,10 +9,10 @@ then exit 1; fi -DEBUGHELPER=`which kunittest_debughelper` +DEBUGHELPER=`which tdeunittest_debughelper` if [ -z $DEBUGHELPER ] then - kdialog --error "Sorry, couldn't find the kunittest_debughelper script." + kdialog --error "Sorry, couldn't find the tdeunittest_debughelper script." exit 3 fi diff --git a/kunittest/kunittest_debughelper b/tdeunittest/tdeunittest_debughelper index 66dfacf2..66dfacf2 100755 --- a/kunittest/kunittest_debughelper +++ b/tdeunittest/tdeunittest_debughelper diff --git a/kunittest/kunittestmod b/tdeunittest/tdeunittestmod index ba039844..f5872692 100755 --- a/kunittest/kunittestmod +++ b/tdeunittest/tdeunittestmod @@ -19,17 +19,17 @@ do shift done -APP=`which kunittestguimodrunner` +APP=`which tdeunittestguimodrunner` if [ ! -x $APP ] then kdialog --error "Sorry, $APP is not a valid executable file." exit 1; fi -DEBUGHELPER=`which kunittest_debughelper` +DEBUGHELPER=`which tdeunittest_debughelper` if [ -z $DEBUGHELPER ] then - kdialog --error "Sorry, couldn't find the kunittest_debughelper script." + kdialog --error "Sorry, couldn't find the tdeunittest_debughelper script." exit 3 fi diff --git a/kunittest/testerwidget.ui b/tdeunittest/testerwidget.ui index e6e92e1c..e6e92e1c 100644 --- a/kunittest/testerwidget.ui +++ b/tdeunittest/testerwidget.ui diff --git a/kunittest/testerwidget.ui.h b/tdeunittest/testerwidget.ui.h index f80a248d..f80a248d 100644 --- a/kunittest/testerwidget.ui.h +++ b/tdeunittest/testerwidget.ui.h diff --git a/umbrello/umbrello/docgenerators/Makefile.am b/umbrello/umbrello/docgenerators/Makefile.am index 3d2b7aec..f702ca72 100644 --- a/umbrello/umbrello/docgenerators/Makefile.am +++ b/umbrello/umbrello/docgenerators/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbr METASOURCES = AUTO 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_SOURCES = main.cpp umbodoc_LDADD = $(LIB_TDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS) |