From fb758f679005d3eb923888302ade9b6e4dda15bb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:07 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- blinken/src/Makefile.am | 2 +- kalzium/src/Makefile.am | 2 +- kalzium/src/detailinfodlg.cpp | 4 ++-- kanagram/src/Makefile.am | 2 +- kbruch/src/Makefile.am | 2 +- kbruch/testcases/Makefile.am | 2 +- keduca/keduca/keduca.cpp | 2 +- keduca/keduca/keduca.h | 4 ++-- keduca/keduca/keduca_part.cpp | 2 +- keduca/keduca/keduca_part.h | 2 +- keduca/keducabuilder/Makefile.am | 2 +- keduca/libkeduca/Makefile.am | 2 +- keduca/libkeduca/fileread.h | 2 +- kgeography/src/Makefile.am | 2 +- khangman/khangman/Makefile.am | 2 +- kig/Makefile.am | 2 +- kig/README.Developers | 2 +- kig/kig/Makefile.am | 2 +- kig/kig/kig.h | 2 +- kig/kig/kig_part.cpp | 2 +- kig/kig/kig_part.h | 2 +- kig/kig/kig_view.h | 2 +- kig/scripting/newscriptwizard.cc | 14 +++++++------- kig/scripting/newscriptwizard.h | 6 +++--- kiten/Makefile.am | 4 ++-- klatin/klatin/Makefile.am | 2 +- klettres/klettres/Makefile.am | 2 +- kmplot/kmplot/MainDlg.h | 6 +++--- kmplot/kmplot/kmplot.h | 2 +- kpercentage/kpercentage/Makefile.am | 2 +- kstars/kstars/Makefile.am | 2 +- ktouch/src/Makefile.am | 2 +- kturtle/file.txt | 2 +- kturtle/src/Makefile.am | 4 ++-- kturtle/src/kturtle.cpp | 20 ++++++++++---------- kturtle/src/kturtle.h | 6 +++--- kverbos/kverbos/Makefile.am | 2 +- kvoctrain/kvoctrain/Makefile.am | 4 ++-- kwordquiz/src/Makefile.am | 2 +- libtdeedu/extdate/Makefile.am | 4 ++-- libtdeedu/tdeeduui/tdeeduglossary.cpp | 4 ++-- libtdeedu/tdeeduui/tdeeduglossary.h | 2 +- 42 files changed, 70 insertions(+), 70 deletions(-) diff --git a/blinken/src/Makefile.am b/blinken/src/Makefile.am index c4de4922..167bf188 100644 --- a/blinken/src/Makefile.am +++ b/blinken/src/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = blinken INCLUDES = $(all_includes) -blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor blinken_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(artslib) blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am index 1ccdcbe5..7bd41796 100644 --- a/kalzium/src/Makefile.am +++ b/kalzium/src/Makefile.am @@ -79,7 +79,7 @@ rcui_DATA = kalziumui.rc KDE_ICON = AUTO # the library search path. -kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor #this RegExp-monster grep for bar and puts the i18n() around foo and bar messages-old: rc.cpp diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index c9791771..6dd03422 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/kanagram/src/Makefile.am b/kanagram/src/Makefile.am index b6e8a16d..1f8f4d5c 100644 --- a/kanagram/src/Makefile.am +++ b/kanagram/src/Makefile.am @@ -28,7 +28,7 @@ bin_PROGRAMS = kanagram # the application source, library search path, and link libraries kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp -kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kanagram_LDADD = $(LIB_TDEUI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(artslib) kde_kcfg_DATA=kanagram.kcfg diff --git a/kbruch/src/Makefile.am b/kbruch/src/Makefile.am index c09bab8c..fc9f6676 100644 --- a/kbruch/src/Makefile.am +++ b/kbruch/src/Makefile.am @@ -4,7 +4,7 @@ kbruch_COMPILE_FIRST = version.h kbruch_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc kbruch_LDADD = $(LIB_TDEUI) # the library search path. -kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui diff --git a/kbruch/testcases/Makefile.am b/kbruch/testcases/Makefile.am index 99c6e9f8..2f05f22d 100644 --- a/kbruch/testcases/Makefile.am +++ b/kbruch/testcases/Makefile.am @@ -5,7 +5,7 @@ kbruch_test_SOURCES = task.cpp ratio.cpp ratio_test.cpp primenumber.cpp primenum kbruch_test_LDADD = -lboost_unit_test_framework-gcc $(LIB_TDEUI) # the library search path. -kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor EXTRA_DIST = primenumber.cpp primenumber.h ratio.cpp ratio.h task.cpp task.h primenumber_test.cpp ratio_test.cpp kbruch_test.cpp diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index b6afc115..ca6de0d9 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h index 0f111585..f4899a4c 100644 --- a/keduca/keduca/keduca.h +++ b/keduca/keduca/keduca.h @@ -25,8 +25,8 @@ */ #include -#include -#include +#include +#include #include /** The KEduca TestMaster. diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index aa61d65c..04dd5deb 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -27,7 +27,7 @@ #include "configdialogbase.h" #include -#include +#include #include #include diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h index b11a7f1c..69d88fdf 100644 --- a/keduca/keduca/keduca_part.h +++ b/keduca/keduca/keduca_part.h @@ -24,7 +24,7 @@ #ifndef KEDUCA_PART_H #define KEDUCA_PART_H -#include +#include class KEducaView; class TDEAboutData; diff --git a/keduca/keducabuilder/Makefile.am b/keduca/keducabuilder/Makefile.am index e047fac7..a6c1ecbb 100644 --- a/keduca/keducabuilder/Makefile.am +++ b/keduca/keducabuilder/Makefile.am @@ -23,7 +23,7 @@ INCLUDES= -I../libkeduca $(all_includes) METASOURCES = AUTO # the library search path. -keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE´s XML GUI builing diff --git a/keduca/libkeduca/Makefile.am b/keduca/libkeduca/Makefile.am index 4b59b7c6..2df02456 100644 --- a/keduca/libkeduca/Makefile.am +++ b/keduca/libkeduca/Makefile.am @@ -2,7 +2,7 @@ INCLUDES=$(all_includes) noinst_LTLIBRARIES = libkeduca.la libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp -libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libkeduca_la_LIBADD = -ltdeprint noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h index 3199f0ad..8a823303 100644 --- a/keduca/libkeduca/fileread.h +++ b/keduca/libkeduca/fileread.h @@ -235,7 +235,7 @@ protected slots: void slotUploadFinished( TDEIO::Job * job ); signals: -/* Stolen from kparts */ +/* Stolen from tdeparts */ /** * Emit this when you have completed loading data. diff --git a/kgeography/src/Makefile.am b/kgeography/src/Makefile.am index 446a33ec..6084761e 100644 --- a/kgeography/src/Makefile.am +++ b/kgeography/src/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = kgeography INCLUDES = $(all_includes) # the library search path. -kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. kgeography_LDADD = $(LIB_TDEUI) diff --git a/khangman/khangman/Makefile.am b/khangman/khangman/Makefile.am index 426a2434..95658c83 100644 --- a/khangman/khangman/Makefile.am +++ b/khangman/khangman/Makefile.am @@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/libtdeedu/tdeeducore $(all_includes) METASOURCES = AUTO # the library search path. -khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor rc_DATA = khangmanui.rc rcdir = $(kde_datadir)/khangman diff --git a/kig/Makefile.am b/kig/Makefile.am index 62d97410..e011bf79 100644 --- a/kig/Makefile.am +++ b/kig/Makefile.am @@ -25,7 +25,7 @@ SUBDIRS = \ kde_module_LTLIBRARIES = libkigpart.la libkigpart_la_SOURCES = dummy.cpp -libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lktexteditor +libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltdetexteditor libkigpart_la_LIBADD = $(LIB_KPARTS) \ misc/libmisc.la objects/libobjects.la filters/libfilters.la \ modes/libmodes.la kig/libkigparttemp.la $(scriptinglib) diff --git a/kig/README.Developers b/kig/README.Developers index 7f9a92bf..ea571396 100644 --- a/kig/README.Developers +++ b/kig/README.Developers @@ -4,7 +4,7 @@ Hi, here are some things that might not be immediately clear : modes ) ( just in case this wasn't clear.. ) - for testing code, i don't really know how you're supposed to do this with - kparts, so i just do a "make install" every time, and then simply run the + tdeparts, so i just do a "make install" every time, and then simply run the program, you prolly want to do "./configure --enable-debug=full --prefix=/usr/local/trinity" (meanwhile, i found out, the solution is in a developer faq on developer.kde.org diff --git a/kig/kig/Makefile.am b/kig/kig/Makefile.am index 8e04c0dd..4ffc5b85 100644 --- a/kig/kig/Makefile.am +++ b/kig/kig/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = kig # the application source, library search path, and link libraries kig_SOURCES = main.cpp kig.cpp -kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kig_LDADD = $(LIB_KPARTS) # this is where the desktop file will go diff --git a/kig/kig/kig.h b/kig/kig/kig.h index ee65962c..0df1ad43 100644 --- a/kig/kig/kig.h +++ b/kig/kig/kig.h @@ -36,7 +36,7 @@ #endif #include -#include +#include #include class KToggleAction; diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 128eaeed..a8117c6e 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h index 641d93aa..2a1c6506 100644 --- a/kig/kig/kig_part.h +++ b/kig/kig/kig_part.h @@ -24,7 +24,7 @@ #include -#include +#include #include "../objects/common.h" diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h index 96da513c..2e09014a 100644 --- a/kig/kig/kig_view.h +++ b/kig/kig/kig_view.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc index c02226e8..67a0b9a4 100644 --- a/kig/scripting/newscriptwizard.cc +++ b/kig/scripting/newscriptwizard.cc @@ -32,13 +32,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/kig/scripting/newscriptwizard.h b/kig/scripting/newscriptwizard.h index ac690156..6fa9d07f 100644 --- a/kig/scripting/newscriptwizard.h +++ b/kig/scripting/newscriptwizard.h @@ -23,9 +23,9 @@ #include "script-common.h" #include -#include -#include -#include +#include +#include +#include #include diff --git a/kiten/Makefile.am b/kiten/Makefile.am index d96a4ebb..67356d1e 100644 --- a/kiten/Makefile.am +++ b/kiten/Makefile.am @@ -6,7 +6,7 @@ kiten_SOURCES = main.cpp kiten.cpp learn.cpp kloader.cpp ksaver.cpp \ configsearching.ui configlearn.ui configfont.ui configdictionariesbase.ui \ configdictionaries.cpp optiondialog.cpp kitenconfig.kcfgc -kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kiten_LDADD = libkiten.la $(LIB_KIO) bin_PROGRAMS = kiten kitengen @@ -23,7 +23,7 @@ libkiteninclude_HEADERS = \ asyndeta.h dict.h widgets.h kromajiedit.h rad.h deinf.h kitengen_SOURCES = xjdxgen.c -kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/klatin/klatin/Makefile.am b/klatin/klatin/Makefile.am index f87bfc5c..a9fa0eac 100644 --- a/klatin/klatin/Makefile.am +++ b/klatin/klatin/Makefile.am @@ -12,7 +12,7 @@ bin_PROGRAMS = klatin INCLUDES = $(all_includes) # the library search path. -klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. klatin_LDADD = $(LIB_KFILE) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la diff --git a/klettres/klettres/Makefile.am b/klettres/klettres/Makefile.am index dc6c2578..a42dcde2 100644 --- a/klettres/klettres/Makefile.am +++ b/klettres/klettres/Makefile.am @@ -24,7 +24,7 @@ METASOURCES = AUTO KDE_ICON = AUTO # the library search path. -klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/klettres.pot; diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h index 19370836..021ed3e0 100644 --- a/kmplot/kmplot/MainDlg.h +++ b/kmplot/kmplot/MainDlg.h @@ -36,9 +36,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #undef GrayScale diff --git a/kmplot/kmplot/kmplot.h b/kmplot/kmplot/kmplot.h index 6ca68451..3848015d 100644 --- a/kmplot/kmplot/kmplot.h +++ b/kmplot/kmplot/kmplot.h @@ -32,7 +32,7 @@ #include #include -#include +#include #include "kmplotIface.h" #include "kmplotprogress.h" diff --git a/kpercentage/kpercentage/Makefile.am b/kpercentage/kpercentage/Makefile.am index 443e70d7..7f02bc35 100644 --- a/kpercentage/kpercentage/Makefile.am +++ b/kpercentage/kpercentage/Makefile.am @@ -30,7 +30,7 @@ METASOURCES = AUTO # the library search path. -kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor stringstocpp: diff --git a/kstars/kstars/Makefile.am b/kstars/kstars/Makefile.am index 5d74fddf..58404f65 100644 --- a/kstars/kstars/Makefile.am +++ b/kstars/kstars/Makefile.am @@ -54,7 +54,7 @@ INCLUDES= -I$(top_srcdir) -Itools -I$(srcdir)/tools $(all_includes) METASOURCES = AUTO # the library search path. -kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE diff --git a/ktouch/src/Makefile.am b/ktouch/src/Makefile.am index 7f592eeb..e3661e88 100644 --- a/ktouch/src/Makefile.am +++ b/ktouch/src/Makefile.am @@ -50,7 +50,7 @@ ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \ ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp # the library search path. -ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/kturtle/file.txt b/kturtle/file.txt index 0037b68a..8203dad7 100644 --- a/kturtle/file.txt +++ b/kturtle/file.txt @@ -18,7 +18,7 @@ The following packages will be REMOVED: tdelibs4 tdelibs4-doc tdepim tdepim-kfile-plugins tdepim-libs tdeprint kdesktop tdm kfind kgpgcertmanager khelpcenter kicker kitchensync klipper kmail kmailcvt kmenuedit knode knotes konqueror konqueror-nsplugins konsole - kontact korganizer korn kpager kpersonalizer kpilot kscreensaver ksmserver + kontact korganizer korn kpager kpersonalizer kpilot tdescreensaver ksmserver ksplash ksync ksysguard ksysguardd ktip ktnef twin libarts1 libarts1-dev libartsc0 libkcal2 libtdenetwork2 libkgantt0 libkonq4 libmimelib1 x-window-system-core xlibmesa-dri xlibmesa-gl xlibmesa-glu diff --git a/kturtle/src/Makefile.am b/kturtle/src/Makefile.am index 4aa312d8..48282292 100644 --- a/kturtle/src/Makefile.am +++ b/kturtle/src/Makefile.am @@ -4,9 +4,9 @@ INCLUDES = $(all_includes) SUBDIRS = pics # added from kjots -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 -kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kturtle_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIB_KPARTS) -lkatepartinterfaces KDE_ICON = kturtle diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index 06f72c53..587c6020 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -41,16 +41,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "lexer.h" #include "settings.h" diff --git a/kturtle/src/kturtle.h b/kturtle/src/kturtle.h index 1cd77f55..6961fcc1 100644 --- a/kturtle/src/kturtle.h +++ b/kturtle/src/kturtle.h @@ -30,9 +30,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "canvas.h" #include "dialogs.h" diff --git a/kverbos/kverbos/Makefile.am b/kverbos/kverbos/Makefile.am index e78c5af2..622553a4 100644 --- a/kverbos/kverbos/Makefile.am +++ b/kverbos/kverbos/Makefile.am @@ -19,7 +19,7 @@ INCLUDES= $(all_includes) METASOURCES = AUTO # the library search path. -kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor rcdir = $(kde_datadir)/kverbos rc_DATA = kverbosui.rc diff --git a/kvoctrain/kvoctrain/Makefile.am b/kvoctrain/kvoctrain/Makefile.am index 4bed1eb1..1749e1d8 100644 --- a/kvoctrain/kvoctrain/Makefile.am +++ b/kvoctrain/kvoctrain/Makefile.am @@ -40,8 +40,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/kvt-core -Icommon-dialogs \ bin_PROGRAMS = kvoctrain spotlight2kvtml # the library search path. -kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor CLEANFILES = *.i.c diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am index 0c81f934..d8f49002 100644 --- a/kwordquiz/src/Makefile.am +++ b/kwordquiz/src/Makefile.am @@ -50,7 +50,7 @@ SUBDIRS = . pics examples METASOURCES = AUTO # the library search path. -kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor rcdir = $(kde_datadir)/kwordquiz rc_DATA = kwordquizui.rc eventsrc diff --git a/libtdeedu/extdate/Makefile.am b/libtdeedu/extdate/Makefile.am index a877a28e..c32d024f 100644 --- a/libtdeedu/extdate/Makefile.am +++ b/libtdeedu/extdate/Makefile.am @@ -11,11 +11,11 @@ libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) test_extdate_SOURCES = test_extdate.cc test_extdate_LDADD = libextdate.la -test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test_extdatepicker_SOURCES = testwidget.cpp main.cpp test_extdatepicker_LDADD = libextdate.la -test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp index 6b3c2843..7c935f7c 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.cpp +++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h index c77b2135..43b5fd92 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.h +++ b/libtdeedu/tdeeduui/tdeeduglossary.h @@ -16,7 +16,7 @@ ***************************************************************************/ -#include +#include #include class TQChar;