summaryrefslogtreecommitdiffstats
path: root/kompare/komparepart/kompareconnectwidget.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-12 01:36:19 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-12 01:36:19 +0000
commit99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch)
treeeff34cf0762227f6baf2a93e8fef48d4bed2651c /kompare/komparepart/kompareconnectwidget.cpp
parent1c104292188541106338d4940b0f04beeb4301a0 (diff)
downloadtdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz
tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip
TQt4 convert kdesdk
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kompare/komparepart/kompareconnectwidget.cpp')
-rw-r--r--kompare/komparepart/kompareconnectwidget.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 57185e5a..b0f4ab78 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -39,21 +39,21 @@ using namespace Diff2;
KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left,
KompareListView* right,
ViewSettings* settings,
- KompareSplitter* parent,
+ KompareSplitter* tqparent,
const char* name ) :
- QSplitterHandle(Horizontal, (TQSplitter *)parent, name),
+ QSplitterHandle(Qt::Horizontal, (QSplitter *)tqparent, name),
m_wid ( left, right, settings, this, name ),
m_label ( "", this ),
m_layout ( this )
{
- setSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) );
- m_wid.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
- m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) );
+ m_wid.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
+ m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
m_label.setMargin(3);
TQFrame* bottomLine = new TQFrame(this);
bottomLine->setFrameShape(TQFrame::HLine);
bottomLine->setFrameShadow ( TQFrame::Plain );
- bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
bottomLine->setFixedHeight(1);
m_layout.setSpacing(0);
m_layout.setMargin(0);
@@ -66,19 +66,19 @@ KompareConnectWidgetFrame::~KompareConnectWidgetFrame()
{
}
-TQSize KompareConnectWidgetFrame::sizeHint() const
+TQSize KompareConnectWidgetFrame::tqsizeHint() const
{
- return TQSize(50, style().pixelMetric( TQStyle::PM_ScrollBarExtent ) );
+ return TQSize(50, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) );
}
static int kMouseOffset;
void KompareConnectWidgetFrame::mouseMoveEvent( TQMouseEvent *e )
{
- if ( !(e->state()&LeftButton) )
+ if ( !(e->state()&Qt::LeftButton) )
return;
- QCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
+ TQCOORD pos = s->pick( tqparentWidget()->mapFromGlobal(e->globalPos()) )
- kMouseOffset;
((KompareSplitter*)s)->moveSplitter( pos, id() );
@@ -86,23 +86,23 @@ void KompareConnectWidgetFrame::mouseMoveEvent( TQMouseEvent *e )
void KompareConnectWidgetFrame::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == LeftButton )
+ if ( e->button() == Qt::LeftButton )
kMouseOffset = s->pick( e->pos() );
QSplitterHandle::mousePressEvent(e);
}
void KompareConnectWidgetFrame::mouseReleaseEvent( TQMouseEvent *e )
{
- if ( !opaque() && e->button() == LeftButton ) {
- QCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
+ if ( !opaque() && e->button() == Qt::LeftButton ) {
+ TQCOORD pos = s->pick( tqparentWidget()->mapFromGlobal(e->globalPos()) )
- kMouseOffset;
((KompareSplitter*)s)->moveSplitter( pos, id() );
}
}
KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListView* right,
- ViewSettings* settings, TQWidget* parent, const char* name )
- : TQWidget(parent, name),
+ ViewSettings* settings, TQWidget* tqparent, const char* name )
+ : TQWidget(tqparent, name),
m_settings( settings ),
m_leftView( left ),
m_rightView( right ),
@@ -111,8 +111,8 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi
{
// connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) );
setBackgroundMode( NoBackground );
- setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
- setFocusProxy( parent->parentWidget() );
+ tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+ setFocusProxy( tqparent->tqparentWidget() );
}
KompareConnectWidget::~KompareConnectWidget()
@@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe
void KompareConnectWidget::slotDelayedRepaint()
{
- TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( tqrepaint() ) );
}
void KompareConnectWidget::slotSetSelection( const Difference* diff )
@@ -169,8 +169,8 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ )
int lastL = m_leftView->lastVisibleDifference();
int lastR = m_rightView->lastVisibleDifference();
- int first = firstL < 0 ? firstR : QMIN( firstL, firstR );
- int last = lastL < 0 ? lastR : QMAX( lastL, lastR );
+ int first = firstL < 0 ? firstR : TQMIN( firstL, firstR );
+ int last = lastL < 0 ? lastR : TQMAX( lastL, lastR );
// kdDebug(8106) << " left: " << firstL << " - " << lastL << endl;
// kdDebug(8106) << " right: " << firstR << " - " << lastR << endl;
@@ -190,13 +190,13 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ )
if ( TQApplication::reverseLayout() )
{
- leftRect = m_rightView->itemRect( i );
- rightRect = m_leftView->itemRect( i );
+ leftRect = m_rightView->tqitemRect( i );
+ rightRect = m_leftView->tqitemRect( i );
}
else
{
- leftRect = m_leftView->itemRect( i );
- rightRect = m_rightView->itemRect( i );
+ leftRect = m_leftView->tqitemRect( i );
+ rightRect = m_rightView->tqitemRect( i );
}
int tl = leftRect.top();