From 2bde5a371051658ca7939d771722bbdfd0d828e5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Jul 2011 19:01:13 -0500 Subject: [PATCH] Fix FTBFS --- tqtinterface/qt4/src/kernel/qt_kernel.pri | 2 +- tqtinterface/qt4/src/kernel/tqlayout.cpp | 2 +- tqtinterface/qt4/src/kernel/tqlayout.h | 2 +- tqtinterface/qt4/src/kernel/tqt.h | 2 +- tqtinterface/qt4/src/kernel/tqvariant.cpp | 2 +- tqtinterface/qt4/src/kernel/tqvariant.cpp.new | 2 +- tqtinterface/qt4/src/kernel/tqwidget.h | 2 +- tqtinterface/qt4/tools/designer/designer/defs.h | 2 +- tqtinterface/qt4/tools/designer/designer/metadatabase.h | 2 +- tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp | 2 +- tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp | 2 +- tqtinterface/qt4/tools/designer/shared/domtool.cpp | 2 +- tqtinterface/qt4/tools/designer/shared/ui2uib.cpp | 2 +- tqtinterface/qt4/tools/designer/uic/object.cpp | 2 +- 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 492b7b5..2324084 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/sizepolicy.h \ + $$KERNEL_H/tqsizepolicy.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 a5c86dd..4b883d2 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 "sizepolicy.h" +#include "tqsizepolicy.h" #include "tqlayoutengine_p.h" diff --git a/tqtinterface/qt4/src/kernel/tqlayout.h b/tqtinterface/qt4/src/kernel/tqlayout.h index d964838..eb994f0 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 "sizepolicy.h" +#include "tqsizepolicy.h" #include "tqwidget.h" #endif // TQT_H diff --git a/tqtinterface/qt4/src/kernel/tqt.h b/tqtinterface/qt4/src/kernel/tqt.h index e88f88e..8304eec 100644 --- a/tqtinterface/qt4/src/kernel/tqt.h +++ b/tqtinterface/qt4/src/kernel/tqt.h @@ -44,7 +44,7 @@ #include #include "tqtextstream.h" #include "tqfontinfo.h" -#include "sizepolicy.h" +#include "tqsizepolicy.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 e80e190..bd022e1 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 "sizepolicy.h" +#include "tqsizepolicy.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 3e41415..22c05b3 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 "sizepolicy.h" +#include "tqsizepolicy.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 4f0e36b..c0143e9 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 "sizepolicy.h" +#include "tqsizepolicy.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 fb06317..b6560d1 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 +#include #include #define POINTER_TOOL 32000 diff --git a/tqtinterface/qt4/tools/designer/designer/metadatabase.h b/tqtinterface/qt4/tools/designer/designer/metadatabase.h index 4f12bac..0bcb8f8 100644 --- a/tqtinterface/qt4/tools/designer/designer/metadatabase.h +++ b/tqtinterface/qt4/tools/designer/designer/metadatabase.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp index a425e06..255ccfc 100644 --- a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp +++ b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp @@ -71,7 +71,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp index 4931878..4571cf5 100644 --- a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include diff --git a/tqtinterface/qt4/tools/designer/shared/domtool.cpp b/tqtinterface/qt4/tools/designer/shared/domtool.cpp index 8175b2a..0c50fbf 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 +#include #include #include #include diff --git a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp index b49537e..bf6335d 100644 --- a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp +++ b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include /* 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 a489e22..1ce89b8 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 -#include +#include #include #define NO_STATIC_COLORS #include