Rename a number of old tq methods that are no longer tq specific

7 files changed, 10 insertions, 10 deletions

diff --git a/qtinterface/qt4/Qt/q3dockarea.h b/qtinterface/qt4/Qt/q3dockarea.h
index c506368..011fcbd 100644
--- a/qtinterface/qt4/Qt/q3dockarea.h
+++ b/qtinterface/qt4/Qt/q3dockarea.h
@@ -90,7 +90,7 @@ public:
     QLayoutItem *itemAt(int) const;
     QLayoutItem *takeAt(int);
     int count() const;
-    Qt::Orientations expandingDirections() const { return Qt::Orientations(0); }
+    Qt::Orientations expanding() const { return Qt::Orientations(0); }
     void invalidate();
     Qt::Orientation orientation() const { return orient; }
     QList<QRect> lineList() const { return lines; }
diff --git a/qtinterface/qt4/Qt/qboxlayout.h b/qtinterface/qt4/Qt/qboxlayout.h
index 06ace10..45bcc8d 100644
--- a/qtinterface/qt4/Qt/qboxlayout.h
+++ b/qtinterface/qt4/Qt/qboxlayout.h
@@ -109,7 +109,7 @@ public:
     int heightForWidth(int) const;
     int minimumHeightForWidth(int) const;
 
-    Qt::Orientations expandingDirections() const;
+    Qt::Orientations expanding() const;
     void invalidate();
     QLayoutItem *itemAt(int) const;
     QLayoutItem *takeAt(int);
diff --git a/qtinterface/qt4/Qt/qformlayout.h b/qtinterface/qt4/Qt/qformlayout.h
index 9ef1943..338f370 100644
--- a/qtinterface/qt4/Qt/qformlayout.h
+++ b/qtinterface/qt4/Qt/qformlayout.h
@@ -140,7 +140,7 @@ public:
 
     bool hasHeightForWidth() const;
     int heightForWidth(int width) const;
-    Qt::Orientations expandingDirections() const;
+    Qt::Orientations expanding() const;
     int count() const;
 
     int rowCount() const;
diff --git a/qtinterface/qt4/Qt/qgridlayout.h b/qtinterface/qt4/Qt/qgridlayout.h
index e906a97..a33fc2a 100644
--- a/qtinterface/qt4/Qt/qgridlayout.h
+++ b/qtinterface/qt4/Qt/qgridlayout.h
@@ -110,7 +110,7 @@ public:
     int heightForWidth(int) const;
     int minimumHeightForWidth(int) const;
 
-    Qt::Orientations expandingDirections() const;
+    Qt::Orientations expanding() const;
     void invalidate();
 
     inline void addWidget(QWidget *w) { QLayout::addWidget(w); }
diff --git a/qtinterface/qt4/Qt/qlayout.h b/qtinterface/qt4/Qt/qlayout.h
index 5077d77..6713a34 100644
--- a/qtinterface/qt4/Qt/qlayout.h
+++ b/qtinterface/qt4/Qt/qlayout.h
@@ -158,7 +158,7 @@ public:
     void removeWidget(QWidget *w);
     void removeItem(QLayoutItem *);
 
-    Qt::Orientations expandingDirections() const;
+    Qt::Orientations expanding() const;
     QSize minimumSize() const;
     QSize maximumSize() const;
     virtual void setGeometry(const QRect&);
diff --git a/qtinterface/qt4/Qt/qlayoutitem.h b/qtinterface/qt4/Qt/qlayoutitem.h
index f934223..ec4c704 100644
--- a/qtinterface/qt4/Qt/qlayoutitem.h
+++ b/qtinterface/qt4/Qt/qlayoutitem.h
@@ -69,7 +69,7 @@ public:
     virtual QSize sizeHint() const = 0;
     virtual QSize minimumSize() const = 0;
     virtual QSize maximumSize() const = 0;
-    virtual Qt::Orientations expandingDirections() const = 0;
+    virtual Qt::Orientations expanding() const = 0;
     virtual void setGeometry(const QRect&) = 0;
     virtual QRect geometry() const = 0;
     virtual bool isEmpty() const = 0;
@@ -106,7 +106,7 @@ public:
     QSize sizeHint() const;
     QSize minimumSize() const;
     QSize maximumSize() const;
-    Qt::Orientations expandingDirections() const;
+    Qt::Orientations expanding() const;
     bool isEmpty() const;
     void setGeometry(const QRect&);
     QRect geometry() const;
@@ -128,7 +128,7 @@ public:
     QSize sizeHint() const;
     QSize minimumSize() const;
     QSize maximumSize() const;
-    Qt::Orientations expandingDirections() const;
+    Qt::Orientations expanding() const;
     bool isEmpty() const;
     void setGeometry(const QRect&);
     QRect geometry() const;
diff --git a/qtinterface/qt4/Qt/qsizepolicy.h b/qtinterface/qt4/Qt/qsizepolicy.h
index 76a8e75..fffc496 100644
--- a/qtinterface/qt4/Qt/qsizepolicy.h
+++ b/qtinterface/qt4/Qt/qsizepolicy.h
@@ -123,7 +123,7 @@ public:
     void setVerticalPolicy(Policy d) { data = (data & ~(HMask << HSize)) | (d << HSize); }
     void setControlType(ControlType type);
 
-    Qt::Orientations expandingDirections() const {
+    Qt::Orientations expanding() const {
         Qt::Orientations result;
         if (verticalPolicy() & ExpandFlag)
             result |= Qt::Vertical;
@@ -170,7 +170,7 @@ public:
     inline QT3_SUPPORT bool mayShrinkVertically() const { return verticalPolicy() & ShrinkFlag; }
     inline QT3_SUPPORT bool mayGrowHorizontally() const { return horizontalPolicy() & GrowFlag; }
     inline QT3_SUPPORT bool mayGrowVertically() const { return verticalPolicy() & GrowFlag; }
-    inline QT3_SUPPORT Qt::Orientations expanding() const { return expandingDirections(); }
+    inline QT3_SUPPORT Qt::Orientations expanding() const { return expanding(); }
 
     QT3_SUPPORT_CONSTRUCTOR QSizePolicy(Policy hor, Policy ver, bool hfw)
         : data(hor | (ver<<HSize) | (hfw ? (1U<<2*HSize) : 0)) { }