summaryrefslogtreecommitdiffstats
path: root/kig/misc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:56:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:56:40 -0600
commit4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e (patch)
tree8bdb18e6838f1eb1357e22b6e50b2948d33868a6 /kig/misc
parentd5f01dcc48ac3af828089b8810ef30a245e0346b (diff)
downloadtdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.tar.gz
tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kig/misc')
-rw-r--r--kig/misc/builtin_stuff.cc2
-rw-r--r--kig/misc/common.cpp2
-rw-r--r--kig/misc/coordinate_system.cpp4
-rw-r--r--kig/misc/goniometry.cc2
-rw-r--r--kig/misc/guiaction.cc2
-rw-r--r--kig/misc/kigfiledialog.cc4
-rw-r--r--kig/misc/kiginputdialog.cc2
-rw-r--r--kig/misc/kigtransform.cpp2
-rw-r--r--kig/misc/lists.cc4
-rw-r--r--kig/misc/object_constructor.cc2
-rw-r--r--kig/misc/object_hierarchy.cc2
-rw-r--r--kig/misc/special_constructors.cc2
12 files changed, 15 insertions, 15 deletions
diff --git a/kig/misc/builtin_stuff.cc b/kig/misc/builtin_stuff.cc
index 85d0d110..d42ef8ad 100644
--- a/kig/misc/builtin_stuff.cc
+++ b/kig/misc/builtin_stuff.cc
@@ -42,7 +42,7 @@
#include "../objects/vector_type.h"
#include "../objects/polygon_type.h"
-#include <klocale.h>
+#include <tdelocale.h>
void setupBuiltinStuff()
{
diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp
index 287bde1f..5e82d564 100644
--- a/kig/misc/common.cpp
+++ b/kig/misc/common.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <knumvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#if KDE_IS_VERSION( 3, 1, 90 )
#include <kinputdialog.h>
#else
diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp
index 33ec67ce..194a008f 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -32,8 +32,8 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <knumvalidator.h>
#include <string>
diff --git a/kig/misc/goniometry.cc b/kig/misc/goniometry.cc
index 61e13358..ee4f75fa 100644
--- a/kig/misc/goniometry.cc
+++ b/kig/misc/goniometry.cc
@@ -25,7 +25,7 @@
#include <tqstringlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <cmath>
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index 831a4b64..0d7b35d9 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -32,7 +32,7 @@
#include "../objects/bogus_imp.h"
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
diff --git a/kig/misc/kigfiledialog.cc b/kig/misc/kigfiledialog.cc
index 2d7ea08f..28d4dc74 100644
--- a/kig/misc/kigfiledialog.cc
+++ b/kig/misc/kigfiledialog.cc
@@ -21,8 +21,8 @@
#include <tqfile.h>
#include <tqpoint.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
KigFileDialog::KigFileDialog( const TQString& startDir, const TQString& filter,
const TQString& caption, TQWidget* parent )
diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc
index ac7f9ac5..a596c87c 100644
--- a/kig/misc/kiginputdialog.cc
+++ b/kig/misc/kiginputdialog.cc
@@ -36,7 +36,7 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ktextedit.h>
class KigInputDialogPrivate
diff --git a/kig/misc/kigtransform.cpp b/kig/misc/kigtransform.cpp
index bc446403..2bb0e91a 100644
--- a/kig/misc/kigtransform.cpp
+++ b/kig/misc/kigtransform.cpp
@@ -26,7 +26,7 @@
#include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// Transformation getProjectiveTransformation ( int argsnum,
diff --git a/kig/misc/lists.cc b/kig/misc/lists.cc
index d3a4fb4d..f0e0c3f7 100644
--- a/kig/misc/lists.cc
+++ b/kig/misc/lists.cc
@@ -24,8 +24,8 @@
#include "config.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqdom.h>
diff --git a/kig/misc/object_constructor.cc b/kig/misc/object_constructor.cc
index f2b9f330..ae2a37d0 100644
--- a/kig/misc/object_constructor.cc
+++ b/kig/misc/object_constructor.cc
@@ -38,7 +38,7 @@
#include <tqpen.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <algorithm>
#include <functional>
diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc
index da89b66c..7861c56e 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cc
@@ -26,7 +26,7 @@
#include "../objects/transform_types.h"
#include "../objects/object_type.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqdom.h>
class ObjectHierarchy::Node
diff --git a/kig/misc/special_constructors.cc b/kig/misc/special_constructors.cc
index 51ac346e..9618bc90 100644
--- a/kig/misc/special_constructors.cc
+++ b/kig/misc/special_constructors.cc
@@ -54,7 +54,7 @@
#include <tqpen.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <algorithm>
#include <functional>