summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-06 13:21:04 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-06 13:21:04 -0500
commit5b8fb8d16e8ccc768f14b4dba66ae9813cfd4e14 (patch)
tree9445c98da00e5ef800fc78f52e91a83de50caf4b
parentabad789602d2d90f0e379ab84f7cf399d6737fd3 (diff)
downloadtde-5b8fb8d16e8ccc768f14b4dba66ae9813cfd4e14.tar.gz
tde-5b8fb8d16e8ccc768f14b4dba66ae9813cfd4e14.zip
Fix another Qt3/TQt4 FTBFS related to the QSplitter commit
-rw-r--r--experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp10
-rw-r--r--experimental/tqtinterface/qt4/src/widgets/tqsplitter.h11
-rw-r--r--main/dependencies/qt3/src/widgets/qsplitter.cpp10
-rw-r--r--main/dependencies/qt3/src/widgets/qsplitter.h11
4 files changed, 20 insertions, 22 deletions
diff --git a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp
index 5abfc7185..50a4a1338 100644
--- a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp
+++ b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp
@@ -148,6 +148,16 @@ void TQSplitterHandle::paintEvent( TQPaintEvent * )
TQStyle::Style_Horizontal : 0) );
}
+TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient )
+{
+ if ( sizer == -1 ) {
+ TQSize s = wid->tqsizeHint();
+ if ( !s.isValid() || wid->testWState(WState_Resized) )
+ s = wid->size();
+ sizer = ( orient == Qt::Horizontal ) ? s.width() : s.height();
+ }
+ return sizer;
+}
/*!
\class TQSplitter
diff --git a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h
index 1ad769355..306e14470 100644
--- a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h
+++ b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h
@@ -83,17 +83,6 @@ public:
TQCOORD getSizer( Qt::Orientation orient );
};
-TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient )
-{
- if ( sizer == -1 ) {
- TQSize s = wid->tqsizeHint();
- if ( !s.isValid() || wid->testWState(WState_Resized) )
- s = wid->size();
- sizer = ( orient == Qt::Horizontal ) ? s.width() : s.height();
- }
- return sizer;
-}
-
class TQ_EXPORT TQSplitter : public TQFrame
{
Q_OBJECT
diff --git a/main/dependencies/qt3/src/widgets/qsplitter.cpp b/main/dependencies/qt3/src/widgets/qsplitter.cpp
index add3ade04..407441f5c 100644
--- a/main/dependencies/qt3/src/widgets/qsplitter.cpp
+++ b/main/dependencies/qt3/src/widgets/qsplitter.cpp
@@ -148,6 +148,16 @@ void QSplitterHandle::paintEvent( QPaintEvent * )
QStyle::Style_Horizontal : 0) );
}
+QCOORD QSplitterLayoutStruct::getSizer( Orientation orient )
+{
+ if ( sizer == -1 ) {
+ QSize s = wid->sizeHint();
+ if ( !s.isValid() || wid->testWState(WState_Resized) )
+ s = wid->size();
+ sizer = ( orient == Horizontal ) ? s.width() : s.height();
+ }
+ return sizer;
+}
/*!
\class QSplitter
diff --git a/main/dependencies/qt3/src/widgets/qsplitter.h b/main/dependencies/qt3/src/widgets/qsplitter.h
index b5012f654..fea0af3ef 100644
--- a/main/dependencies/qt3/src/widgets/qsplitter.h
+++ b/main/dependencies/qt3/src/widgets/qsplitter.h
@@ -83,17 +83,6 @@ public:
QCOORD getSizer( Orientation orient );
};
-QCOORD QSplitterLayoutStruct::getSizer( Orientation orient )
-{
- if ( sizer == -1 ) {
- QSize s = wid->sizeHint();
- if ( !s.isValid() || wid->testWState(WState_Resized) )
- s = wid->size();
- sizer = ( orient == Horizontal ) ? s.width() : s.height();
- }
- return sizer;
-}
-
class Q_EXPORT QSplitter : public QFrame
{
Q_OBJECT