From 7422cac1a18dca897d3830a267eb91683d05a95b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:10:41 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- lib/kofficecore/KoDocument.cpp | 2 +- lib/kofficecore/KoDocument.h | 2 +- lib/kofficecore/KoDocumentChild.cpp | 2 +- lib/kofficecore/KoDocument_p.h | 2 +- lib/kofficecore/KoFactory.h | 2 +- lib/kofficecore/KoFrame.cpp | 2 +- lib/kofficecore/KoMainWindow.cpp | 8 ++++---- lib/kofficecore/KoMainWindow.h | 2 +- lib/kofficecore/KoQueryTrader.cpp | 2 +- lib/kofficecore/KoQueryTrader.h | 2 +- lib/kofficecore/KoView.cpp | 4 ++-- lib/kofficecore/KoView.h | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) (limited to 'lib/kofficecore') 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 #include #include -#include +#include #include #include 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 -#include +#include #include #include #include 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 #include -#include +#include #include #include 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 +#include 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 +#include #include 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 #include -#include +#include #include #include 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 #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -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 +#include #include #include #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 +#include #include #include 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 #include #include -#include -#include +#include +#include #include #include #include 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 #include -#include +#include #include #include -- cgit v1.2.1