summaryrefslogtreecommitdiffstats
path: root/example
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:48:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:48:17 -0600
commit63f984a752aa6a6a73e3af795b05a5a042833eff (patch)
tree89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /example
parent3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
downloadkoffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'example')
-rw-r--r--example/example_aboutdata.h2
-rw-r--r--example/example_factory.cc2
-rw-r--r--example/example_view.cc2
-rw-r--r--example/main.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/example/example_aboutdata.h b/example/example_aboutdata.h
index a1f69b7f..6c53d670 100644
--- a/example/example_aboutdata.h
+++ b/example/example_aboutdata.h
@@ -21,7 +21,7 @@
#define EXAMPLE_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char* description=I18N_NOOP("Example KOffice Program");
static const char* version="0.1";
diff --git a/example/example_factory.cc b/example/example_factory.cc
index 307b7e93..9564e5fa 100644
--- a/example/example_factory.cc
+++ b/example/example_factory.cc
@@ -22,7 +22,7 @@
#include <example_aboutdata.h>
#include <kinstance.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
K_EXPORT_COMPONENT_FACTORY( libexamplepart, ExampleFactory )
diff --git a/example/example_view.cc b/example/example_view.cc
index 57d26b07..e681bdb3 100644
--- a/example/example_view.cc
+++ b/example/example_view.cc
@@ -25,7 +25,7 @@
#include <tqiconset.h>
#include <tdeaction.h>
#include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
ExampleView::ExampleView( ExamplePart* part, TQWidget* parent, const char* name )
diff --git a/example/main.cc b/example/main.cc
index dd4b0129..ecffb373 100644
--- a/example/main.cc
+++ b/example/main.cc
@@ -21,7 +21,7 @@
#include <KoDocument.h>
#include <KoMainWindow.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include "example_aboutdata.h"
#include <koffice_export.h>