Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 11 insertions, 5 deletions

diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h
index 995497268..d91113660 100644
--- a/kicker/kicker/core/containerarealayout.h
+++ b/kicker/kicker/core/containerarealayout.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class ContainerAreaLayout;
 
-class ContainerAreaLayoutItem : public Qt
+class ContainerAreaLayoutItem : public TQt
 {
     public:
         ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* layout)
@@ -71,7 +71,7 @@ class ContainerAreaLayoutItem : public Qt
         ContainerAreaLayout* m_layout;
 };
 
-class ContainerAreaLayout : public QLayout
+class ContainerAreaLayout : public TQLayout
 {
     public:
         typedef ContainerAreaLayoutItem Item;
@@ -79,12 +79,12 @@ class ContainerAreaLayout : public QLayout
 
         ContainerAreaLayout(TQWidget* parent);
 
-        void addItem(TQLayoutItem* item);
+        void addItem(QLayoutItem* item);
         void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint);
         TQStringList listItems() const;
         TQWidget* widgetAt(int index) const;
-        TQSize sizeHint() const;
-        TQSize minimumSize() const;
+        TQSize tqsizeHint() const;
+        TQSize tqminimumSize() const;
         TQLayoutIterator iterator();
         void setGeometry(const TQRect& rect);
 
@@ -108,6 +108,12 @@ class ContainerAreaLayout : public QLayout
         int leftR() const;
         int rightR() const;
 
+#ifdef USE_QT4
+
+        QLAYOUT_REQUIRED_METHOD_DECLARATIONS
+
+#endif // USE_QT4
+
     private:
         int moveContainerPushRecursive(ItemList::const_iterator it, int distance);
         int distanceToPreviousItem(ItemList::const_iterator it) const;