diff options
Diffstat (limited to 'lib')
33 files changed, 53 insertions, 53 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 4907df59..6a0eab16 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -24,5 +24,5 @@ messages: # $(XGETTEXT) kotext/kohyphen/*.cpp */*.cc */*.cpp -o $(podir)/koffice.pot # rm -f kformula/symbolnames.cc -DOXYGEN_REFERENCES = dcop kprint tdeui kparts +DOXYGEN_REFERENCES = dcop kprint tdeui tdeparts include ../admin/Doxyfile.am diff --git a/lib/kdoc.rules b/lib/kdoc.rules index ec43dc05..30a995af 100644 --- a/lib/kdoc.rules +++ b/lib/kdoc.rules @@ -10,7 +10,7 @@ store_FILES = *.h store_LIBS = -ltdecore -lqt kofficecore_FILES = *.h -kofficecore_LIBS = -lkparts -ltdecore -lqt +kofficecore_LIBS = -ltdeparts -ltdecore -lqt kofficeui_FILES = *.h kofficeui_LIBS = -lkofficecore -ltdeui -ltdecore -lqt diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 8bc8f88c..b3e9a7b6 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -45,7 +45,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kmimetype.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <kprinter.h> #include <ksavefile.h> diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index 4dc192b7..4947506d 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -27,7 +27,7 @@ namespace std { } using namespace std; #include <tqwmatrix.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kurl.h> #include <kservice.h> #include <KoGlobal.h> diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index c71c7609..882ccadf 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -28,7 +28,7 @@ #include <KoStore.h> #include <KoStoreDevice.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <kmimetype.h> #include <klocale.h> diff --git a/lib/kofficecore/KoDocument_p.h b/lib/kofficecore/KoDocument_p.h index e3ab46cf..a6437d3d 100644 --- a/lib/kofficecore/KoDocument_p.h +++ b/lib/kofficecore/KoDocument_p.h @@ -19,7 +19,7 @@ #ifndef __koDocument_p_h__ #define __koDocument_p_h__ -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> class KoDocument; diff --git a/lib/kofficecore/KoFactory.h b/lib/kofficecore/KoFactory.h index db9e12ad..21287315 100644 --- a/lib/kofficecore/KoFactory.h +++ b/lib/kofficecore/KoFactory.h @@ -20,7 +20,7 @@ #ifndef __koFactory_h__ #define __koFactory_h__ -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <koffice_export.h> class TDEInstance; diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp index f9b3930e..b1262ce5 100644 --- a/lib/kofficecore/KoFrame.cpp +++ b/lib/kofficecore/KoFrame.cpp @@ -21,7 +21,7 @@ #include <KoView.h> #include <tqpainter.h> -#include <kparts/event.h> +#include <tdeparts/event.h> #include <kcursor.h> #include <kdebug.h> diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index f06d2c46..ccb25828 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -47,9 +47,9 @@ #include <kdebug.h> #include <ktempfile.h> #include <krecentdocument.h> -#include <kparts/partmanager.h> -#include <kparts/plugin.h> -#include <kparts/event.h> +#include <tdeparts/partmanager.h> +#include <tdeparts/plugin.h> +#include <tdeparts/event.h> #include <klocale.h> #include <kstatusbar.h> #include <kglobalsettings.h> @@ -567,7 +567,7 @@ bool KoMainWindow::openDocument( KoDocument *newdoc, const KURL & url ) TQString mime = KMimeType::findByURL(url)->name(); if ( mime.isEmpty() || mime == KMimeType::defaultMimeType() ) mime = newdoc->nativeFormatMimeType(); - if ( url.isLocalFile() ) // workaround for kde<=3.3 kparts bug, fixed for 3.4 + if ( url.isLocalFile() ) // workaround for kde<=3.3 tdeparts bug, fixed for 3.4 newdoc->setFile(url.path()); newdoc->setMimeTypeAfterLoading( mime ); updateCaption(); diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h index 293d7722..d7727025 100644 --- a/lib/kofficecore/KoMainWindow.h +++ b/lib/kofficecore/KoMainWindow.h @@ -21,7 +21,7 @@ #ifndef __ko_main_window_h__ #define __ko_main_window_h__ -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include <kfiledialog.h> #include <koffice_export.h> #include "KoDocument.h" diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp index 7b1618c1..54699ca1 100644 --- a/lib/kofficecore/KoQueryTrader.cpp +++ b/lib/kofficecore/KoQueryTrader.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <KoQueryTrader.h> #include <KoDocument.h> diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h index c945d5a6..8f81e323 100644 --- a/lib/kofficecore/KoQueryTrader.h +++ b/lib/kofficecore/KoQueryTrader.h @@ -73,7 +73,7 @@ public: KoDocument* createDoc( KoDocument* parent = 0, const char* name = 0 ) const; /** - * This function will query ksycoca to find all available components. + * This function will query tdesycoca to find all available components. * The result will only contain parts, which are embeddable into a document * * @param _constr is a constraint expression as used by KTrader. diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 3688de4e..7e4045a8 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -27,8 +27,8 @@ #include <klocale.h> #include <kglobal.h> #include <kdebug.h> -#include <kparts/partmanager.h> -#include <kparts/event.h> +#include <tdeparts/partmanager.h> +#include <tdeparts/event.h> #include <kcursor.h> #include <assert.h> #include <kstatusbar.h> diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h index 549296da..a0113e07 100644 --- a/lib/kofficecore/KoView.h +++ b/lib/kofficecore/KoView.h @@ -22,7 +22,7 @@ #include <tqwidget.h> #include <tqguardedptr.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <KoChild.h> #include <koffice_export.h> diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index ba3c3a9b..d266aaaa 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -28,7 +28,7 @@ #include <tqdockwindow.h> #include <kdebug.h> -#include <kparts/event.h> +#include <tdeparts/event.h> #include <klocale.h> #include <ktoolbar.h> #include <kiconloader.h> diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index cf215120..2a9d1f5c 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -23,7 +23,7 @@ #include <tqobject.h> #include <tqevent.h> -#include <kparts/event.h> +#include <tdeparts/event.h> #include <kapplication.h> #include <kpopupmenu.h> #include <kaction.h> diff --git a/lib/koproperty/test/Makefile.am b/lib/koproperty/test/Makefile.am index 22bacaa6..8bdfdbe1 100644 --- a/lib/koproperty/test/Makefile.am +++ b/lib/koproperty/test/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO noinst_PROGRAMS = propertytest propertytest_SOURCES = main.cpp test.cpp -propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor propertytest_LDADD = $(LIB_KOPROPERTY) # this is where the shell's XML-GUI resource file goes diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index 604a6237..3df928a1 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -31,11 +31,11 @@ #include "KoTextDocument.h" -#include <kspell2/backgroundchecker.h> -#include <kspell2/broker.h> -#include <kspell2/dictionary.h> -#include <kspell2/settings.h> -#include <kspell2/filter.h> +#include <tdespell2/backgroundchecker.h> +#include <tdespell2/broker.h> +#include <tdespell2/dictionary.h> +#include <tdespell2/settings.h> +#include <tdespell2/filter.h> using namespace KSpell2; #include <klocale.h> diff --git a/lib/kotext/KoBgSpellCheck.h b/lib/kotext/KoBgSpellCheck.h index 0872dee0..3cb2f35b 100644 --- a/lib/kotext/KoBgSpellCheck.h +++ b/lib/kotext/KoBgSpellCheck.h @@ -20,7 +20,7 @@ #ifndef KOBGSPELLCHECK_H #define KOBGSPELLCHECK_H -#include <kspell2/broker.h> +#include <tdespell2/broker.h> #include <tqobject.h> #include <tqstringlist.h> #include <koffice_export.h> diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h index 556a2321..a3e35b1d 100644 --- a/lib/kotext/KoFontDia.h +++ b/lib/kotext/KoFontDia.h @@ -34,7 +34,7 @@ #include "KoFontDiaPreview.h" -#include <kspell2/broker.h> +#include <tdespell2/broker.h> class TQComboBox; diff --git a/lib/kotext/KoLanguageTab.h b/lib/kotext/KoLanguageTab.h index fbcbb5df..ea8f08b8 100644 --- a/lib/kotext/KoLanguageTab.h +++ b/lib/kotext/KoLanguageTab.h @@ -22,7 +22,7 @@ #include <kolanguagetabbase.h> -#include <kspell2/broker.h> +#include <tdespell2/broker.h> class KoLanguageTab : public KoLanguageTabBase { diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp index d0361b4c..2a9e5476 100644 --- a/lib/kotext/KoSpell.cpp +++ b/lib/kotext/KoSpell.cpp @@ -26,8 +26,8 @@ #include "KoTextParag.h" #include "KoTextIterator.h" -#include <kspell2/broker.h> -#include <kspell2/filter.h> +#include <tdespell2/broker.h> +#include <tdespell2/filter.h> #include <kglobal.h> #include <klocale.h> diff --git a/lib/kotext/KoSpell.h b/lib/kotext/KoSpell.h index 2430bb69..685b7348 100644 --- a/lib/kotext/KoSpell.h +++ b/lib/kotext/KoSpell.h @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <tqstring.h> -#include <kspell2/backgroundchecker.h> +#include <tdespell2/backgroundchecker.h> #include <koffice_export.h> class KoTextIterator; class KoTextParag; diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index afd18909..2ce575ca 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -44,7 +44,7 @@ //#define DEBUG_FORMATS //#define DEBUG_FORMAT_MORE -const char KoTextObject::s_customItemChar = '#'; // Has to be transparent to kspell but still be saved (not space) +const char KoTextObject::s_customItemChar = '#'; // Has to be transparent to tdespell but still be saved (not space) struct KoTextObject::KoTextObjectPrivate { diff --git a/lib/kotext/Makefile.am b/lib/kotext/Makefile.am index bb55e8a1..160c689c 100644 --- a/lib/kotext/Makefile.am +++ b/lib/kotext/Makefile.am @@ -23,7 +23,7 @@ libkotext_la_SOURCES = KoComplexText.cpp KoRichText.cpp \ libkotext_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -libkotext_la_LIBADD = $(LIB_KOFFICEUI) kohyphen/libkohyphen.la $(LIBKSPELL2) -lkutils +libkotext_la_LIBADD = $(LIB_KOFFICEUI) kohyphen/libkohyphen.la $(LIBKSPELL2) -ltdeutils METASOURCES = AUTO diff --git a/lib/kotext/configure.in.bot b/lib/kotext/configure.in.bot index 509b061a..6cc24b81 100644 --- a/lib/kotext/configure.in.bot +++ b/lib/kotext/configure.in.bot @@ -1,6 +1,6 @@ if test -z "$LIBKSPELL2"; then echo "" - echo "You don't use tdelibs CVS (kspell2 not found). Spell-checking disabled." + echo "You don't use tdelibs CVS (tdespell2 not found). Spell-checking disabled." echo "" all_tests=bad fi diff --git a/lib/kotext/configure.in.in b/lib/kotext/configure.in.in index 2132a5cb..c8f96e0a 100644 --- a/lib/kotext/configure.in.in +++ b/lib/kotext/configure.in.in @@ -1,13 +1,13 @@ AC_LANG_SAVE AC_LANG_C dnl Check for aspell library - KDE_CHECK_HEADERS([kspell2/broker.h]) - if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then + KDE_CHECK_HEADERS([tdespell2/broker.h]) + if test "x$ac_cv_header_tdespell2_broker_h" = "xyes"; then dnl the header and the lib exist -> ok dnl this is for config.h - AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libkspell2 for spell-checking]) - LIBKSPELL2="-lkspell2" - AC_MSG_RESULT([found in $ac_kspell2_includes]) + AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libtdespell2 for spell-checking]) + LIBKSPELL2="-ltdespell2" + AC_MSG_RESULT([found in $ac_tdespell2_includes]) else LIBKSPELL2="" AC_MSG_RESULT([not found -- spell-checking will be disabled]) diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am index 724b0257..5302f0ef 100644 --- a/lib/kotext/kohyphen/Makefile.am +++ b/lib/kotext/kohyphen/Makefile.am @@ -18,4 +18,4 @@ check_PROGRAMS = kohyphentest kohyphentest_SOURCES = kohyphentest.cpp kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_TDECORE) -kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp index 7eac3881..72e5081c 100644 --- a/lib/kotext/tests/KoUserStyleTester.cpp +++ b/lib/kotext/tests/KoUserStyleTester.cpp @@ -18,8 +18,8 @@ // KoUserStyle/KoUserStyleCollection test -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include <KoUserStyleCollection.h> #include <KoUserStyle.h> @@ -29,7 +29,7 @@ #include "KoUserStyleTester.h" #include "KoUserStyleTester.moc" -KUNITTEST_MODULE(kunittest_KoUserStyleTester, "KoUserStyle Tester"); +KUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester); #undef COMPARE diff --git a/lib/kotext/tests/KoUserStyleTester.h b/lib/kotext/tests/KoUserStyleTester.h index c53b8415..4be17d4c 100644 --- a/lib/kotext/tests/KoUserStyleTester.h +++ b/lib/kotext/tests/KoUserStyleTester.h @@ -19,7 +19,7 @@ #ifndef KOUSERSTYLETESTER_H #define KOUSERSTYLETESTER_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class KoUserStyleTester : public KUnitTest::SlotTester { Q_OBJECT diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am index d5cf50a2..fd7754b2 100644 --- a/lib/kotext/tests/Makefile.am +++ b/lib/kotext/tests/Makefile.am @@ -8,17 +8,17 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest TESTS = kotextformattertest kovariabletest LDADD = ../libkotext.la -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kobordertest_SOURCES = kobordertest.cpp kotextformattertest_SOURCES = kotextformattertest.cpp kovariabletest_SOURCES = kovariabletest.cpp -check_LTLIBRARIES = kunittest_KoUserStyleTester.la +check_LTLIBRARIES = tdeunittest_KoUserStyleTester.la -kunittest_KoUserStyleTester_la_SOURCES = KoUserStyleTester.cpp -kunittest_KoUserStyleTester_la_LIBADD = ../libkotext.la -lkunittest -kunittest_KoUserStyleTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_KoUserStyleTester_la_SOURCES = KoUserStyleTester.cpp +tdeunittest_KoUserStyleTester_la_LIBADD = ../libkotext.la -ltdeunittest +tdeunittest_KoUserStyleTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) check-local: - kunittestmodrunner + tdeunittestmodrunner diff --git a/lib/kross/runner/Makefile.am b/lib/kross/runner/Makefile.am index 1b2c9357..b048c26e 100644 --- a/lib/kross/runner/Makefile.am +++ b/lib/kross/runner/Makefile.am @@ -6,6 +6,6 @@ bin_PROGRAMS = krossrunner krossrunner_SOURCES = main.cpp krossrunner_LDADD = $(LIB_QT) $(LIB_TDECORE) ../api/libkrossapi.la ../main/libkrossmain.la INCLUDES = $(KROSS_INCLUDES) $(all_includes) -krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor SUBDIRS = . METASOURCES = AUTO diff --git a/lib/kross/test/Makefile.am b/lib/kross/test/Makefile.am index 09e51e74..37bee54f 100644 --- a/lib/kross/test/Makefile.am +++ b/lib/kross/test/Makefile.am @@ -12,6 +12,6 @@ krosstest_LDADD = \ ../main/libkrossmain.la INCLUDES = $(KROSS_INCLUDES) $(all_includes) -krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor SUBDIRS = . METASOURCES = AUTO |