diff options
| author | Timothy Pearson <[email protected]> | 2011-07-17 19:19:26 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-07-17 19:19:26 -0500 |
| commit | 33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd (patch) | |
| tree | 4939d6567b50d0dd669257422a6868aa1259e62b /tqtinterface/qt4/src/workspace | |
| parent | f01eee0362e54f47d0266295c5263790c04b6510 (diff) | |
| download | experimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.tar.gz experimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.zip | |
Revert "Rename tqsize* to size*"
This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.
Diffstat (limited to 'tqtinterface/qt4/src/workspace')
| -rw-r--r-- | tqtinterface/qt4/src/workspace/tqworkspace.cpp | 8 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/workspace/tqworkspace.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tqtinterface/qt4/src/workspace/tqworkspace.cpp b/tqtinterface/qt4/src/workspace/tqworkspace.cpp index a169090..164a670 100644 --- a/tqtinterface/qt4/src/workspace/tqworkspace.cpp +++ b/tqtinterface/qt4/src/workspace/tqworkspace.cpp @@ -161,7 +161,7 @@ public: void doResize(); void doMove(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; TQSize baseSize() const; @@ -393,7 +393,7 @@ TQWorkspace::~TQWorkspace() } /*!\reimp */ -TQSize TQWorkspace::sizeHint() const +TQSize TQWorkspace::tqsizeHint() const { TQSize s( TQApplication::desktop()->size() ); return TQSize( s.width()*2/3, s.height()*2/3); @@ -2279,10 +2279,10 @@ TQSize TQWorkspaceChild::baseSize() const return TQSize( 2*frameWidth(), 2*frameWidth() + th ); } -TQSize TQWorkspaceChild::sizeHint() const +TQSize TQWorkspaceChild::tqsizeHint() const { if ( !childWidget ) - return TQFrame::sizeHint() + baseSize(); + return TQFrame::tqsizeHint() + baseSize(); TQSize prefSize = windowWidget()->sizeHint().expandedTo( windowWidget()->minimumSizeHint() ); prefSize = prefSize.expandedTo( windowWidget()->tqminimumSize() ).boundedTo( windowWidget()->tqmaximumSize() ); diff --git a/tqtinterface/qt4/src/workspace/tqworkspace.h b/tqtinterface/qt4/src/workspace/tqworkspace.h index b1649c2..2b128ec 100644 --- a/tqtinterface/qt4/src/workspace/tqworkspace.h +++ b/tqtinterface/qt4/src/workspace/tqworkspace.h @@ -89,7 +89,7 @@ public: TQWidgetList windowList() const; // ### merge with below in 4.0 TQWidgetList windowList( WindowOrder order ) const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool scrollBarsEnabled() const; void setScrollBarsEnabled( bool enable ); |