From f629c284059b75ab5b2d654e9a4132b1fc7f73e8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:08:27 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- katapult/katapult/Makefile.am | 2 +- katapult/katapult/katapult.cpp | 2 +- katapult/katapult/katapultsettings.cpp | 2 +- katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp | 4 ++-- katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp | 4 ++-- katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp | 4 ++-- katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp | 4 ++-- katapult/plugins/catalogs/execcatalog/command.h | 2 +- katapult/plugins/catalogs/execcatalog/execcatalog.cpp | 4 ++-- katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp | 4 ++-- katapult/plugins/catalogs/googlecatalog/query.h | 2 +- katapult/plugins/catalogs/programcatalog/programcatalog.cpp | 4 ++-- katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp | 4 ++-- katapult/plugins/catalogs/spellcatalog/spelling.h | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) (limited to 'katapult') diff --git a/katapult/katapult/Makefile.am b/katapult/katapult/Makefile.am index af3f9c5..881d19d 100644 --- a/katapult/katapult/Makefile.am +++ b/katapult/katapult/Makefile.am @@ -16,7 +16,7 @@ bin_PROGRAMS = katapult # the application source, library search path, and link libraries katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \ katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel -katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor katapult_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la # this is where the desktop file will go diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 660b8e9..1f5ae44 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index b283ed0..522592c 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp index 0bade79..991dc72 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp @@ -21,8 +21,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp index c8391af..20bb887 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp index e8ae53c..dbb006f 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp @@ -22,8 +22,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp index 587b119..c1d772a 100644 --- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp +++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/execcatalog/command.h b/katapult/plugins/catalogs/execcatalog/command.h index 010de1e..4ed1ef9 100644 --- a/katapult/plugins/catalogs/execcatalog/command.h +++ b/katapult/plugins/catalogs/execcatalog/command.h @@ -26,7 +26,7 @@ #ifndef COMMAND_H #define COMMAND_H -#include +#include #include diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp index 9aed4e8..b4f136d 100644 --- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp +++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp @@ -25,8 +25,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp index 0db0782..4f65d0c 100644 --- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp +++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp @@ -25,8 +25,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include diff --git a/katapult/plugins/catalogs/googlecatalog/query.h b/katapult/plugins/catalogs/googlecatalog/query.h index 75f43dc..db5a5b5 100644 --- a/katapult/plugins/catalogs/googlecatalog/query.h +++ b/katapult/plugins/catalogs/googlecatalog/query.h @@ -26,7 +26,7 @@ #ifndef QUERY_H #define QUERY_H -#include +#include #include diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp index ef5ac83..d0d9854 100644 --- a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp +++ b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp index 0e75cd8..9303674 100644 --- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp @@ -25,8 +25,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.h b/katapult/plugins/catalogs/spellcatalog/spelling.h index 40dceaa..17fa298 100644 --- a/katapult/plugins/catalogs/spellcatalog/spelling.h +++ b/katapult/plugins/catalogs/spellcatalog/spelling.h @@ -23,7 +23,7 @@ #ifndef SPELLING_H #define SPELLING_H -#include +#include #include -- cgit v1.2.3