diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
| commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
| tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kontact/src/iconsidepane.cpp | |
| parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
| download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip | |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kontact/src/iconsidepane.cpp')
| -rw-r--r-- | kontact/src/iconsidepane.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index b54454e14..7e4d027ed 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -92,8 +92,8 @@ class PluginProxy using namespace Kontact; -EntryItem::EntryItem( Navigator *parent, Kontact::Plugin *plugin ) - : TQListBoxItem( parent ), +EntryItem::EntryItem( Navigator *tqparent, Kontact::Plugin *plugin ) + : TQListBoxItem( tqparent ), mPlugin( plugin ), mHasHover( false ), mPaintActive( false ) @@ -137,7 +137,7 @@ int EntryItem::width( const TQListBox *listbox ) const if ( navigator()->viewMode() == SmallIcons ) w += listbox->fontMetrics().width( text() ); else - w = QMAX( w, listbox->fontMetrics().width( text() ) ); + w = TQMAX( w, listbox->fontMetrics().width( text() ) ); } return w + ( KDialog::marginHint() * 2 ); } @@ -149,7 +149,7 @@ int EntryItem::height( const TQListBox *listbox ) const h = (int)navigator()->viewMode() + 4; if ( navigator()->showText() ) { if ( navigator()->viewMode() == SmallIcons || !navigator()->showIcons() ) - h = QMAX( h, listbox->fontMetrics().lineSpacing() ) + KDialog::spacingHint() * 2; + h = TQMAX( h, listbox->fontMetrics().lineSpacing() ) + KDialog::spacingHint() * 2; else h = (int)navigator()->viewMode() + listbox->fontMetrics().lineSpacing() + 4; } @@ -250,8 +250,8 @@ void EntryItem::setPaintActive( bool paintActive ) mPaintActive = paintActive; } -Navigator::Navigator( IconSidePane *parent, const char *name ) - : KListBox( parent, name ), mSidePane( parent ), +Navigator::Navigator( IconSidePane *tqparent, const char *name ) + : KListBox( tqparent, name ), mSidePane( tqparent ), mShowIcons( true ), mShowText( true ) { mMouseOn = 0; @@ -399,7 +399,7 @@ void Navigator::resizeEvent( TQResizeEvent *event ) void Navigator::enterEvent( TQEvent *event ) { - // work around Qt behaviour: onItem is not emmitted in enterEvent() + // work around TQt behaviour: onItem is not emmitted in enterEvent() KListBox::enterEvent( event ); emit onItem( itemAt( mapFromGlobal( TQCursor::pos() ) ) ); } @@ -535,8 +535,8 @@ void Navigator::slotMouseOff() slotMouseOn( 0 ); } -IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name ) - : SidePaneBase( core, parent, name ) +IconSidePane::IconSidePane( Core *core, TQWidget *tqparent, const char *name ) + : SidePaneBase( core, tqparent, name ) { mNavigator = new Navigator( this ); connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ), |