diff options
Diffstat (limited to 'tdeui')
78 files changed, 352 insertions, 352 deletions
diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp index 1805714f2..a730f179e 100644 --- a/tdeui/kanimwidget.cpp +++ b/tdeui/kanimwidget.cpp @@ -140,7 +140,7 @@ void KAnimWidget::mousePressEvent( TQMouseEvent *e ) void KAnimWidget::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && rect().contains( e->pos() ) ) emit clicked(); diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp index 4dbbe5bab..b1ecc4c88 100644 --- a/tdeui/karrowbutton.cpp +++ b/tdeui/karrowbutton.cpp @@ -24,10 +24,10 @@ class KArrowButtonPrivate { public: - Qt::ArrowType arrow; + TQt::ArrowType arrow; }; -KArrowButton::KArrowButton(TQWidget *parent, Qt::ArrowType arrow, +KArrowButton::KArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name) : TQPushButton(parent, name) { @@ -45,14 +45,14 @@ TQSize KArrowButton::sizeHint() const return TQSize( 12, 12 ); } -void KArrowButton::setArrowType(Qt::ArrowType a) +void KArrowButton::setArrowType(TQt::ArrowType a) { if (d->arrow != a) { d->arrow = a; repaint(); } } -Qt::ArrowType KArrowButton::arrowType() const +TQt::ArrowType KArrowButton::arrowType() const { return d->arrow; } @@ -95,10 +95,10 @@ void KArrowButton::drawButton(TQPainter *p) TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft; switch (d->arrow) { - case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: e = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: e = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Enabled; if ( isDown() ) diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h index 7634ea4ce..a1843ad18 100644 --- a/tdeui/karrowbutton.h +++ b/tdeui/karrowbutton.h @@ -48,7 +48,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton * @param arrow The direction the arrrow should be pointing in * @param name An internal name for this widget */ - KArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, + KArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); /** @@ -65,11 +65,11 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton * Returns the arrow type * @since 3.4 */ - Qt::ArrowType arrowType() const; + TQt::ArrowType arrowType() const; // hacks for moc braindamages with enums int arrowTp() const { return (int) arrowType(); } - void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); } + void setArrowTp( int tp ) { setArrowType( (TQt::ArrowType) tp ); } public slots: /** * Defines in what direction the arrow is pointing to. Will repaint the @@ -77,7 +77,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton * * @param a The direction this arrow should be pointing in */ - void setArrowType(Qt::ArrowType a); + void setArrowType(TQt::ArrowType a); protected: /** diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index bd7559f42..874aee4d4 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -122,7 +122,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou parent ); connect( m_configureEmail, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotConfigureEmail() ) ); - glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, (Qt::AlignmentFlags)(AlignTop|AlignRight) ); + glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, TQt::AlignTop|TQt::AlignRight ); // To qwtstr = i18n( "The email address this bug report is sent to." ); diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp index faa26e95e..a1f107996 100644 --- a/tdeui/kbuttonbox.cpp +++ b/tdeui/kbuttonbox.cpp @@ -183,7 +183,7 @@ void KButtonBox::layout() { void KButtonBox::placeButtons() { - if(data->orientation == Qt::Horizontal) { + if(data->orientation == TQt::Horizontal) { // calculate free size and stretches int fs = width() - 2 * data->border; int stretch = 0; @@ -323,7 +323,7 @@ TQSize KButtonBox::sizeHint() const { else s = bs; - if(data->orientation == Qt::Horizontal) + if(data->orientation == TQt::Horizontal) dw += s.width(); else dw += s.height(); @@ -335,7 +335,7 @@ TQSize KButtonBox::sizeHint() const { ++itr; } - if(data->orientation == Qt::Horizontal) + if(data->orientation == TQt::Horizontal) return TQSize(dw, bs.height() + 2 * data->border); else return TQSize(bs.width() + 2 * data->border, dw); @@ -344,7 +344,7 @@ TQSize KButtonBox::sizeHint() const { TQSizePolicy KButtonBox::sizePolicy() const { - return data->orientation == Qt::Horizontal? + return data->orientation == TQt::Horizontal? TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) : TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); } diff --git a/tdeui/kbuttonbox.h b/tdeui/kbuttonbox.h index 4fd9e7ddb..5e0ce32fa 100644 --- a/tdeui/kbuttonbox.h +++ b/tdeui/kbuttonbox.h @@ -51,7 +51,7 @@ public: * addButton() are laid out from top to bottom, otherwise they * are laid out from left to right. */ - KButtonBox(TQWidget *parent, Orientation _orientation = Qt::Horizontal, + KButtonBox(TQWidget *parent, Orientation _orientation = TQt::Horizontal, int border = 0, int _autoborder = 6); /** diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp index 7f4529b27..a4cc92791 100644 --- a/tdeui/kcharselect.cpp +++ b/tdeui/kcharselect.cpp @@ -382,7 +382,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar ); lFont->resize( lFont->sizeHint() ); - lFont->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lFont->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); lFont->setMaximumWidth( lFont->sizeHint().width() ); fontCombo = new TQComboBox( true, bar ); @@ -393,7 +393,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); lTable->resize( lTable->sizeHint() ); - lTable->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lTable->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); lTable->setMaximumWidth( lTable->sizeHint().width() ); tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); @@ -403,7 +403,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); lUnicode->resize( lUnicode->sizeHint() ); - lUnicode->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lUnicode->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp index 60e250575..996623551 100644 --- a/tdeui/kcmenumngr.cpp +++ b/tdeui/kcmenumngr.cpp @@ -70,7 +70,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) TQPoint pos; switch ( e->type() ) { case TQEvent::MouseButtonPress: - if (((TQMouseEvent*) e )->button() != Qt::RightButton ) + if (((TQMouseEvent*) e )->button() != TQt::RightButton ) break; if ( !showOnPress ) return true; // eat event for safety @@ -78,7 +78,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) pos = ((TQMouseEvent*) e )->globalPos(); break; case TQEvent::MouseButtonRelease: - if ( showOnPress || ((TQMouseEvent*) e )->button() != Qt::RightButton ) + if ( showOnPress || ((TQMouseEvent*) e )->button() != TQt::RightButton ) break; popup = menus[o]; pos = ((TQMouseEvent*) e )->globalPos(); diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp index 5a42406a0..37ab8a111 100644 --- a/tdeui/kcolorbutton.cpp +++ b/tdeui/kcolorbutton.cpp @@ -174,7 +174,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e) void KColorButton::mouseMoveEvent( TQMouseEvent *e) { - if( (e->state() & Qt::LeftButton) && + if( (e->state() & TQt::LeftButton) && (e->pos()-mPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { // Drag color object diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp index 87d5de32a..676774b2f 100644 --- a/tdeui/kcolorcombo.cpp +++ b/tdeui/kcolorcombo.cpp @@ -79,23 +79,23 @@ static void createStandardPalette() int i = 0; - standardPalette[i++] = Qt::red; - standardPalette[i++] = Qt::green; - standardPalette[i++] = Qt::blue; - standardPalette[i++] = Qt::cyan; - standardPalette[i++] = Qt::magenta; - standardPalette[i++] = Qt::yellow; - standardPalette[i++] = Qt::darkRed; - standardPalette[i++] = Qt::darkGreen; - standardPalette[i++] = Qt::darkBlue; - standardPalette[i++] = Qt::darkCyan; - standardPalette[i++] = Qt::darkMagenta; - standardPalette[i++] = Qt::darkYellow; - standardPalette[i++] = Qt::white; - standardPalette[i++] = Qt::lightGray; - standardPalette[i++] = Qt::gray; - standardPalette[i++] = Qt::darkGray; - standardPalette[i++] = Qt::black; + standardPalette[i++] = TQt::red; + standardPalette[i++] = TQt::green; + standardPalette[i++] = TQt::blue; + standardPalette[i++] = TQt::cyan; + standardPalette[i++] = TQt::magenta; + standardPalette[i++] = TQt::yellow; + standardPalette[i++] = TQt::darkRed; + standardPalette[i++] = TQt::darkGreen; + standardPalette[i++] = TQt::darkBlue; + standardPalette[i++] = TQt::darkCyan; + standardPalette[i++] = TQt::darkMagenta; + standardPalette[i++] = TQt::darkYellow; + standardPalette[i++] = TQt::white; + standardPalette[i++] = TQt::lightGray; + standardPalette[i++] = TQt::gray; + standardPalette[i++] = TQt::darkGray; + standardPalette[i++] = TQt::black; } #endif diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index e5832f81f..9eb28b07f 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -191,23 +191,23 @@ static void createStandardPalette() int i = 0; - standardPalette[i++] = Qt::red; - standardPalette[i++] = Qt::green; - standardPalette[i++] = Qt::blue; - standardPalette[i++] = Qt::cyan; - standardPalette[i++] = Qt::magenta; - standardPalette[i++] = Qt::yellow; - standardPalette[i++] = Qt::darkRed; - standardPalette[i++] = Qt::darkGreen; - standardPalette[i++] = Qt::darkBlue; - standardPalette[i++] = Qt::darkCyan; - standardPalette[i++] = Qt::darkMagenta; - standardPalette[i++] = Qt::darkYellow; - standardPalette[i++] = Qt::white; - standardPalette[i++] = Qt::lightGray; - standardPalette[i++] = Qt::gray; - standardPalette[i++] = Qt::darkGray; - standardPalette[i++] = Qt::black; + standardPalette[i++] = TQt::red; + standardPalette[i++] = TQt::green; + standardPalette[i++] = TQt::blue; + standardPalette[i++] = TQt::cyan; + standardPalette[i++] = TQt::magenta; + standardPalette[i++] = TQt::yellow; + standardPalette[i++] = TQt::darkRed; + standardPalette[i++] = TQt::darkGreen; + standardPalette[i++] = TQt::darkBlue; + standardPalette[i++] = TQt::darkCyan; + standardPalette[i++] = TQt::darkMagenta; + standardPalette[i++] = TQt::darkYellow; + standardPalette[i++] = TQt::white; + standardPalette[i++] = TQt::lightGray; + standardPalette[i++] = TQt::gray; + standardPalette[i++] = TQt::darkGray; + standardPalette[i++] = TQt::black; } @@ -263,7 +263,7 @@ void KHSSelector::drawPalette( TQPixmap *pixmap ) //----------------------------------------------------------------------------- KValueSelector::KValueSelector( TQWidget *parent, const char *name ) - : TDESelector( Qt::Vertical, parent, name ), _hue(0), _sat(0) + : TDESelector( TQt::Vertical, parent, name ), _hue(0), _sat(0) { setRange( 0, 255 ); pixmap.setOptimization( TQPixmap::BestOptim ); @@ -300,7 +300,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap ) uint *p; TQRgb rgb; - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) { for ( int v = 0; v < ySize; v++ ) { @@ -315,7 +315,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap ) } } - if( orientation() == Qt::Vertical ) + if( orientation() == TQt::Vertical ) { for ( int v = 0; v < ySize; v++ ) { @@ -429,7 +429,7 @@ int KColorCells::posToCell(const TQPoint &pos, bool ignoreBorders) void KColorCells::mouseMoveEvent( TQMouseEvent *e ) { - if( !(e->state() & Qt::LeftButton)) return; + if( !(e->state() & TQt::LeftButton)) return; if(inMouse) { int delay = TDEGlobalSettings::dndEventDelay(); @@ -533,7 +533,7 @@ void KColorPatch::drawContents( TQPainter *painter ) void KColorPatch::mouseMoveEvent( TQMouseEvent *e ) { // Drag color object - if( !(e->state() & Qt::LeftButton)) return; + if( !(e->state() & TQt::LeftButton)) return; KColorDrag *d = new KColorDrag( color, this); d->dragCopy(); } @@ -1131,28 +1131,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label = new TQLabel( page ); label->setText(i18n("Name:")); - l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, Qt::AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, TQt::AlignLeft); d->colorName = new TQLabel( page ); - l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, Qt::AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, TQt::AlignLeft); label = new TQLabel( page ); label->setText(i18n("HTML:")); - l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, Qt::AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, TQt::AlignLeft); d->htmlName = new KLineEdit( page ); d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD")); d->htmlName->setFixedWidth(w); - l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, Qt::AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, TQt::AlignLeft); connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ), TQT_SLOT( slotHtmlChanged() ) ); d->patch = new KColorPatch( page ); d->patch->setFixedSize(48, 48); - l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, Qt::AlignHCenter | Qt::AlignVCenter); + l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter); connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), TQT_SLOT( setColor( const TQColor&))); diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index 542dce2e5..2c3cbf335 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -141,7 +141,7 @@ class KURL; * // Tell the widget not to handle completion and rotation * combo->setHandleSignals( false ); * // Set your own completion key for manual completions. - * combo->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End ); + * combo->setKeyBinding( TDECompletionBase::TextCompletion, TQt::End ); * // Hide the context (popup) menu * combo->setContextMenuEnabled( false ); * \endcode diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 7a13e791d..31bbc2f2e 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -294,7 +294,7 @@ void KCursorPrivateAutoHideEventFilter::unhideCursor() TQWidget* w = actualWidget(); - if ( w->cursor().shape() != Qt::BlankCursor ) // someone messed with the cursor already + if ( w->cursor().shape() != TQt::BlankCursor ) // someone messed with the cursor already return; if ( m_isOwnCursor ) diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp index a99763478..a6dffca89 100644 --- a/tdeui/kdatepicker.cpp +++ b/tdeui/kdatepicker.cpp @@ -225,8 +225,8 @@ KDatePicker::eventFilter(TQObject *o, TQEvent *e ) if ( (k->key() == TQt::Key_Prior) || (k->key() == TQt::Key_Next) || - (k->key() == Qt::Key_Up) || - (k->key() == Qt::Key_Down) ) + (k->key() == TQt::Key_Up) || + (k->key() == TQt::Key_Down) ) { TQApplication::sendEvent( table, e ); table->setFocus(); diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index a158d8404..6212b4e52 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -497,7 +497,7 @@ KDateTable::contentsMousePressEvent(TQMouseEvent *e) emit tableClicked(); - if ( e->button() == Qt::RightButton && d->popupMenuEnabled ) + if ( e->button() == TQt::RightButton && d->popupMenuEnabled ) { TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) ); @@ -756,7 +756,7 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) void KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) { - if(!isEnabled() || e->button() != Qt::LeftButton) + if(!isEnabled() || e->button() != TQt::LeftButton) { KNotifyClient::beep(); return; @@ -783,7 +783,7 @@ KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) void KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) { - if (e->state() & Qt::LeftButton) + if (e->state() & TQt::LeftButton) { int row, col; TQPoint mouseCoord; diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 72925525c..4bc6c24bc 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -326,7 +326,7 @@ void KDialog::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) - : TQWidget( parent, "", Qt::WDestructiveClose ) + : TQWidget( parent, "", TQt::WDestructiveClose ) { TQVBoxLayout* vbox = new TQVBoxLayout( this ); @@ -375,7 +375,7 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) TQWidget* swidget = new TQWidget( frame ); swidget->resize(2, frame->sizeHint().width()); - swidget->setBackgroundColor(Qt::black); + swidget->setBackgroundColor(TQt::black); seperatorbox->addWidget( swidget, AlignCenter ); TQLabel* label = new TQLabel( i18n("Trinity Desktop Environment"), frame ); @@ -396,7 +396,7 @@ KSMModalDialogHeader::~KSMModalDialogHeader() } KSMModalDialog::KSMModalDialog(TQWidget* parent) - : TQWidget( 0, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WType_Dialog | Qt::WStyle_Title | Qt::WStyle_StaysOnTop | Qt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false) + : TQWidget( 0, "systemmodaldialogclass", TQt::WStyle_Customize | TQt::WType_Dialog | TQt::WStyle_Title | TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false) { // Signal that we do not want any window controls to be shown at all diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index 4fa65f92f..92226f954 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -104,7 +104,7 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal, :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); @@ -126,7 +126,7 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption, :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); @@ -155,7 +155,7 @@ KDialogBase::KDialogBase( KDialogBase::DialogType dialogFace, WFlags f, TQWidge :KDialog( parent, name, modal, f ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); @@ -183,7 +183,7 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask, :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(true), - mButtonOrientation(Qt::Horizontal),mEscapeButton(escapeButton), + mButtonOrientation(TQt::Horizontal),mEscapeButton(escapeButton), d(new KDialogBasePrivate) { setCaption( caption ); @@ -235,7 +235,7 @@ void SButton::resize( bool sameWidth, int margin, if( s.width() > w ) { w = s.width(); } } - if( orientation == Qt::Horizontal ) + if( orientation == TQt::Horizontal ) { for( p = list.first(); p; p = list.next() ) { @@ -299,7 +299,7 @@ void KDialogBase::setupLayout() // mTopLayout = new TQVBoxLayout( this, marginHint(), spacingHint() ); - if( mButtonOrientation == Qt::Horizontal ) + if( mButtonOrientation == TQt::Horizontal ) { mTopLayout = new TQBoxLayout( this, TQBoxLayout::TopToBottom, marginHint(), spacingHint() ); @@ -349,10 +349,10 @@ void KDialogBase::setButtonBoxOrientation( int orientation ) mButtonOrientation = orientation; if( mActionSep ) { - mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? + mActionSep->setOrientation( mButtonOrientation == TQt::Horizontal ? TQFrame::HLine : TQFrame::VLine ); } - if( mButtonOrientation == Qt::Vertical ) + if( mButtonOrientation == TQt::Vertical ) { enableLinkedHelp(false); // 2000-06-18 Espen: No support for this yet. } @@ -396,7 +396,7 @@ void KDialogBase::enableButtonSeparator( bool state ) } mActionSep = new KSeparator( this ); mActionSep->setFocusPolicy(TQWidget::NoFocus); - mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? + mActionSep->setOrientation( mButtonOrientation == TQt::Horizontal ? TQFrame::HLine : TQFrame::VLine ); mActionSep->show(); } @@ -506,7 +506,7 @@ TQSize KDialogBase::minimumSizeHint() const if( d->mButton.box ) { s2 = d->mButton.box->minimumSize(); - if( mButtonOrientation == Qt::Horizontal ) + if( mButtonOrientation == TQt::Horizontal ) { s1.rwidth() = TQMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); @@ -686,7 +686,7 @@ void KDialogBase::setButtonStyle( int style ) layoutMax = 6; layout = layoutRule[ d->mButton.style ]; } - else if (mButtonOrientation == Qt::Horizontal) + else if (mButtonOrientation == TQt::Horizontal) { static const unsigned int layoutRule[5][10] = { @@ -720,7 +720,7 @@ void KDialogBase::setButtonStyle( int style ) } TQBoxLayout *lay; - if( mButtonOrientation == Qt::Horizontal ) + if( mButtonOrientation == TQt::Horizontal ) { lay = new TQBoxLayout( d->mButton.box, TQBoxLayout::LeftToRight, 0, spacingHint()); diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h index 969d1c3e2..25f4613ae 100644 --- a/tdeui/kdialogbase.h +++ b/tdeui/kdialogbase.h @@ -575,9 +575,9 @@ class TDEUI_EXPORT KDialogBase : public KDialog * toplevel widget for this particular page. The widget contains a * TQGridLayout layout so the widget children are positioned in a grid. * - * @param n Specifies the number of columns if @p dir is Qt::Horizontal - * or the number of rows if @p dir is Qt::Vertical. - * @param dir Can be Qt::Horizontal or Qt::Vertical. + * @param n Specifies the number of columns if @p dir is TQt::Horizontal + * or the number of rows if @p dir is TQt::Vertical. + * @param dir Can be TQt::Horizontal or TQt::Vertical. * @param itemName String used in the list or as tab item name. * @param header Header text use in the list modes @p Ignored in @p Tabbed * mode. If empty, the item text is used instead. @@ -673,9 +673,9 @@ class TDEUI_EXPORT KDialogBase : public KDialog * constructor where you define the face (Plain, Swallow, Tabbed, * TreeList, IconList). * - * @param n Specifies the number of columns if 'dir' is Qt::Horizontal - * or the number of rows if 'dir' is Qt::Vertical. - * @param dir Can be Qt::Horizontal or Qt::Vertical. + * @param n Specifies the number of columns if 'dir' is TQt::Horizontal + * or the number of rows if 'dir' is TQt::Vertical. + * @param dir Can be TQt::Horizontal or TQt::Vertical. * * @return The main widget or 0 if any of the rules described above * were broken. diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 1474ad894..36f482f64 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -921,7 +921,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) { if (!parent()) return 0; if (!parent()->inherits("KDockSplitter")) return 0; - Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? Qt::Vertical:Qt::Horizontal; + Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? TQt::Vertical:TQt::Horizontal; if (((KDockSplitter*)(parent()))->orientation()==orientation) { KDockWidget *neighbor= @@ -1161,8 +1161,8 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, // if to dock not to the center of the target dockwidget, // dock to newDock KDockSplitter* panner = 0L; - if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Horizontal, spliPos ); - if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Vertical , spliPos ); + if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", TQt::Horizontal, spliPos ); + if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_", TQt::Vertical , spliPos ); newDock->setWidget( panner ); panner->setOpaqueResize(manager->splitterOpaqueResize()); @@ -1347,13 +1347,13 @@ void KDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation == TQt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation == TQt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom ); @@ -1719,7 +1719,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) break; case TQEvent::MouseButtonPress: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( curdw->eDocking != (int)KDockWidget::DockNone ){ dropCancel = true; curdw->setFocus(); @@ -1744,7 +1744,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) } break; case TQEvent::MouseButtonRelease: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( dragging ){ if ( !dropCancel ) drop(); @@ -1822,7 +1822,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (d->readyToDrag) { d->readyToDrag = false; } - if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) && + if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) && (curdw->eDocking != (int)KDockWidget::DockNone) ) { startDrag( curdw); } @@ -2401,7 +2401,7 @@ void KDockManager::readConfig(TQDomElement &base) KDockWidget *second = getDockWidgetFromName(secondName); if (first && second) { obj = first->manualDock(second, - (orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, + (orientation == (int)TQt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, separatorPos); if (obj) obj->setName(name.latin1()); @@ -2758,7 +2758,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group ) Orientation p = (Orientation)c->readNumEntry( oname + ":orientation" ); if ( first && last ){ - obj = first->manualDock( last, ( p == Qt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); + obj = first->manualDock( last, ( p == TQt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); if (obj){ obj->setName( oname.latin1() ); } diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h index 1c755d71a..6c6d48d92 100644 --- a/tdeui/kdockwidget.h +++ b/tdeui/kdockwidget.h @@ -448,7 +448,7 @@ public: * @param parent Parent widget * @param strCaption Title of the dockwidget window (shown when toplevel) * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption - * @param f Qt::WidgetFlags widget flags + * @param f TQt::WidgetFlags widget flags */ KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null, @@ -1330,7 +1330,7 @@ public: * * @param parent Parent widget for the dock main widget * @param name internal object name - * @param f Qt::WidgetFlags widget flags + * @param f TQt::WidgetFlags widget flags */ #ifdef qdoc KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); diff --git a/tdeui/kdockwidget_private.cpp b/tdeui/kdockwidget_private.cpp index 3b9d91b34..3b00fbb1a 100644 --- a/tdeui/kdockwidget_private.cpp +++ b/tdeui/kdockwidget_private.cpp @@ -61,7 +61,7 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1) divider->setLineWidth(1); divider->raise(); - if (m_orientation == Qt::Horizontal) + if (m_orientation == TQt::Horizontal) divider->setCursor(TQCursor(tqsizeVerCursor)); else divider->setCursor(TQCursor(tqsizeHorCursor)); @@ -173,7 +173,7 @@ void KDockSplitter::setupMinMaxSize() { // Set the minimum and maximum sizes for the KDockSplitter (this) int minx, maxx, miny, maxy; - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { miny = child0->minimumHeight() + child1->minimumHeight() + 4; maxy = child0->maximumHeight() + child1->maximumHeight() + 4; minx = (child0->minimumWidth() > child1->minimumWidth()) ? child0->minimumWidth() : child1->minimumWidth(); @@ -266,13 +266,13 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // if (ev && isVisible() && divider->isVisible()) { // real resize event. -// kdDebug(282)<<"mKeepSize : "<< ((m_orientation == Qt::Horizontal) ? "Horizontal":"Vertical") <<endl; +// kdDebug(282)<<"mKeepSize : "<< ((m_orientation == TQt::Horizontal) ? "Horizontal":"Vertical") <<endl; if (mKeepSize) { // keep the splitter on a fixed position. This may be a bit inaccurate, because // xpos saves a proportional value, which means there might occur rounding errors. // However, this works surprising well! - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { if (ev->oldSize().height() != ev->size().height()) { if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { // dockwidget is on the bottom. move xpos so that the size from child1 stays @@ -307,7 +307,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // values. // if ( isVisible()) { - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { if (fixedHeight0!=-1) xpos = checkValue(fixedHeight0) * factor / height(); else if (fixedHeight1!=-1) @@ -327,7 +327,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) /* // --- debugging information --- kdDebug(282) << "isVisible() is : " << isVisible() << endl; - kdDebug(282) << "Orientation : " << (m_orientation==Qt::Horizontal?"Horizontal":"Vertical") + kdDebug(282) << "Orientation : " << (m_orientation==TQt::Horizontal?"Horizontal":"Vertical") << endl; kdDebug(282) << "Splitter visibility : " << divider->isVisible() << endl;; kdDebug(282) << "Splitter procentual pos: " << xpos << endl; @@ -346,8 +346,8 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // // handle overlapped widgets only. // - if( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || - ( (m_orientation==Qt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { + if( ( (m_orientation==TQt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || + ( (m_orientation==TQt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { if ((c0->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget())) && (dc->isOverlapMode())) { // child0 ist a KDockContainer @@ -355,7 +355,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) child0->show(); child0->raise(); divider->raise(); - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { position = checkValueOverlapped( height() * xpos / factor, child0 ); child0->setGeometry(0, 0, width(), position); child1->setGeometry(0, dc->m_nonOverlapSize, width(), height()-dc->m_nonOverlapSize); @@ -374,7 +374,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) child1->show(); child1->raise(); divider->raise(); - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { position = checkValueOverlapped( height() * xpos / factor, child1 ); child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize); child1->setGeometry(0, position+4, width(), height()-position-4); @@ -399,10 +399,10 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // the child0 and child1 adjoin. // if (stdHandling) { - int position = checkValue( (m_orientation == Qt::Vertical ? width() : height()) * xpos / factor ); + int position = checkValue( (m_orientation == TQt::Vertical ? width() : height()) * xpos / factor ); int diff = 0; - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { // bottom is dockcontainer if( divider->isVisible() ) { @@ -442,7 +442,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const { if (initialised) { - if (m_orientation == Qt::Vertical) { + if (m_orientation == TQt::Vertical) { if (child0==overlappingWidget) { if (position < child0->minimumWidth() || position > width()) position = child0->minimumWidth(); @@ -450,7 +450,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge if (position > (width()-child1->minimumWidth()-4) || position < 0) position = width()-child1->minimumWidth()-4; } - } else {// orientation == Qt::Horizontal + } else {// orientation == TQt::Horizontal if (child0==overlappingWidget) { if (position < (child0->minimumHeight()) || position > height()) position = child0->minimumHeight(); @@ -466,7 +466,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge int KDockSplitter::checkValue( int position ) const { if (initialised) { - if (m_orientation == Qt::Vertical) { + if (m_orientation == TQt::Vertical) { if (position < child0->minimumWidth()) position = child0->minimumWidth(); if ((width()-4-position) < (child1->minimumWidth())) @@ -481,9 +481,9 @@ int KDockSplitter::checkValue( int position ) const if (position < 0) position = 0; - if ((m_orientation == Qt::Vertical) && (position > width())) + if ((m_orientation == TQt::Vertical) && (position > width())) position = width(); - if ((m_orientation == Qt::Horizontal) && (position > height())) + if ((m_orientation == TQt::Horizontal) && (position > height())) position = height(); return position; @@ -499,7 +499,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) mev= (TQMouseEvent*)e; child0->setUpdatesEnabled(mOpaqueResize); child1->setUpdatesEnabled(mOpaqueResize); - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; @@ -539,7 +539,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) child0->setUpdatesEnabled(true); child1->setUpdatesEnabled(true); mev= (TQMouseEvent*)e; - if (m_orientation == Qt::Horizontal){ + if (m_orientation == TQt::Horizontal){ if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; diff --git a/tdeui/kdockwidget_private.h b/tdeui/kdockwidget_private.h index 739286e5f..b6cc685d0 100644 --- a/tdeui/kdockwidget_private.h +++ b/tdeui/kdockwidget_private.h @@ -56,7 +56,7 @@ public: * @param orient orientation. Either @p Vertical or @p Horizontal * @param pos procentual position of the splitter. Must be int [0...100]. */ - KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= Qt::Vertical, int pos= 50); + KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= TQt::Vertical, int pos= 50); virtual ~KDockSplitter(){} /** diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp index 532e4aaaa..44bd6d6f2 100644 --- a/tdeui/kdualcolorbutton.cpp +++ b/tdeui/kdualcolorbutton.cpp @@ -46,8 +46,8 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget* (const unsigned char *)dcolorarrow_bits, true); arrowBitmap->setMask(*arrowBitmap); // heh resetPixmap = new TQPixmap((const char **)dcolorreset_xpm); - fg = TQBrush(Qt::black, Qt::SolidPattern); - bg = TQBrush(Qt::white, Qt::SolidPattern); + fg = TQBrush(TQt::black, TQt::SolidPattern); + bg = TQBrush(TQt::white, TQt::SolidPattern); curColor = Foreground; dragFlag = false; miniCtlFlag = false; @@ -67,8 +67,8 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo (const unsigned char *)dcolorarrow_bits, true); arrowBitmap->setMask(*arrowBitmap); resetPixmap = new TQPixmap((const char **)dcolorreset_xpm); - fg = TQBrush(fgColor, Qt::SolidPattern); - bg = TQBrush(bgColor, Qt::SolidPattern); + fg = TQBrush(fgColor, TQt::SolidPattern); + bg = TQBrush(bgColor, TQt::SolidPattern); curColor = Foreground; dragFlag = false; miniCtlFlag = false; @@ -111,7 +111,7 @@ TQSize KDualColorButton::sizeHint() const void KDualColorButton::setForeground(const TQColor &c) { - fg = TQBrush(c, Qt::SolidPattern); + fg = TQBrush(c, TQt::SolidPattern); repaint(false); emit fgChanged(fg.color()); @@ -119,7 +119,7 @@ void KDualColorButton::setForeground(const TQColor &c) void KDualColorButton::setBackground(const TQColor &c) { - bg = TQBrush(c, Qt::SolidPattern); + bg = TQBrush(c, TQt::SolidPattern); repaint(false); emit bgChanged(bg.color()); @@ -128,9 +128,9 @@ void KDualColorButton::setBackground(const TQColor &c) void KDualColorButton::setCurrentColor(const TQColor &c) { if(curColor == Background) - bg = TQBrush(c, Qt::SolidPattern); + bg = TQBrush(c, TQt::SolidPattern); else - fg = TQBrush(c, Qt::SolidPattern); + fg = TQBrush(c, TQt::SolidPattern); repaint(false); } @@ -211,8 +211,8 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) miniCtlFlag = true; } else if(ev->pos().x() < bgRect.x()){ - fg.setColor(Qt::black); - bg.setColor(Qt::white); + fg.setColor(TQt::black); + bg.setColor(TQt::white); emit fgChanged(fg.color()); emit bgChanged(bg.color()); miniCtlFlag = true; diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp index 0c147e4b8..77a7d9391 100644 --- a/tdeui/keditcl2.cpp +++ b/tdeui/keditcl2.cpp @@ -834,7 +834,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) { setWFlags( WType_TopLevel ); - setButtonBoxOrientation( Qt::Vertical ); + setButtonBoxOrientation( TQt::Vertical ); TQFrame *page = makeMainWidget(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index 04b78f389..e4ae13716 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -310,7 +310,7 @@ void TDEIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) TQIconViewItem* item = findItem( e->pos() ); if( item ) { - if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) + if( (e->button() == TQt::LeftButton) && !m_bUseSingle ) emitExecute( item, e->globalPos() ); emit doubleClicked( item, e->globalPos() ); @@ -324,7 +324,7 @@ void TDEIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const T if( d->doubleClickIgnoreTimer.isActive() ) return; // Ignore double click - if( (btn == Qt::LeftButton) && item ) + if( (btn == TQt::LeftButton) && item ) emitExecute( item, pos ); } @@ -388,7 +388,7 @@ void TDEIconView::cancelPendingHeldSignal() void TDEIconView::wheelEvent( TQWheelEvent *e ) { if (horizontalScrollBar() && (arrangement() == TQIconView::TopToBottom)) { - TQWheelEvent ce(e->pos(), e->delta(), e->state(), Qt::Horizontal); + TQWheelEvent ce(e->pos(), e->delta(), e->state(), TQt::Horizontal); TQApplication::sendEvent( horizontalScrollBar(), &ce); if (ce.isAccepted()) { e->accept(); @@ -757,7 +757,7 @@ void TDEIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) p->setPen( TQPen( cg.highlightedText() ) ); } else { - if ( iconView()->itemTextBackground() != Qt::NoBrush ) { + if ( iconView()->itemTextBackground() != TQt::NoBrush ) { p->fillRect( textRect( false ), iconView()->itemTextBackground() ); } p->setPen( cg.text() ); diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index dceb2e745..703c8f030 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -1110,14 +1110,14 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap() pix = new TQPixmap( 32, 32 ); TQPainter p( pix ); p.eraseRect( 0, 0, pix->width(), pix->height() ); - p.setPen( Qt::red ); + p.setPen( TQt::red ); p.drawRect ( 0, 0, pix->width(), pix->height() ); p.end(); TQBitmap mask( pix->width(), pix->height(), true ); - mask.fill( Qt::black ); + mask.fill( TQt::black ); p.begin( &mask ); - p.setPen( Qt::white ); + p.setPen( TQt::white ); p.drawRect ( 0, 0, pix->width(), pix->height() ); p.end(); @@ -1149,14 +1149,14 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter ) void KJanusWidget::IconListItem::paintContents( TQPainter *painter ) { TQFontMetrics fm = painter->fontMetrics(); - int ht = fm.boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height(); + int ht = fm.boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height(); int wp = mPixmap.width(); int hp = mPixmap.height(); painter->drawPixmap( (mMinimumWidth - wp) / 2, 5, mPixmap ); if( !text().isEmpty() ) { - painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, Qt::AlignCenter, text() ); + painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, TQt::AlignCenter, text() ); } } @@ -1168,7 +1168,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const } else { - int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height(); + int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height(); return (mPixmap.height() + ht + 10); } } @@ -1176,7 +1176,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const int KJanusWidget::IconListItem::width( const TQListBox *lb ) const { - int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).width() + 10; + int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).width() + 10; int wp = mPixmap.width() + 10; int w = TQMAX( wt, wp ); return TQMAX( w, mMinimumWidth ); diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp index 6b29ac0ca..4f12ec12e 100644 --- a/tdeui/kled.cpp +++ b/tdeui/kled.cpp @@ -225,7 +225,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn with a thin gray "border" (pen) - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); pen.setWidth( scale ); @@ -280,7 +280,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn first - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -328,7 +328,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp color = colorGroup().dark(); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing - brush.setStyle( Qt::NoBrush ); // Switch off the brush + brush.setStyle( TQt::NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse paint.drawEllipse( 2, 2, width, width ); @@ -376,7 +376,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn first - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -421,7 +421,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp // from the upper left. pen.setWidth( 2 * scale + 1 ); // ### shouldn't this value be smaller for smaller LEDs? - brush.setStyle( (Qt::BrushStyle)NoBrush ); // Switch off the brush + brush.setStyle( (TQt::BrushStyle)NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse // Set the initial color value to colorGroup().light() (bright) and start @@ -494,8 +494,8 @@ KLed::paintRectFrame(bool raised) TQBrush darkBrush(d->offcolor); int w=width(); int h=height(); - TQColor black=Qt::black; - TQColor white=Qt::white; + TQColor black=TQt::black; + TQColor white=TQt::white; // ----- if(raised) { diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index b305d3cf1..e700a9d26 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -526,7 +526,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { KeyBindingMap keys = getKeyBindings(); TDEGlobalSettings::Completion mode = completionMode(); - bool noModifier = (e->state() == Qt::NoButton || + bool noModifier = (e->state() == TQt::NoButton || e->state() == TQt::ShiftButton || e->state() == TQt::Keypad); @@ -536,7 +536,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { if ( !d->userSelection && hasSelectedText() && ( e->key() == Key_Right || e->key() == Key_Left ) && - e->state()== Qt::NoButton ) + e->state()== TQt::NoButton ) { TQString old_txt = text(); d->disableRestoreSelection = true; @@ -817,7 +817,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) void KLineEdit::mouseDoubleClickEvent( TQMouseEvent* e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { possibleTripleClick=true; TQTimer::singleShot( TQApplication::doubleClickInterval(),this, @@ -828,7 +828,7 @@ void KLineEdit::mouseDoubleClickEvent( TQMouseEvent* e ) void KLineEdit::mousePressEvent( TQMouseEvent* e ) { - if ( possibleTripleClick && e->button() == Qt::LeftButton ) + if ( possibleTripleClick && e->button() == TQt::LeftButton ) { selectAll(); e->accept(); @@ -841,7 +841,7 @@ void KLineEdit::mouseReleaseEvent( TQMouseEvent* e ) { TQLineEdit::mouseReleaseEvent( e ); if (TQApplication::clipboard()->supportsSelection() ) { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { // Fix copying of squeezed text if needed copySqueezedText( false ); } @@ -1022,12 +1022,12 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) { TQKeyEvent *e = TQT_TQKEYEVENT( ev ); - if( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) + if( e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter ) { bool trap = d->completionBox && d->completionBox->isVisible(); bool stopEvent = trap || (d->grabReturnKeyEvents && - (e->state() == Qt::NoButton || + (e->state() == TQt::NoButton || e->state() == TQt::Keypad)); // Qt will emit returnPressed() itself if we return false @@ -1180,7 +1180,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) int key = e->key(); ButtonState state = e->state(); if ((key == Key_Backtab || key == Key_Tab) && - (state == Qt::NoButton || (state & TQt::ShiftButton))) + (state == TQt::NoButton || (state & TQt::ShiftButton))) { return true; } diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h index 98168313a..fed0b4a25 100644 --- a/tdeui/klineedit.h +++ b/tdeui/klineedit.h @@ -127,7 +127,7 @@ class KURL; * edit->setHandleSignals( false ); * * // Set your own key-bindings for a text completion mode. - * edit->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End ); + * edit->setKeyBinding( TDECompletionBase::TextCompletion, TQt::End ); * * // Hide the context (popup) menu * edit->setContextMenuEnabled( false ); diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index 46f7f2b5c..4a16c97c6 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -344,7 +344,7 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider) m_slider->setRange(lower, upper); else { m_slider = new TQSlider(lower, upper, step, m_spin->value(), - Qt::Horizontal, this); + TQt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); connect(m_slider, TQT_SIGNAL(valueChanged(int)), m_spin, TQT_SLOT(setValue(int))); @@ -771,7 +771,7 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, m_slider->setValue(slvalue); } else { m_slider = new TQSlider(slmin, slmax, slstep, slvalue, - Qt::Horizontal, this); + TQt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); // feedback line: when one moves, the other moves, too: connect(m_slider, TQT_SIGNAL(valueChanged(int)), @@ -1011,7 +1011,7 @@ public: KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->setAlignment( Qt::AlignRight ); + editor()->setAlignment( TQt::AlignRight ); d = new Private(); updateValidator(); connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); @@ -1022,7 +1022,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->setAlignment( Qt::AlignRight ); + editor()->setAlignment( TQt::AlignRight ); d = new Private(); setRange( lower, upper, step, precision ); setValue( value ); diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp index f88cb5a8a..64a190d77 100644 --- a/tdeui/kpanelapplet.cpp +++ b/tdeui/kpanelapplet.cpp @@ -94,12 +94,12 @@ void KPanelApplet::positionChange( Position ) popupDirectionChange( popupDirection() ); } -Qt::Orientation KPanelApplet::orientation() const +TQt::Orientation KPanelApplet::orientation() const { if( _position == pTop || _position == pBottom ) { - return Qt::Horizontal; + return TQt::Horizontal; } else { - return Qt::Vertical; + return TQt::Vertical; } } diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp index 31fbd4343..d332ba2a1 100644 --- a/tdeui/kpanelextension.cpp +++ b/tdeui/kpanelextension.cpp @@ -98,12 +98,12 @@ void KPanelExtension::action( Action a ) reportBug(); } -Qt::Orientation KPanelExtension::orientation() +TQt::Orientation KPanelExtension::orientation() { if (_position == Left || _position == Right) - return Qt::Vertical; + return TQt::Vertical; else - return Qt::Horizontal; + return TQt::Horizontal; } KPanelExtension::Size KPanelExtension::sizeSetting() const diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index 1d3805881..4aebc70b6 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -230,12 +230,12 @@ void KPasswordDialog::init() lbl->setPixmap(pix); lbl->setAlignment(AlignHCenter|AlignVCenter); lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 0, 0, (Qt::AlignmentFlags)AlignCenter); + m_pGrid->addWidget(lbl, 0, 0, TQt::AlignCenter); } m_pHelpLbl = new TQLabel(m_pMain); m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak); - m_pGrid->addWidget(m_pHelpLbl, 0, 2, (Qt::AlignmentFlags)AlignLeft); + m_pGrid->addWidget(m_pHelpLbl, 0, 2, TQt::AlignLeft); m_pGrid->addRowSpacing(1, 10); m_pGrid->setRowStretch(1, 12); @@ -248,7 +248,7 @@ void KPasswordDialog::init() lbl->setAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Password:")); lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 7, 0, (Qt::AlignmentFlags)AlignLeft); + m_pGrid->addWidget(lbl, 7, 0, TQt::AlignLeft); TQHBoxLayout *h_lay = new TQHBoxLayout(); m_pGrid->addLayout(h_lay, 7, 2); @@ -278,8 +278,8 @@ void KPasswordDialog::init() m_keepWarnLbl->hide(); } connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool))); - m_pGrid->addWidget(cb, 9, 2, (Qt::AlignmentFlags)(AlignLeft|AlignVCenter)); -// m_pGrid->addWidget(m_keepWarnLbl, 13, 2, (Qt::AlignmentFlags)(AlignLeft|AlignVCenter)); + m_pGrid->addWidget(cb, 9, 2, TQt::AlignLeft|TQt::AlignVCenter); +// m_pGrid->addWidget(m_keepWarnLbl, 13, 2, TQt::AlignLeft|TQt::AlignVCenter); m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3); } else if (m_Type == NewPassword) { m_pGrid->addRowSpacing(8, 10); @@ -287,7 +287,7 @@ void KPasswordDialog::init() lbl->setAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Verify:")); lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 9, 0, (Qt::AlignmentFlags)AlignLeft); + m_pGrid->addWidget(lbl, 9, 0, TQt::AlignLeft); h_lay = new TQHBoxLayout(); m_pGrid->addLayout(h_lay, 9, 2); @@ -381,12 +381,12 @@ void KPasswordDialog::addLine(TQString key, TQString value) TQLabel *lbl = new TQLabel(key, m_pMain); lbl->setAlignment(AlignLeft|AlignTop); lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, m_Row+2, 0, (Qt::AlignmentFlags)AlignLeft); + m_pGrid->addWidget(lbl, m_Row+2, 0, TQt::AlignLeft); lbl = new TQLabel(value, m_pMain); lbl->setAlignment(AlignTop|WordBreak); lbl->setFixedSize(275, lbl->heightForWidth(275)); - m_pGrid->addWidget(lbl, m_Row+2, 2, (Qt::AlignmentFlags)AlignLeft); + m_pGrid->addWidget(lbl, m_Row+2, 2, TQt::AlignLeft); ++m_Row; } diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index ce6126314..7821ec767 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -178,7 +178,7 @@ TQVBox * KPassivePopup::standardView(const TQString& caption, #endif fnt.setBold( true ); ttl->setFont( fnt ); - ttl->setAlignment( Qt::AlignHCenter ); + ttl->setAlignment( TQt::AlignHCenter ); if ( hb ) { hb->setStretchFactor( ttl, 10 ); // enforce centering } @@ -442,7 +442,7 @@ void KPassivePopup::updateMask() TQBitmap mask( width(), height(), true ); TQPainter p( &mask ); - TQBrush brush( Qt::white, Qt::SolidPattern ); + TQBrush brush( TQt::white, TQt::SolidPattern ); p.setBrush( brush ); int i = 0, z = 0; diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp index 0bc84e108..c2adb7c1f 100644 --- a/tdeui/kpixmapregionselectorwidget.cpp +++ b/tdeui/kpixmapregionselectorwidget.cpp @@ -110,7 +110,7 @@ void KPixmapRegionSelectorWidget::updatePixmap() painter.begin(&m_linedPixmap); painter.setRasterOp( TQt::XorROP ); painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(), - TQBrush( TQColor(255,255,255), Qt::BDiagPattern) ); + TQBrush( TQColor(255,255,255), TQt::BDiagPattern) ); painter.end(); TQImage image=m_linedPixmap.convertToImage(); @@ -213,7 +213,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TQMouseEvent *mev= (TQMouseEvent *)(ev); //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; - if ( mev->button() == Qt::RightButton ) + if ( mev->button() == TQt::RightButton ) { TDEPopupMenu *popup = createPopupMenu( ); popup->exec( mev->globalPos() ); @@ -227,12 +227,12 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) && m_selectedRegion!=m_originalPixmap.rect() ) { m_state=Moving; - cursor.setShape( Qt::SizeAllCursor ); + cursor.setShape( TQt::SizeAllCursor ); } else { m_state=Resizing; - cursor.setShape( Qt::CrossCursor ); + cursor.setShape( TQt::CrossCursor ); } TQApplication::setOverrideCursor(cursor); diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp index 6f994dbe3..2baffc4ee 100644 --- a/tdeui/kpushbutton.cpp +++ b/tdeui/kpushbutton.cpp @@ -193,7 +193,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e ) return; } - if ( (e->state() & Qt::LeftButton) && + if ( (e->state() & TQt::LeftButton) && (e->pos() - startPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { diff --git a/tdeui/kruler.cpp b/tdeui/kruler.cpp index fed264981..eac7d8c99 100644 --- a/tdeui/kruler.cpp +++ b/tdeui/kruler.cpp @@ -94,7 +94,7 @@ public: KRuler::KRuler(TQWidget *parent, const char *name) : TQFrame(parent, name), range(INIT_MIN_VALUE, INIT_MAX_VALUE, 1, 10, INIT_VALUE), - dir(Qt::Horizontal) + dir(TQt::Horizontal) { init(); setFixedHeight(FIX_WIDTH); @@ -108,7 +108,7 @@ KRuler::KRuler(Orientation orient, dir(orient) { init(); - if (orient == Qt::Horizontal) + if (orient == TQt::Horizontal) setFixedHeight(FIX_WIDTH); else setFixedWidth(FIX_WIDTH); @@ -123,7 +123,7 @@ KRuler::KRuler(Orientation orient, int widgetWidth, { init(); - if (orient == Qt::Horizontal) + if (orient == TQt::Horizontal) setFixedHeight(widgetWidth); else setFixedWidth(widgetWidth); @@ -362,7 +362,7 @@ KRuler::setEndLabel(const TQString& label) endlabel = label; // premeasure the fontwidth and save it - if (dir == Qt::Vertical) { + if (dir == TQt::Vertical) { TQFont font = this->font(); font.setPointSize(LABEL_SIZE); TQFontMetrics fm(font); @@ -551,7 +551,7 @@ KRuler::slotNewValue(int _value) } // get the rectangular of the old and the new ruler pointer // and repaint only him - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { TQRect oldrec(-5+oldvalue,10, 11,6); TQRect newrec(-5+_value,10, 11,6); repaint( oldrec.unite(newrec) ); @@ -604,7 +604,7 @@ KRuler::drawContents(TQPainter *p) int value = range.value(), minval = range.minValue(), maxval; - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { maxval = range.maxValue() + offset_ - (d->lengthFix?(height()-d->endOffset_length):d->endOffset_length); @@ -636,7 +636,7 @@ KRuler::drawContents(TQPainter *p) // draw endlabel if (d->showEndL) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->translate( fontOffset, 0 ); p->drawText( END_LABEL_X, END_LABEL_Y, endlabel ); } @@ -659,7 +659,7 @@ KRuler::drawContents(TQPainter *p) if (showtm) { fend = ppm*tmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine((int)f, BASE_MARK_X1, (int)f, BASE_MARK_X2); } else { @@ -671,7 +671,7 @@ KRuler::drawContents(TQPainter *p) // draw the little marks fend = ppm*lmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2); } else { @@ -683,7 +683,7 @@ KRuler::drawContents(TQPainter *p) // draw medium marks fend = ppm*mmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2); } else { @@ -695,7 +695,7 @@ KRuler::drawContents(TQPainter *p) // draw big marks fend = ppm*bmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2); } else { @@ -705,7 +705,7 @@ KRuler::drawContents(TQPainter *p) } if (showem) { // draw end marks - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine(minval-offset_, END_MARK_X1, minval-offset_, END_MARK_X2); p->drawLine(maxval-offset_, END_MARK_X1, maxval-offset_, END_MARK_X2); } @@ -718,7 +718,7 @@ KRuler::drawContents(TQPainter *p) // draw pointer if (d->showpointer) { TQPointArray pa(4); - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { pa.setPoints(3, value-5, 10, value+5, 10, value/*+0*/,15); } else { diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp index cf37c4403..b765e6a2c 100644 --- a/tdeui/kscrollview.cpp +++ b/tdeui/kscrollview.cpp @@ -40,7 +40,7 @@ struct KScrollView::KScrollViewPrivate { bool scrolling; }; -KScrollView::KScrollView( TQWidget *parent, const char *name, Qt::WFlags f ) +KScrollView::KScrollView( TQWidget *parent, const char *name, TQt::WFlags f ) : TQScrollView( parent, name, f ) { d = new KScrollViewPrivate; diff --git a/tdeui/kscrollview.h b/tdeui/kscrollview.h index 2f96b047d..7082f3dba 100644 --- a/tdeui/kscrollview.h +++ b/tdeui/kscrollview.h @@ -32,7 +32,7 @@ class TDEUI_EXPORT KScrollView : public TQScrollView TQ_OBJECT public: - KScrollView( TQWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0 ); + KScrollView( TQWidget *parent = 0, const char *name = 0, TQt::WFlags f = 0 ); ~KScrollView(); diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp index c5a4879d8..647f62ba5 100644 --- a/tdeui/kseparator.cpp +++ b/tdeui/kseparator.cpp @@ -49,7 +49,7 @@ void KSeparator::setOrientation(int orientation) { switch(orientation) { - case Qt::Vertical: + case TQt::Vertical: case VLine: setFrameStyle( TQFrame::VLine | TQFrame::Sunken ); setMinimumSize(2, 0); @@ -58,7 +58,7 @@ void KSeparator::setOrientation(int orientation) default: kdWarning() << "KSeparator::setOrientation(): invalid orientation, using default orientation HLine" << endl; - case Qt::Horizontal: + case TQt::Horizontal: case HLine: setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); setMinimumSize(0, 2); diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp index 207d93a0d..a3c8af485 100644 --- a/tdeui/kswitchlanguagedialog.cpp +++ b/tdeui/kswitchlanguagedialog.cpp @@ -323,12 +323,12 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo int numRows = languagesLayout->numRows(); TQLabel *languageLabel = new TQLabel(labelText, page); - languagesLayout->addWidget( languageLabel, numRows + 1, 1, (Qt::AlignmentFlags)TQt::AlignAuto ); - languagesLayout->addWidget( languageButton, numRows + 1, 2, (Qt::AlignmentFlags)TQt::AlignAuto ); + languagesLayout->addWidget( languageLabel, numRows + 1, 1, (TQt::AlignmentFlags)TQt::AlignAuto ); + languagesLayout->addWidget( languageButton, numRows + 1, 2, (TQt::AlignmentFlags)TQt::AlignAuto ); if (primaryLanguage == false) { - languagesLayout->addWidget( removeButton, numRows + 1, 3, (Qt::AlignmentFlags)TQt::AlignAuto ); + languagesLayout->addWidget( removeButton, numRows + 1, 3, (TQt::AlignmentFlags)TQt::AlignAuto ); languageRowData.setRowWidgets( languageLabel, diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index b5baf87dd..3dd9fbaf7 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -96,7 +96,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->on_all_desktops = false; } setCaption( TDEGlobal::instance()->aboutData()->programName()); - setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); + setAlignment( alignment() | TQt::AlignVCenter | TQt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications setScaledContents(true); @@ -148,12 +148,12 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e ) return; switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: toggleActive(); break; - case Qt::MidButton: + case TQt::MidButton: // fall through - case Qt::RightButton: + case TQt::RightButton: if ( parentWidget() ) { TDEAction* action = d->actionCollection->action("minimizeRestore"); if ( parentWidget()->isVisible() ) diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index 2dd2cc9a3..290e97410 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -87,7 +87,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; TQTab *tab = selectTab( e->pos() ); @@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabBar::mousePressEvent( TQMouseEvent *e ) { - if( e->button() == Qt::LeftButton ) { + if( e->button() == TQt::LeftButton ) { mEnableCloseButtonTimer->stop(); mDragStart = e->pos(); } - else if( e->button() == Qt::RightButton ) { + else if( e->button() == TQt::RightButton ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) ); @@ -116,7 +116,7 @@ void KTabBar::mousePressEvent( TQMouseEvent *e ) void KTabBar::mouseMoveEvent( TQMouseEvent *e ) { - if ( e->state() == Qt::LeftButton ) { + if ( e->state() == TQt::LeftButton ) { TQTab *tab = selectTab( e->pos() ); if ( mDragSwitchTab && tab != mDragSwitchTab ) { mActivateDragSwitchTabTimer->stop(); @@ -134,7 +134,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } } } - else if ( e->state() == Qt::MidButton ) { + else if ( e->state() == TQt::MidButton ) { if (mReorderStartTab==-1) { int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); @@ -230,7 +230,7 @@ void KTabBar::activateDragSwitchTab() void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) { - if( e->button() == Qt::MidButton ) { + if( e->button() == TQt::MidButton ) { if ( mReorderStartTab==-1 ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { @@ -282,7 +282,7 @@ void KTabBar::dropEvent( TQDropEvent *e ) #ifndef TQT_NO_WHEELEVENT void KTabBar::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Qt::Horizontal ) + if ( e->orientation() == TQt::Horizontal ) return; emit( wheelDelta( e->delta() ) ); diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index 943598022..a6f14d2a2 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -336,7 +336,7 @@ void KTabWidget::dropEvent( TQDropEvent *e ) #ifndef TQT_NO_WHEELEVENT void KTabWidget::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Qt::Horizontal ) + if ( e->orientation() == TQt::Horizontal ) return; if ( isEmptyTabbarSpace( e->pos() ) ) @@ -365,7 +365,7 @@ void KTabWidget::wheelDelta(int delta) void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; if ( isEmptyTabbarSpace( e->pos() ) ) { @@ -377,12 +377,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( contextMenu( mapToGlobal( e->pos() ) ) ); return; } - } else if ( e->button() == Qt::MidButton ) { + } else if ( e->button() == TQt::MidButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( mouseMiddleClick() ); return; diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 80693b4f9..76e44be0d 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -268,7 +268,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQLabel *l = new TQLabel(hbox); l->setPixmap(img); l->setBackgroundColor(mBlendedColor); - l->setAlignment(Qt::AlignRight | Qt::AlignBottom); + l->setAlignment(TQt::AlignRight | TQt::AlignBottom); resize(550, 230); TQSize sh = size(); diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp index 5a8188200..754871c17 100644 --- a/tdeui/kurllabel.cpp +++ b/tdeui/kurllabel.cpp @@ -37,7 +37,7 @@ public: Private (const TQString& url, KURLLabel* label) : URL (url), LinkColor (TDEGlobalSettings::linkColor()), - HighlightedLinkColor (Qt::red), + HighlightedLinkColor (TQt::red), Tip(url), Cursor (0L), Underline (true), @@ -122,17 +122,17 @@ void KURLLabel::mouseReleaseEvent (TQMouseEvent* e) switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: emit leftClickedURL (); emit leftClickedURL (d->URL); break; - case Qt::MidButton: + case TQt::MidButton: emit middleClickedURL (); emit middleClickedURL (d->URL); break; - case Qt::RightButton: + case TQt::RightButton: emit rightClickedURL (); emit rightClickedURL (d->URL); break; @@ -373,7 +373,7 @@ bool KURLLabel::event (TQEvent *e) } else if (e->type() == TQEvent::KeyPress) { TQKeyEvent* ke = TQT_TQKEYEVENT(e); - if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) { + if (ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Return) { setLinkColor (d->HighlightedLinkColor); d->Timer->start (300); emit leftClickedURL (); diff --git a/tdeui/kwordwrap.cpp b/tdeui/kwordwrap.cpp index de031c966..471a7227a 100644 --- a/tdeui/kwordwrap.cpp +++ b/tdeui/kwordwrap.cpp @@ -236,9 +236,9 @@ void KWordWrap::drawText( TQPainter *painter, int textX, int textY, int flags ) break; int end = (*it); int x = textX; - if ( flags & Qt::AlignHCenter ) + if ( flags & TQt::AlignHCenter ) x += ( maxwidth - *itw ) / 2; - else if ( flags & Qt::AlignRight ) + else if ( flags & TQt::AlignRight ) x += maxwidth - *itw; painter->drawText( x, textY + y + ascent, m_text.mid( start, end - start + 1 ) ); y += height; @@ -246,9 +246,9 @@ void KWordWrap::drawText( TQPainter *painter, int textX, int textY, int flags ) } // Draw the last line int x = textX; - if ( flags & Qt::AlignHCenter ) + if ( flags & TQt::AlignHCenter ) x += ( maxwidth - *itw ) / 2; - else if ( flags & Qt::AlignRight ) + else if ( flags & TQt::AlignRight ) x += maxwidth - *itw; if ( (d->m_constrainingRect.height() < 0) || ((y + height) <= d->m_constrainingRect.height()) ) { diff --git a/tdeui/kwordwrap.h b/tdeui/kwordwrap.h index 3fb48acd9..803389ed3 100644 --- a/tdeui/kwordwrap.h +++ b/tdeui/kwordwrap.h @@ -91,8 +91,8 @@ public: /** * Draw the text that has been previously wrapped, at position x,y. - * Flags are for alignment, e.g. Qt::AlignHCenter. Default is - * Qt::AlignAuto. + * Flags are for alignment, e.g. TQt::AlignHCenter. Default is + * TQt::AlignAuto. * @param painter the TQPainter to use. * @param x the horizontal position of the text * @param y the vertical position of the text diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp index 16cf14e2e..9f6bf24b2 100644 --- a/tdeui/tdeaboutdialog.cpp +++ b/tdeui/tdeaboutdialog.cpp @@ -227,8 +227,8 @@ void TDEAboutContributor::updateLayout( void ) { if( mShowHeader ) { - gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (Qt::AlignmentFlags)AlignLeft ); - gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (Qt::AlignmentFlags)AlignLeft ); + gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQt::AlignmentFlags)AlignLeft ); + gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft ); mLabel[i]->show(); mText[i]->show(); } @@ -237,11 +237,11 @@ void TDEAboutContributor::updateLayout( void ) mLabel[i]->hide(); if( !i ) { - gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (Qt::AlignmentFlags)AlignLeft ); + gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft ); } else { - gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (Qt::AlignmentFlags)AlignLeft ); + gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft ); } mText[i]->show(); } diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp index 985782f33..9e9ec6a54 100644 --- a/tdeui/tdeaction.cpp +++ b/tdeui/tdeaction.cpp @@ -1103,7 +1103,7 @@ void TDEAction::addContainer( TQWidget* c, TQWidget* w ) void TDEAction::activate() { - emit activated( TDEAction::EmulatedActivation, Qt::NoButton ); + emit activated( TDEAction::EmulatedActivation, TQt::NoButton ); slotActivated(); } @@ -1113,7 +1113,7 @@ void TDEAction::slotActivated() if ( senderObj ) { if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) ) - emit activated( TDEAction::AccelActivation, Qt::NoButton ); + emit activated( TDEAction::AccelActivation, TQt::NoButton ); } emit activated(); } @@ -1149,7 +1149,7 @@ void TDEAction::slotPopupActivated() } kdWarning(129)<<"Don't connect TDEAction::slotPopupActivated() to anything, expect into QPopupMenus which are in containers. Use slotActivated instead."<<endl; - emit activated( TDEAction::PopupMenuActivation, Qt::NoButton ); + emit activated( TDEAction::PopupMenuActivation, TQt::NoButton ); slotActivated(); } @@ -1159,7 +1159,7 @@ void TDEAction::slotButtonClicked( int, TQt::ButtonState state ) emit activated( TDEAction::ToolBarActivation, state ); // RightButton isn't really an activation - if ( ( state & Qt::LeftButton ) || ( state & Qt::MidButton ) ) + if ( ( state & TQt::LeftButton ) || ( state & TQt::MidButton ) ) slotActivated(); } diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp index 3f2dfa987..62ca3130e 100644 --- a/tdeui/tdecompletionbox.cpp +++ b/tdeui/tdecompletionbox.cpp @@ -115,7 +115,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) TQKeyEvent *ev = TQT_TQKEYEVENT( e ); switch ( ev->key() ) { case Key_BackTab: - if ( d->tabHandling && (ev->state() == Qt::NoButton || + if ( d->tabHandling && (ev->state() == TQt::NoButton || (ev->state() & ShiftButton)) ) { up(); ev->accept(); @@ -123,7 +123,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) } break; case Key_Tab: - if ( d->tabHandling && (ev->state() == Qt::NoButton) ) { + if ( d->tabHandling && (ev->state() == TQt::NoButton) ) { down(); // Only on TAB!! ev->accept(); return true; @@ -199,7 +199,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) break; case Key_Tab: case Key_BackTab: - if ( ev->state() == Qt::NoButton || + if ( ev->state() == TQt::NoButton || (ev->state() & ShiftButton)) { ev->accept(); diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp index d29ea60be..eb2186ca5 100644 --- a/tdeui/tdefontdialog.cpp +++ b/tdeui/tdefontdialog.cpp @@ -85,8 +85,8 @@ class TDEFontChooser::TDEFontChooserPrivate { public: TDEFontChooserPrivate() - { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, Qt::black); - m_palette.setColor(TQPalette::Active, TQColorGroup::Base, Qt::white); } + { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, TQt::black); + m_palette.setColor(TQPalette::Active, TQColorGroup::Base, TQt::white); } TQPalette m_palette; }; @@ -132,7 +132,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, if (diff) { familyCheckbox = new TQCheckBox(i18n("Font"), page); connect(familyCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); - familyLayout->addWidget(familyCheckbox, 0, Qt::AlignLeft); + familyLayout->addWidget(familyCheckbox, 0, TQt::AlignLeft); TQString familyCBToolTipText = i18n("Change font family?"); TQString familyCBWhatsThisText = @@ -143,7 +143,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, } else { familyCheckbox = 0; familyLabel = new TQLabel( i18n("Font:"), page, "familyLabel" ); - familyLayout->addWidget(familyLabel, 1, Qt::AlignLeft); + familyLayout->addWidget(familyLabel, 1, TQt::AlignLeft); } gridLayout->addLayout(familyLayout, row, 0 ); @@ -151,7 +151,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, if (diff) { styleCheckbox = new TQCheckBox(i18n("Font style"), page); connect(styleCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); - styleLayout->addWidget(styleCheckbox, 0, Qt::AlignLeft); + styleLayout->addWidget(styleCheckbox, 0, TQt::AlignLeft); TQString styleCBToolTipText = i18n("Change font style?"); TQString styleCBWhatsThisText = @@ -162,7 +162,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, } else { styleCheckbox = 0; styleLabel = new TQLabel( i18n("Font style:"), page, "styleLabel"); - styleLayout->addWidget(styleLabel, 1, Qt::AlignLeft); + styleLayout->addWidget(styleLabel, 1, TQt::AlignLeft); } styleLayout->addSpacing( checkBoxGap ); gridLayout->addLayout(styleLayout, row, 1 ); @@ -171,7 +171,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, if (diff) { sizeCheckbox = new TQCheckBox(i18n("Size"),page); connect(sizeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); - sizeLayout->addWidget(sizeCheckbox, 0, Qt::AlignLeft); + sizeLayout->addWidget(sizeCheckbox, 0, TQt::AlignLeft); TQString sizeCBToolTipText = i18n("Change font size?"); TQString sizeCBWhatsThisText = @@ -182,7 +182,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, } else { sizeCheckbox = 0; sizeLabel = new TQLabel( i18n("Size:"), page, "sizeLabel"); - sizeLayout->addWidget(sizeLabel, 1, Qt::AlignLeft); + sizeLayout->addWidget(sizeLabel, 1, TQt::AlignLeft); } sizeLayout->addSpacing( checkBoxGap ); sizeLayout->addSpacing( checkBoxGap ); // prevent label from eating border @@ -258,7 +258,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, sizeLayout2->setColStretch( 1, 1 ); // to prevent text from eating the right border sizeLayout2->addMultiCellWidget( sizeOfFont, 0, 0, 0, 1); sizeLayout2->addMultiCellWidget(sizeListBox, 1,1, 0,1); - sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, Qt::AlignLeft); + sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, TQt::AlignLeft); TQWhatsThis::add( sizeIsRelativeCheckBox, sizeIsRelativeCBWhatsThisText ); TQToolTip::add( sizeIsRelativeCheckBox, sizeIsRelativeCBToolTipText ); } @@ -296,7 +296,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, //i18n: This is a classical test phrase. (It contains all letters from A to Z.) sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() ); - sampleEdit->setAlignment(Qt::AlignCenter); + sampleEdit->setAlignment(TQt::AlignCenter); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); TQString sampleEditWhatsThisText = i18n("This sample text illustrates the current settings. " diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp index 0e4c5d520..a308f5cbe 100644 --- a/tdeui/tdelistbox.cpp +++ b/tdeui/tdelistbox.cpp @@ -249,14 +249,14 @@ void TDEListBox::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) if( item ) { emit doubleClicked( item, e->globalPos() ); - if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) + if( (e->button() == TQt::LeftButton) && !m_bUseSingle ) emitExecute( item, e->globalPos() ); } } void TDEListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQPoint &pos ) { - if( (btn == Qt::LeftButton) && item ) + if( (btn == TQt::LeftButton) && item ) emitExecute( item, pos ); } diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp index c0c52ce48..ce7f530be 100644 --- a/tdeui/tdelistview.cpp +++ b/tdeui/tdelistview.cpp @@ -344,7 +344,7 @@ bool TDEListViewLineEdit::event(TQEvent *pe) keyPressEvent(k); return true; } - else if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) && + else if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab) && p->tabOrderedRenaming() && p->itemsRenameable() && !(k->state() & ControlButton || k->state() & AltButton)) { @@ -374,11 +374,11 @@ void TDEListViewLineEdit::keyPressEvent(TQKeyEvent *e) emit renamePrev(i,c); } } - else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) + else if (e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter) terminate(true); - else if(e->key() == Qt::Key_Escape) + else if(e->key() == TQt::Key_Escape) terminate(false); - else if (e->key() == Qt::Key_Down || e->key() == Qt::Key_Up) + else if (e->key() == TQt::Key_Down || e->key() == TQt::Key_Up) { terminate(true); KLineEdit::keyPressEvent(e); @@ -828,7 +828,7 @@ void TDEListView::contentsMousePressEvent( TQMouseEvent *e ) treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() ) && ( p.x() >= header()->cellPos( header()->mapToActual( 0 ) ) ); - if (e->button() == Qt::LeftButton && !rootDecoClicked) + if (e->button() == TQt::LeftButton && !rootDecoClicked) { //Start a drag d->startDragPos = e->pos(); @@ -885,7 +885,7 @@ void TDEListView::contentsMouseMoveEvent( TQMouseEvent *e ) void TDEListView::contentsMouseReleaseEvent( TQMouseEvent *e ) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { // If the row was already selected, maybe we want to start an in-place editing if ( d->pressedOnSelected && itemsRenameable() ) @@ -921,7 +921,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e ) // We don't want to call the parent method because it does setOpen, // whereas we don't do it in single click mode... (David) //TQListView::contentsMouseDoubleClickEvent( e ); - if ( !e || e->button() != Qt::LeftButton ) { + if ( !e || e->button() != TQt::LeftButton ) { return; } @@ -934,7 +934,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e ) if( item ) { emit doubleClicked( item, e->globalPos(), col ); - if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) { + if( (e->button() == TQt::LeftButton) && !d->bUseSingle ) { emitExecute( item, e->globalPos(), col ); } } @@ -942,7 +942,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e ) void TDEListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c ) { - if( (btn == Qt::LeftButton) && item ) { + if( (btn == TQt::LeftButton) && item ) { emitExecute(item, pos, c); } } @@ -1601,7 +1601,7 @@ void TDEListView::fileManagerKeyPressEvent (TQKeyEvent* e) } if (((!selectedItems) || ((selectedItems==1) && (d->selectedUsingMouse))) - && (e_state==Qt::NoButton) + && (e_state==TQt::NoButton) && ((e->key()==Key_Down) || (e->key()==Key_Up) || (e->key()==Key_Next) @@ -2456,7 +2456,7 @@ TQColor TDEListViewItem::backgroundColor(int column) // calculate a different color if the current column is sorted (only if more than 1 column) if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) ) { - if ( color == Qt::black ) + if ( color == TQt::black ) color = TQColor(55, 55, 55); // dark gray else { diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp index 60607d870..052382851 100644 --- a/tdeui/tdemainwindow.cpp +++ b/tdeui/tdemainwindow.cpp @@ -126,7 +126,7 @@ public: TQApplication::sendEvent( window, &e ); canceled = !e.isAccepted(); /* Don't even think_about deleting widgets with - Qt::WDestructiveClose flag set at this point. We + TQt::WDestructiveClose flag set at this point. We are faking a close event, but we are *not*_ closing the window. The purpose of the faked close event is to prepare the application so it diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp index 3208e94d8..f4fbc84bb 100644 --- a/tdeui/tdemessagebox.cpp +++ b/tdeui/tdemessagebox.cpp @@ -164,7 +164,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, if (!icon.isNull()) label1->setPixmap(icon); - lay->addWidget( label1, 0, Qt::AlignCenter ); + lay->addWidget( label1, 0, TQt::AlignCenter ); lay->addSpacing(KDialog::spacingHint()); // Enforce <p>text</p> otherwise the word-wrap doesn't work well TQString qt_text = qrichtextify( text ); diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp index 955c3f12f..6110667f9 100644 --- a/tdeui/tdepopupmenu.cpp +++ b/tdeui/tdepopupmenu.cpp @@ -124,7 +124,7 @@ public: , shortcuts(false) , autoExec(false) , lastHitIndex(-1) - , state(Qt::NoButton) + , state(TQt::NoButton) , m_ctxMenu(0) {} @@ -274,7 +274,7 @@ void TDEPopupMenu::closeEvent(TQCloseEvent*e) void TDEPopupMenu::activateItemAt(int index) { - d->state = Qt::NoButton; + d->state = TQt::NoButton; TQPopupMenu::activateItemAt(index); } @@ -285,7 +285,7 @@ TQt::ButtonState TDEPopupMenu::state() const void TDEPopupMenu::keyPressEvent(TQKeyEvent* e) { - d->state = Qt::NoButton; + d->state = TQt::NoButton; if (!d->shortcuts) { // continue event processing by Qpopup //e->ignore(); diff --git a/tdeui/tdeselect.cpp b/tdeui/tdeselect.cpp index 272f7a144..9d1a898fd 100644 --- a/tdeui/tdeselect.cpp +++ b/tdeui/tdeselect.cpp @@ -160,7 +160,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e ) void KXYSelector::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Qt::Horizontal ) + if ( e->orientation() == TQt::Horizontal ) setValues( xValue() + e->delta()/120, yValue() ); else setValues( xValue(), yValue() + e->delta()/120 ); @@ -238,7 +238,7 @@ void KXYSelector::drawCursor( TQPainter *p, int xp, int yp ) TDESelector::TDESelector( TQWidget *parent, const char *name ) : TQWidget( parent, name ), TQRangeControl() { - _orientation = Qt::Horizontal; + _orientation = TQt::Horizontal; _indent = true; } @@ -258,7 +258,7 @@ TQRect TDESelector::contentsRect() const { int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw ); else return TQRect( iw, w, width() - 2 * iw, height() - w * 2 - 5 ); @@ -277,7 +277,7 @@ void TDESelector::paintEvent( TQPaintEvent * ) if ( indent() ) { TQRect r = rect(); - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) r.addCoords(0, iw - w, -iw, w - iw); else r.addCoords(iw - w, 0, w - iw, -iw); @@ -332,7 +332,7 @@ void TDESelector::moveArrow( const TQPoint &pos ) int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) val = ( maxValue() - minValue() ) * (height()-pos.y()-5+w) / (height()-iw*2) + minValue(); else @@ -348,7 +348,7 @@ TQPoint TDESelector::calcArrowPos( int val ) int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { p.setY( height() - ( (height()-2*iw) * val / ( maxValue() - minValue() ) + 5 ) ); @@ -377,7 +377,7 @@ void TDESelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos ) painter->setBrush( TQBrush( colorGroup().buttonText() ) ); array.setPoint( 0, pos.x()+0, pos.y()+0 ); array.setPoint( 1, pos.x()+5, pos.y()+5 ); - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { array.setPoint( 2, pos.x()+5, pos.y()-5 ); } @@ -390,7 +390,7 @@ void TDESelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos ) } else { - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { repaint(pos.x(), pos.y()-5, 6, 11, true); } @@ -442,7 +442,7 @@ void KGradientSelector::drawContents( TQPainter *painter ) int greenDiff = color2.green() - color1.green(); int blueDiff = color2.blue() - color1.blue(); - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { for ( int y = 0; y < image.height(); y++ ) { @@ -488,7 +488,7 @@ void KGradientSelector::drawContents( TQPainter *painter ) painter->drawPixmap( contentsRect().x(), contentsRect().y(), p ); - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { int yPos = contentsRect().top() + painter->fontMetrics().ascent() + 2; int xPos = contentsRect().left() + (contentsRect().width() - diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index 5154c78f7..9cfd2948f 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -167,7 +167,7 @@ void TDEToolBarSeparator::drawContents( TQPainter* p ) if ( line ) { TQStyle::SFlags flags = TQStyle::Style_Default; - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) flags = flags | TQStyle::Style_Horizontal; style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p, @@ -185,7 +185,7 @@ void TDEToolBarSeparator::styleChange( TQStyle& ) TQSize TDEToolBarSeparator::sizeHint() const { int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); - return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); + return orientation() == TQt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); } TQSizePolicy TDEToolBarSeparator::sizePolicy() const @@ -1159,7 +1159,7 @@ void TDEToolBar::mousePressEvent ( TQMouseEvent *m ) return; TQMainWindow *mw = mainWindow(); if ( mw->toolBarsMovable() && d->m_enableContext ) { - if ( m->button() == Qt::RightButton ) { + if ( m->button() == TQt::RightButton ) { TQGuardedPtr<TDEToolBar> guard( this ); int i = contextMenu()->exec( m->globalPos(), 0 ); // "Configure Toolbars" recreates toolbars, so we might not exist anymore. @@ -1240,7 +1240,7 @@ void TDEToolBar::rebuildLayout() continue; TDEToolBarSeparator *ktbs = tqt_dynamic_cast<TDEToolBarSeparator *>(w); if ( ktbs && !ktbs->showLine() ) { - l->addSpacing( orientation() == Qt::Vertical ? w->sizeHint().height() : w->sizeHint().width() ); + l->addSpacing( orientation() == TQt::Vertical ? w->sizeHint().height() : w->sizeHint().width() ); w->hide(); continue; } @@ -1248,7 +1248,7 @@ void TDEToolBar::rebuildLayout() continue; l->addWidget( w ); w->show(); - if ((orientation() == Qt::Horizontal) && tqt_dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? + if ((orientation() == TQt::Horizontal) && tqt_dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? l->addSpacing(2); // A little bit extra spacing behind it. } if ( rightAligned ) { @@ -1337,7 +1337,7 @@ void TDEToolBar::setStretchableWidget( TQWidget *w ) TQSizePolicy TDEToolBar::sizePolicy() const { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); else return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp index c5f0eb99f..2c859ab2f 100644 --- a/tdeui/tdetoolbarbutton.cpp +++ b/tdeui/tdetoolbarbutton.cpp @@ -455,10 +455,10 @@ void TDEToolBarButton::mousePressEvent( TQMouseEvent * e ) { d->m_buttonDown = true; - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) { // Get TQToolButton to show the button being down while pressed - TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); + TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), TQt::LeftButton, e->state() ); TQToolButton::mousePressEvent(&ev); return; } @@ -468,9 +468,9 @@ void TDEToolBarButton::mousePressEvent( TQMouseEvent * e ) void TDEToolBarButton::mouseReleaseEvent( TQMouseEvent * e ) { TQt::ButtonState state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask)); - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) { - TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); + TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), TQt::LeftButton, e->state() ); TQToolButton::mouseReleaseEvent(&ev); } else @@ -676,8 +676,8 @@ void TDEToolBarButton::slotClicked() // emit buttonClicked when the button was clicked while being in an extension popupmenu if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) { ButtonState state = TDEApplication::keyboardMouseState(); - if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton ) - state = ButtonState( Qt::LeftButton | state ); + if ( ( state & TQt::MouseButtonMask ) == TQt::NoButton ) + state = ButtonState( TQt::LeftButton | state ); emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton } } diff --git a/tdeui/tdetoolbarlabelaction.cpp b/tdeui/tdetoolbarlabelaction.cpp index 07cfbb731..e75e0a755 100644 --- a/tdeui/tdetoolbarlabelaction.cpp +++ b/tdeui/tdetoolbarlabelaction.cpp @@ -85,8 +85,8 @@ void TDEToolBarLabelAction::init() konq_misc.cpp */ d->m_label->setBackgroundMode(TQt::PaletteButton); d->m_label->setAlignment((TQApplication::reverseLayout() - ? Qt::AlignRight : Qt::AlignLeft) | - Qt::AlignVCenter | TQt::ShowPrefix ); + ? TQt::AlignRight : TQt::AlignLeft) | + TQt::AlignVCenter | TQt::ShowPrefix ); d->m_label->adjustSize(); } diff --git a/tdeui/tdetoolbarlabelaction.h b/tdeui/tdetoolbarlabelaction.h index c330c9254..f57365359 100644 --- a/tdeui/tdetoolbarlabelaction.h +++ b/tdeui/tdetoolbarlabelaction.h @@ -35,7 +35,7 @@ class TQLabel; * * KHistoryCombo* findCombo = new KHistoryCombo(true, this); * KWidgetAction* action - * = new KWidgetAction(findCombo, i18n("F&ind Combo"), Qt::Key_F6, this, + * = new KWidgetAction(findCombo, i18n("F&ind Combo"), TQt::Key_F6, this, * TQT_SLOT(slotFocus()), actionCollection(), "find_combo"); * * new TDEToolBarLabelAction(findCombo, i18n("F&ind "), 0, this, diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index c3b6d1ddc..4837fe119 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -66,7 +66,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) hBox->addSpacing( 5 ); //Selection mode selection - m_pbgMode = new TQButtonGroup( 1, Qt::Horizontal, "Selection Mode", this); + m_pbgMode = new TQButtonGroup( 1, TQt::Horizontal, "Selection Mode", this); m_pbgMode->insert(new TQRadioButton("NoSlection", m_pbgMode), TopLevel::NoSelection ); m_pbgMode->insert(new TQRadioButton("Single", m_pbgMode), TopLevel::Single ); m_pbgMode->insert(new TQRadioButton("Multi", m_pbgMode), TopLevel::Multi ); @@ -78,17 +78,17 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) this, TQT_SLOT( slotSwitchMode( int ) ) ); //Signal labels - TQGroupBox* gbWiget = new TQGroupBox( 1, Qt::Horizontal, "Widget", this); + TQGroupBox* gbWiget = new TQGroupBox( 1, TQt::Horizontal, "Widget", this); m_plblWidget = new TQLabel( gbWiget ); vBox->addWidget( gbWiget ); - TQGroupBox* gbSignal = new TQGroupBox( 1, Qt::Horizontal, "emitted Signal", this); + TQGroupBox* gbSignal = new TQGroupBox( 1, TQt::Horizontal, "emitted Signal", this); m_plblSignal = new TQLabel( gbSignal ); vBox->addWidget( gbSignal ); - TQGroupBox* gbItem = new TQGroupBox( 1, Qt::Horizontal, "on Item", this); + TQGroupBox* gbItem = new TQGroupBox( 1, TQt::Horizontal, "on Item", this); m_plblItem = new TQLabel( gbItem ); vBox->addWidget( gbItem ); - TQButtonGroup* bgListView = new TQButtonGroup( 1, Qt::Horizontal, "TDEListView", this); + TQButtonGroup* bgListView = new TQButtonGroup( 1, TQt::Horizontal, "TDEListView", this); TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView); vBox->addWidget( bgListView ); connect( cbListView, TQT_SIGNAL( toggled( bool ) ), @@ -97,7 +97,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) TDEGlobal::config()->reparseConfiguration(); //Create IconView - TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "TDEIconView", this); + TQGroupBox* gbIconView = new TQGroupBox( 1, TQt::Horizontal, "TDEIconView", this); m_pIconView = new TDEIconView( gbIconView ); hBox->addWidget( gbIconView ); hBox->addSpacing( 5 ); @@ -105,7 +105,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) ); //Create ListView - TQGroupBox* gbListView = new TQGroupBox( 1, Qt::Horizontal, "TDEListView", this); + TQGroupBox* gbListView = new TQGroupBox( 1, TQt::Horizontal, "TDEListView", this); m_pListView = new TDEListView( gbListView ); m_pListView->addColumn("Item"); m_pListView->addColumn("Text"); @@ -115,7 +115,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) ); //Create ListBox - TQGroupBox* gbListBox = new TQGroupBox( 1, Qt::Horizontal, "TDEListBox", this); + TQGroupBox* gbListBox = new TQGroupBox( 1, TQt::Horizontal, "TDEListBox", this); m_pListBox = new TDEListBox( gbListBox ); hBox->addWidget( gbListBox ); connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ), diff --git a/tdeui/tests/kblendtest.cpp b/tdeui/tests/kblendtest.cpp index 4672b76ee..6484791b5 100644 --- a/tdeui/tests/kblendtest.cpp +++ b/tdeui/tests/kblendtest.cpp @@ -28,7 +28,7 @@ void KBlendWidget::paintEvent(TQPaintEvent */*ev*/) image = TQImage("testimage.png"); TQPainter p(this); - p.setPen(Qt::black); + p.setPen(TQt::black); // you see here use of anti_dir param (blend from down to up, here) time.start(); diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp index c9eb1134b..a44175b68 100644 --- a/tdeui/tests/kbuttonboxtest.cpp +++ b/tdeui/tests/kbuttonboxtest.cpp @@ -37,7 +37,7 @@ int main(int argc, char **argv) { "the window!\n" "Press OK or Cancel when done" , w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -65,7 +65,7 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are right aligned\n"\ "Try resizing the window!", w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -91,7 +91,7 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are middle aligned\n"\ "Try resizing the window!", w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -120,7 +120,7 @@ int main(int argc, char **argv) { "the maximum width for all buttons\n" "since it will look ugly -- " "anyway, it works", w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -152,7 +152,7 @@ int main(int argc, char **argv) { "prevent this strange effect as seen\n" "the former example!" ,w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -182,7 +182,7 @@ int main(int argc, char **argv) { "to make vertically aligned buttons\n" "too?" ,w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp index dbe39484c..a7738a7ed 100644 --- a/tdeui/tests/kcolordlgtest.cpp +++ b/tdeui/tests/kcolordlgtest.cpp @@ -33,7 +33,7 @@ int main( int argc, char *argv[] ) aConfig.setGroup( "KColorDialog-test" ); color = aConfig.readColorEntry( "Chosen" ); - int nRet = KColorDialog::getColor( color, Qt::red /*testing default color*/ ); + int nRet = KColorDialog::getColor( color, TQt::red /*testing default color*/ ); aConfig.writeEntry( "Chosen", color ); return nRet; diff --git a/tdeui/tests/kcolortest.cpp b/tdeui/tests/kcolortest.cpp index 8966be81a..09b4a56c1 100644 --- a/tdeui/tests/kcolortest.cpp +++ b/tdeui/tests/kcolortest.cpp @@ -25,7 +25,7 @@ void KColorWidget::paintEvent(TQPaintEvent *) { if(!pixmap.isNull()) bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } void KColorWidget::doIntensityLoop() @@ -58,7 +58,7 @@ void KColorWidget::doIntensityLoop() } pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } stop = t.elapsed(); tqDebug ("Total fullscreen %s dim time for %d steps : %f s", @@ -71,7 +71,7 @@ void KColorWidget::doIntensityLoop() KImageEffect::fade(image, 1./max, black); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } } stop = t.elapsed(); @@ -87,14 +87,14 @@ void KColorWidget::doIntensityLoop() KImageEffect::intensity(image, 1./max); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } for(count=0; count < max; ++count){ KImageEffect::intensity(image, -1./max); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } image = original; image.detach(); @@ -103,13 +103,13 @@ void KColorWidget::doIntensityLoop() KImageEffect::channelIntensity(image, -1./max, KImageEffect::Red); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } for(count=0; count < max; ++count){ KImageEffect::channelIntensity(image, 1./max, KImageEffect::Red); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } image = original; image.detach(); @@ -118,13 +118,13 @@ void KColorWidget::doIntensityLoop() KImageEffect::channelIntensity(image, -1./max, KImageEffect::Green); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } for(count=0; count < max; ++count){ KImageEffect::channelIntensity(image, 1./max, KImageEffect::Green); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } image = original; image.detach(); @@ -133,13 +133,13 @@ void KColorWidget::doIntensityLoop() KImageEffect::channelIntensity(image, -1./max, KImageEffect::Blue); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } for(count=0; count < max; ++count){ KImageEffect::channelIntensity(image, 1./max, KImageEffect::Blue); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } } } diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp index 261534465..ff477e027 100644 --- a/tdeui/tests/kcompletiontest.cpp +++ b/tdeui/tests/kcompletiontest.cpp @@ -38,11 +38,11 @@ Form1::Form1( TQWidget* parent, const char* name ) GroupBox1 = new TQGroupBox( this, "GroupBox1" ); GroupBox1->setTitle( "Completion Test" ); - GroupBox1->setColumnLayout(0, Qt::Vertical ); + GroupBox1->setColumnLayout(0, TQt::Vertical ); GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setMargin( 0 ); GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); + GroupBox1Layout->setAlignment( TQt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp index 8eab0b125..a986ce026 100644 --- a/tdeui/tests/kdesattest.cpp +++ b/tdeui/tests/kdesattest.cpp @@ -33,7 +33,7 @@ void KDesatWidget::paintEvent(TQPaintEvent */*ev*/) TQString say; TQPainter p(this); - p.setPen(Qt::black); + p.setPen(TQt::black); // original image time.start(); diff --git a/tdeui/tests/kdocktest.cpp b/tdeui/tests/kdocktest.cpp index 538e2b888..57b8d2a08 100644 --- a/tdeui/tests/kdocktest.cpp +++ b/tdeui/tests/kdocktest.cpp @@ -18,7 +18,7 @@ DockTest::DockTest( TQWidget* parent ) m_blueDock->setCaption( "Blue" ); m_blueDock->setGeometry( 50, 50, 100, 100 ); TQWidget *l = new TQWidget( m_blueDock ); - l->setBackgroundColor( Qt::blue ); + l->setBackgroundColor( TQt::blue ); l->setMinimumSize( 100,100 ); m_blueDock->setWidget( l ); @@ -32,7 +32,7 @@ DockTest::DockTest( TQWidget* parent ) m_redDock->setCaption( "Red" ); m_redDock->setGeometry( 50, 50, 100, 100 ); l = new TQWidget( m_redDock ); - l->setBackgroundColor( Qt::red ); + l->setBackgroundColor( TQt::red ); l->setMinimumSize( 100,100 ); m_redDock->setWidget( l ); m_redDock->manualDock( m_blueDock, KDockWidget::DockLeft, 3000 ); @@ -45,7 +45,7 @@ DockTest::DockTest( TQWidget* parent ) m_yellowDock->setCaption( "Yellow" ); m_yellowDock->setGeometry( 50, 50, 100, 100 ); l = new TQWidget( m_yellowDock ); - l->setBackgroundColor( Qt::yellow ); + l->setBackgroundColor( TQt::yellow ); l->setMinimumSize( 100,100 ); m_yellowDock->setWidget( l ); m_yellowDock->manualDock( m_blueDock, KDockWidget::DockTop, 5000 ); diff --git a/tdeui/tests/kgradienttest.cpp b/tdeui/tests/kgradienttest.cpp index 4ee8c0f93..f828e31f7 100644 --- a/tdeui/tests/kgradienttest.cpp +++ b/tdeui/tests/kgradienttest.cpp @@ -13,13 +13,13 @@ void KGradientWidget::paintEvent(TQPaintEvent */*ev*/) int it, ft; TQString say; - TQColor ca = Qt::black, cb = Qt::blue; + TQColor ca = TQt::black, cb = TQt::blue; int x = 0, y = 0; pix.resize(width()/cols, height()/rows); TQPainter p(this); - p.setPen(Qt::white); + p.setPen(TQt::white); // draw once, so that the benchmarking be fair :-) KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient); diff --git a/tdeui/tests/khashtest.cpp b/tdeui/tests/khashtest.cpp index d392fcbc5..d2829606e 100644 --- a/tdeui/tests/khashtest.cpp +++ b/tdeui/tests/khashtest.cpp @@ -21,7 +21,7 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/) pix.resize(width()/cols, height()/rows); TQPainter p(this); - p.setPen(Qt::white); + p.setPen(TQt::white); // draw once, so that the benchmarking be fair :-) KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient); @@ -86,9 +86,9 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/) pix.resize(width()/cols, height()/rows); say.setNum( ft - it); say += " ms, CrossDiagonal"; p.drawPixmap(x*width()/cols, y*height()/rows, pix); - p.setPen(Qt::blue); + p.setPen(TQt::blue); p.drawText(5+(x++)*width()/cols, 15+y*height()/rows, say); - p.setPen(Qt::white); + p.setPen(TQt::white); y++; // next row diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp index 8a16c122f..564d4d2f2 100644 --- a/tdeui/tests/kledtest.cpp +++ b/tdeui/tests/kledtest.cpp @@ -22,7 +22,7 @@ KLedTest::KLedTest(TQWidget* parent) if (kled_round) { //KLed l(KLed::red, &qw); // create lamp //KLed l(KLed::blue, &qw); // create lamp - l = new KLed(Qt::green, this); // create lamp + l = new KLed(TQt::green, this); // create lamp //KLed l(KLed::yellow, &qw); // create lamp //KLed l(KLed::orange, &qw); // create lamp @@ -55,7 +55,7 @@ KLedTest::KLedTest(TQWidget* parent) for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) { for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1)) { - leds[index]=new KLed(Qt::yellow, state, + leds[index]=new KLed(TQt::yellow, state, (KLed::Look)(look+1), (KLed::Shape)(shape+1), this); leds[index]->setGeometry(x, y, LedWidth, LedHeight); diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp index 64d2795fc..01bafd192 100644 --- a/tdeui/tests/ktabwidgettest.cpp +++ b/tdeui/tests/ktabwidgettest.cpp @@ -21,8 +21,8 @@ Test::Test( TQWidget* parent, const char *name ) mWidget->addTab( new TQLabel( "Testlabel 2", mWidget ), "Two" ); mWidget->addTab( new TQWidget( mWidget), SmallIcon( "konsole" ), "Three" ); mWidget->addTab( new TQWidget( mWidget), "Four" ); - mWidget->setTabColor( mWidget->page(0), Qt::red ); - mWidget->setTabColor( mWidget->page(1), Qt::blue ); + mWidget->setTabColor( mWidget->page(0), TQt::red ); + mWidget->setTabColor( mWidget->page(1), TQt::blue ); connect( mWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), TQT_SLOT( currentChanged( TQWidget * ) ) ); connect( mWidget, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQT_SLOT(contextMenu( TQWidget *, const TQPoint & ))); @@ -89,7 +89,7 @@ Test::Test( TQWidget* parent, const char *name ) void Test::currentChanged(TQWidget* w) { - mWidget->setTabColor( w, Qt::black ); + mWidget->setTabColor( w, TQt::black ); } void Test::addTab() @@ -326,7 +326,7 @@ void Test::mouseDoubleClick(TQWidget *w) mWidget->label( mWidget->indexOf( w ) ), &ok, this ); if ( ok && !text.isEmpty() ) { mWidget->changeTab( w, text ); - mWidget->setTabColor( w, Qt::green ); + mWidget->setTabColor( w, TQt::green ); } } diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp index 40904000b..cf76e7980 100644 --- a/tdeui/tests/kunbalancedgrdtest.cpp +++ b/tdeui/tests/kunbalancedgrdtest.cpp @@ -20,13 +20,13 @@ void KGradientWidget::paintEvent(TQPaintEvent *) int it, ft; TQString say; - TQColor ca = Qt::black, cb = Qt::cyan; + TQColor ca = TQt::black, cb = TQt::cyan; int x = 0, y = 0; pix.resize(width()/cols, height()/rows); TQPainter p(this); - p.setPen(Qt::white); + p.setPen(TQt::white); // draw once, so that the benchmarking be fair :-) KPixmapEffect::unbalancedGradient(pix,ca, cb, diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp index 0635188d0..bbe028a1a 100644 --- a/tdeui/tests/kwizardtest.cpp +++ b/tdeui/tests/kwizardtest.cpp @@ -37,7 +37,7 @@ int main(int argc, char **argv) TQString msg = TQString("This is page %1 out of 10").arg(i); TQLabel *label = new TQLabel(msg, p); TQHBoxLayout *layout = new TQHBoxLayout(p, 5); - label->setAlignment(Qt::AlignCenter); + label->setAlignment(TQt::AlignCenter); label->setFixedSize(300, 200); layout->addWidget(label); TQString title = TQString("%1. page").arg(i); diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index b72e9dc68..7c224db8d 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -48,7 +48,7 @@ int main( int argc, char **argv ) Client *part = new Client; (void)new TDEAction( "decfont", "zoom-out", 0, 0, 0, part->actionCollection(), "decFontSizes" ); - (void)new TDEAction( "sec", "unlock", Qt::ALT + Qt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" ); + (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" ); part->setXMLFile( "./kxmlguitest_part.rc" ); diff --git a/tdeui/tests/qxembedtest.cpp b/tdeui/tests/qxembedtest.cpp index 4965e5487..2ee3d7907 100644 --- a/tdeui/tests/qxembedtest.cpp +++ b/tdeui/tests/qxembedtest.cpp @@ -25,7 +25,7 @@ main(int argc, char**argv) TQApplication a(argc,argv); - TQWidget *main = new TQVBox(NULL,"main",Qt::WDestructiveClose); + TQWidget *main = new TQVBox(NULL,"main",TQt::WDestructiveClose); TQWidget *top = new TQHBox(main); TQPushButton *quit = new TQPushButton("Quit", top); TQObject::connect( quit, TQT_SIGNAL(clicked()), main, TQT_SLOT(close()) ); |