diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:07 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:07 -0600 |
commit | fb758f679005d3eb923888302ade9b6e4dda15bb (patch) | |
tree | 60658c27bd33523266b992b1e50774ca76b965a1 /keduca | |
parent | 9f2c757e1a1694373c11427a00502c2ff4c2d403 (diff) | |
download | tdeedu-fb758f679005d3eb923888302ade9b6e4dda15bb.tar.gz tdeedu-fb758f679005d3eb923888302ade9b6e4dda15bb.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'keduca')
-rw-r--r-- | keduca/keduca/keduca.cpp | 2 | ||||
-rw-r--r-- | keduca/keduca/keduca.h | 4 | ||||
-rw-r--r-- | keduca/keduca/keduca_part.cpp | 2 | ||||
-rw-r--r-- | keduca/keduca/keduca_part.h | 2 | ||||
-rw-r--r-- | keduca/keducabuilder/Makefile.am | 2 | ||||
-rw-r--r-- | keduca/libkeduca/Makefile.am | 2 | ||||
-rw-r--r-- | keduca/libkeduca/fileread.h | 2 |
7 files changed, 8 insertions, 8 deletions
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 <kfiledialog.h> #include <kdebug.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <tqlabel.h> 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 <kapplication.h> -#include <kparts/mainwindow.h> -#include <kparts/part.h> +#include <tdeparts/mainwindow.h> +#include <tdeparts/part.h> #include <kaction.h> /** 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 <kaboutdata.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kstdaction.h> #include <kconfigdialog.h> 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 <kparts/part.h> +#include <tdeparts/part.h> 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. |