summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 19:18:53 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 19:18:53 -0500
commit07cb0159c03c6b24b1088c95ab3bbe0915f4df82 (patch)
tree9a2cfd2a589eefc953e99c8aef96b89c7feca1cf
parent2bde5a371051658ca7939d771722bbdfd0d828e5 (diff)
downloadexperimental-07cb0159c03c6b24b1088c95ab3bbe0915f4df82.tar.gz
experimental-07cb0159c03c6b24b1088c95ab3bbe0915f4df82.zip
Revert "Fix FTBFS"
This reverts commit 788af62a17eb6cfa50388059c61bc63fe3bb8b38.
-rw-r--r--tqtinterface/qt4/src/kernel/qt_kernel.pri2
-rw-r--r--tqtinterface/qt4/src/kernel/tqlayout.cpp2
-rw-r--r--tqtinterface/qt4/src/kernel/tqlayout.h2
-rw-r--r--tqtinterface/qt4/src/kernel/tqt.h2
-rw-r--r--tqtinterface/qt4/src/kernel/tqvariant.cpp2
-rw-r--r--tqtinterface/qt4/src/kernel/tqvariant.cpp.new2
-rw-r--r--tqtinterface/qt4/src/kernel/tqwidget.h2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/defs.h2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/metadatabase.h2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/shared/domtool.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/shared/ui2uib.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/uic/object.cpp2
14 files changed, 14 insertions, 14 deletions
diff --git a/tqtinterface/qt4/src/kernel/qt_kernel.pri b/tqtinterface/qt4/src/kernel/qt_kernel.pri
index 2324084..492b7b5 100644
--- a/tqtinterface/qt4/src/kernel/qt_kernel.pri
+++ b/tqtinterface/qt4/src/kernel/qt_kernel.pri
@@ -73,7 +73,7 @@ kernel {
$$KERNEL_H/tqsignalslotimp.h \
$$KERNEL_H/tqsize.h \
$$KERNEL_H/sizegrip.h \
- $$KERNEL_H/tqsizepolicy.h \
+ $$KERNEL_H/sizepolicy.h \
$$KERNEL_H/tqsocketnotifier.h \
$$KERNEL_H/tqsound.h \
$$KERNEL_H/tqstyle.h \
diff --git a/tqtinterface/qt4/src/kernel/tqlayout.cpp b/tqtinterface/qt4/src/kernel/tqlayout.cpp
index 4b883d2..a5c86dd 100644
--- a/tqtinterface/qt4/src/kernel/tqlayout.cpp
+++ b/tqtinterface/qt4/src/kernel/tqlayout.cpp
@@ -46,7 +46,7 @@
#include "tqwidget.h"
#include "tqmenubar.h"
#include "tqptrlist.h"
-#include "tqsizepolicy.h"
+#include "sizepolicy.h"
#include "tqlayoutengine_p.h"
diff --git a/tqtinterface/qt4/src/kernel/tqlayout.h b/tqtinterface/qt4/src/kernel/tqlayout.h
index eb994f0..d964838 100644
--- a/tqtinterface/qt4/src/kernel/tqlayout.h
+++ b/tqtinterface/qt4/src/kernel/tqlayout.h
@@ -52,7 +52,7 @@
#ifndef TQT_H
#include "tqobject.h"
-#include "tqsizepolicy.h"
+#include "sizepolicy.h"
#include "tqwidget.h"
#endif // TQT_H
diff --git a/tqtinterface/qt4/src/kernel/tqt.h b/tqtinterface/qt4/src/kernel/tqt.h
index 8304eec..e88f88e 100644
--- a/tqtinterface/qt4/src/kernel/tqt.h
+++ b/tqtinterface/qt4/src/kernel/tqt.h
@@ -44,7 +44,7 @@
#include <stdio.h>
#include "tqtextstream.h"
#include "tqfontinfo.h"
-#include "tqsizepolicy.h"
+#include "sizepolicy.h"
#include "tqtl.h"
#include "tqsize.h"
#include "tqrect.h"
diff --git a/tqtinterface/qt4/src/kernel/tqvariant.cpp b/tqtinterface/qt4/src/kernel/tqvariant.cpp
index bd022e1..e80e190 100644
--- a/tqtinterface/qt4/src/kernel/tqvariant.cpp
+++ b/tqtinterface/qt4/src/kernel/tqvariant.cpp
@@ -60,7 +60,7 @@
#include "tqbitmap.h"
#include "tqcursor.h"
#include "tqdatetime.h"
-#include "tqsizepolicy.h"
+#include "sizepolicy.h"
#include "tqshared.h"
#include "tqbitarray.h"
#include "tqkeysequence.h"
diff --git a/tqtinterface/qt4/src/kernel/tqvariant.cpp.new b/tqtinterface/qt4/src/kernel/tqvariant.cpp.new
index 22c05b3..3e41415 100644
--- a/tqtinterface/qt4/src/kernel/tqvariant.cpp.new
+++ b/tqtinterface/qt4/src/kernel/tqvariant.cpp.new
@@ -60,7 +60,7 @@
#include "tqbitmap.h"
#include "tqcursor.h"
#include "tqdatetime.h"
-#include "tqsizepolicy.h"
+#include "sizepolicy.h"
#include "tqshared.h"
#include "tqbitarray.h"
#include "tqkeysequence.h"
diff --git a/tqtinterface/qt4/src/kernel/tqwidget.h b/tqtinterface/qt4/src/kernel/tqwidget.h
index c0143e9..4f0e36b 100644
--- a/tqtinterface/qt4/src/kernel/tqwidget.h
+++ b/tqtinterface/qt4/src/kernel/tqwidget.h
@@ -51,7 +51,7 @@
#include "tqfont.h"
#include "tqfontmetrics.h"
#include "tqfontinfo.h"
-#include "tqsizepolicy.h"
+#include "sizepolicy.h"
#include "tqbitmap.h"
#endif // TQT_H
diff --git a/tqtinterface/qt4/tools/designer/designer/defs.h b/tqtinterface/qt4/tools/designer/designer/defs.h
index b6560d1..fb06317 100644
--- a/tqtinterface/qt4/tools/designer/designer/defs.h
+++ b/tqtinterface/qt4/tools/designer/designer/defs.h
@@ -34,7 +34,7 @@
#ifndef DEFS_H
#define DEFS_H
-#include <tqsizepolicy.h>
+#include <sizepolicy.h>
#include <tqstring.h>
#define POINTER_TOOL 32000
diff --git a/tqtinterface/qt4/tools/designer/designer/metadatabase.h b/tqtinterface/qt4/tools/designer/designer/metadatabase.h
index 0bcb8f8..4f12bac 100644
--- a/tqtinterface/qt4/tools/designer/designer/metadatabase.h
+++ b/tqtinterface/qt4/tools/designer/designer/metadatabase.h
@@ -39,7 +39,7 @@
#include <tqstringlist.h>
#include <tqmap.h>
#include <tqptrlist.h>
-#include <tqsizepolicy.h>
+#include <sizepolicy.h>
#include <tqsize.h>
#include <tqwidgetlist.h>
#include <tqcursor.h>
diff --git a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp
index 255ccfc..a425e06 100644
--- a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp
@@ -71,7 +71,7 @@
#include <tqcolordialog.h>
#include <tqlabel.h>
#include <tqlayout.h>
-#include <tqsizepolicy.h>
+#include <sizepolicy.h>
#include <tqbitmap.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
diff --git a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp
index 4571cf5..4931878 100644
--- a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp
@@ -43,7 +43,7 @@
#include <tqmessagebox.h>
#include <tqrect.h>
#include <tqregexp.h>
-#include <tqsizepolicy.h>
+#include <sizepolicy.h>
#include <ctype.h>
diff --git a/tqtinterface/qt4/tools/designer/shared/domtool.cpp b/tqtinterface/qt4/tools/designer/shared/domtool.cpp
index 0c50fbf..8175b2a 100644
--- a/tqtinterface/qt4/tools/designer/shared/domtool.cpp
+++ b/tqtinterface/qt4/tools/designer/shared/domtool.cpp
@@ -33,7 +33,7 @@
#include "domtool.h"
-#include <tqsizepolicy.h>
+#include <sizepolicy.h>
#include <tqcolor.h>
#include <tqcursor.h>
#include <tqdatetime.h>
diff --git a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp
index bf6335d..b49537e 100644
--- a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp
+++ b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp
@@ -44,7 +44,7 @@
#include <tqfont.h>
#include <tqobject.h>
#include <tqrect.h>
-#include <tqsizepolicy.h>
+#include <sizepolicy.h>
/*
The .uib file format is the binary counterpart of the .ui file
diff --git a/tqtinterface/qt4/tools/designer/uic/object.cpp b/tqtinterface/qt4/tools/designer/uic/object.cpp
index 1ce89b8..a489e22 100644
--- a/tqtinterface/qt4/tools/designer/uic/object.cpp
+++ b/tqtinterface/qt4/tools/designer/uic/object.cpp
@@ -35,7 +35,7 @@
#include "parser.h"
#include "domtool.h"
#include <tqregexp.h>
-#include <tqsizepolicy.h>
+#include <sizepolicy.h>
#include <tqstringlist.h>
#define NO_STATIC_COLORS
#include <globaldefs.h>