diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /kdeui | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui')
244 files changed, 2356 insertions, 2264 deletions
diff --git a/kdeui/kaboutdialog.cpp b/kdeui/kaboutdialog.cpp index 12e610791..3ad8391e2 100644 --- a/kdeui/kaboutdialog.cpp +++ b/kdeui/kaboutdialog.cpp @@ -41,25 +41,25 @@ #include <kaboutdialog_private.h> #include <kdebug.h> -//MOC_SKIP_BEGIN +//TQMOC_SKIP_BEGIN template class TQPtrList<KAboutContributor>; -//MOC_SKIP_END +//TQMOC_SKIP_END #define WORKTEXT_IDENTATION 16 #define Grid 3 // ############################################################## -// MOC OUTPUT FILES: +// TQMOC OUTPUT FILES: #include "kaboutdialog.moc" #include "kaboutdialog_private.moc" // ############################################################## -class KAboutTabWidget : public QTabWidget +class KAboutTabWidget : public TQTabWidget { public: KAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {} - TQSize sizeHint() const { - return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) ); + TQSize tqsizeHint() const { + return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) ); } }; @@ -106,7 +106,7 @@ KAboutContributor::KAboutContributor( TQWidget *_parent, const char *wname, connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), TQT_SLOT(urlClickedSlot(const TQString &))); - mLabel[3]->setAlignment( AlignTop ); + mLabel[3]->tqsetAlignment( AlignTop ); fontChange( font() ); updateLayout(); @@ -227,8 +227,8 @@ void KAboutContributor::updateLayout( void ) { if( mShowHeader ) { - gbox->addWidget( mLabel[i], r, 0, AlignLeft ); - gbox->addWidget( mText[i], r, 1, AlignLeft ); + gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQ_Alignment)AlignLeft ); + gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft ); mLabel[i]->show(); mText[i]->show(); } @@ -237,11 +237,11 @@ void KAboutContributor::updateLayout( void ) mLabel[i]->hide(); if( !i ) { - gbox->addMultiCellWidget( mText[i], r, r, 0, 1, AlignLeft ); + gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQ_Alignment)AlignLeft ); } else { - gbox->addWidget( mText[i], r, 1, AlignLeft ); + gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft ); } mText[i]->show(); } @@ -256,7 +256,7 @@ void KAboutContributor::updateLayout( void ) } gbox->activate(); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } @@ -272,9 +272,9 @@ void KAboutContributor::fontChange( const TQFont &/*oldFont*/ ) } -TQSize KAboutContributor::sizeHint( void ) const +TQSize KAboutContributor::tqsizeHint( void ) const { - return minimumSizeHint(); + return tqminimumSizeHint(); } @@ -314,7 +314,7 @@ KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent, if( layoutType & AbtTitle ) { mTitleLabel = new TQLabel( this, "title" ); - mTitleLabel->setAlignment(AlignCenter); + mTitleLabel->tqsetAlignment(AlignCenter); mTopLayout->addWidget( mTitleLabel ); mTopLayout->addSpacing( KDialog::spacingHint() ); } @@ -427,9 +427,9 @@ void KAboutContainerBase::show( void ) TQWidget::show(); } -TQSize KAboutContainerBase::sizeHint( void ) const +TQSize KAboutContainerBase::tqsizeHint( void ) const { - return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) ); + return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) ); } void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) @@ -451,7 +451,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); - mVersionLabel->parentWidget()->layout()->activate(); + mVersionLabel->tqparentWidget()->layout()->activate(); } update(); @@ -716,7 +716,7 @@ void KAboutContainerBase::setProduct( const TQString &appName, mAuthorLabel->hide(); } - mIconLabel->parentWidget()->layout()->activate(); + mIconLabel->tqparentWidget()->layout()->activate(); } @@ -790,26 +790,26 @@ void KAboutContainer::childEvent( TQChildEvent *e ) TQWidget* const w = static_cast<TQWidget *>(e->child()); mVbox->addWidget( w, 0, mAlignment ); - const TQSize s( sizeHint() ); + const TQSize s( tqsizeHint() ); setMinimumSize( s ); - TQObjectList* const l = const_cast<TQObjectList *>(children()); // silence please - TQObjectListIterator itr( *l ); + TQObjectList const l = childrenListObject(); // silence please + TQObjectListIterator itr( l ); TQObject * o; while ( (o = itr.current()) ) { ++itr; if( o->isWidgetType() ) { - static_cast<TQWidget *>(o)->setMinimumWidth( s.width() ); + TQT_TQWIDGET(o)->setMinimumWidth( s.width() ); } } } -TQSize KAboutContainer::sizeHint( void ) const +TQSize KAboutContainer::tqsizeHint( void ) const { // - // The size is computed by adding the sizeHint().height() of all + // The size is computed by adding the tqsizeHint().height() of all // widget children and taking the width of the widest child and adding // layout()->margin() and layout()->spacing() // @@ -817,24 +817,24 @@ TQSize KAboutContainer::sizeHint( void ) const TQSize total_size; int numChild = 0; - TQObjectList* const l = const_cast<TQObjectList *>(children()); // silence please + TQObjectList const l = childrenListObject(); // silence please - TQObjectListIterator itr( *l ); + TQObjectListIterator itr( l ); TQObject * o; while ( (o = itr.current()) ) { ++itr; if( o->isWidgetType() ) { ++numChild; - TQWidget* const w= static_cast<TQWidget *>(o); + TQWidget* const w= TQT_TQWIDGET(o); - TQSize s = w->minimumSize(); + TQSize s = w->tqminimumSize(); if( s.isEmpty() ) { - s = w->minimumSizeHint(); + s = w->tqminimumSizeHint(); if( s.isEmpty() ) { - s = w->sizeHint(); + s = w->tqsizeHint(); if( s.isEmpty() ) { s = TQSize( 100, 100 ); // Default size @@ -864,9 +864,9 @@ TQSize KAboutContainer::sizeHint( void ) const } -TQSize KAboutContainer::minimumSizeHint( void ) const +TQSize KAboutContainer::tqminimumSizeHint( void ) const { - return sizeHint(); + return tqsizeHint(); } @@ -890,7 +890,7 @@ void KAboutContainer::addPerson( const TQString &_name, const TQString &_email, } -void KAboutContainer::addTitle( const TQString &title, int alignment, +void KAboutContainer::addTitle( const TQString &title, int tqalignment, bool showFrame, bool showBold ) { @@ -905,11 +905,11 @@ void KAboutContainer::addTitle( const TQString &title, int alignment, { label->setFrameStyle(TQFrame::Panel | TQFrame::Raised); } - label->setAlignment( alignment ); + label->tqsetAlignment( tqalignment ); } -void KAboutContainer::addImage( const TQString &fileName, int alignment ) +void KAboutContainer::addImage( const TQString &fileName, int tqalignment ) { if( fileName.isNull() ) { @@ -924,11 +924,11 @@ void KAboutContainer::addImage( const TQString &fileName, int alignment ) pix = logo; label->setPixmap( pix ); } - label->setAlignment( alignment ); + label->tqsetAlignment( tqalignment ); } #if 0 -//MOC_SKIP_BEGIN +//TQMOC_SKIP_BEGIN /** Every person displayed is stored in a KAboutContributor object. * Every contributor, the author and/or the maintainer of the application are @@ -960,8 +960,8 @@ public: void setWork(const TQString&); /** The size hint. Very important here, since KAboutWidget relies on it for * geometry management. */ - TQSize sizeHint(); - TQSize minimumSizeHint(void); + TQSize tqsizeHint(); + TQSize tqminimumSizeHint(void); virtual void show( void ); // ---------------------------------------------------------------------------- @@ -1007,7 +1007,7 @@ KAboutContributor::KAboutContributor(TQWidget* parent, const char* n) if(name==0 || email==0) { // this will nearly never happen (out of memory in about box?) kdDebug() << "KAboutContributor::KAboutContributor: Out of memory." << endl; - qApp->quit(); + tqApp->quit(); } setFrameStyle(TQFrame::Panel | TQFrame::Raised); // ----- @@ -1096,7 +1096,7 @@ KAboutContributor::setWork(const TQString& w) #if 0 QSize -KAboutContributor::sizeHint() +KAboutContributor::tqsizeHint() { // ############################################################################ const int FrameWidth=frameWidth(); @@ -1104,8 +1104,8 @@ KAboutContributor::sizeHint() int maxx, maxy; TQRect rect; // ----- first calculate name and email width: - maxx=name->sizeHint().width(); - maxx=QMAX(maxx, email->sizeHint().width()+WORKTEXT_IDENTATION); + maxx=name->tqsizeHint().width(); + maxx=QMAX(maxx, email->tqsizeHint().width()+WORKTEXT_IDENTATION); // ----- now determine "work" text rectangle: if(!work.isEmpty()) // save time { @@ -1116,10 +1116,10 @@ KAboutContributor::sizeHint() { maxx=WorkTextWidth+WORKTEXT_IDENTATION; } - maxx=QMAX(maxx, url->sizeHint().width()+WORKTEXT_IDENTATION); + maxx=QMAX(maxx, url->tqsizeHint().width()+WORKTEXT_IDENTATION); // ----- - maxy=2*(name->sizeHint().height()+Grid); // need a space above the KURLLabels - maxy+=/* email */ name->sizeHint().height(); + maxy=2*(name->tqsizeHint().height()+Grid); // need a space above the KURLLabels + maxy+=/* email */ name->tqsizeHint().height(); maxy+=rect.height(); // ----- maxx+=2*FrameWidth; @@ -1128,16 +1128,16 @@ KAboutContributor::sizeHint() // ############################################################################ } -TQSize KAboutContributor::minimumSizeHint(void) +TQSize KAboutContributor::tqminimumSizeHint(void) { - return( sizeHint() ); + return( tqsizeHint() ); } void KAboutContributor::show( void ) { TQFrame::show(); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } @@ -1151,15 +1151,15 @@ KAboutContributor::resizeEvent(TQResizeEvent*) int cy=framewidth; // ----- name->setGeometry - (framewidth, framewidth, childwidth, name->sizeHint().height()); + (framewidth, framewidth, childwidth, name->tqsizeHint().height()); cy=name->height()+Grid; email->setGeometry (framewidth+WORKTEXT_IDENTATION, cy, - childwidth-WORKTEXT_IDENTATION, /* email */ name->sizeHint().height()); + childwidth-WORKTEXT_IDENTATION, /* email */ name->tqsizeHint().height()); cy+=name->height()+Grid; url->setGeometry (framewidth+WORKTEXT_IDENTATION, cy, - childwidth-WORKTEXT_IDENTATION, /* url */ name->sizeHint().height()); + childwidth-WORKTEXT_IDENTATION, /* url */ name->tqsizeHint().height()); // the work text is drawn in the paint event // ############################################################################ } @@ -1181,20 +1181,20 @@ KAboutContributor::paintEvent(TQPaintEvent* e) paint.drawText(WORKTEXT_IDENTATION, cy, w, h, AlignLeft | WordBreak, work); // ############################################################################ } -// MOC_SKIP_END +// TQMOC_SKIP_END #endif #if 0 -TQSize KAboutContributor::sizeHint( void ) +TQSize KAboutContributor::tqsizeHint( void ) { int s = KDialog::spacingHint(); int h = fontMetrics().lineSpacing()*3 + 2*s; int m = frameWidth(); - int w = name->sizeHint().width(); - w = QMAX( w, email->sizeHint().width()+s); - w = QMAX( w, url->sizeHint().width()+s); + int w = name->tqsizeHint().width(); + w = QMAX( w, email->tqsizeHint().width()+s); + w = QMAX( w, url->tqsizeHint().width()+s); if( work.isEmpty() == false ) { @@ -1214,10 +1214,10 @@ TQSize KAboutContributor::sizeHint( void ) int s = 3; int m = frameWidth() + KDialog::spacingHint(); int h = ls * 3 + s * 2; - int w = name->sizeHint().width(); + int w = name->tqsizeHint().width(); - w = QMAX( w, email->sizeHint().width()+WORKTEXT_IDENTATION); - w = QMAX( w, url->sizeHint().width()+WORKTEXT_IDENTATION); + w = QMAX( w, email->tqsizeHint().width()+WORKTEXT_IDENTATION); + w = QMAX( w, url->tqsizeHint().width()+WORKTEXT_IDENTATION); if( work.isEmpty() == false ) { const int WorkTextWidth=200; @@ -1257,7 +1257,7 @@ void KAboutContributor::resizeEvent(TQResizeEvent*) int x = frameWidth() + KDialog::spacingHint(); int y = x; int w = width() - 2*x; - int h = name->sizeHint().height(); + int h = name->tqsizeHint().height(); int s = 3; name->setGeometry( x, y, w, h ); @@ -1291,7 +1291,7 @@ void KAboutContributor::paintEvent( TQPaintEvent *e ) int s = 3; int x = frameWidth() + KDialog::spacingHint() + WORKTEXT_IDENTATION; int w = width()-WORKTEXT_IDENTATION-2*(frameWidth()+KDialog::spacingHint()); - int y = frameWidth()+KDialog::spacingHint()+(name->sizeHint().height()+s)*3; + int y = frameWidth()+KDialog::spacingHint()+(name->tqsizeHint().height()+s)*3; int h = height()-y-frameWidth(); TQPainter paint( this ); @@ -1320,13 +1320,13 @@ KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name) { // this will nearly never happen (out of memory in about box?) kdDebug() << "KAboutWidget::KAboutWidget: Out of memory." << endl; - qApp->quit(); + tqApp->quit(); } // ----- cont->setText(i18n("Other Contributors:")); logo->setText(i18n("(No logo available)")); logo->setFrameStyle(TQFrame::Panel | TQFrame::Raised); - version->setAlignment(AlignCenter); + version->tqsetAlignment(AlignCenter); // ----- connect(author, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); @@ -1350,33 +1350,33 @@ KAboutWidget::adjust() // ----- if(showMaintainer) { - total_size=maintainer->sizeHint(); + total_size=maintainer->tqsizeHint(); maintWidth=total_size.width(); maintHeight=total_size.height(); } else { maintWidth=0; maintHeight=0; } - total_size=author->sizeHint(); + total_size=author->tqsizeHint(); logo->adjustSize(); - cy=version->sizeHint().height()+Grid; + cy=version->tqsizeHint().height()+Grid; cx=logo->width(); tempx=QMAX(total_size.width(), maintWidth); cx+=Grid+tempx; - cx=QMAX(cx, version->sizeHint().width()); + cx=QMAX(cx, version->tqsizeHint().width()); cy+=QMAX(logo->height(), total_size.height()+(showMaintainer ? Grid+maintHeight : 0)); // ----- if(!contributors.isEmpty()) { - cx=QMAX(cx, cont->sizeHint().width()); - cy+=cont->sizeHint().height()+Grid; + cx=QMAX(cx, cont->tqsizeHint().width()); + cy+=cont->tqsizeHint().height()+Grid; TQPtrListIterator<KAboutContributor> _pos(contributors); KAboutContributor* currEntry; while ( (currEntry = _pos.current()) ) { ++_pos; - cy+=currEntry->sizeHint().height(); + cy+=currEntry->tqsizeHint().height(); } } // ----- @@ -1459,7 +1459,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*) // ############################################################################ int _x=0, _y, cx, tempx, tempy; // ----- set version label geometry: - version->setGeometry(0, 0, width(), version->sizeHint().height()); + version->setGeometry(0, 0, width(), version->tqsizeHint().height()); _y=version->height()+Grid; // ----- move logo to correct position: logo->adjustSize(); @@ -1468,16 +1468,16 @@ KAboutWidget::resizeEvent(TQResizeEvent*) tempx=logo->width()+Grid; cx=width()-tempx; author->setGeometry - (tempx, _y, cx, author->sizeHint().height()); + (tempx, _y, cx, author->tqsizeHint().height()); maintainer->setGeometry - (tempx, _y+author->height()+Grid, cx, maintainer->sizeHint().height()); + (tempx, _y+author->height()+Grid, cx, maintainer->tqsizeHint().height()); _y+=QMAX(logo->height(), author->height()+(showMaintainer ? Grid+maintainer->height() : 0)); // ----- if(!contributors.isEmpty()) { - tempy=cont->sizeHint().height(); + tempy=cont->tqsizeHint().height(); cont->setGeometry(0, _y, width(), tempy); cont->show(); _y+=tempy+Grid; @@ -1489,7 +1489,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*) while( (currEntry = _pos.current()) ) { ++_pos; - tempy=currEntry->sizeHint().height(); + tempy=currEntry->tqsizeHint().height(); // y+=Grid; currEntry->setGeometry(_x, _y, width(), tempy); _y+=tempy; @@ -1512,7 +1512,7 @@ KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal) { // this will nearly never happen (out of memory in about box?) kdDebug() << "KAboutDialog::KAboutDialog: Out of memory." << endl; - qApp->quit(); + tqApp->quit(); } setMainWidget(about); connect(about, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), @@ -1567,7 +1567,7 @@ void KAboutDialog::adjust() if( !about ) { return; } about->adjust(); //initializeGeometry(); - resize( sizeHint() ); + resize( tqsizeHint() ); } diff --git a/kdeui/kaboutdialog.h b/kdeui/kaboutdialog.h index 8d732cdbe..345bc9f2c 100644 --- a/kdeui/kaboutdialog.h +++ b/kdeui/kaboutdialog.h @@ -47,7 +47,7 @@ class KAboutContainerPrivate; /** * KAboutContainer can be used to make a application specific AboutDialog. */ -class KDEUI_EXPORT KAboutContainer : public QFrame +class KDEUI_EXPORT KAboutContainer : public TQFrame { Q_OBJECT @@ -62,12 +62,12 @@ class KDEUI_EXPORT KAboutContainer : public QFrame const TQString &url, const TQString &task, bool showHeader = false, bool showframe = false, bool showBold = false ); - void addTitle( const TQString &title, int alignment=AlignLeft, + void addTitle( const TQString &title, int tqalignment=AlignLeft, bool showframe = false, bool showBold = false ); - void addImage( const TQString &fileName, int alignment=AlignLeft ); + void addImage( const TQString &fileName, int tqalignment=AlignLeft ); - virtual TQSize sizeHint( void ) const; - virtual TQSize minimumSizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; + virtual TQSize tqminimumSizeHint( void ) const; protected: virtual void childEvent( TQChildEvent *e ); @@ -89,7 +89,7 @@ class KAboutContributorPrivate; * Used internally by KAboutWidget * @internal */ -class KDEUI_EXPORT KAboutContributor : public QFrame +class KDEUI_EXPORT KAboutContributor : public TQFrame { Q_OBJECT @@ -115,7 +115,7 @@ class KDEUI_EXPORT KAboutContributor : public QFrame TQString getURL( void ) const; TQString getWork( void ) const; - virtual TQSize sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; protected: virtual void fontChange( const TQFont &oldFont ); @@ -147,7 +147,7 @@ class KDEUI_EXPORT KAboutContributor : public QFrame * * It has a minimum size set. */ -class KDEUI_EXPORT KAboutWidget : public QWidget +class KDEUI_EXPORT KAboutWidget : public TQWidget { Q_OBJECT diff --git a/kdeui/kaboutdialog_private.h b/kdeui/kaboutdialog_private.h index 563eb825b..3f6ffedd5 100644 --- a/kdeui/kaboutdialog_private.h +++ b/kdeui/kaboutdialog_private.h @@ -32,7 +32,7 @@ class TQVBoxLayout; * Used internally by KAboutContainerBase * @internal */ -class KImageTrackLabel : public QLabel +class KImageTrackLabel : public TQLabel { Q_OBJECT @@ -66,7 +66,7 @@ class KAboutContainerBasePrivate; * Used internally by KAboutDialog * @internal */ -class KAboutContainerBase : public QWidget +class KAboutContainerBase : public TQWidget { Q_OBJECT @@ -88,7 +88,7 @@ class KAboutContainerBase : public QWidget public: KAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 ); virtual void show( void ); - virtual TQSize sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; void setTitle( const TQString &title ); void setImage( const TQString &fileName ); diff --git a/kdeui/kaboutkde.cpp b/kdeui/kaboutkde.cpp index 1d05e289c..7ab50dca6 100644 --- a/kdeui/kaboutkde.cpp +++ b/kdeui/kaboutkde.cpp @@ -27,7 +27,7 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) - :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::fromLatin1("KDE"), + :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::tqfromLatin1("KDE"), KDialogBase::Help|KDialogBase::Close, KDialogBase::Close, parent, name, modal ) { @@ -75,13 +75,13 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) "donation, using one of the ways described at " "<a href=\"http://trinity.pearsoncomputing.net/support/\">http://trinity.pearsoncomputing.net/support/</a>." "<br><br>Thank you very much in advance for your support!"); - setHelp( TQString::fromLatin1("khelpcenter/main.html"), TQString::null ); + setHelp( TQString::tqfromLatin1("khelpcenter/main.html"), TQString::null ); setTitle(i18n("Trinity Desktop Environment. Release %1"). - arg(TQString::fromLatin1(KDE_VERSION_STRING)) ); + arg(TQString::tqfromLatin1(KDE_VERSION_STRING)) ); addTextPage( i18n("About Trinity","&About"), text1, true ); addTextPage( i18n("&Report Bugs or Wishes"), text2, true ); addTextPage( i18n("&Join the Trinity Team"), text3, true ); addTextPage( i18n("&Support Trinity"), text4, true ); - setImage( locate( "data", TQString::fromLatin1("kdeui/pics/aboutkde.png")) ); + setImage( locate( "data", TQString::tqfromLatin1("kdeui/pics/aboutkde.png")) ); setImageBackgroundColor( white ); } diff --git a/kdeui/kaccelgen.h b/kdeui/kaccelgen.h index 8f0c50bed..382320a15 100644 --- a/kdeui/kaccelgen.h +++ b/kdeui/kaccelgen.h @@ -131,7 +131,7 @@ loadPredefined(Iter begin, Iter end, TQMap<TQChar,bool>& keys) { for (Iter i = begin; i != end; ++i) { TQString item = Deref::deref(i); - int user_ampersand = item.find(TQChar('&')); + int user_ampersand = item.tqfind(TQChar('&')); if( user_ampersand >= 0 ) { // Sanity check. Note that we don't try to find an // accelerator if the user shoots him/herself in the foot @@ -178,7 +178,7 @@ generate(Iter begin, Iter end, TQStringList& target) // Attempt to find a good accelerator, but only if the user // has not manually hardcoded one. - int user_ampersand = item.find(TQChar('&')); + int user_ampersand = item.tqfind(TQChar('&')); if( user_ampersand < 0 || item[user_ampersand+1] == '&') { bool found = false; uint found_idx; diff --git a/kdeui/kaction.cpp b/kdeui/kaction.cpp index 9bfd23468..5327845ab 100644 --- a/kdeui/kaction.cpp +++ b/kdeui/kaction.cpp @@ -515,11 +515,11 @@ void KAction::updateShortcut( int i ) int id = itemId( i ); TQWidget* w = container( i ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>(w); updateShortcut( menu, id ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->setAccel( d->m_cut.keyCodeQt(), id ); } @@ -530,7 +530,7 @@ void KAction::updateShortcut( TQPopupMenu* menu, int id ) // show the string representation of its shortcut. if ( d->m_kaccel || d->m_kaccelList.count() ) { TQString s = menu->text( id ); - int i = s.find( '\t' ); + int i = s.tqfind( '\t' ); if ( i >= 0 ) s.replace( i+1, s.length()-i, d->m_cut.seq(0).toString() ); else @@ -616,7 +616,7 @@ void KAction::updateToolTip( int i ) { TQWidget *w = container( i ); - if ( ::qt_cast<KToolBar *>( w ) ) + if ( ::tqqt_cast<KToolBar *>( w ) ) TQToolTip::add( static_cast<KToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() ); } @@ -649,7 +649,7 @@ int KAction::plug( TQWidget *w, int index ) plugShortcut(); - if ( ::qt_cast<TQPopupMenu *>( w ) ) + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( w ); int id; @@ -683,7 +683,7 @@ int KAction::plug( TQWidget *w, int index ) menu->setItemEnabled( id, false ); if ( !d->whatsThis().isEmpty() ) - menu->setWhatsThis( id, whatsThisWithIcon() ); + menu->TQMenuData::setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); @@ -693,7 +693,7 @@ int KAction::plug( TQWidget *w, int index ) return d->m_containers.count() - 1; } - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { KToolBar *bar = static_cast<KToolBar *>( w ); @@ -706,8 +706,8 @@ int KAction::plug( TQWidget *w, int index ) if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, Qt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, Qt::ButtonState) ), + bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index ); } else @@ -715,8 +715,8 @@ int KAction::plug( TQWidget *w, int index ) TQString icon = d->iconName(); if ( icon.isEmpty() ) icon = "unknown"; - bar->insertButton( icon, id_, TQT_SIGNAL( buttonClicked(int, Qt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, Qt::ButtonState) ), + bar->insertButton( icon, id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index, instance ); } @@ -749,17 +749,17 @@ void KAction::unplug( TQWidget *w ) return; int id = itemId( i ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu *menu = static_cast<TQPopupMenu *>( w ); menu->removeItem( id ); } - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { KToolBar *bar = static_cast<KToolBar *>( w ); bar->removeItemDelayed( id ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) { TQMenuBar *bar = static_cast<TQMenuBar *>( w ); bar->removeItem( id ); @@ -810,10 +810,10 @@ void KAction::unplugAccel() void KAction::plugMainWindowAccel( TQWidget *w ) { - // Note: topLevelWidget() stops too early, we can't use it. + // Note: tqtopLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow @@ -857,11 +857,11 @@ void KAction::updateEnabled( int i ) { TQWidget *w = container( i ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) static_cast<TQPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) static_cast<KToolBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); } @@ -903,18 +903,18 @@ void KAction::updateText( int i ) { TQWidget *w = container( i ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { int id = itemId( i ); static_cast<TQPopupMenu*>(w)->changeItem( id, d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), id ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( i ), d->text() ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget *button = static_cast<KToolBar *>(w)->getWidget( itemId( i ) ); - if ( ::qt_cast<KToolBarButton *>( button ) ) + if ( ::tqqt_cast<KToolBarButton *>( button ) ) static_cast<KToolBarButton *>(button)->setText( d->plainText() ); } } @@ -943,15 +943,15 @@ void KAction::updateIcon( int id ) { TQWidget* w = container( id ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { int itemId_ = itemId( id ); static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( KIcon::Small ), d->text() ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) static_cast<KToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() ); } @@ -974,16 +974,16 @@ void KAction::updateIconSet( int id ) { TQWidget *w = container( id ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { int itemId_ = itemId( id ); static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet(), d->text() ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { if ( icon().isEmpty() && d->hasIcon() ) // only if there is no named icon ( scales better ) static_cast<KToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet() ); @@ -1016,7 +1016,7 @@ void KAction::updateWhatsThis( int i ) TQPopupMenu* pm = popupMenu( i ); if ( pm ) { - pm->setWhatsThis( itemId( i ), d->whatsThis() ); + pm->TQMenuData::setWhatsThis( itemId( i ), d->whatsThis() ); return; } @@ -1039,7 +1039,7 @@ TQString KAction::whatsThisWithIcon() const { TQString text = whatsThis(); if (!d->iconName().isEmpty()) - return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text); + return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text); return text; } @@ -1103,10 +1103,10 @@ void KAction::activate() void KAction::slotActivated() { - const TQObject *senderObj = sender(); + const TQObject *senderObj = TQT_TQOBJECT_CONST(sender()); if ( senderObj ) { - if ( ::qt_cast<KAccelPrivate *>( senderObj ) ) + if ( ::tqqt_cast<KAccelPrivate *>( senderObj ) ) emit activated( KAction::AccelActivation, Qt::NoButton ); } emit activated(); @@ -1118,7 +1118,7 @@ void KAction::slotActivated() // only called by QPopupMenus, we plugged us in. void KAction::slotPopupActivated() { - if( ::qt_cast<TQSignal *>(sender())) + if( ::tqqt_cast<TQSignal *>(sender())) { int id = dynamic_cast<const TQSignal *>(sender())->value().toInt(); int pos = findContainer(id); @@ -1128,7 +1128,7 @@ void KAction::slotPopupActivated() if(qpm) { KPopupMenu* kpm = dynamic_cast<KPopupMenu *>( qpm ); - Qt::ButtonState state; + TQt::ButtonState state; if ( kpm ) // KPopupMenu? Nice, it stores the state. state = kpm->state(); else { // just a QPopupMenu? We'll ask for the state now then (small race condition?) @@ -1147,13 +1147,13 @@ void KAction::slotPopupActivated() slotActivated(); } -void KAction::slotButtonClicked( int, Qt::ButtonState state ) +void KAction::slotButtonClicked( int, TQt::ButtonState state ) { kdDebug(129) << "slotButtonClicked() state=" << state << endl; emit activated( KAction::ToolBarActivation, state ); // RightButton isn't really an activation - if ( ( state & LeftButton ) || ( state & MidButton ) ) + if ( ( state & Qt::LeftButton ) || ( state & Qt::MidButton ) ) slotActivated(); } @@ -1161,7 +1161,7 @@ void KAction::slotButtonClicked( int, Qt::ButtonState state ) void KAction::slotDestroyed() { kdDebug(129) << "KAction::slotDestroyed(): this = " << this << ", name = \"" << name() << "\", sender = " << sender() << endl; - const TQObject* const o = sender(); + const TQObject* const o = TQT_TQOBJECT_CONST(sender()); #ifndef KDE_NO_COMPAT // KDE 4: remove if ( o == d->m_kaccel ) @@ -1187,7 +1187,7 @@ void KAction::slotDestroyed() int i; do { - i = findContainer( static_cast<const TQWidget*>( o ) ); + i = findContainer( TQT_TQWIDGET_CONST( static_cast<const QObject*>(o) ) ); if ( i != -1 ) removeContainer( i ); } while ( i != -1 ); diff --git a/kdeui/kaction.h b/kdeui/kaction.h index 85be6e3dc..203272256 100644 --- a/kdeui/kaction.h +++ b/kdeui/kaction.h @@ -199,7 +199,7 @@ class KMainWindow; * * @see KStdAction */ -class KDEUI_EXPORT KAction : public QObject +class KDEUI_EXPORT KAction : public TQObject { friend class KActionCollection; Q_OBJECT @@ -570,7 +570,7 @@ protected slots: /// @since 3.4 void slotPopupActivated(); // KDE4: make virtual /// @since 3.4 - void slotButtonClicked( int, Qt::ButtonState state ); // KDE4: make virtual + void slotButtonClicked( int, TQt::ButtonState state ); // KDE4: make virtual protected: KToolBar* toolBar( int index ) const; @@ -620,7 +620,7 @@ signals: * * @since 3.4 */ - void activated( KAction::ActivationReason reason, Qt::ButtonState state ); + void activated( KAction::ActivationReason reason, TQt::ButtonState state ); void enabled( bool ); private: diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp index f5a031869..3185db276 100644 --- a/kdeui/kactionclasses.cpp +++ b/kdeui/kactionclasses.cpp @@ -137,7 +137,7 @@ KToggleAction::~KToggleAction() int KToggleAction::plug( TQWidget* widget, int index ) { - if ( !::qt_cast<TQPopupMenu *>( widget ) && !::qt_cast<KToolBar *>( widget ) ) + if ( !::tqqt_cast<TQPopupMenu *>( widget ) && !::tqqt_cast<KToolBar *>( widget ) ) { kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl; return -1; @@ -149,7 +149,7 @@ int KToggleAction::plug( TQWidget* widget, int index ) if ( _index == -1 ) return _index; - if ( ::qt_cast<KToolBar *>( widget ) ) { + if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = static_cast<KToolBar *>( widget ); bar->setToggle( itemId( _index ), true ); @@ -176,11 +176,11 @@ void KToggleAction::setChecked( bool c ) updateChecked( i ); if ( c && parent() && !exclusiveGroup().isEmpty() ) { - const TQObjectList *list = parent()->children(); - if ( list ) { - TQObjectListIt it( *list ); + const TQObjectList list = tqparent()->childrenListObject(); + if ( !list.isEmpty() ) { + TQObjectListIt it( list ); for( ; it.current(); ++it ) { - if ( ::qt_cast<KToggleAction *>( it.current() ) && it.current() != this && + if ( ::tqqt_cast<KToggleAction *>( it.current() ) && it.current() != this && static_cast<KToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) { KToggleAction *a = static_cast<KToggleAction*>(it.current()); if( a->isChecked() ) { @@ -197,7 +197,7 @@ void KToggleAction::updateChecked( int id ) { TQWidget *w = container( id ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* pm = static_cast<TQPopupMenu*>(w); int itemId_ = itemId( id ); if ( !d->m_checkedGuiItem ) @@ -215,16 +215,16 @@ void KToggleAction::updateChecked( int id ) pm->setItemChecked( itemId_, d->m_checked ); if ( !d->m_checkedGuiItem->whatsThis().isEmpty() ) // if empty, we keep the initial one - pm->setWhatsThis( itemId_, gui->whatsThis() ); + pm->TQMenuData::setWhatsThis( itemId_, gui->whatsThis() ); updateShortcut( pm, itemId_ ); } } - else if ( ::qt_cast<TQMenuBar *>( w ) ) // not handled in plug... + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) // not handled in plug... static_cast<TQMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getButton( itemId( id ) ); - if ( r && ::qt_cast<KToolBarButton *>( r ) ) { + if ( r && ::tqqt_cast<KToolBarButton *>( r ) ) { static_cast<KToolBar*>( w )->setButton( itemId( id ), d->m_checked ); if ( d->m_checkedGuiItem && d->m_checkedGuiItem->hasIcon() ) { const KGuiItem* gui = d->m_checked ? d->m_checkedGuiItem : &guiItem(); @@ -322,12 +322,12 @@ void KRadioAction::slotActivated() { if ( isChecked() ) { - const TQObject *senderObj = sender(); + const TQObject *senderObj = TQT_TQOBJECT_CONST(sender()); - if ( !senderObj || !::qt_cast<const KToolBarButton *>( senderObj ) ) + if ( !senderObj || !::tqqt_cast<const KToolBarButton *>( senderObj ) ) return; - const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( senderObj ) )->on( true ); + const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true ); return; } @@ -537,10 +537,10 @@ void KSelectAction::changeItem( int id, int index, const TQString& text) return; TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = (static_cast<KToolBar*>( w ))->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->changeItem(text, index ); @@ -587,9 +587,9 @@ void KSelectAction::updateCurrentItem( int id ) return; TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) { + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) { + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->setCurrentItem( d->m_current ); } @@ -604,9 +604,9 @@ int KSelectAction::comboWidth() const void KSelectAction::updateComboWidth( int id ) { TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) { + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) { + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *cb = static_cast<TQComboBox*>( r ); cb->setMinimumWidth( d->m_comboWidth ); cb->setMaximumWidth( d->m_comboWidth ); @@ -618,17 +618,17 @@ void KSelectAction::updateItems( int id ) { kdDebug(129) << "KAction::updateItems( " << id << ", lst )" << endl; // remove -- ellis TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) { + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) { + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *cb = static_cast<TQComboBox*>( r ); cb->clear(); TQStringList lst = comboItems(); TQStringList::ConstIterator it = lst.begin(); for( ; it != lst.end(); ++it ) cb->insertItem( *it ); - // qt caches and never recalculates the sizeHint() - // qcombobox.cpp recommends calling setFont to invalidate the sizeHint + // qt caches and never recalculates the tqsizeHint() + // qcombobox.cpp recommends calling setFont to tqinvalidate the tqsizeHint // setFont sets own_font = True, so we're a bit mean and calll // unsetFont which calls setFont and then overwrites the own_font cb->unsetFont(); @@ -641,7 +641,7 @@ int KSelectAction::plug( TQWidget *widget, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; kdDebug(129) << "KSelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( ::qt_cast<TQPopupMenu *>( widget) ) + if ( ::tqqt_cast<TQPopupMenu *>( widget) ) { // Create the PopupMenu and store it in m_menu (void)popupMenu(); @@ -658,14 +658,14 @@ int KSelectAction::plug( TQWidget *widget, int index ) TQString wth = whatsThis(); if ( !wth.isEmpty() ) - menu->setWhatsThis( id, wth ); + menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); return containerCount() - 1; } - else if ( ::qt_cast<KToolBar *>( widget ) ) + else if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar* bar = static_cast<KToolBar*>( widget ); int id_ = KAction::getToolButtonID(); @@ -677,8 +677,8 @@ int KSelectAction::plug( TQWidget *widget, int index ) TQComboBox *cb = bar->getCombo( id_ ); if ( cb ) { - if (!isEditable()) cb->setFocusPolicy(TQWidget::NoFocus); - cb->setMinimumWidth( cb->sizeHint().width() ); + if (!isEditable()) cb->setFocusPolicy(TQ_NoFocus); + cb->setMinimumWidth( cb->tqsizeHint().width() ); if ( d->m_comboWidth > 0 ) { cb->setMinimumWidth( d->m_comboWidth ); @@ -697,7 +697,7 @@ int KSelectAction::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) { // Create the PopupMenu and store it in m_menu (void)popupMenu(); @@ -710,7 +710,7 @@ int KSelectAction::plug( TQWidget *widget, int index ) TQString wth = whatsThis(); if ( !wth.isEmpty() ) - menu->setWhatsThis( id, wth ); + menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); @@ -730,7 +730,7 @@ TQStringList KSelectAction::comboItems() const for( ; it != d->m_list.end(); ++it ) { TQString item = *it; - int i = item.find( '&' ); + int i = item.tqfind( '&' ); if ( i > -1 ) item = item.remove( i, 1 ); lst.append( item ); @@ -754,9 +754,9 @@ void KSelectAction::clear() void KSelectAction::updateClear( int id ) { TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) { + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) { + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->clear(); } @@ -779,18 +779,18 @@ void KSelectAction::slotActivated( const TQString &text ) if ( isEditable() ) { TQStringList lst = d->m_list; - if(!lst.contains(text)) + if(!lst.tqcontains(text)) { lst.append( text ); setItems( lst ); } } - int i = d->m_list.findIndex( text ); + int i = d->m_list.tqfindIndex( text ); if ( i > -1 ) setCurrentItem( i ); else - setCurrentItem( comboItems().findIndex( text ) ); + setCurrentItem( comboItems().tqfindIndex( text ) ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); @@ -1272,7 +1272,7 @@ int KRecentFilesAction::plug( TQWidget *widget, int index ) return -1; // This is very related to KActionMenu::plug. // In fact this class could be an interesting base class for KActionMenu - if ( ::qt_cast<KToolBar *>( widget ) ) + if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = (KToolBar *)widget; @@ -1476,7 +1476,7 @@ void KFontAction::setFont( const TQString &family ) return; } } - i = lowerName.find(" ["); + i = lowerName.tqfind(" ["); if (i>-1) { lowerName = lowerName.left(i); @@ -1513,7 +1513,7 @@ void KFontAction::setFont( const TQString &family ) FcConfigSubstitute (config, pattern, FcMatchPattern); pattern = FcFontMatch(NULL, pattern, NULL); realFamily = (char*)FcNameUnparse(pattern); - realFamily.remove(realFamily.find(regExp), realFamily.length()); + realFamily.remove(realFamily.tqfind(regExp), realFamily.length()); if ( !realFamily.isEmpty() && realFamily != family ) setFont( realFamily ); @@ -1525,7 +1525,7 @@ int KFontAction::plug( TQWidget *w, int index ) { if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( ::qt_cast<KToolBar *>( w ) ) + if ( ::tqqt_cast<KToolBar *>( w ) ) { KToolBar* bar = static_cast<KToolBar*>( w ); int id_ = KAction::getToolButtonID(); @@ -1534,7 +1534,7 @@ int KFontAction::plug( TQWidget *w, int index ) TQT_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); - cb->setMinimumWidth( cb->sizeHint().width() ); + cb->setMinimumWidth( cb->tqsizeHint().width() ); addContainer( bar, id_ ); @@ -1626,7 +1626,7 @@ void KFontSizeAction::init() setEditable( true ); TQFontDatabase fontDB; - TQValueList<int> sizes = fontDB.standardSizes(); + TQValueList<int> sizes = fontDB.tqstandardSizes(); TQStringList lst; for ( TQValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it ) lst.append( TQString::number( *it ) ); @@ -1637,7 +1637,7 @@ void KFontSizeAction::init() void KFontSizeAction::setFontSize( int size ) { if ( size == fontSize() ) { - setCurrentItem( items().findIndex( TQString::number( size ) ) ); + setCurrentItem( items().tqfindIndex( TQString::number( size ) ) ); return; } @@ -1646,7 +1646,7 @@ void KFontSizeAction::setFontSize( int size ) return; } - int index = items().findIndex( TQString::number( size ) ); + int index = items().tqfindIndex( TQString::number( size ) ); if ( index == -1 ) { // Insert at the correct position in the list (to keep sorting) TQValueList<int> lst; @@ -1664,7 +1664,7 @@ void KFontSizeAction::setFontSize( int size ) strLst.append( TQString::number(*it) ); KSelectAction::setItems( strLst ); // Find new current item - index = lst.findIndex( size ); + index = lst.tqfindIndex( size ); setCurrentItem( index ); } else @@ -1795,7 +1795,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; kdDebug(129) << "KActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( ::qt_cast<TQPopupMenu *>( widget ) ) + if ( ::tqqt_cast<TQPopupMenu *>( widget ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); int id; @@ -1815,7 +1815,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<KToolBar *>( widget ) ) + else if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = static_cast<KToolBar *>( widget ); @@ -1857,7 +1857,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) { TQMenuBar *bar = static_cast<TQMenuBar *>( widget ); @@ -1942,7 +1942,7 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index ) return -1; // This is very related to KActionMenu::plug. // In fact this class could be an interesting base class for KActionMenu - if ( ::qt_cast<KToolBar *>( widget ) ) + if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = (KToolBar *)widget; @@ -2021,10 +2021,10 @@ int KToggleToolBarAction::plug( TQWidget* w, int index ) return -1; if ( !m_toolBar ) { - // Note: topLevelWidget() stops too early, we can't use it. + // Note: tqtopLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow @@ -2054,7 +2054,7 @@ void KToggleToolBarAction::setChecked( bool c ) m_toolBar->hide(); } TQMainWindow* mw = m_toolBar->mainWindow(); - if ( mw && ::qt_cast<KMainWindow *>( mw ) ) + if ( mw && ::tqqt_cast<KMainWindow *>( mw ) ) static_cast<KMainWindow *>( mw )->setSettingsDirty(); } KToggleAction::setChecked( c ); @@ -2102,7 +2102,7 @@ void KToggleFullScreenAction::setChecked( bool c ) bool KToggleFullScreenAction::eventFilter( TQObject* o, TQEvent* e ) { - if( o == window ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(window) ) if( e->type() == TQEvent::WindowStateChange ) { if( window->isFullScreen() != isChecked()) @@ -2152,7 +2152,7 @@ int KWidgetAction::plug( TQWidget* w, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( !::qt_cast<KToolBar *>( w ) ) { + if ( !::tqqt_cast<KToolBar *>( w ) ) { kdError() << "KWidgetAction::plug: KWidgetAction must be plugged into KToolBar." << endl; return -1; } @@ -2216,7 +2216,7 @@ KActionSeparator::~KActionSeparator() int KActionSeparator::plug( TQWidget *widget, int index ) { - if ( ::qt_cast<TQPopupMenu *>( widget) ) + if ( ::tqqt_cast<TQPopupMenu *>( widget) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); @@ -2227,7 +2227,7 @@ int KActionSeparator::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) { TQMenuBar *menuBar = static_cast<TQMenuBar *>( widget ); @@ -2239,7 +2239,7 @@ int KActionSeparator::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<KToolBar *>( widget ) ) + else if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *toolBar = static_cast<KToolBar *>( widget ); @@ -2284,7 +2284,7 @@ int KPasteTextAction::plug( TQWidget *widget, int index ) { if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( ::qt_cast<KToolBar *>( widget ) ) + if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = (KToolBar *)widget; @@ -2326,7 +2326,7 @@ void KPasteTextAction::menuAboutToShow() if (reply.isValid()) list = reply; } - TQString clipboardText = qApp->clipboard()->text(QClipboard::Clipboard); + TQString clipboardText = tqApp->clipboard()->text(TQClipboard::Clipboard); if (list.isEmpty()) list << clipboardText; bool found = false; @@ -2354,7 +2354,7 @@ void KPasteTextAction::menuItemActivated( int id) TQString clipboardText = reply; reply = klipper.call("setClipboardContents(TQString)", clipboardText); if (reply.isValid()) - kdDebug(129) << "Clipboard: " << qApp->clipboard()->text(QClipboard::Clipboard) << endl; + kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl; } TQTimer::singleShot(20, this, TQT_SLOT(slotActivated())); } @@ -2362,8 +2362,8 @@ void KPasteTextAction::menuItemActivated( int id) void KPasteTextAction::slotActivated() { if (!m_mixedMode) { - TQWidget *w = qApp->widgetAt(TQCursor::pos(), true); - TQMimeSource *data = TQApplication::clipboard()->data(); + TQWidget *w = tqApp->widgetAt(TQCursor::pos(), true); + TQMimeSource *data = TQApplication::tqclipboard()->data(); if (!data->provides("text/plain") && w) { m_popup->popup(w->mapToGlobal(TQPoint(0, w->height()))); } else diff --git a/kdeui/kactionclasses.h b/kdeui/kactionclasses.h index 9a0ffbbae..1a1096aa7 100644 --- a/kdeui/kactionclasses.h +++ b/kdeui/kactionclasses.h @@ -68,6 +68,7 @@ class KMainWindow; class KDEUI_EXPORT KToggleAction : public KAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( bool checked READ isChecked WRITE setChecked ) Q_PROPERTY( TQString exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup ) public: @@ -230,6 +231,7 @@ private: class KDEUI_EXPORT KRadioAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: /** * Constructs a radio action with text and potential keyboard @@ -329,6 +331,7 @@ private: class KDEUI_EXPORT KSelectAction : public KAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem ) Q_PROPERTY( TQStringList items READ items WRITE setItems ) Q_PROPERTY( bool editable READ isEditable WRITE setEditable ) @@ -581,6 +584,7 @@ private: class KDEUI_EXPORT_DEPRECATED KListAction : public KSelectAction { Q_OBJECT + TQ_OBJECT public: /** * Constructs a list action with text and potential keyboard @@ -696,6 +700,7 @@ private: class KDEUI_EXPORT KRecentFilesAction : public KListAction // TODO public KSelectAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( uint maxItems READ maxItems WRITE setMaxItems ) public: /** @@ -905,6 +910,7 @@ private: class KDEUI_EXPORT KFontAction : public KSelectAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( TQString font READ font WRITE setFont ) public: KFontAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, @@ -955,6 +961,7 @@ private: class KDEUI_EXPORT KFontSizeAction : public KSelectAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize ) public: KFontSizeAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, @@ -1013,6 +1020,7 @@ private: class KDEUI_EXPORT KActionMenu : public KAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( bool delayed READ delayed WRITE setDelayed ) Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu ) @@ -1086,6 +1094,7 @@ private: class KDEUI_EXPORT KToolBarPopupAction : public KAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( bool delayed READ delayed WRITE setDelayed ) Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu ) @@ -1208,6 +1217,7 @@ private: class KDEUI_EXPORT KToggleToolBarAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: /** * Create a KToggleToolbarAction that manages the toolbar @@ -1254,6 +1264,7 @@ private: class KDEUI_EXPORT KToggleFullScreenAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: /** * Create a KToggleFullScreenAction @@ -1298,6 +1309,7 @@ private: class KDEUI_EXPORT KWidgetAction : public KAction { Q_OBJECT + TQ_OBJECT public: /** * Create an action that will embed widget into a toolbar @@ -1342,6 +1354,7 @@ private: class KDEUI_EXPORT KActionSeparator : public KAction { Q_OBJECT + TQ_OBJECT public: KActionSeparator( TQObject* parent = 0, const char* name = 0 ); virtual ~KActionSeparator(); @@ -1368,6 +1381,7 @@ private: class KDEUI_EXPORT KPasteTextAction: public KAction { Q_OBJECT + TQ_OBJECT public: /** * Create a KPasteTextAction, with a text, an icon, an accelerator, diff --git a/kdeui/kactioncollection.cpp b/kdeui/kactioncollection.cpp index e383809c6..47f649d6b 100644 --- a/kdeui/kactioncollection.cpp +++ b/kdeui/kactioncollection.cpp @@ -426,7 +426,7 @@ TQStringList KActionCollection::groups() const TQAsciiDictIterator<KAction> it( d->m_actionDict ); for( ; it.current(); ++it ) - if ( !it.current()->group().isEmpty() && !lst.contains( it.current()->group() ) ) + if ( !it.current()->group().isEmpty() && !lst.tqcontains( it.current()->group() ) ) lst.append( it.current()->group() ); return lst; @@ -501,14 +501,14 @@ void KActionCollection::connectHighlight( TQWidget *container, KAction *action ) { actionList = new TQPtrList<KAction>; - if ( ::qt_cast<TQPopupMenu *>( container ) ) + if ( ::tqqt_cast<TQPopupMenu *>( container ) ) { connect( container, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotMenuItemHighlighted( int ) ) ); connect( container, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuAboutToHide() ) ); } - else if ( ::qt_cast<KToolBar *>( container ) ) + else if ( ::tqqt_cast<KToolBar *>( container ) ) { connect( container, TQT_SIGNAL( highlighted( int, bool ) ), this, TQT_SLOT( slotToolBarButtonHighlighted( int, bool ) ) ); @@ -547,7 +547,7 @@ void KActionCollection::slotMenuItemHighlighted( int id ) if ( d->m_currentHighlightAction ) emit actionHighlighted( d->m_currentHighlightAction, false ); - TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ) ); + TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() )); d->m_currentHighlightAction = findAction( container, id ); @@ -581,7 +581,7 @@ void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight ) if ( !d->m_highlight ) return; - TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ) ); + TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() )); KAction *action = findAction( container, id ); @@ -606,7 +606,7 @@ void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight ) void KActionCollection::slotDestroyed() { - d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject *>(sender()) ) ); + d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())) ) ); } KAction *KActionCollection::findAction( TQWidget *container, int id ) @@ -713,8 +713,8 @@ bool KActionShortcutList::save() const if( m_actions.xmlFile().isEmpty() ) return writeSettings(); - TQString attrShortcut = TQString::fromLatin1("shortcut"); - TQString attrAccel = TQString::fromLatin1("accel"); // Depricated attribute + TQString attrShortcut = TQString::tqfromLatin1("shortcut"); + TQString attrAccel = TQString::tqfromLatin1("accel"); // Depricated attribute // Read XML file TQString sXml( KXMLGUIFactory::readConfigFile( xmlFile, false, instance() ) ); diff --git a/kdeui/kactioncollection.h b/kdeui/kactioncollection.h index 7ce10052c..971bc862f 100644 --- a/kdeui/kactioncollection.h +++ b/kdeui/kactioncollection.h @@ -75,7 +75,7 @@ typedef TQValueList<KAction *> KActionPtrList; * statusBar(), TQT_SLOT( clear() ) ); * \endcode */ -class KDEUI_EXPORT KActionCollection : public QObject +class KDEUI_EXPORT KActionCollection : public TQObject { friend class KAction; friend class KXMLGUIClient; diff --git a/kdeui/kactionselector.cpp b/kdeui/kactionselector.cpp index 9bbf52dbf..056045906 100644 --- a/kdeui/kactionselector.cpp +++ b/kdeui/kactionselector.cpp @@ -343,7 +343,7 @@ void KActionSelector::polish() void KActionSelector::keyPressEvent( TQKeyEvent *e ) { if ( ! d->keyboardEnabled ) return; - if ( (e->state() & Qt::ControlButton) ) + if ( (e->state() & TQt::ControlButton) ) { switch ( e->key() ) { @@ -370,7 +370,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) { if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress ) { - if ( (((TQKeyEvent*)e)->state() & Qt::ControlButton) ) + if ( (((TQKeyEvent*)e)->state() & TQt::ControlButton) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/kdeui/kactivelabel.cpp b/kdeui/kactivelabel.cpp index c01a91d41..0315e348d 100644 --- a/kdeui/kactivelabel.cpp +++ b/kdeui/kactivelabel.cpp @@ -40,11 +40,11 @@ KActiveLabel::KActiveLabel(const TQString &text, TQWidget * parent, const char * void KActiveLabel::init() { - setTextFormat(Qt::RichText); + setTextFormat(TQt::RichText); setVScrollBarMode(TQScrollView::AlwaysOff); setHScrollBarMode(TQScrollView::AlwaysOff); setFrameStyle(TQFrame::NoFrame); - setFocusPolicy( TQWidget::TabFocus ); + setFocusPolicy( TQ_TabFocus ); paletteChanged(); connect(this, TQT_SIGNAL(linkClicked(const TQString &)), @@ -111,9 +111,9 @@ void KActiveLabel::keyPressEvent( TQKeyEvent *e ) } } -TQSize KActiveLabel::minimumSizeHint() const +TQSize KActiveLabel::tqminimumSizeHint() const { - TQSize ms = minimumSize(); + TQSize ms = tqminimumSize(); if ((ms.width() > 0) && (ms.height() > 0)) return ms; @@ -134,9 +134,9 @@ TQSize KActiveLabel::minimumSizeHint() const return TQSize(w, h); } -TQSize KActiveLabel::sizeHint() const +TQSize KActiveLabel::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } #include "kactivelabel.moc" diff --git a/kdeui/kactivelabel.h b/kdeui/kactivelabel.h index 8ab2bacf2..1220c9ce8 100644 --- a/kdeui/kactivelabel.h +++ b/kdeui/kactivelabel.h @@ -34,7 +34,7 @@ class KActiveLabelPrivate; * @author Waldo Bastian (bastian@kde.org) * @version $Id$ */ -class KDEUI_EXPORT KActiveLabel : public QTextBrowser +class KDEUI_EXPORT KActiveLabel : public TQTextBrowser { Q_OBJECT public: @@ -56,8 +56,8 @@ public: */ KActiveLabel(const TQString & text, TQWidget * parent, const char * name = 0); - TQSize minimumSizeHint() const; - TQSize sizeHint() const; + TQSize tqminimumSizeHint() const; + TQSize tqsizeHint() const; public slots: /** diff --git a/kdeui/kanimwidget.cpp b/kdeui/kanimwidget.cpp index 5ff1037d5..7b723a1f0 100644 --- a/kdeui/kanimwidget.cpp +++ b/kdeui/kanimwidget.cpp @@ -74,7 +74,7 @@ void KAnimWidget::stop() { d->current_frame = 0; d->timer.stop(); - repaint(); + tqrepaint(); } void KAnimWidget::setSize( int size ) @@ -142,7 +142,7 @@ void KAnimWidget::mousePressEvent( TQMouseEvent *e ) void KAnimWidget::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == LeftButton && + if ( e->button() == Qt::LeftButton && rect().contains( e->pos() ) ) emit clicked(); @@ -159,10 +159,10 @@ void KAnimWidget::slotTimerUpdate() d->current_frame = 0; // TODO - // We have to clear the widget when repainting a transparent image + // We have to clear the widget when tqrepainting a transparent image // By doing it like this we get a bit of flicker though. A better // way might be to merge it with the background in drawContents. - repaint(d->transparent); + tqrepaint(d->transparent); } void KAnimWidget::drawContents( TQPainter *p ) diff --git a/kdeui/kanimwidget.h b/kdeui/kanimwidget.h index 23e043e15..68f33d1b0 100644 --- a/kdeui/kanimwidget.h +++ b/kdeui/kanimwidget.h @@ -52,7 +52,7 @@ class KAnimWidgetPrivate; * * @author Kurt Granroth <granroth@kde.org> */ -class KDEUI_EXPORT KAnimWidget : public QFrame +class KDEUI_EXPORT KAnimWidget : public TQFrame { Q_OBJECT Q_PROPERTY( int size READ size WRITE setSize ) diff --git a/kdeui/karrowbutton.cpp b/kdeui/karrowbutton.cpp index fd9624b67..ab0d6785c 100644 --- a/kdeui/karrowbutton.cpp +++ b/kdeui/karrowbutton.cpp @@ -40,7 +40,7 @@ KArrowButton::~KArrowButton() delete d; } -TQSize KArrowButton::sizeHint() const +TQSize KArrowButton::tqsizeHint() const { return TQSize( 12, 12 ); } @@ -49,7 +49,7 @@ void KArrowButton::setArrowType(Qt::ArrowType a) { if (d->arrow != a) { d->arrow = a; - repaint(); + tqrepaint(); } } Qt::ArrowType KArrowButton::arrowType() const @@ -62,9 +62,9 @@ void KArrowButton::drawButton(TQPainter *p) const unsigned int arrowSize = 8; const unsigned int margin = 2; - p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); - style().drawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ), - colorGroup(), + p->fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ), + tqcolorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default, TQStyleOption( 2, 0 ) ); @@ -103,8 +103,8 @@ void KArrowButton::drawButton(TQPainter *p) int flags = TQStyle::Style_Enabled; if ( isDown() ) flags |= TQStyle::Style_Down; - style().drawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ), - colorGroup(), flags ); + tqstyle().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ), + tqcolorGroup(), flags ); } void KArrowButton::virtual_hook( int, void* ) diff --git a/kdeui/karrowbutton.h b/kdeui/karrowbutton.h index e20278692..9c0c1f032 100644 --- a/kdeui/karrowbutton.h +++ b/kdeui/karrowbutton.h @@ -28,14 +28,14 @@ class KArrowButtonPrivate; * @short Draws a button with an arrow. * * Draws a button which shows an arrow pointing into a certain direction. The - * arrow's alignment on the button depends on the direction it's pointing to, + * arrow's tqalignment on the button depends on the direction it's pointing to, * e.g. a left arrow is aligned at the left border, a upwards arrow at the top * border. This class honors the currently configured KStyle when drawing * the arrow. * * @author Frerich Raabe */ -class KDEUI_EXPORT KArrowButton : public QPushButton +class KDEUI_EXPORT KArrowButton : public TQPushButton { Q_OBJECT Q_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp ) @@ -59,7 +59,7 @@ class KDEUI_EXPORT KArrowButton : public QPushButton /** * Reimplemented from TQPushButton. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Returns the arrow type @@ -67,12 +67,12 @@ class KDEUI_EXPORT KArrowButton : public QPushButton */ Qt::ArrowType arrowType() const; - // hacks for moc braindamages with enums + // hacks for tqmoc braindamages with enums int arrowTp() const { return (int) arrowType(); } void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); } public slots: /** - * Defines in what direction the arrow is pointing to. Will repaint the + * Defines in what direction the arrow is pointing to. Will tqrepaint the * button if necessary. * * @param a The direction this arrow should be pointing in diff --git a/kdeui/kauthicon.cpp b/kdeui/kauthicon.cpp index d4c18a114..fa49a1d26 100644 --- a/kdeui/kauthicon.cpp +++ b/kdeui/kauthicon.cpp @@ -102,7 +102,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) lockBox = new TQLabel(this); lockBox->setFrameStyle(TQFrame::WinPanel|TQFrame::Raised); lockBox->setPixmap(lockPM); - lockBox->setFixedSize(lockBox->sizeHint()); + lockBox->setFixedSize(lockBox->tqsizeHint()); lockLabel = new TQLabel(this); lockLabel->setFrameStyle(TQFrame::NoFrame); @@ -113,8 +113,8 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) lockLabel->setText(lockText); else lockLabel->setText(openLockText); - lockLabel->setAlignment(AlignCenter); - lockLabel->setMinimumSize(lockLabel->sizeHint()); + lockLabel->tqsetAlignment(AlignCenter); + lockLabel->setMinimumSize(lockLabel->tqsizeHint()); lockLabel->setText(lockText); layout = new TQHBoxLayout(this); @@ -124,7 +124,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) layout->addWidget(lockLabel, 0, AlignRight|AlignVCenter); layout->activate(); - resize(sizeHint()); + resize(tqsizeHint()); } KAuthIcon::~KAuthIcon() @@ -132,9 +132,9 @@ KAuthIcon::~KAuthIcon() } -TQSize KAuthIcon::sizeHint() const +TQSize KAuthIcon::tqsizeHint() const { - return layout->minimumSize(); + return layout->tqminimumSize(); } diff --git a/kdeui/kauthicon.h b/kdeui/kauthicon.h index 0bfe0cc22..6c473c9dd 100644 --- a/kdeui/kauthicon.h +++ b/kdeui/kauthicon.h @@ -44,7 +44,7 @@ class KAuthIconPrivate; * @see KRootPermsIcon, KWritePermsIcon * @author Preston Brown <pbrown@kde.org> */ -class KDEUI_EXPORT KAuthIcon : public QWidget +class KDEUI_EXPORT KAuthIcon : public TQWidget { Q_OBJECT @@ -55,7 +55,7 @@ public: KAuthIcon(TQWidget *parent = 0, const char *name = 0); ~KAuthIcon(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * return the status of whatever is being monitored. */ diff --git a/kdeui/kbugreport.cpp b/kdeui/kbugreport.cpp index 3d7898861..f90ce28fb 100644 --- a/kdeui/kbugreport.cpp +++ b/kdeui/kbugreport.cpp @@ -88,7 +88,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD TQWidget * parent = plainPage(); d->submitBugButton = 0; - //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.pearsoncomputing.net") ) + //if ( m_aboutData->bugAddress() == TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") ) //{ // // This is a core KDE application -> redirect to the web form // Always redirect to the Web form for Trinity @@ -122,7 +122,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD parent ); connect( m_configureEmail, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotConfigureEmail() ) ); - glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, AlignTop|AlignRight ); + glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, (TQ_Alignment)(AlignTop|AlignRight) ); // To qwtstr = i18n( "The email address this bug report is sent to." ); @@ -153,9 +153,9 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD TQWhatsThis::add( d->appcombo, qwtstr ); d->appcombo->insertStrList((const char**)packages); connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int))); - d->appname = TQString::fromLatin1( m_aboutData + d->appname = TQString::tqfromLatin1( m_aboutData ? m_aboutData->productName() - : qApp->name() ); + : tqApp->name() ); glay->addWidget( d->appcombo, row, 1 ); int index = 0; for (; index < d->appcombo->count(); index++) { @@ -179,8 +179,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD m_strVersion = m_aboutData->version(); else m_strVersion = i18n("no version set (programmer error!)"); - d->kde_version = TQString::fromLatin1( KDE_VERSION_STRING ); - d->kde_version += ", " + TQString::fromLatin1( KDE_DISTRIBUTION_TEXT ); + d->kde_version = TQString::tqfromLatin1( KDE_VERSION_STRING ); + d->kde_version += ", " + TQString::tqfromLatin1( KDE_DISTRIBUTION_TEXT ); if ( !d->submitBugButton ) m_strVersion += " " + d->kde_version; m_version = new TQLabel( m_strVersion, parent ); @@ -193,16 +193,16 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD struct utsname unameBuf; uname( &unameBuf ); - d->os = TQString::fromLatin1( unameBuf.sysname ) + - " (" + TQString::fromLatin1( unameBuf.machine ) + ") " - "release " + TQString::fromLatin1( unameBuf.release ); + d->os = TQString::tqfromLatin1( unameBuf.sysname ) + + " (" + TQString::tqfromLatin1( unameBuf.machine ) + ") " + "release " + TQString::tqfromLatin1( unameBuf.release ); tmpLabel = new TQLabel(d->os, parent); glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 ); tmpLabel = new TQLabel(i18n("Compiler:"), parent); glay->addWidget( tmpLabel, ++row, 0 ); - tmpLabel = new TQLabel(TQString::fromLatin1(KDE_COMPILER_VERSION), parent); + tmpLabel = new TQLabel(TQString::tqfromLatin1(KDE_COMPILER_VERSION), parent); glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 ); if ( !d->submitBugButton ) @@ -259,7 +259,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD updateURL(); d->submitBugButton->setText( i18n("&Launch Bug Report Wizard") ); - d->submitBugButton->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + d->submitBugButton->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); lay->addWidget( d->submitBugButton ); lay->addSpacing(10); @@ -289,7 +289,7 @@ void KBugReport::updateURL() void KBugReport::appChanged(int i) { TQString appName = d->appcombo->text(i); - int index = appName.find( '/' ); + int index = appName.tqfind( '/' ); if ( index > 0 ) appName = appName.left( index ); kdDebug() << "appName " << appName << endl; @@ -311,7 +311,7 @@ void KBugReport::slotConfigureEmail() { if (m_process) return; m_process = new KProcess; - *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); + *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount"); connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom())); if (!m_process->start()) { @@ -330,24 +330,24 @@ void KBugReport::slotSetFrom() m_configureEmail->setEnabled(true); // ### KDE4: why oh why is KEmailSettings in kio? - KConfig emailConf( TQString::fromLatin1("emaildefaults") ); + KConfig emailConf( TQString::tqfromLatin1("emaildefaults") ); // find out the default profile - emailConf.setGroup( TQString::fromLatin1("Defaults") ); - TQString profile = TQString::fromLatin1("PROFILE_"); - profile += emailConf.readEntry( TQString::fromLatin1("Profile"), - TQString::fromLatin1("Default") ); + emailConf.setGroup( TQString::tqfromLatin1("Defaults") ); + TQString profile = TQString::tqfromLatin1("PROFILE_"); + profile += emailConf.readEntry( TQString::tqfromLatin1("Profile"), + TQString::tqfromLatin1("Default") ); emailConf.setGroup( profile ); - TQString fromaddr = emailConf.readEntry( TQString::fromLatin1("EmailAddress") ); + TQString fromaddr = emailConf.readEntry( TQString::tqfromLatin1("EmailAddress") ); if (fromaddr.isEmpty()) { struct passwd *p; p = getpwuid(getuid()); - fromaddr = TQString::fromLatin1(p->pw_name); + fromaddr = TQString::tqfromLatin1(p->pw_name); } else { - TQString name = emailConf.readEntry( TQString::fromLatin1("FullName")); + TQString name = emailConf.readEntry( TQString::tqfromLatin1("FullName")); if (!name.isEmpty()) - fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">"); + fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">"); } m_from->setText( fromaddr ); } @@ -438,9 +438,9 @@ TQString KBugReport::text() const { kdDebug() << m_bgSeverity->selected()->name() << endl; // Prepend the pseudo-headers to the contents of the mail - TQString severity = TQString::fromLatin1(m_bgSeverity->selected()->name()); + TQString severity = TQString::tqfromLatin1(m_bgSeverity->selected()->name()); TQString appname = d->appcombo->currentText(); - TQString os = TQString::fromLatin1("OS: %1 (%2)\n"). + TQString os = TQString::tqfromLatin1("OS: %1 (%2)\n"). arg(KDE_COMPILING_OS). arg(KDE_DISTRIBUTION_TEXT); TQString bodyText; @@ -452,25 +452,25 @@ TQString KBugReport::text() const bodyText += line; } - if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { + if (severity == TQString::tqfromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { // Case 1 : i18n bug - TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language()); - package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-")); - return TQString::fromLatin1("Package: %1").arg(package) + - TQString::fromLatin1("\n" + TQString package = TQString::tqfromLatin1("i18n_%1").arg(KGlobal::locale()->language()); + package = package.replace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-")); + return TQString::tqfromLatin1("Package: %1").arg(package) + + TQString::tqfromLatin1("\n" "Application: %1\n" // not really i18n's version, so better here IMHO "Version: %2\n").arg(appname).arg(m_strVersion)+ - os+TQString::fromLatin1("\n")+bodyText; + os+TQString::tqfromLatin1("\n")+bodyText; } else { - appname = appname.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-")); + appname = appname.replace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-")); // Case 2 : normal bug - return TQString::fromLatin1("Package: %1\n" + return TQString::tqfromLatin1("Package: %1\n" "Version: %2\n" "Severity: %3\n") .arg(appname).arg(m_strVersion).arg(severity)+ - TQString::fromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+ - os+TQString::fromLatin1("\n")+bodyText; + TQString::tqfromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+ + os+TQString::tqfromLatin1("\n")+bodyText; } } @@ -478,12 +478,12 @@ bool KBugReport::sendBugReport() { TQString recipient ( m_aboutData ? m_aboutData->bugAddress() : - TQString::fromLatin1("submit@bugs.pearsoncomputing.net") ); + TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") ); TQString command; command = locate("exe", "ksendbugmail"); if (command.isEmpty()) - command = KStandardDirs::findExe( TQString::fromLatin1("ksendbugmail") ); + command = KStandardDirs::findExe( TQString::tqfromLatin1("ksendbugmail") ); KTempFile outputfile; outputfile.close(); diff --git a/kdeui/kbuttonbox.cpp b/kdeui/kbuttonbox.cpp index eb0e27827..25bd6c71b 100644 --- a/kdeui/kbuttonbox.cpp +++ b/kdeui/kbuttonbox.cpp @@ -39,7 +39,7 @@ * which makes the buttons look better. * * 01/17/98 Mario Weilguni <mweilguni@sime.com> - * Fixed a bug in sizeHint() + * Fixed a bug in tqsizeHint() * Improved the handling of Motif default buttons * * 01/09/98 Mario Weilguni <mweilguni@sime.com> @@ -178,12 +178,12 @@ void KButtonBox::layout() { ++itr; } - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } void KButtonBox::placeButtons() { - if(data->orientation == Horizontal) { + if(data->orientation == Qt::Horizontal) { // calculate free size and stretches int fs = width() - 2 * data->border; int stretch = 0; @@ -300,7 +300,7 @@ TQSize KButtonBox::bestButtonSize() const { return s; } -TQSize KButtonBox::sizeHint() const { +TQSize KButtonBox::tqsizeHint() const { unsigned int dw; if(data->buttons.isEmpty()) @@ -323,7 +323,7 @@ TQSize KButtonBox::sizeHint() const { else s = bs; - if(data->orientation == Horizontal) + if(data->orientation == Qt::Horizontal) dw += s.width(); else dw += s.height(); @@ -335,7 +335,7 @@ TQSize KButtonBox::sizeHint() const { ++itr; } - if(data->orientation == Horizontal) + if(data->orientation == Qt::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 == Horizontal? + return data->orientation == Qt::Horizontal? TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) : TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); } @@ -355,8 +355,8 @@ TQSizePolicy KButtonBox::sizePolicy() const * as minimum width */ TQSize KButtonBox::buttonSizeHint(TQPushButton *b) const { - TQSize s = b->sizeHint(); - const TQSize ms = b->minimumSize(); + TQSize s = b->tqsizeHint(); + const TQSize ms = b->tqminimumSize(); if(s.width() < minButtonWidth) s.setWidth(minButtonWidth); diff --git a/kdeui/kbuttonbox.h b/kdeui/kbuttonbox.h index 7eda45577..03de09008 100644 --- a/kdeui/kbuttonbox.h +++ b/kdeui/kbuttonbox.h @@ -39,7 +39,7 @@ class KButtonBoxPrivate; * @version $Id$ **/ -class KDEUI_EXPORT KButtonBox : public QWidget +class KDEUI_EXPORT KButtonBox : public TQWidget { Q_OBJECT @@ -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 = Horizontal, + KButtonBox(TQWidget *parent, Orientation _orientation = Qt::Horizontal, int border = 0, int _autoborder = 6); /** @@ -65,7 +65,7 @@ public: * This size is * calculated by the width/height of all buttons plus border/autoborder. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual TQSizePolicy sizePolicy() const; virtual void resizeEvent(TQResizeEvent *); diff --git a/kdeui/kcharselect.cpp b/kdeui/kcharselect.cpp index 1eb707c4d..9f3d76dd2 100644 --- a/kdeui/kcharselect.cpp +++ b/kdeui/kcharselect.cpp @@ -45,7 +45,7 @@ class KCharSelect::KCharSelectPrivate { public: - TQLineEdit *unicodeLine; + TQLineEdit *tqunicodeLine; }; TQFontDatabase * KCharSelect::fontDataBase = 0; @@ -66,7 +66,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ : TQGridView( parent, name ), vFont( _font ), vChr( _chr ), vTableNum( _tableNum ), vPos( 0, 0 ), focusItem( _chr ), focusPos( 0, 0 ), d(0) { - setBackgroundColor( colorGroup().base() ); + setBackgroundColor( tqcolorGroup().base() ); setCellWidth( 20 ); setCellHeight( 25 ); @@ -74,11 +74,11 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ setNumCols( 32 ); setNumRows( 8 ); - repaintContents( false ); + tqrepaintContents( false ); setToolTips(); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setBackgroundMode( TQWidget::NoBackground ); } @@ -86,7 +86,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ void KCharSelectTable::setFont( const TQString &_font ) { vFont = _font; - repaintContents( false ); + tqrepaintContents( false ); setToolTips(); } @@ -95,7 +95,7 @@ void KCharSelectTable::setFont( const TQString &_font ) void KCharSelectTable::setChar( const TQChar &_chr ) { vChr = _chr; - repaintContents( false ); + tqrepaintContents( false ); } //================================================================== @@ -104,13 +104,13 @@ void KCharSelectTable::setTableNum( int _tableNum ) focusItem = TQChar( _tableNum * 256 ); vTableNum = _tableNum; - repaintContents( false ); + tqrepaintContents( false ); setToolTips(); } //================================================================== -TQSize KCharSelectTable::sizeHint() const +TQSize KCharSelectTable::tqsizeHint() const { int w = cellWidth(); int h = cellHeight(); @@ -155,26 +155,26 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col ) c += row * numCols(); c += col; - if ( c == vChr.unicode() ) { - p->setBrush( TQBrush( colorGroup().highlight() ) ); + if ( c == vChr.tqunicode() ) { + p->setBrush( TQBrush( tqcolorGroup().highlight() ) ); p->setPen( NoPen ); p->drawRect( 0, 0, w, h ); - p->setPen( colorGroup().highlightedText() ); + p->setPen( tqcolorGroup().highlightedText() ); vPos = TQPoint( col, row ); } else { TQFontMetrics fm = TQFontMetrics( font ); if( fm.inFont( c ) ) - p->setBrush( TQBrush( colorGroup().base() ) ); + p->setBrush( TQBrush( tqcolorGroup().base() ) ); else - p->setBrush( TQBrush( colorGroup().button() ) ); + p->setBrush( TQBrush( tqcolorGroup().button() ) ); p->setPen( NoPen ); p->drawRect( 0, 0, w, h ); - p->setPen( colorGroup().text() ); + p->setPen( tqcolorGroup().text() ); } - if ( c == focusItem.unicode() && hasFocus() ) { - style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), - colorGroup() ); + if ( c == focusItem.tqunicode() && hasFocus() ) { + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), + tqcolorGroup() ); focusPos = TQPoint( col, row ); } @@ -182,7 +182,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col ) p->drawText( 0, 0, x2, y2, AlignHCenter | AlignVCenter, TQString( TQChar( c ) ) ); - p->setPen( colorGroup().text() ); + p->setPen( tqcolorGroup().text() ); p->drawLine( x2, 0, x2, y2 ); p->drawLine( 0, y2, x2, y2 ); @@ -210,9 +210,9 @@ void KCharSelectTable::mouseMoveEvent( TQMouseEvent *e ) focusPos = vPos; focusItem = vChr; - repaintCell( oldFocus.y(), oldFocus.x(), true ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( vPos.y(), vPos.x(), true ); + tqrepaintCell( oldFocus.y(), oldFocus.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( vPos.y(), vPos.x(), true ); emit highlighted( vChr ); emit highlighted(); @@ -256,8 +256,8 @@ void KCharSelectTable::keyPressEvent( TQKeyEvent *e ) vPos = focusPos; vChr = focusItem; - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( vPos.y(), vPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( vPos.y(), vPos.x(), true ); emit activated( vChr ); emit activated(); @@ -277,8 +277,8 @@ void KCharSelectTable::gotoLeft() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( focusPos.y(), focusPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -295,8 +295,8 @@ void KCharSelectTable::gotoRight() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( focusPos.y(), focusPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -313,8 +313,8 @@ void KCharSelectTable::gotoUp() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( focusPos.y(), focusPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -331,8 +331,8 @@ void KCharSelectTable::gotoDown() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( focusPos.y(), focusPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -381,43 +381,43 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f bar->setSpacing( KDialog::spacingHint() ); TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar ); - lFont->resize( lFont->sizeHint() ); - lFont->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lFont->setMaximumWidth( lFont->sizeHint().width() ); + lFont->resize( lFont->tqsizeHint() ); + lFont->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lFont->setMaximumWidth( lFont->tqsizeHint().width() ); fontCombo = new TQComboBox( true, bar ); fillFontCombo(); - fontCombo->resize( fontCombo->sizeHint() ); + fontCombo->resize( fontCombo->tqsizeHint() ); connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) ); TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); - lTable->resize( lTable->sizeHint() ); - lTable->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lTable->setMaximumWidth( lTable->sizeHint().width() ); + lTable->resize( lTable->tqsizeHint() ); + lTable->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lTable->setMaximumWidth( lTable->tqsizeHint().width() ); tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); - tableSpinBox->resize( tableSpinBox->sizeHint() ); + tableSpinBox->resize( tableSpinBox->tqsizeHint() ); connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) ); TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); - lUnicode->resize( lUnicode->sizeHint() ); - lUnicode->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); + lUnicode->resize( lUnicode->tqsizeHint() ); + lUnicode->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lUnicode->setMaximumWidth( lUnicode->tqsizeHint().width() ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); - TQValidator* const validator = new TQRegExpValidator( rx, this ); + TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); - d->unicodeLine = new KLineEdit( bar ); - d->unicodeLine->setValidator(validator); - lUnicode->setBuddy(d->unicodeLine); - d->unicodeLine->resize( d->unicodeLine->sizeHint() ); + d->tqunicodeLine = new KLineEdit( bar ); + d->tqunicodeLine->setValidator(validator); + lUnicode->setBuddy(d->tqunicodeLine); + d->tqunicodeLine->resize( d->tqunicodeLine->tqsizeHint() ); slotUpdateUnicode(_chr); - connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); + connect( d->tqunicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); - charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQVBox::font().family() : _font, _chr, _tableNum ); + charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQString(TQVBox::font().family()) : _font, _chr, _tableNum ); const TQSize sz( charTable->contentsWidth() + 4 , charTable->contentsHeight() + 4 ); charTable->resize( sz ); @@ -426,7 +426,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f charTable->setHScrollBarMode( TQScrollView::AlwaysOff ); charTable->setVScrollBarMode( TQScrollView::AlwaysOff ); - setFont( _font.isEmpty() ? TQVBox::font().family() : _font ); + setFont( _font.isEmpty() ? TQString(TQVBox::font().family()) : _font ); setTableNum( _tableNum ); connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( slotUpdateUnicode( const TQChar & ) ) ); @@ -442,7 +442,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f connect( charTable, TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(slotDoubleClicked())); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setFocusProxy( charTable ); } @@ -452,15 +452,15 @@ KCharSelect::~KCharSelect() } //================================================================== -TQSize KCharSelect::sizeHint() const +TQSize KCharSelect::tqsizeHint() const { - return TQVBox::sizeHint(); + return TQVBox::tqsizeHint(); } //================================================================== void KCharSelect::setFont( const TQString &_font ) { - const TQValueList<TQString>::Iterator it = fontList.find( _font ); + const TQValueList<TQString>::Iterator it = fontList.tqfind( _font ); if ( it != fontList.end() ) { TQValueList<TQString>::Iterator it2 = fontList.begin(); int pos = 0; @@ -493,7 +493,7 @@ void KCharSelect::fillFontCombo() fontDataBase = new TQFontDatabase(); qAddPostRoutine( cleanupFontDatabase ); } - fontList=fontDataBase->families(); + fontList=fontDataBase->tqfamilies(); fontCombo->insertStringList( fontList ); } @@ -513,7 +513,7 @@ void KCharSelect::tableChanged( int _value ) //================================================================== void KCharSelect::slotUnicodeEntered( ) { - const TQString s = d->unicodeLine->text(); + const TQString s = d->tqunicodeLine->text(); if (s.isEmpty()) return; @@ -532,10 +532,10 @@ void KCharSelect::slotUnicodeEntered( ) void KCharSelect::slotUpdateUnicode( const TQChar &c ) { - const int uc = c.unicode(); + const int uc = c.tqunicode(); TQString s; s.sprintf("%04X", uc); - d->unicodeLine->setText(s); + d->tqunicodeLine->setText(s); } void KCharSelectTable::virtual_hook( int, void*) diff --git a/kdeui/kcharselect.h b/kdeui/kcharselect.h index 526d594b6..5e1532fb6 100644 --- a/kdeui/kcharselect.h +++ b/kdeui/kcharselect.h @@ -48,7 +48,7 @@ class KCharSelectPrivate; * @author Reginald Stadlbauer <reggie@kde.org> */ -class KDEUI_EXPORT KCharSelectTable : public QGridView +class KDEUI_EXPORT KCharSelectTable : public TQGridView { Q_OBJECT @@ -56,7 +56,7 @@ public: KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font, const TQChar &_chr, int _tableNum ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual void resizeEvent( TQResizeEvent * ); virtual void setFont( const TQString &_font ); @@ -137,7 +137,7 @@ private: * @author Reginald Stadlbauer <reggie@kde.org> */ -class KDEUI_EXPORT KCharSelect : public QVBox +class KDEUI_EXPORT KCharSelect : public TQVBox { Q_OBJECT Q_PROPERTY( TQString fontFamily READ font WRITE setFont ) @@ -157,7 +157,7 @@ public: /** * Reimplemented. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Sets the font which is displayed to @p font diff --git a/kdeui/kcmenumngr.cpp b/kdeui/kcmenumngr.cpp index 9cd9d6288..2288a5963 100644 --- a/kdeui/kcmenumngr.cpp +++ b/kdeui/kcmenumngr.cpp @@ -35,10 +35,10 @@ KContextMenuManager* KContextMenuManager::manager = 0; KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name ) : TQObject( parent, name) { - KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; - menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt(); - saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ; - showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true ); + KConfigGroupSaver saver ( KGlobal::config(), TQString::tqfromLatin1("Shortcuts") ) ; + menuKey = KShortcut( saver.config()->readEntry(TQString::tqfromLatin1("PopupContextMenu"), TQString::tqfromLatin1("Menu") ) ).keyCodeQt(); + saver.config()->setGroup( TQString::tqfromLatin1("ContextMenus") ) ; + showOnPress = saver.config()->readBoolEntry(TQString::tqfromLatin1("ShowOnPress"), true ); } KContextMenuManager::~KContextMenuManager() @@ -70,7 +70,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) TQPoint pos; switch ( e->type() ) { case TQEvent::MouseButtonPress: - if (((TQMouseEvent*) e )->button() != RightButton ) + if (((TQMouseEvent*) e )->button() != Qt::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() != RightButton ) + if ( showOnPress || ((TQMouseEvent*) e )->button() != Qt::RightButton ) break; popup = menus[o]; pos = ((TQMouseEvent*) e )->globalPos(); @@ -122,7 +122,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) void KContextMenuManager::widgetDestroyed() { - if ( menus.find( (TQObject*)sender() ) ) + if ( menus.tqfind( (TQObject*)sender() ) ) menus.remove( (TQObject*)sender() ); } diff --git a/kdeui/kcmenumngr.h b/kdeui/kcmenumngr.h index cd478e494..ce05f6b9d 100644 --- a/kdeui/kcmenumngr.h +++ b/kdeui/kcmenumngr.h @@ -20,7 +20,7 @@ #ifndef KCMENUMNGR_H #define KCMENUMNGR_H -#include <tqt.h> +// #include <tqt.h> #include <tqobject.h> #include <tqptrdict.h> @@ -75,7 +75,7 @@ If the popup menu is invoked with the keyboard shortcut, it's shown at the position of the micro focus hint of the widget ( TQWidget::microFocusHint() ). */ -class KDEUI_EXPORT KContextMenuManager : public QObject +class KDEUI_EXPORT KContextMenuManager : public TQObject { Q_OBJECT public: diff --git a/kdeui/kcmodule.h b/kdeui/kcmodule.h index 3791f950a..268c3800a 100644 --- a/kdeui/kcmodule.h +++ b/kdeui/kcmodule.h @@ -66,7 +66,7 @@ class KInstance; * * @author Matthias Hoelzer-Kluepfel <hoelzer@kde.org> */ -class KDEUI_EXPORT KCModule : public QWidget +class KDEUI_EXPORT KCModule : public TQWidget { Q_OBJECT diff --git a/kdeui/kcolorbutton.cpp b/kdeui/kcolorbutton.cpp index 3cccbe1df..847b6816b 100644 --- a/kdeui/kcolorbutton.cpp +++ b/kdeui/kcolorbutton.cpp @@ -85,7 +85,7 @@ void KColorButton::setColor( const TQColor &c ) { if ( col != c ) { col = c; - repaint( false ); + tqrepaint( false ); emit changed( col ); } } @@ -105,34 +105,34 @@ void KColorButton::setDefaultColor( const TQColor &c ) void KColorButton::drawButtonLabel( TQPainter *painter ) { int x, y, w, h; - TQRect r = style().subRect( TQStyle::SR_PushButtonContents, this ); + TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this ); r.rect(&x, &y, &w, &h); - int margin = style().pixelMetric( TQStyle::PM_ButtonMargin, this ); + int margin = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this ); x += margin; y += margin; w -= 2*margin; h -= 2*margin; if (isOn() || isDown()) { - x += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - y += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } TQColor fillCol = isEnabled() ? col : backgroundColor(); - qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL); + qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL); if ( fillCol.isValid() ) painter->fillRect( x+1, y+1, w-2, h-2, fillCol ); if ( hasFocus() ) { - TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this ); - style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); + TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() ); } } -TQSize KColorButton::sizeHint() const +TQSize KColorButton::tqsizeHint() const { - return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). + return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). expandedTo(TQApplication::globalStrut()); } @@ -155,11 +155,11 @@ void KColorButton::keyPressEvent( TQKeyEvent *e ) if ( KStdAccel::copy().contains( key ) ) { TQMimeSource* mime = new KColorDrag( color() ); - TQApplication::clipboard()->setData( mime, QClipboard::Clipboard ); + TQApplication::tqclipboard()->setData( mime, TQClipboard::Clipboard ); } else if ( KStdAccel::paste().contains( key ) ) { TQColor color; - KColorDrag::decode( TQApplication::clipboard()->data( QClipboard::Clipboard ), color ); + KColorDrag::decode( TQApplication::tqclipboard()->data( QClipboard::Clipboard ), color ); setColor( color ); } else @@ -174,7 +174,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e) void KColorButton::mouseMoveEvent( TQMouseEvent *e) { - if( (e->state() & LeftButton) && + if( (e->state() & Qt::LeftButton) && (e->pos()-mPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) { // Drag color object diff --git a/kdeui/kcolorbutton.h b/kdeui/kcolorbutton.h index cff929156..e1a9b1dc8 100644 --- a/kdeui/kcolorbutton.h +++ b/kdeui/kcolorbutton.h @@ -34,7 +34,7 @@ class KColorButtonPrivate; * * \image html kcolorbutton.png "KDE Color Button" */ -class KDEUI_EXPORT KColorButton : public QPushButton +class KDEUI_EXPORT KColorButton : public TQPushButton { Q_OBJECT Q_PROPERTY( TQColor color READ color WRITE setColor ) @@ -80,7 +80,7 @@ public: */ void setDefaultColor( const TQColor &c ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; signals: /** diff --git a/kdeui/kcolorcombo.cpp b/kdeui/kcolorcombo.cpp index c418b6a81..a7dd90ac7 100644 --- a/kdeui/kcolorcombo.cpp +++ b/kdeui/kcolorcombo.cpp @@ -175,7 +175,7 @@ void KColorCombo::slotActivated( int index ) TQRect rect( 0, 0, width(), TQFontMetrics(painter.font()).height()+4); TQPixmap pixmap( rect.width(), rect.height() ); - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); @@ -228,7 +228,7 @@ void KColorCombo::addColors() if ( i == STANDARD_PAL_SIZE ) customColor = internalcolor; - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); diff --git a/kdeui/kcolorcombo.h b/kdeui/kcolorcombo.h index 8ef33f5c9..aefac504f 100644 --- a/kdeui/kcolorcombo.h +++ b/kdeui/kcolorcombo.h @@ -36,7 +36,7 @@ class KColorComboInternal; /** * Combobox for colors. */ -class KDEUI_EXPORT KColorCombo : public QComboBox +class KDEUI_EXPORT KColorCombo : public TQComboBox { Q_OBJECT Q_PROPERTY( TQColor color READ color WRITE setColor ) diff --git a/kdeui/kcolordialog.cpp b/kdeui/kcolordialog.cpp index 64decd2c5..990e9df9e 100644 --- a/kdeui/kcolordialog.cpp +++ b/kdeui/kcolordialog.cpp @@ -93,7 +93,7 @@ const ColorPaletteNameType colorPaletteName[]= const int recentColorIndex = 0; const int customColorIndex = 1; -class KColorSpinBox : public QSpinBox +class KColorSpinBox : public TQSpinBox { public: KColorSpinBox(int minValue, int maxValue, int step, TQWidget* parent) @@ -260,7 +260,7 @@ void KHSSelector::drawPalette( TQPixmap *pixmap ) //----------------------------------------------------------------------------- KValueSelector::KValueSelector( TQWidget *parent, const char *name ) - : KSelector( KSelector::Vertical, parent, name ), _hue(0), _sat(0) + : KSelector( Qt::Vertical, parent, name ), _hue(0), _sat(0) { setRange( 0, 255 ); pixmap.setOptimization( TQPixmap::BestOptim ); @@ -297,7 +297,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap ) uint *p; QRgb rgb; - if ( orientation() == KSelector::Horizontal ) + if ( orientation() == Qt::Horizontal ) { for ( int v = 0; v < ySize; v++ ) { @@ -312,7 +312,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap ) } } - if( orientation() == KSelector::Vertical ) + if( orientation() == Qt::Vertical ) { for ( int v = 0; v < ySize; v++ ) { @@ -376,7 +376,7 @@ void KColorCells::paintCell( TQPainter *painter, int row, int col ) if (shade) { qDrawShadePanel( painter, 1, 1, cellWidth()-2, - cellHeight()-2, colorGroup(), true, 1, &brush ); + cellHeight()-2, tqcolorGroup(), true, 1, &brush ); w = 2; } TQColor color = colors[ row * numCols() + col ]; @@ -426,7 +426,7 @@ int KColorCells::posToCell(const TQPoint &pos, bool ignoreBorders) void KColorCells::mouseMoveEvent( TQMouseEvent *e ) { - if( !(e->state() & LeftButton)) return; + if( !(e->state() & Qt::LeftButton)) return; if(inMouse) { int delay = KGlobalSettings::dndEventDelay(); @@ -530,7 +530,7 @@ void KColorPatch::drawContents( TQPainter *painter ) void KColorPatch::mouseMoveEvent( TQMouseEvent *e ) { // Drag color object - if( !(e->state() & LeftButton)) return; + if( !(e->state() & Qt::LeftButton)) return; KColorDrag *d = new KColorDrag( color, this); d->dragCopy(); } @@ -597,7 +597,7 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols) connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )), this, TQT_SLOT( slotColorTextSelected( const TQString & )) ); - setFixedSize( sizeHint()); + setFixedSize( tqsizeHint()); connect( combo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetPalette( const TQString &))); } @@ -608,7 +608,7 @@ KPaletteTable::~KPaletteTable() delete d; } -QString +TQString KPaletteTable::palette() const { return combo->currentText(); @@ -674,8 +674,8 @@ KPaletteTable::readNamedColor( void ) // that start with "gray". // TQString name = line.mid(pos).stripWhiteSpace(); - if( name.isNull() || name.find(' ') != -1 || - name.find( "gray" ) != -1 || name.find( "grey" ) != -1 ) + if( name.isNull() || name.tqfind(' ') != -1 || + name.tqfind( "gray" ) != -1 || name.tqfind( "grey" ) != -1 ) { continue; } @@ -981,7 +981,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) l_left->addSpacing(10); TQGridLayout *l_lbot = new TQGridLayout(3, 6); - l_left->addLayout(l_lbot); + l_left->addLayout(TQT_TQLAYOUT(l_lbot)); // // the palette and value selector go into the H-box @@ -1003,28 +1003,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) // add the HSV fields // label = new TQLabel( i18n("H:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 2); d->hedit = new KColorSpinBox( 0, 359, 1, page ); - d->hedit->setValidator( new TQIntValidator( d->hedit ) ); + d->hedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->hedit) ) ); l_lbot->addWidget(d->hedit, 0, 3); connect( d->hedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("S:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 1, 2); d->sedit = new KColorSpinBox( 0, 255, 1, page ); - d->sedit->setValidator( new TQIntValidator( d->sedit ) ); + d->sedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->sedit) ) ); l_lbot->addWidget(d->sedit, 1, 3); connect( d->sedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("V:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 2); d->vedit = new KColorSpinBox( 0, 255, 1, page ); - d->vedit->setValidator( new TQIntValidator( d->vedit ) ); + d->vedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->vedit) ) ); l_lbot->addWidget(d->vedit, 2, 3); connect( d->vedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); @@ -1033,28 +1033,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) // add the RGB fields // label = new TQLabel( i18n("R:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 4); d->redit = new KColorSpinBox( 0, 255, 1, page ); - d->redit->setValidator( new TQIntValidator( d->redit ) ); + d->redit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->redit) ) ); l_lbot->addWidget(d->redit, 0, 5); connect( d->redit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("G:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget( label, 1, 4); d->gedit = new KColorSpinBox( 0, 255,1, page ); - d->gedit->setValidator( new TQIntValidator( d->gedit ) ); + d->gedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->gedit) ) ); l_lbot->addWidget(d->gedit, 1, 5); connect( d->gedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("B:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 4); d->bedit = new KColorSpinBox( 0, 255, 1, page ); - d->bedit->setValidator( new TQIntValidator( d->bedit ) ); + d->bedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->bedit) ) ); l_lbot->addWidget(d->bedit, 2, 5); connect( d->bedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); @@ -1131,33 +1131,33 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label = new TQLabel( page ); label->setText(i18n("Name:")); - l_grid->addWidget(label, 0, 1, AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, Qt::AlignLeft); d->colorName = new TQLabel( page ); - l_grid->addWidget(d->colorName, 0, 2, AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, Qt::AlignLeft); label = new TQLabel( page ); label->setText(i18n("HTML:")); - l_grid->addWidget(label, 1, 1, AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, Qt::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")); + w = d->htmlName->fontMetrics().width(TQString::tqfromLatin1("#DDDDDDD")); d->htmlName->setFixedWidth(w); - l_grid->addWidget(d->htmlName, 1, 2, AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, Qt::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(d->patch, 0, 1, 0, 0, AlignHCenter | AlignVCenter); + l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, Qt::AlignHCenter | Qt::AlignVCenter); connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), TQT_SLOT( setColor( const TQColor&))); tl_layout->activate(); - page->setMinimumSize( page->sizeHint() ); + page->setMinimumSize( page->tqsizeHint() ); readSettings(); d->bRecursion = false; @@ -1187,7 +1187,7 @@ KColorDialog::~KColorDialog() bool KColorDialog::eventFilter( TQObject *obj, TQEvent *ev ) { - if ((obj == d->htmlName) || (obj == d->hsSelector)) + if ((TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->htmlName)) || (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->hsSelector))) switch(ev->type()) { case TQEvent::DragEnter: @@ -1195,7 +1195,7 @@ KColorDialog::eventFilter( TQObject *obj, TQEvent *ev ) case TQEvent::DragLeave: case TQEvent::Drop: case TQEvent::DragResponse: - qApp->sendEvent(d->patch, ev); + tqApp->sendEvent(d->patch, ev); return true; default: break; @@ -1223,7 +1223,7 @@ KColorDialog::setDefaultColor( const TQColor& col ) mainWidget()->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); // cancel setFixedSize() d->tl_layout->activate(); - mainWidget()->setMinimumSize( mainWidget()->sizeHint() ); + mainWidget()->setMinimumSize( mainWidget()->tqsizeHint() ); disableResize(); connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) ); @@ -1277,7 +1277,7 @@ KColorDialog::slotWriteSettings() } } -QColor +TQColor KColorDialog::color() const { if ( d->cbDefaultColor && d->cbDefaultColor->isChecked() ) @@ -1479,7 +1479,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name ) d->valuePal->setValue( v ); d->valuePal->updateContents(); d->valuePal->blockSignals(false); - d->valuePal->repaint( false ); + d->valuePal->tqrepaint( false ); d->bRecursion = false; } @@ -1507,7 +1507,7 @@ KColorDialog::slotColorPicker() d->oldfilter = qt_set_x11_event_filter(kde_color_dlg_handler); #endif kde_color_dlg_widget = this; - grabMouse( crossCursor ); + grabMouse( tqcrossCursor ); grabKeyboard(); } @@ -1529,10 +1529,10 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e ) KDialogBase::mouseReleaseEvent( e ); } -QColor +TQColor KColorDialog::grabColor(const TQPoint &p) { - TQWidget *desktop = TQApplication::desktop(); + TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); TQPixmap pm = TQPixmap::grabWindow( desktop->winId(), p.x(), p.y(), 1, 1); TQImage i = pm.convertToImage(); return i.pixel(0,0); diff --git a/kdeui/kcolordialog.h b/kdeui/kcolordialog.h index c3a6fabf3..7a1a66d6d 100644 --- a/kdeui/kcolordialog.h +++ b/kdeui/kcolordialog.h @@ -161,7 +161,7 @@ private: * * @author Waldo Bastian <bastian@kde.org> **/ -class KDEUI_EXPORT KColor : public QColor +class KDEUI_EXPORT KColor : public TQColor { public: KColor(); @@ -195,7 +195,7 @@ private: * * @author Waldo Bastian <bastian@kde.org> **/ -class KDEUI_EXPORT KPaletteTable : public QWidget +class KDEUI_EXPORT KPaletteTable : public TQWidget { Q_OBJECT public: @@ -250,7 +250,7 @@ private: * * @author Martin Jones <mjones@kde.org> */ -class KDEUI_EXPORT KColorCells : public QGridView +class KDEUI_EXPORT KColorCells : public TQGridView { Q_OBJECT public: @@ -308,7 +308,7 @@ private: * automatically handles drag and drop from and on the widget. * */ -class KDEUI_EXPORT KColorPatch : public QFrame +class KDEUI_EXPORT KColorPatch : public TQFrame { Q_OBJECT public: diff --git a/kdeui/kcolordrag.cpp b/kdeui/kcolordrag.cpp index 1c56d9ccd..978130fcd 100644 --- a/kdeui/kcolordrag.cpp +++ b/kdeui/kcolordrag.cpp @@ -40,7 +40,7 @@ void KColorDrag::setColor( const TQColor &color) { TQColorDrag tmp(color, 0, 0); - setEncodedData(tmp.encodedData(color_mime_string)); + setEncodedData(tmp.tqencodedData(color_mime_string)); TQPixmap colorpix( 25, 20); colorpix.fill( color); @@ -59,17 +59,17 @@ const char *KColorDrag::format(int i) const return TQStoredDrag::format(i); } -TQByteArray KColorDrag::encodedData ( const char * m ) const +TQByteArray KColorDrag::tqencodedData ( const char * m ) const { if (!qstrcmp(m, text_mime_string) ) { TQColor color; TQColorDrag::decode(const_cast<KColorDrag *>(this), color); - TQCString result = color.name().latin1(); + TQCString result = TQString(color.name()).latin1(); ((TQByteArray&)result).resize(result.length()); return result; } - return TQStoredDrag::encodedData(m); + return TQStoredDrag::tqencodedData(m); } bool @@ -91,8 +91,8 @@ KColorDrag::decode( TQMimeSource *e, TQColor &color) if (TQColorDrag::decode(e, color)) return true; - TQByteArray data = e->encodedData( text_mime_string); - TQString colorName = TQString::fromLatin1(data.data(), data.size()); + TQByteArray data = e->tqencodedData( text_mime_string); + TQString colorName = TQString::tqfromLatin1(data.data(), data.size()); if ((colorName.length() < 4) || (colorName[0] != '#')) return false; color.setNamedColor(colorName); diff --git a/kdeui/kcolordrag.h b/kdeui/kcolordrag.h index 7f0cd1ba3..e33e5796f 100644 --- a/kdeui/kcolordrag.h +++ b/kdeui/kcolordrag.h @@ -48,7 +48,7 @@ public: virtual ~KColorDrag() {} virtual const char *format(int i) const; - virtual TQByteArray encodedData ( const char * m ) const; + virtual TQByteArray tqencodedData ( const char * m ) const; /** * Sets the color of the drag to @p col. diff --git a/kdeui/kcombobox.cpp b/kdeui/kcombobox.cpp index c3cc4c402..94df22190 100644 --- a/kdeui/kcombobox.cpp +++ b/kdeui/kcombobox.cpp @@ -163,7 +163,7 @@ void KComboBox::makeCompletion( const TQString& text ) if( text.isNull() || !listBox() ) return; - const int index = listBox()->index( listBox()->findItem( text ) ); + const int index = listBox()->index( listBox()->tqfindItem( text ) ); if( index >= 0 ) setCurrentItem( index ); } @@ -764,14 +764,14 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget new TQListViewItem( m_pListView, *it ); } - m_pListView->setMinimumSize( m_pListView->sizeHint() ); + m_pListView->setMinimumSize( m_pListView->tqsizeHint() ); connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); enableButton( KDialogBase::User1, false ); - resize( sizeHint() ); + resize( tqsizeHint() ); } KHistoryComboEditor::~KHistoryComboEditor() diff --git a/kdeui/kcommand.cpp b/kdeui/kcommand.cpp index 2c76b21cd..4960c8016 100644 --- a/kdeui/kcommand.cpp +++ b/kdeui/kcommand.cpp @@ -133,7 +133,7 @@ void KCommandHistory::addCommand(KCommand *command, bool execute) { return; int index; - if(d->m_present && (index=m_commands.findRef(d->m_present))!=-1) { + if(d->m_present && (index=m_commands.tqfindRef(d->m_present))!=-1) { if (m_first) --index; m_commands.insert(index+1, command); @@ -192,7 +192,7 @@ void KCommandHistory::undo() { m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name())); } int index; - if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()) { + if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.prev()) { d->m_present=m_commands.current(); if (m_undo) { m_undo->setEnabled(true); @@ -226,7 +226,7 @@ void KCommandHistory::redo() { if(!d->m_savedAt) emit documentRestored(); } - else if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.next()) { + else if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.next()) { d->m_present=m_commands.current(); d->m_present->execute(); emit commandExecuted(); @@ -257,7 +257,7 @@ void KCommandHistory::redo() { void KCommandHistory::documentSaved() { if(d->m_present && !m_first) - d->m_savedAt=m_commands.findRef(d->m_present); + d->m_savedAt=m_commands.tqfindRef(d->m_present); else if(!d->m_present && !m_first) d->m_savedAt=-42; // this value signals that the document has // been saved with an empty history. @@ -287,7 +287,7 @@ void KCommandHistory::clipCommands() { if(count<=m_undoLimit && count<=m_redoLimit) return; - int index=m_commands.findRef(d->m_present); + int index=m_commands.tqfindRef(d->m_present); if(index>=m_undoLimit) { for(int i=0; i<=(index-m_undoLimit); ++i) { m_commands.removeFirst(); @@ -295,7 +295,7 @@ void KCommandHistory::clipCommands() { if(d->m_savedAt==-1) d->m_savedAt=-42; } - index=m_commands.findRef(d->m_present); // calculate the new + index=m_commands.tqfindRef(d->m_present); // calculate the new count=m_commands.count(); // values (for the redo-branch :) // make it easier for us... d->m_savedAt==-1 -> invalid if(d->m_savedAt!=-42 && d->m_savedAt<-1) @@ -316,7 +316,7 @@ void KCommandHistory::slotUndoAboutToShow() { m_undoPopup->clear(); int i = 0; - if (m_commands.findRef(d->m_present)!=-1) + if (m_commands.tqfindRef(d->m_present)!=-1) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { m_undoPopup->insertItem( i18n("Undo: %1").arg(m_commands.current()->name()), i++ ); @@ -340,7 +340,7 @@ void KCommandHistory::slotRedoAboutToShow() d->m_present = m_commands.first(); m_redoPopup->insertItem( i18n("Redo: %1").arg(d->m_present->name()), i++ ); } - if (m_commands.findRef(d->m_present)!=-1 && m_commands.next()) + if (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next()) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { m_redoPopup->insertItem( i18n("Redo: %1").arg(m_commands.current()->name()), i++ ); @@ -360,7 +360,7 @@ void KCommandHistory::updateActions() if ( m_undo && m_redo ) { m_undo->setEnabled( !m_first && ( d->m_present ) ); - m_redo->setEnabled(m_first || (m_commands.findRef(d->m_present)!=-1 && m_commands.next())); + m_redo->setEnabled(m_first || (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next())); } } diff --git a/kdeui/kcommand.h b/kdeui/kcommand.h index 97fa3c2e2..a9b8e4f6c 100644 --- a/kdeui/kcommand.h +++ b/kdeui/kcommand.h @@ -180,7 +180,7 @@ public: /** * Erases all the undo/redo history. - * Use this when reloading the data, for instance, since this invalidates + * Use this when reloading the data, for instance, since this tqinvalidates * all the commands. */ void clear(); diff --git a/kdeui/kcompletionbox.cpp b/kdeui/kcompletionbox.cpp index ed75ecd21..1349b7d8c 100644 --- a/kdeui/kcompletionbox.cpp +++ b/kdeui/kcompletionbox.cpp @@ -45,7 +45,7 @@ public: }; KCompletionBox::KCompletionBox( TQWidget *parent, const char *name ) - :KListBox( parent, name, WType_Popup ), d(new KCompletionBoxPrivate) + :KListBox( parent, name, (WFlags)WType_Popup ), d(new KCompletionBoxPrivate) { d->m_parent = parent; @@ -61,7 +61,7 @@ KCompletionBox::KCompletionBox( TQWidget *parent, const char *name ) if ( parent ) setFocusProxy( parent ); else - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); setVScrollBarMode( Auto ); setHScrollBarMode( AlwaysOff ); @@ -109,13 +109,13 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) { int type = e->type(); - if ( o == d->m_parent ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_parent) ) { if ( isVisible() ) { if ( type == TQEvent::KeyPress ) { - TQKeyEvent *ev = static_cast<TQKeyEvent *>( e ); + TQKeyEvent *ev = TQT_TQKEYEVENT( e ); switch ( ev->key() ) { case Key_BackTab: - if ( d->tabHandling && (ev->state() == NoButton || + if ( d->tabHandling && (ev->state() == Qt::NoButton || (ev->state() & ShiftButton)) ) { up(); ev->accept(); @@ -123,7 +123,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) } break; case Key_Tab: - if ( d->tabHandling && (ev->state() == NoButton) ) { + if ( d->tabHandling && (ev->state() == Qt::NoButton) ) { down(); // Only on TAB!! ev->accept(); return true; @@ -185,7 +185,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) else if ( type == TQEvent::AccelOverride ) { // Override any acceleartors that match // the key sequences we use here... - TQKeyEvent *ev = static_cast<TQKeyEvent *>( e ); + TQKeyEvent *ev = TQT_TQKEYEVENT( e ); switch ( ev->key() ) { case Key_Down: case Key_Up: @@ -199,7 +199,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) break; case Key_Tab: case Key_BackTab: - if ( ev->state() == NoButton || + if ( ev->state() == Qt::NoButton || (ev->state() & ShiftButton)) { ev->accept(); @@ -230,11 +230,11 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) // any mouse-click on something else than "this" makes us hide else if ( type == TQEvent::MouseButtonPress ) { - TQMouseEvent *ev = static_cast<TQMouseEvent *>( e ); + TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); if ( !rect().contains( ev->pos() )) // this widget hide(); - if ( !d->emitSelected && currentItem() && !::qt_cast<TQScrollBar*>(o) ) + if ( !d->emitSelected && currentItem() && !::tqqt_cast<TQScrollBar*>(o) ) { emit highlighted( currentText() ); hide(); @@ -260,7 +260,7 @@ void KCompletionBox::popup() clearSelection(); if ( !isVisible() ) show(); - else if ( size().height() != sizeHint().height() ) + else if ( size().height() != tqsizeHint().height() ) sizeAndPosition(); } } @@ -302,7 +302,7 @@ void KCompletionBox::show() d->upwardBox = false; if ( d->m_parent ) { sizeAndPosition(); - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); } // ### we shouldn't need to call this, but without this, the scrollbars @@ -317,14 +317,14 @@ void KCompletionBox::show() // The problem is, KCompletionBox::eventFilter() detects resizing // of the parent, and calls hide() - and this hide() happen in the middle // of show(), causing inconsistent state. I'll try to submit a Qt patch too. - qApp->sendPostedEvents(); + tqApp->sendPostedEvents(); KListBox::show(); } void KCompletionBox::hide() { if ( d->m_parent ) - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); d->cancelText = TQString::null; KListBox::hide(); } @@ -335,17 +335,17 @@ TQRect KCompletionBox::calculateGeometry() const int ih = itemHeight(); int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth(); - int w = (d->m_parent) ? d->m_parent->width() : KListBox::minimumSizeHint().width(); - w = QMAX( KListBox::minimumSizeHint().width(), w ); + int w = (d->m_parent) ? d->m_parent->width() : KListBox::tqminimumSizeHint().width(); + w = QMAX( KListBox::tqminimumSizeHint().width(), w ); //If we're inside a combox, Qt by default makes the dropdown // as wide as the combo, and gives the style a chance // to adjust it. Do that here as well, for consistency const TQObject* combo; - if ( d->m_parent && (combo = d->m_parent->parent() ) && + if ( d->m_parent && (combo = d->m_parent->tqparent() ) && combo->inherits("QComboBox") ) { - const TQComboBox* cb = static_cast<const TQComboBox*>(combo); + const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo)); //Expand to the combo width w = QMAX( w, cb->width() ); @@ -361,7 +361,7 @@ TQRect KCompletionBox::calculateGeometry() const comboCorner.y() - parentCorner.y(); //Ask the style to refine this a bit - TQRect styleAdj = style().querySubControlMetrics(TQStyle::CC_ComboBox, + TQRect styleAdj = tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, cb, TQStyle::SC_ComboBoxListBoxPopup, TQStyleOption(x, y, w, h)); //TQCommonStyle returns TQRect() by default, so this is what we get if the @@ -373,7 +373,7 @@ TQRect KCompletionBox::calculateGeometry() const return TQRect(x, y, w, h); } -TQSize KCompletionBox::sizeHint() const +TQSize KCompletionBox::tqsizeHint() const { return calculateGeometry().size(); } @@ -451,7 +451,7 @@ void KCompletionBox::canceled() hide(); } -class KCompletionBoxItem : public QListBoxItem +class KCompletionBoxItem : public TQListBoxItem { public: //Returns true if dirty. @@ -485,7 +485,7 @@ void KCompletionBox::setItems( const TQStringList& items ) } else { //Keep track of whether we need to change anything, - //so we can avoid a repaint for identical updates, + //so we can avoid a tqrepaint for identical updates, //to reduce flicker bool dirty = false; @@ -520,7 +520,7 @@ void KCompletionBox::setItems( const TQStringList& items ) triggerUpdate( false ); } - if ( isVisible() && size().height() != sizeHint().height() ) + if ( isVisible() && size().height() != tqsizeHint().height() ) sizeAndPosition(); blockSignals( block ); diff --git a/kdeui/kcompletionbox.h b/kdeui/kcompletionbox.h index 4e981bf86..9ae7d124b 100644 --- a/kdeui/kcompletionbox.h +++ b/kdeui/kcompletionbox.h @@ -61,7 +61,7 @@ public: */ ~KCompletionBox(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * @returns true if selecting an item results in the emition of the selected signal. diff --git a/kdeui/kconfigdialog.cpp b/kdeui/kconfigdialog.cpp index 3d5bfd697..d0cb6aaa7 100644 --- a/kdeui/kconfigdialog.cpp +++ b/kdeui/kconfigdialog.cpp @@ -52,7 +52,7 @@ KConfigDialog::KConfigDialog( TQWidget *parent, const char *name, int dialogButtons, ButtonCode defaultButton, bool modal ) : - KDialogBase( dialogType, Qt::WStyle_DialogBorder, + KDialogBase( dialogType, (WFlags)TQt::WStyle_DialogBorder, parent, name, modal, i18n("Configure"), dialogButtons, defaultButton ), d(new KConfigDialogPrivate(dialogType)) { @@ -160,7 +160,7 @@ void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager) KConfigDialog* KConfigDialog::exists(const char* name) { - return openDialogs.find(name); + return openDialogs.tqfind(name); } bool KConfigDialog::showDialog(const char* name) diff --git a/kdeui/kcursor.cpp b/kdeui/kcursor.cpp index 02f8723f5..0ee90bb1e 100644 --- a/kdeui/kcursor.cpp +++ b/kdeui/kcursor.cpp @@ -145,72 +145,72 @@ TQCursor KCursor::workingCursor() */ TQCursor KCursor::arrowCursor() { - return Qt::arrowCursor; + return tqarrowCursor; } TQCursor KCursor::upArrowCursor() { - return Qt::upArrowCursor; + return tqupArrowCursor; } TQCursor KCursor::crossCursor() { - return Qt::crossCursor; + return tqcrossCursor; } TQCursor KCursor::waitCursor() { - return Qt::waitCursor; + return tqwaitCursor; } TQCursor KCursor::ibeamCursor() { - return Qt::ibeamCursor; + return tqibeamCursor; } TQCursor KCursor::sizeVerCursor() { - return Qt::sizeVerCursor; + return tqsizeVerCursor; } TQCursor KCursor::sizeHorCursor() { - return Qt::sizeHorCursor; + return tqsizeHorCursor; } TQCursor KCursor::sizeBDiagCursor() { - return Qt::sizeBDiagCursor; + return tqsizeBDiagCursor; } TQCursor KCursor::sizeFDiagCursor() { - return Qt::sizeFDiagCursor; + return tqsizeFDiagCursor; } TQCursor KCursor::sizeAllCursor() { - return Qt::sizeAllCursor; + return tqsizeAllCursor; } TQCursor KCursor::blankCursor() { - return Qt::blankCursor; + return tqblankCursor; } TQCursor KCursor::whatsThisCursor() { - return Qt::whatsThisCursor; + return tqwhatsThisCursor; } // auto-hide cursor stuff @@ -317,7 +317,7 @@ TQWidget* KCursorPrivateAutoHideEventFilter::actualWidget() const bool KCursorPrivateAutoHideEventFilter::eventFilter( TQObject *o, TQEvent *e ) { - Q_ASSERT( o == m_widget ); + Q_ASSERT( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_widget) ); switch ( e->type() ) { @@ -370,9 +370,9 @@ KCursorPrivate::KCursorPrivate() hideCursorDelay = 5000; // 5s default value KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") ); + KConfigGroupSaver ks( kc, TQString::tqfromLatin1("KDE") ); enabled = kc->readBoolEntry( - TQString::fromLatin1("Autohiding cursor enabled"), true ); + TQString::tqfromLatin1("Autohiding cursor enabled"), true ); } KCursorPrivate::~KCursorPrivate() @@ -386,7 +386,7 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve if ( enable ) { - if ( m_eventFilters.find( w ) != NULL ) + if ( m_eventFilters.tqfind( w ) != NULL ) return; KCursorPrivateAutoHideEventFilter* filter = new KCursorPrivateAutoHideEventFilter( w ); m_eventFilters.insert( w, filter ); @@ -412,7 +412,7 @@ bool KCursorPrivate::eventFilter( TQObject *o, TQEvent *e ) if ( !enabled ) return false; - KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.find( o ); + KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.tqfind( o ); Q_ASSERT( filter != NULL ); if ( filter == NULL ) diff --git a/kdeui/kcursor.h b/kdeui/kcursor.h index ddef7a1cf..19bcd2348 100644 --- a/kdeui/kcursor.h +++ b/kdeui/kcursor.h @@ -33,7 +33,7 @@ class TQWidget; * * A wrapper around TQCursor that allows for "themed" cursors. * - * Currently, the only themed cursor is a hand shaped cursor. + * Currently, the only themed cursor is a hand tqshaped cursor. * * A typical usage would be * \code @@ -42,7 +42,7 @@ class TQWidget; * * @author Kurt Granroth <granroth@kde.org> */ -class KDEUI_EXPORT KCursor : public Qt +class KDEUI_EXPORT KCursor : public TQt { public: /** diff --git a/kdeui/kcursor_private.h b/kdeui/kcursor_private.h index 839350c8c..0ed1789e6 100644 --- a/kdeui/kcursor_private.h +++ b/kdeui/kcursor_private.h @@ -36,7 +36,7 @@ class TQWidget; * @author John Firebaugh <jfirebaugh@kde.org> * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KCursorPrivateAutoHideEventFilter : public QObject +class KCursorPrivateAutoHideEventFilter : public TQObject { Q_OBJECT @@ -68,7 +68,7 @@ private: * @author Carsten Pfeiffer <pfeiffer@kde.org> * @author John Firebaugh <jfirebaugh@kde.org> */ -class KCursorPrivate : public QObject +class KCursorPrivate : public TQObject { friend class KCursor; // to shut up the compiler Q_OBJECT diff --git a/kdeui/kdatepicker.cpp b/kdeui/kdatepicker.cpp index af9dede01..ab41fec15 100644 --- a/kdeui/kdatepicker.cpp +++ b/kdeui/kdatepicker.cpp @@ -92,7 +92,7 @@ void KDatePicker::fillWeeksCombo(const TQDate &date) // make sure that the week of the lastDay is always inserted: in Chinese calendar // system, this is not always the case if(day < lastDay && day.daysTo(lastDay) < 7 && calendar->weekNumber(day) != calendar->weekNumber(lastDay)) - day = lastDay.addDays(-7); + day = TQT_TQDATE_OBJECT(lastDay.addDays(-7)); } } @@ -175,17 +175,17 @@ void KDatePicker::init( const TQDate &dt ) line->installEventFilter( this ); if ( TQApplication::reverseLayout() ) { - yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); - monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); + yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); + monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); } else { - yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); - monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); + yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); + monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); } connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -223,8 +223,8 @@ KDatePicker::eventFilter(TQObject *o, TQEvent *e ) if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *k = (TQKeyEvent *)e; - if ( (k->key() == Qt::Key_Prior) || - (k->key() == Qt::Key_Next) || + if ( (k->key() == TQt::Key_Prior) || + (k->key() == TQt::Key_Next) || (k->key() == Qt::Key_Up) || (k->key() == Qt::Key_Down) ) { @@ -371,7 +371,7 @@ KDatePicker::selectMonthClicked() int day = calendar->day(date); // ----- construct a valid date in this month: calendar->setYMD(date, calendar->year(date), month, 1); - date = date.addDays(QMIN(day, calendar->daysInMonth(date)) - 1); + date = TQT_TQDATE_OBJECT(date.addDays(QMIN(day, calendar->daysInMonth(date)) - 1)); // ----- set this month setDate(date); } @@ -390,7 +390,7 @@ KDatePicker::selectYearClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalYearSelector* picker = new KDateInternalYearSelector(popup); // ----- - picker->resize(picker->sizeHint()); + picker->resize(picker->tqsizeHint()); picker->setYear( table->getDate().year() ); picker->selectAll(); popup->setMainWidget(picker); @@ -466,10 +466,10 @@ KDatePicker::todayButtonClicked() setDate(TQDate::currentDate()); } -QSize -KDatePicker::sizeHint() const +TQSize +KDatePicker::tqsizeHint() const { - return TQWidget::sizeHint(); + return TQWidget::tqsizeHint(); } void @@ -507,7 +507,7 @@ KDatePicker::setFontSize(int s) maxMonthRect.setHeight(QMAX(r.height(), maxMonthRect.height())); } - TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton, + TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); selectMonth->setMinimumSize(metricBound); @@ -529,7 +529,7 @@ KDatePicker::setCloseButton( bool enable ) TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); connect( d->closeButton, TQT_SIGNAL( clicked() ), - topLevelWidget(), TQT_SLOT( close() ) ); + tqtopLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/kdeui/kdatepicker.h b/kdeui/kdatepicker.h index 6a4e93537..fb51732f3 100644 --- a/kdeui/kdatepicker.h +++ b/kdeui/kdatepicker.h @@ -48,7 +48,7 @@ class KDateTable; * @author Tim Gilman, Mirko Boehm * **/ -class KDEUI_EXPORT KDatePicker: public QFrame +class KDEUI_EXPORT KDatePicker: public TQFrame { Q_OBJECT Q_PROPERTY( TQDate date READ date WRITE setDate) @@ -60,7 +60,7 @@ public: * initially. **/ KDatePicker(TQWidget *parent=0, - QDate=TQDate::currentDate(), + TQDate=TQDate::currentDate(), const char *name=0); /** The usual constructor. The given date will be displayed @@ -90,7 +90,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * Sets the date. @@ -136,7 +136,7 @@ public: /** * By calling this method with @p enable = true, KDatePicker will show * a little close-button in the upper button-row. Clicking the - * close-button will cause the KDatePicker's topLevelWidget()'s close() + * close-button will cause the KDatePicker's tqtopLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see hasCloseButton diff --git a/kdeui/kdatetbl.cpp b/kdeui/kdatetbl.cpp index bbf673a15..f5adc48d7 100644 --- a/kdeui/kdatetbl.cpp +++ b/kdeui/kdatetbl.cpp @@ -84,7 +84,7 @@ public: KDateValidator::KDateValidator(TQWidget* parent, const char* name) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { } @@ -124,7 +124,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags kdDebug() << "KDateTable ctor: WARNING: Given date is invalid, using current date." << endl; date_=TQDate::currentDate(); } - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); @@ -140,7 +140,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f) { d = new KDateTablePrivate; setFontSize(10); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); @@ -158,12 +158,12 @@ KDateTable::~KDateTable() void KDateTable::initAccels() { KAccel* accel = new KAccel(this, "date table accel"); - accel->insert(KStdAccel::Next, this, TQT_SLOT(nextMonth())); - accel->insert(KStdAccel::Prior, this, TQT_SLOT(previousMonth())); - accel->insert(KStdAccel::Home, this, TQT_SLOT(beginningOfMonth())); - accel->insert(KStdAccel::End, this, TQT_SLOT(endOfMonth())); - accel->insert(KStdAccel::BeginningOfLine, this, TQT_SLOT(beginningOfWeek())); - accel->insert(KStdAccel::EndOfLine, this, TQT_SLOT(endOfWeek())); + accel->insert(KStdAccel::Next, TQT_TQOBJECT(this), TQT_SLOT(nextMonth())); + accel->insert(KStdAccel::Prior, TQT_TQOBJECT(this), TQT_SLOT(previousMonth())); + accel->insert(KStdAccel::Home, TQT_TQOBJECT(this), TQT_SLOT(beginningOfMonth())); + accel->insert(KStdAccel::End, TQT_TQOBJECT(this), TQT_SLOT(endOfMonth())); + accel->insert(KStdAccel::BeginningOfLine, TQT_TQOBJECT(this), TQT_SLOT(beginningOfWeek())); + accel->insert(KStdAccel::EndOfLine, TQT_TQOBJECT(this), TQT_SLOT(endOfWeek())); accel->readSettings(); } @@ -233,7 +233,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) ( daynum == 6 && calendar->calendarName() == "gregorian" ) ) normalday=false; - TQBrush brushInvertTitle(colorGroup().base()); + TQBrush brushInvertTitle(tqcolorGroup().base()); TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) ); TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); if (!normalday) @@ -250,7 +250,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) } painter->drawText(0, 0, w, h-1, AlignCenter, calendar->weekDayName(daynum, true), -1, &rect); - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); painter->moveTo(0, h-1); painter->lineTo(w-1, h-1); // ----- draw the weekday: @@ -267,7 +267,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) // ° painting a day of the previous month or // ° painting a day of the following month // TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text. - painter->setPen( colorGroup().mid() ); + painter->setPen( tqcolorGroup().mid() ); // painter->setPen(gray); } else { // paint a day of the current month if ( d->useCustomColors ) @@ -292,9 +292,9 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) } painter->setPen( mode->fgColor ); } else - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); } else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all! - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); } pen=painter->pen(); @@ -308,25 +308,25 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) // draw the currently selected date if (isEnabled()) { - painter->setPen(colorGroup().highlight()); - painter->setBrush(colorGroup().highlight()); + painter->setPen(tqcolorGroup().highlight()); + painter->setBrush(tqcolorGroup().highlight()); } else { - painter->setPen(colorGroup().text()); - painter->setBrush(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); + painter->setBrush(tqcolorGroup().text()); } - pen=colorGroup().highlightedText(); + pen=TQPen(tqcolorGroup().highlightedText()); } else { painter->setBrush(paletteBackgroundColor()); painter->setPen(paletteBackgroundColor()); -// painter->setBrush(colorGroup().base()); -// painter->setPen(colorGroup().base()); +// painter->setBrush(tqcolorGroup().base()); +// painter->setPen(tqcolorGroup().base()); } if ( pCellDate == TQDate::currentDate() ) { - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); } if ( paintRect ) painter->drawRect(0, 0, w, h); @@ -351,22 +351,22 @@ void KDateTable::previousMonth() void KDateTable::beginningOfMonth() { - setDate(date.addDays(1 - date.day())); + setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.day()))); } void KDateTable::endOfMonth() { - setDate(date.addDays(date.daysInMonth() - date.day())); + setDate(TQT_TQDATE_OBJECT(date.addDays(date.daysInMonth() - date.day()))); } void KDateTable::beginningOfWeek() { - setDate(date.addDays(1 - date.dayOfWeek())); + setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.dayOfWeek()))); } void KDateTable::endOfWeek() { - setDate(date.addDays(7 - date.dayOfWeek())); + setDate(TQT_TQDATE_OBJECT(date.addDays(7 - date.dayOfWeek()))); } void @@ -374,22 +374,22 @@ KDateTable::keyPressEvent( TQKeyEvent *e ) { switch( e->key() ) { case Key_Up: - setDate(date.addDays(-7)); + setDate(TQT_TQDATE_OBJECT(date.addDays(-7))); break; case Key_Down: - setDate(date.addDays(7)); + setDate(TQT_TQDATE_OBJECT(date.addDays(7))); break; case Key_Left: - setDate(date.addDays(-1)); + setDate(TQT_TQDATE_OBJECT(date.addDays(-1))); break; case Key_Right: - setDate(date.addDays(1)); + setDate(TQT_TQDATE_OBJECT(date.addDays(1))); break; case Key_Minus: - setDate(date.addDays(-1)); + setDate(TQT_TQDATE_OBJECT(date.addDays(-1))); break; case Key_Plus: - setDate(date.addDays(1)); + setDate(TQT_TQDATE_OBJECT(date.addDays(1))); break; case Key_N: setDate(TQDate::currentDate()); @@ -439,7 +439,7 @@ KDateTable::setFontSize(int size) maxCell.setHeight(QMAX(maxCell.height(), rect.height())); } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::fromLatin1("88")); + rect=metrics.boundingRect(TQString::tqfromLatin1("88")); maxCell.setWidth(QMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(QMAX(maxCell.height()+4, rect.height())); } @@ -447,7 +447,7 @@ KDateTable::setFontSize(int size) void KDateTable::wheelEvent ( TQWheelEvent * e ) { - setDate(date.addMonths( -(int)(e->delta()/120)) ); + setDate(TQT_TQDATE_OBJECT(date.addMonths( -(int)(e->delta()/120)) )); e->accept(); } @@ -536,7 +536,7 @@ KDateTable::setDate(const TQDate& date_) numDaysPrevMonth=calendar->daysInMonth(temp); if(changed) { - repaintContents(false); + tqrepaintContents(false); } return true; } @@ -547,28 +547,28 @@ KDateTable::getDate() const return date; } -// what are those repaintContents() good for? (pfeiffer) +// what are those tqrepaintContents() good for? (pfeiffer) void KDateTable::focusInEvent( TQFocusEvent *e ) { -// repaintContents(false); +// tqrepaintContents(false); TQGridView::focusInEvent( e ); } void KDateTable::focusOutEvent( TQFocusEvent *e ) { -// repaintContents(false); +// tqrepaintContents(false); TQGridView::focusOutEvent( e ); } -QSize -KDateTable::sizeHint() const +TQSize +KDateTable::tqsizeHint() const { if(maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - kdDebug() << "KDateTable::sizeHint: obscure failure - " << endl; + kdDebug() << "KDateTable::tqsizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } @@ -596,7 +596,7 @@ void KDateTable::setCustomDatePainting(const TQDate &date, const TQColor &fgColo mode->fgColor=fgColor; mode->bgColor=bgColor; - d->customPaintingModes.replace( date.toString(), mode ); + d->customPaintingModes.tqreplace( date.toString(), mode ); d->useCustomColors=true; update(); } @@ -609,7 +609,7 @@ void KDateTable::unsetCustomDatePainting( const TQDate &date ) KDateInternalWeekSelector::KDateInternalWeekSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(this)), + val(new TQIntValidator(TQT_TQOBJECT(this))), result(0) { TQFont font; @@ -712,8 +712,8 @@ KDateInternalMonthPicker::KDateInternalMonthPicker } } -QSize -KDateInternalMonthPicker::sizeHint() const +TQSize +KDateInternalMonthPicker::tqsizeHint() const { return TQSize((max.width()+6)*numCols()+2*frameWidth(), (max.height()+6)*numRows()+2*frameWidth()); @@ -756,7 +756,7 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) void KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) { - if(!isEnabled() || e->button() != LeftButton) + if(!isEnabled() || e->button() != Qt::LeftButton) { KNotifyClient::beep(); return; @@ -783,7 +783,7 @@ KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) void KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) { - if (e->state() & LeftButton) + if (e->state() & Qt::LeftButton) { int row, col; TQPoint mouseCoord; @@ -815,7 +815,7 @@ KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) updateCell( row, col /*, false */ ); // mark the new active cell } } - if ( tmpRow > -1 ) // repaint the former active cell + if ( tmpRow > -1 ) // tqrepaint the former active cell updateCell( tmpRow, tmpCol /*, true */ ); } } @@ -850,7 +850,7 @@ KDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) KDateInternalYearSelector::KDateInternalYearSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(this)), + val(new TQIntValidator(TQT_TQOBJECT(this))), result(0) { TQFont font; @@ -914,7 +914,7 @@ class KPopupFrame::KPopupFramePrivate }; KPopupFrame::KPopupFrame(TQWidget* parent, const char* name) - : TQFrame(parent, name, WType_Popup), + : TQFrame(parent, name, (WFlags)WType_Popup), result(0), // rejected main(0), d(new KPopupFramePrivate) @@ -935,7 +935,7 @@ KPopupFrame::keyPressEvent(TQKeyEvent* e) { result=0; // rejected d->exec = false; - qApp->exit_loop(); + tqApp->exit_loop(); } } @@ -944,7 +944,7 @@ KPopupFrame::close(int r) { result=r; d->exec = false; - qApp->exit_loop(); + tqApp->exit_loop(); } void @@ -954,7 +954,7 @@ KPopupFrame::hide() if (d->exec) { d->exec = false; - qApp->exit_loop(); + tqApp->exit_loop(); } } @@ -1006,10 +1006,10 @@ int KPopupFrame::exec(TQPoint pos) { popup(pos); - repaint(); + tqrepaint(); d->exec = true; - const TQGuardedPtr<TQObject> that = this; - qApp->enter_loop(); + const TQGuardedPtr<TQObject> that = TQT_TQOBJECT(this); + tqApp->enter_loop(); if ( !that ) return TQDialog::Rejected; hide(); diff --git a/kdeui/kdatetbl.h b/kdeui/kdatetbl.h index 8827c0a00..8e7ca0022 100644 --- a/kdeui/kdatetbl.h +++ b/kdeui/kdatetbl.h @@ -37,7 +37,7 @@ class KPopupMenu; * @version $Id$ * @author Stephan Binner */ -class KDEUI_EXPORT KDateInternalWeekSelector : public QLineEdit +class KDEUI_EXPORT KDateInternalWeekSelector : public TQLineEdit { Q_OBJECT protected: @@ -64,7 +64,7 @@ private: * @version $Id$ * @author Tim Gilman, Mirko Boehm */ -class KDEUI_EXPORT KDateInternalMonthPicker : public QGridView +class KDEUI_EXPORT KDateInternalMonthPicker : public TQGridView { Q_OBJECT protected: @@ -98,7 +98,7 @@ public: /** * The size hint. */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -137,7 +137,7 @@ private: * @version $Id$ * @author Tim Gilman, Mirko Boehm */ -class KDEUI_EXPORT KDateInternalYearSelector : public QLineEdit +class KDEUI_EXPORT KDateInternalYearSelector : public TQLineEdit { Q_OBJECT protected: @@ -163,7 +163,7 @@ private: * @author Tim Gilman, Mirko Boehm * @version $Id$ */ -class KDEUI_EXPORT KPopupFrame : public QFrame +class KDEUI_EXPORT KPopupFrame : public TQFrame { Q_OBJECT protected: @@ -238,7 +238,7 @@ private: /** * Validates user-entered dates. */ -class KDEUI_EXPORT KDateValidator : public QValidator +class KDEUI_EXPORT KDateValidator : public TQValidator { public: KDateValidator(TQWidget* parent=0, const char* name=0); @@ -260,7 +260,7 @@ public: * @version $Id$ * @author Tim Gilman, Mirko Boehm */ -class KDEUI_EXPORT KDateTable : public QGridView +class KDEUI_EXPORT KDateTable : public TQGridView { Q_OBJECT Q_PROPERTY( TQDate date READ getDate WRITE setDate ) @@ -289,9 +289,9 @@ public: * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * sizeHint() simply returns a multiple of maxCell. + * tqsizeHint() simply returns a multiple of maxCell. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Set the font size of the date table. */ diff --git a/kdeui/kdatetimewidget.cpp b/kdeui/kdatetimewidget.cpp index 76d92edd2..d7b677af9 100644 --- a/kdeui/kdatetimewidget.cpp +++ b/kdeui/kdatetimewidget.cpp @@ -52,8 +52,8 @@ void KDateTimeWidget::init() void KDateTimeWidget::setDateTime(const TQDateTime & datetime) { - d->dateWidget->setDate(datetime.date()); - d->timeWidget->setTime(datetime.time()); + d->dateWidget->setDate(TQT_TQDATE_OBJECT(datetime.date())); + d->timeWidget->setTime(TQT_TQTIME_OBJECT(datetime.time())); } TQDateTime KDateTimeWidget::dateTime() const diff --git a/kdeui/kdatetimewidget.h b/kdeui/kdatetimewidget.h index 5505f21af..5f14ddcef 100644 --- a/kdeui/kdatetimewidget.h +++ b/kdeui/kdatetimewidget.h @@ -37,7 +37,7 @@ * @version $Id$ * @since 3.2 */ -class KDEUI_EXPORT KDateTimeWidget : public QWidget +class KDEUI_EXPORT KDateTimeWidget : public TQWidget { Q_OBJECT Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime ) diff --git a/kdeui/kdatewidget.cpp b/kdeui/kdatewidget.cpp index ad6683e7f..5636c6596 100644 --- a/kdeui/kdatewidget.cpp +++ b/kdeui/kdatewidget.cpp @@ -31,13 +31,13 @@ #include "kdatewidget.h" -class KDateWidgetSpinBox : public QSpinBox +class KDateWidgetSpinBox : public TQSpinBox { public: KDateWidgetSpinBox(int min, int max, TQWidget *parent) : TQSpinBox(min, max, 1, parent) { - editor()->setAlignment(AlignRight); + editor()->tqsetAlignment(TQt::AlignRight); } }; diff --git a/kdeui/kdatewidget.h b/kdeui/kdatewidget.h index 3a7f04d05..63c5b1eea 100644 --- a/kdeui/kdatewidget.h +++ b/kdeui/kdatewidget.h @@ -33,7 +33,7 @@ * * @version $Id$ */ -class KDEUI_EXPORT KDateWidget : public QWidget +class KDEUI_EXPORT KDateWidget : public TQWidget { Q_OBJECT Q_PROPERTY( TQDate date READ date WRITE setDate ) diff --git a/kdeui/kdcopactionproxy.cpp b/kdeui/kdcopactionproxy.cpp index 15e431da3..2b20e8bd3 100644 --- a/kdeui/kdcopactionproxy.cpp +++ b/kdeui/kdcopactionproxy.cpp @@ -132,7 +132,7 @@ bool KDCOPActionProxy::processAction( const TQCString &, const TQCString &fun, c { replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (Q_INT8)action->isPlugged(); + reply << (TQ_INT8)action->isPlugged(); return true; } diff --git a/kdeui/kdetrayproxy/kdetrayproxy.cpp b/kdeui/kdetrayproxy/kdetrayproxy.cpp index e49f3a148..bf2298fd3 100644 --- a/kdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/kdeui/kdetrayproxy/kdetrayproxy.cpp @@ -57,11 +57,11 @@ void KDETrayProxy::windowAdded( WId w ) if ( !trayWinFor ) // not a KDE tray window return; // kdDebug() << "New tray window:" << w << endl; - if( !tray_windows.contains( w )) + if( !tray_windows.tqcontains( w )) tray_windows.append( w ); withdrawWindow( w ); // window will be removed from pending_windows when after docked - if( !pending_windows.contains( w )) + if( !pending_windows.tqcontains( w )) pending_windows.append( w ); docked_windows.remove( w ); Window owner = selection.owner(); @@ -87,21 +87,21 @@ bool KDETrayProxy::x11Event( XEvent* e ) { if( tray_windows.isEmpty()) return false; - if( e->type == DestroyNotify && tray_windows.contains( e->xdestroywindow.window )) + if( e->type == DestroyNotify && tray_windows.tqcontains( e->xdestroywindow.window )) { tray_windows.remove( e->xdestroywindow.window ); pending_windows.remove( e->xdestroywindow.window ); docked_windows.remove( e->xdestroywindow.window ); } - if( e->type == ReparentNotify && tray_windows.contains( e->xreparent.window )) + if( e->type == ReparentNotify && tray_windows.tqcontains( e->xreparent.window )) { if( e->xreparent.parent == qt_xrootwin()) { - if( !docked_windows.contains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] ) + if( !docked_windows.tqcontains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] ) { // kdDebug() << "Window released:" << e->xreparent.window << endl; docked_windows.remove( e->xreparent.window ); - if( !pending_windows.contains( e->xreparent.window )) + if( !pending_windows.tqcontains( e->xreparent.window )) pending_windows.append( e->xreparent.window ); } } @@ -111,9 +111,9 @@ bool KDETrayProxy::x11Event( XEvent* e ) pending_windows.remove( e->xreparent.window ); } } - if( e->type == UnmapNotify && tray_windows.contains( e->xunmap.window )) + if( e->type == UnmapNotify && tray_windows.tqcontains( e->xunmap.window )) { - if( docked_windows.contains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] ) + if( docked_windows.tqcontains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] ) { // kdDebug() << "Window unmapped:" << e->xunmap.window << endl; XReparentWindow( qt_xdisplay(), e->xunmap.window, qt_xrootwin(), 0, 0 ); diff --git a/kdeui/kdetrayproxy/kdetrayproxy.h b/kdeui/kdetrayproxy/kdetrayproxy.h index 49a7164cc..8500bcb4f 100644 --- a/kdeui/kdetrayproxy/kdetrayproxy.h +++ b/kdeui/kdetrayproxy/kdetrayproxy.h @@ -26,7 +26,7 @@ #include <tqwidget.h> class KDETrayProxy - : public QWidget + : public TQWidget { Q_OBJECT public: diff --git a/kdeui/kdialog.cpp b/kdeui/kdialog.cpp index 5963a415d..53ca255bb 100644 --- a/kdeui/kdialog.cpp +++ b/kdeui/kdialog.cpp @@ -62,7 +62,7 @@ void KDialog::keyPressEvent(TQKeyEvent *e) case Key_Enter: case Key_Return: { - if(testWFlags(WType_Dialog | WShowModal)) + if(testWFlags((WFlags)(WType_Dialog | WShowModal))) { TQDialog::keyPressEvent(e); } @@ -134,13 +134,13 @@ void KDialog::resizeLayout( TQWidget *w, int margin, int spacing ) { if( w->layout() ) { - resizeLayout( w->layout(), margin, spacing ); + resizeLayout( TQT_TQLAYOUTITEM(w->layout()), margin, spacing ); } - if( w->children() ) + if( !w->childrenListObject().isEmpty() ) { - const TQObjectList * const l = w->children(); - TQObjectListIterator itr(*l); + const TQObjectList l = w->childrenListObject(); + TQObjectListIterator itr(l); TQObject *o; while ((o = itr.current()) != 0) { if( o->isWidgetType() ) diff --git a/kdeui/kdialog.h b/kdeui/kdialog.h index d74b232ce..cea1532e7 100644 --- a/kdeui/kdialog.h +++ b/kdeui/kdialog.h @@ -48,7 +48,7 @@ class TQLayoutItem; * @see KDialogBase * @author Thomas Tanghus <tanghus@earthling.net>, Espen Sand <espensa@online.no> */ -class KDEUI_EXPORT KDialog : public QDialog +class KDEUI_EXPORT KDialog : public TQDialog { Q_OBJECT @@ -185,7 +185,7 @@ class KDEUI_EXPORT KDialog : public QDialog * @author Waldo Bastian <bastian@kde.org> */ class KDialogQueuePrivate; -class KDEUI_EXPORT KDialogQueue : public QObject +class KDEUI_EXPORT KDialogQueue : public TQObject { Q_OBJECT diff --git a/kdeui/kdialogbase.cpp b/kdeui/kdialogbase.cpp index 202de5f9b..264a9992e 100644 --- a/kdeui/kdialogbase.cpp +++ b/kdeui/kdialogbase.cpp @@ -60,7 +60,7 @@ template class TQPtrList<KDialogBaseButton>; */ namespace { -struct SButton : public Qt +struct SButton : public TQt { SButton() { @@ -101,10 +101,10 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal, ButtonCode defaultButton, bool separator, const KGuiItem &user1, const KGuiItem &user2, const KGuiItem &user3 ) - :KDialog( parent, name, modal, WStyle_DialogBorder ), + :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); @@ -123,10 +123,10 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption, TQWidget *parent, const char *name, bool modal, bool separator, const KGuiItem &user1, const KGuiItem &user2, const KGuiItem &user3 ) - :KDialog( parent, name, modal, WStyle_DialogBorder ), + :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(Qt::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(Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); @@ -180,10 +180,10 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask, TQWidget *parent, const char *name, bool modal, bool separator, const KGuiItem &yes, const KGuiItem &no, const KGuiItem &cancel ) - :KDialog( parent, name, modal, WStyle_DialogBorder ), + :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(true), - mButtonOrientation(Horizontal),mEscapeButton(escapeButton), + mButtonOrientation(Qt::Horizontal),mEscapeButton(escapeButton), d(new KDialogBasePrivate) { setCaption( caption ); @@ -230,16 +230,16 @@ void SButton::resize( bool sameWidth, int margin, for( p = list.first(); p; p = list.next() ) { - const TQSize s( p->sizeHint() ); + const TQSize s( p->tqsizeHint() ); if( s.height() > h ) { h = s.height(); } if( s.width() > w ) { w = s.width(); } } - if( orientation == Horizontal ) + if( orientation == Qt::Horizontal ) { for( p = list.first(); p; p = list.next() ) { - TQSize s( p->sizeHint() ); + TQSize s( p->tqsizeHint() ); if( sameWidth ) { s.setWidth( w ); } p->setFixedWidth( s.width() ); t += s.width() + spacing; @@ -253,7 +253,7 @@ void SButton::resize( bool sameWidth, int margin, // sameWidth has no effect here for( p = list.first(); p; p = list.next() ) { - TQSize s( p->sizeHint() ); + TQSize s( p->tqsizeHint() ); s.setWidth( w ); p->setFixedSize( s ); t += s.height() + spacing; @@ -299,7 +299,7 @@ void KDialogBase::setupLayout() // mTopLayout = new TQVBoxLayout( this, marginHint(), spacingHint() ); - if( mButtonOrientation == Horizontal ) + if( mButtonOrientation == Qt::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 == Horizontal ? + mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? TQFrame::HLine : TQFrame::VLine ); } - if( mButtonOrientation == Vertical ) + if( mButtonOrientation == Qt::Vertical ) { enableLinkedHelp(false); // 2000-06-18 Espen: No support for this yet. } @@ -381,7 +381,7 @@ void KDialogBase::makeRelay() if( mTile ) { connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) ); - connect( qApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) ); + connect( tqApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) ); } } @@ -395,8 +395,8 @@ void KDialogBase::enableButtonSeparator( bool state ) return; } mActionSep = new KSeparator( this ); - mActionSep->setFocusPolicy(TQWidget::NoFocus); - mActionSep->setOrientation( mButtonOrientation == Horizontal ? + mActionSep->setFocusPolicy(TQ_NoFocus); + mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? TQFrame::HLine : TQFrame::VLine ); mActionSep->show(); } @@ -429,17 +429,17 @@ void KDialogBase::adjustSize() // if (layout()) // layout()->activate(); if( d->bFixed ) - setFixedSize( sizeHint() ); + setFixedSize( tqsizeHint() ); else - resize( sizeHint() ); + resize( tqsizeHint() ); } -TQSize KDialogBase::sizeHint() const +TQSize KDialogBase::tqsizeHint() const { - return d->minSize.expandedTo( minimumSizeHint() ) + d->incSize; + return d->minSize.expandedTo( tqminimumSizeHint() ) + d->incSize; } -TQSize KDialogBase::minimumSizeHint() const +TQSize KDialogBase::tqminimumSizeHint() const { const int m = marginHint(); const int s = spacingHint(); @@ -454,7 +454,7 @@ TQSize KDialogBase::minimumSizeHint() const // if( mUrlHelp ) { - s2 = mUrlHelp->minimumSize() + zeroByS; + s2 = mUrlHelp->tqminimumSize() + zeroByS; } s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); @@ -464,13 +464,13 @@ TQSize KDialogBase::minimumSizeHint() const // if( mJanus ) { - s2 = mJanus->minimumSizeHint() + zeroByS; + s2 = mJanus->tqminimumSizeHint() + zeroByS; } else if( mMainWidget ) { - s2 = mMainWidget->sizeHint() + zeroByS; - s2 = s2.expandedTo( mMainWidget->minimumSize() ); - s2 = s2.expandedTo( mMainWidget->minimumSizeHint() ); + s2 = mMainWidget->tqsizeHint() + zeroByS; + s2 = s2.expandedTo( mMainWidget->tqminimumSize() ); + s2 = s2.expandedTo( mMainWidget->tqminimumSizeHint() ); if( s2.isEmpty() ) { s2 = TQSize( 100, 100+s ); @@ -485,9 +485,9 @@ TQSize KDialogBase::minimumSizeHint() const if (d->detailsWidget && d->bDetails) { - s2 = d->detailsWidget->sizeHint() + zeroByS; - s2 = s2.expandedTo( d->detailsWidget->minimumSize() ); - s2 = s2.expandedTo( d->detailsWidget->minimumSizeHint() ); + s2 = d->detailsWidget->tqsizeHint() + zeroByS; + s2 = s2.expandedTo( d->detailsWidget->tqminimumSize() ); + s2 = s2.expandedTo( d->detailsWidget->tqminimumSizeHint() ); s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); } @@ -497,7 +497,7 @@ TQSize KDialogBase::minimumSizeHint() const // if( mActionSep ) { - s1.rheight() += mActionSep->minimumSize().height() + s; + s1.rheight() += mActionSep->tqminimumSize().height() + s; } // @@ -505,8 +505,8 @@ TQSize KDialogBase::minimumSizeHint() const // if( d->mButton.box ) { - s2 = d->mButton.box->minimumSize(); - if( mButtonOrientation == Horizontal ) + s2 = d->mButton.box->tqminimumSize(); + if( mButtonOrientation == Qt::Horizontal ) { s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); @@ -530,7 +530,7 @@ TQSize KDialogBase::minimumSizeHint() const void KDialogBase::disableResize() { - setFixedSize( sizeHint() ); + setFixedSize( tqsizeHint() ); } @@ -586,7 +586,7 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, } if( d->mButton.mask & Details ) { - KPushButton *pb = d->mButton.append( Details, TQString::null ); + KPushButton *pb = d->mButton.append( Details, TQString() ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()) ); setDetails(false); } @@ -686,7 +686,7 @@ void KDialogBase::setButtonStyle( int style ) layoutMax = 6; layout = layoutRule[ d->mButton.style ]; } - else if (mButtonOrientation == Horizontal) + else if (mButtonOrientation == Qt::Horizontal) { static const int layoutRule[5][10] = { @@ -720,7 +720,7 @@ void KDialogBase::setButtonStyle( int style ) } TQBoxLayout *lay; - if( mButtonOrientation == Horizontal ) + if( mButtonOrientation == Qt::Horizontal ) { lay = new TQBoxLayout( d->mButton.box, TQBoxLayout::LeftToRight, 0, spacingHint()); @@ -748,7 +748,7 @@ void KDialogBase::setButtonStyle( int style ) { newButton = actionButton( (ButtonCode) (layout[i] & ~(Stretch | Filler))); if (newButton) - lay->addSpacing(newButton->sizeHint().width()); + lay->addSpacing(newButton->tqsizeHint().width()); } continue; } @@ -1113,7 +1113,7 @@ void KDialogBase::setDetailsWidget(TQWidget *detailsWidget) { delete d->detailsWidget; d->detailsWidget = detailsWidget; - if (d->detailsWidget->parentWidget() != this) + if (d->detailsWidget->tqparentWidget() != this) d->detailsWidget->reparent(this, TQPoint(0,0)); d->detailsWidget->hide(); if( mIsActivated ) @@ -1492,10 +1492,10 @@ TQRect KDialogBase::getContentsRect() const r.setLeft( marginHint() ); r.setTop( marginHint() + (mUrlHelp ? mUrlHelp->height() : 0) ); r.setRight( width() - marginHint() ); - int h = (!mActionSep ? 0 : mActionSep->minimumSize().height()+marginHint()); + int h = (!mActionSep ? 0 : mActionSep->tqminimumSize().height()+marginHint()); if( d->mButton.box ) { - r.setBottom( height() - d->mButton.box->minimumSize().height() - h ); + r.setBottom( height() - d->mButton.box->tqminimumSize().height() - h ); } else { @@ -1513,14 +1513,14 @@ void KDialogBase::getBorderWidths(int& ulx, int& uly, int& lrx, int& lry) const uly = marginHint(); if( mUrlHelp ) { - uly += mUrlHelp->minimumSize().height(); + uly += mUrlHelp->tqminimumSize().height(); } lrx = marginHint(); - lry = d->mButton.box ? d->mButton.box->minimumSize().height() : 0; + lry = d->mButton.box ? d->mButton.box->tqminimumSize().height() : 0; if( mActionSep ) { - lry += mActionSep->minimumSize().height() + marginHint(); + lry += mActionSep->tqminimumSize().height() + marginHint(); } } @@ -1748,15 +1748,15 @@ TQSize KDialogBase::configDialogSize( KConfig& config, const TQString& groupName ) const { int w, h; - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); - w = sizeHint().width(); - h = sizeHint().height(); + w = tqsizeHint().width(); + h = tqsizeHint().height(); KConfigGroupSaver cs(&config, groupName); - w = config.readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w ); - h = config.readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h ); + w = config.readNumEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), w ); + h = config.readNumEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()), h ); return TQSize( w, h ); } @@ -1771,15 +1771,15 @@ void KDialogBase::saveDialogSize( const TQString& groupName, bool global ) void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName, bool global ) const { - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); KConfigGroupSaver cs(&config, groupName); TQSize sizeToSave = size(); - config.writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()), + config.writeEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), TQString::number( sizeToSave.width()), true, global); - config.writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()), + config.writeEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()), TQString::number( sizeToSave.height()), true, global); } diff --git a/kdeui/kdialogbase.h b/kdeui/kdialogbase.h index ea4b21955..bd49764bb 100644 --- a/kdeui/kdialogbase.h +++ b/kdeui/kdialogbase.h @@ -100,7 +100,7 @@ class KDialogBaseTile; * signals that are related to the standard action buttons will be used * when you don't use these buttons. * - * <b>Dialog shapes:</b>\n + * <b>Dialog tqshapes:</b>\n * * You can either use one of the prebuilt, easy to use, faces or * define your own main widget. The dialog provides ready to use @@ -426,8 +426,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog * resized before showing it. **/ virtual void adjustSize(); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * Retrieve the empty page when the predefined layout is used in @p Plain @@ -733,7 +733,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * Sets the page with @p index to be displayed. * * This method will only - * work when the dialog is using the predefined shape of TreeList, + * work when the dialog is using the predefined tqshape of TreeList, * IconList or Tabbed. * * @param index Index of the page to be shown. @@ -745,7 +745,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * Returns the index of the active page. * * This method will only work when the dialog is using the - * predefined shape of Tabbed, TreeList or IconList. + * predefined tqshape of Tabbed, TreeList or IconList. * * @return The page index or -1 if there is no active page. */ @@ -828,7 +828,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog /** * read the dialogs size from the configuration according to the screen size. - * If no size is saved for one dimension of the screen, sizeHint() is returned. + * If no size is saved for one dimension of the screen, tqsizeHint() is returned. * * @param groupName Name of the group to read from. The old group * of KGlobal::config is preserved. @@ -837,7 +837,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog /** * read the dialogs size from the configuration according to the screen size. - * If no size is saved for one dimension of the screen, sizeHint() is returned. + * If no size is saved for one dimension of the screen, tqsizeHint() is returned. * * @param config The KConfig object to read from * @param groupName Name of the group to read from. The old group @@ -1167,7 +1167,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * set it as a minimum size for the resulting dialog. * * You should not need to use this method and never if you use one of - * the predefined shapes. + * the predefined tqshapes. * * @param w The width of you special widget. * @param h The height of you special widget. diff --git a/kdeui/kdialogbase_priv.h b/kdeui/kdialogbase_priv.h index a5bbf31be..d38ef884a 100644 --- a/kdeui/kdialogbase_priv.h +++ b/kdeui/kdialogbase_priv.h @@ -45,7 +45,7 @@ class KDEUI_EXPORT KDialogBaseButton : public KPushButton * Used internally by KDialogBase. * @internal */ -class KDEUI_EXPORT KDialogBaseTile : public QObject +class KDEUI_EXPORT KDialogBaseTile : public TQObject { Q_OBJECT diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index dc5213c3c..5629d5cf8 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); + tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup()); paint.end(); } @@ -219,7 +219,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #ifdef BORDERLESS_WINDOWS setCursor(TQCursor(ArrowCursor)); #endif - d = new KDockWidgetHeaderPrivate( this ); + d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); layout = new TQHBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); @@ -228,7 +228,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) closeButton = new KDockButton_Private( this, "DockCloseButton" ); TQToolTip::add( closeButton, i18n("Close") ); - closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); + closeButton->setPixmap( tqstyle().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); @@ -266,7 +266,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) layout->addWidget( closeButton ); layout->activate(); d->dummy->hide(); - drag->setFixedHeight( layout->minimumSize().height() ); + drag->setFixedHeight( layout->tqminimumSize().height() ); } void KDockWidgetHeader::setTopLevel( bool isTopLevel ) @@ -323,7 +323,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) delete drag; drag = nd; - if (drag->parentWidget()!=this) { + if (drag->tqparentWidget()!=this) { drag->reparent(this,TQPoint(0,0)); } @@ -343,19 +343,19 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); layout->addWidget( closeButton ); layout->activate(); - kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl; + kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->tqminimumSize().height()<<endl; //FIXME somebody left this here, but we don't know what the hell it's for. - drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() ); + drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/tqsizeHint().height() ); } void KDockWidgetHeader::addButton(KDockButton_Private* btn) { if (!btn) return; - if (btn->parentWidget()!=this) { + if (btn->tqparentWidget()!=this) { btn->reparent(this,TQPoint(0,0)); } btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - if (!d->btns.containsRef(btn)) d->btns.append(btn); + if (!d->btns.tqcontainsRef(btn)) d->btns.append(btn); btn->show(); @@ -378,12 +378,12 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); layout->addWidget( closeButton ); layout->activate(); - drag->setFixedHeight( layout->minimumSize().height() ); + drag->setFixedHeight( layout->tqminimumSize().height() ); } void KDockWidgetHeader::removeButton(KDockButton_Private* btn) { - if (btn->parentWidget()==this) { - if (d->btns.containsRef(btn)) d->btns.removeRef(btn); + if (btn->tqparentWidget()==this) { + if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn); delete btn; } } @@ -422,12 +422,12 @@ void KDockWidgetHeader::setDragEnabled(bool b) #ifndef NO_KDE2 void KDockWidgetHeader::saveConfig( KConfig* c ) { - c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() ); + c->writeEntry( TQString("%1%2").arg(tqparent()->name()).arg(":stayButton"), stayButton->isOn() ); } void KDockWidgetHeader::loadConfig( KConfig* c ) { - setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) ); + setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(tqparent()->name()).arg(":stayButton"), false ) ); } #endif @@ -498,7 +498,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; - manager->childDock->append( this ); + manager->childDock->append( TQT_TQOBJECT(this) ); installEventFilter( manager ); eDocking = DockFullDocking; @@ -562,8 +562,8 @@ KDockWidget::~KDockWidget() } } emit iMBeingClosed(); - if (manager->d) manager->d->containerDocks.remove(this); - manager->childDock->remove( this ); + if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this)); + manager->childDock->remove(TQT_TQOBJECT(this)); delete pix; delete d; // destroy private data d=0; @@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe) TQWidget::paintEvent(pe); TQPainter paint; paint.begin( this ); - style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); + tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup()); paint.end(); } @@ -601,7 +601,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme) int styleheight; TQPoint mp; mp=mme->pos(); - styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); + styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this); bbottom=mp.y()>=height()-styleheight; btop=mp.y()<=styleheight; bleft=mp.x()<=styleheight; @@ -689,7 +689,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme) int styleheight; TQPoint mp; mp=mme->pos(); - styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); + styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this); bbottom=mp.y()>=height()-styleheight; btop=mp.y()<=styleheight; bleft=mp.x()<=styleheight; @@ -791,7 +791,7 @@ void KDockWidget::updateHeader() header->setTopLevel( true ); header->show(); #ifdef BORDERLESS_WINDOWS - layout->setMargin(2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this)); + layout->setMargin(2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this)); setMouseTracking(true); #endif } @@ -858,7 +858,7 @@ void KDockWidget::show() void KDockWidget::setDockWindowType (NET::WindowType windowType) { d->windowType = windowType; - applyToWidget( parentWidget(), TQPoint(0,0) ); + applyToWidget( tqparentWidget(), TQPoint(0,0) ); } #endif @@ -867,7 +867,7 @@ void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnable { d->_parent = parent; d->transient = transientEnabled; - applyToWidget( parentWidget(), TQPoint(0,0) ); + applyToWidget( tqparentWidget(), TQPoint(0,0) ); } TQWidget *KDockWidget::transientTo() { @@ -898,7 +898,7 @@ bool KDockWidget::event( TQEvent *event ) emit manager->change(); break; case TQEvent::CaptionChange: - if ( parentWidget() ){ + if ( tqparentWidget() ){ if ( parent()->inherits("KDockSplitter") ){ ((KDockSplitter*)(parent()))->updateName(); } @@ -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)) ? Vertical:Horizontal; + Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? Qt::Vertical:Qt::Horizontal; if (((KDockSplitter*)(parent()))->orientation()==orientation) { KDockWidget *neighbor= @@ -932,7 +932,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) if (neighbor==this) return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos)); else - if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup"))) + if (neighbor->getWidget() && (neighbor->getWidget()->tqqt_cast("KDockTabGroup"))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); else return neighbor; @@ -1091,8 +1091,8 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, } // create a new dockwidget that will contain the target and this - TQWidget* parentDock = target->parentWidget(); - KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(""), parentDock ); + TQWidget* parentDock = target->tqparentWidget(); + KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), parentDock ); newDock->currentDockPos = target->currentDockPos; if ( dockPos == KDockWidget::DockCenter ){ @@ -1161,13 +1161,13 @@ 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_", Horizontal, spliPos ); - if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_", Vertical , spliPos ); + 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 ); newDock->setWidget( panner ); panner->setOpaqueResize(manager->splitterOpaqueResize()); panner->setKeepSize(manager->splitterKeepSize()); - panner->setFocusPolicy( NoFocus ); + panner->setFocusPolicy( TQ_NoFocus ); target->applyToWidget( panner ); applyToWidget( panner ); target->formerDockPos = target->currentDockPos; @@ -1218,7 +1218,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, KDockTabGroup* KDockWidget::parentDockTabGroup() const { if ( !parent() ) return 0L; - TQWidget* candidate = parentWidget()->parentWidget(); + TQWidget* candidate = tqparentWidget()->tqparentWidget(); if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate; return 0L; } @@ -1226,7 +1226,7 @@ KDockTabGroup* KDockWidget::parentDockTabGroup() const TQWidget *KDockWidget::parentDockContainer() const { if (!parent()) return 0L; - TQWidget* candidate = parentWidget()->parentWidget(); + TQWidget* candidate = tqparentWidget()->tqparentWidget(); if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate; return 0L; } @@ -1238,7 +1238,7 @@ void KDockWidget::setForcedFixedWidth(int w) setFixedWidth(w); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w); + static_cast<KDockSplitter*>(tqparent()->tqqt_cast("KDockSplitter"))->setForcedFixedWidth(this,w); } void KDockWidget::setForcedFixedHeight(int h) @@ -1247,7 +1247,7 @@ void KDockWidget::setForcedFixedHeight(int h) setFixedHeight(h); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h); + static_cast<KDockSplitter*>(tqparent()->tqqt_cast("KDockSplitter"))->setForcedFixedHeight(this,h); } int KDockWidget::forcedFixedWidth() @@ -1270,7 +1270,7 @@ void KDockWidget::restoreFromForcedFixedSize() setMaximumHeight(32000); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this); + static_cast<KDockSplitter*>(tqparent()->tqqt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this); } void KDockWidget::toDesktop() @@ -1295,7 +1295,7 @@ void KDockWidget::undock() manager->d->dragRect = TQRect (); manager->drawDragRectangle (); - TQWidget* parentW = parentWidget(); + TQWidget* parentW = tqparentWidget(); if ( !parentW ){ hide(); if (!d->blockHasUndockedSignal) @@ -1337,7 +1337,7 @@ void KDockWidget::undock() KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent(); delete parentTab; // KDockTabGroup - TQWidget* parentOfDockWidget = parentOfTab->parentWidget(); + TQWidget* parentOfDockWidget = parentOfTab->tqparentWidget(); if ( !parentOfDockWidget ){ if ( isV ) lastTab->show(); } else { @@ -1347,13 +1347,13 @@ void KDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation == Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::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 == Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom ); @@ -1396,16 +1396,16 @@ void KDockWidget::undock() d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this ); - KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->parentWidget(); + KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->tqparentWidget(); setFormerBrotherDockWidget(secondWidget); applyToWidget( 0L ); group->hide(); - if ( !group->parentWidget() ){ + if ( !group->tqparentWidget() ){ secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() ); secondWidget->resize( group->width(), group->height() ); } else { - TQWidget* obj = group->parentWidget(); + TQWidget* obj = group->tqparentWidget(); secondWidget->applyToWidget( obj ); if ( obj->inherits("KDockSplitter") ){ KDockSplitter* parentOfGroup = (KDockSplitter*)obj; @@ -1466,7 +1466,7 @@ void KDockWidget::setWidget( TQWidget* mw ) if (dc) { d->isContainer=true; - manager->d->containerDocks.append(this); + manager->d->containerDocks.append(TQT_TQOBJECT(this)); } else { @@ -1494,13 +1494,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) listOfCaption.remove( listOfCaption.length()-1, 1 ); listOfName.remove( listOfName.length()-1, 1 ); - tab->parentWidget()->setName( listOfName.utf8() ); - tab->parentWidget()->setCaption( listOfCaption ); + tab->tqparentWidget()->setName( listOfName.utf8() ); + tab->tqparentWidget()->setCaption( listOfCaption ); - tab->parentWidget()->repaint( false ); // KDockWidget->repaint - if ( tab->parentWidget()->parent() ) - if ( tab->parentWidget()->parent()->inherits("KDockSplitter") ) - ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName(); + tab->tqparentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint + if ( tab->tqparentWidget()->parent() ) + if ( tab->tqparentWidget()->parent()->inherits("KDockSplitter") ) + ((KDockSplitter*)(tab->tqparentWidget()->parent()))->updateName(); } bool KDockWidget::mayBeHide() const @@ -1545,11 +1545,11 @@ void KDockWidget::makeDockVisible() } if ( isVisible() ) return; - TQWidget* p = parentWidget(); + TQWidget* p = tqparentWidget(); while ( p ){ if ( !p->isVisible() ) p->show(); - p = p->parentWidget(); + p = p->tqparentWidget(); } if( !parent() ) // is undocked dockBack(); @@ -1570,7 +1570,7 @@ void KDockWidget::loseFormerBrotherDockWidget() TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), this, TQT_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; - repaint(); + tqrepaint(); } void KDockWidget::dockBack() @@ -1719,11 +1719,11 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) break; case TQEvent::MouseButtonPress: - if ( ((TQMouseEvent*)event)->button() == LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ if ( curdw->eDocking != (int)KDockWidget::DockNone ){ dropCancel = true; curdw->setFocus(); - qApp->processOneEvent(); + tqApp->processOneEvent(); currentDragWidget = curdw; currentMoveWidget = 0L; @@ -1744,7 +1744,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) } break; case TQEvent::MouseButtonRelease: - if ( ((TQMouseEvent*)event)->button() == LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == Qt::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() == LeftButton) && + if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) && (curdw->eDocking != (int)KDockWidget::DockNone) ) { startDrag( curdw); } @@ -1850,7 +1850,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) return 0L; } #if defined(_OS_WIN32_) || defined(Q_OS_WIN32) - p = p->topLevelWidget(); + p = p->tqtopLevelWidget(); #endif TQWidget* w = 0L; findChildDockWidget( w, p, p->mapFromGlobal(pos) ); @@ -1860,12 +1860,12 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( qt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( qt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L; + if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; if (dynamic_cast<KDockContainer*>(w)) return 0L; if (!childDockWidgetList) return 0L; - if ( childDockWidgetList->find(w) != -1 ) return 0L; + if ( childDockWidgetList->tqfind(w) != -1 ) return 0L; if ( currentDragWidget->isGroup && ((KDockWidget*)w)->parentDockTabGroup() ) return 0L; KDockWidget* www = (KDockWidget*)w; @@ -1903,14 +1903,14 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const TQPoint& pos ) { - if ( p->children() ) { + if ( !p->childrenListObject().isEmpty() ) { TQWidget *w; - TQObjectListIt it( *p->children() ); + TQObjectListIt it( p->childrenListObject() ); it.toLast(); while ( it.current() ) { if ( it.current()->isWidgetType() ) { w = (TQWidget*)it.current(); - if ( w->isVisible() && w->geometry().contains(pos) ) { + if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) { if ( w->inherits("KDockWidget") ) ww = w; findChildDockWidget( ww, w, w->mapFromParent(pos) ); return; @@ -1924,9 +1924,9 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const void KDockManager::findChildDockWidget( const TQWidget* p, TQWidgetList*& list ) { - if ( p->children() ) { + if ( !p->childrenListObject().isEmpty() ) { TQWidget *w; - TQObjectListIt it( *p->children() ); + TQObjectListIt it( p->childrenListObject() ); it.toLast(); while ( it.current() ) { if ( it.current()->isWidgetType() ) { @@ -1948,8 +1948,8 @@ void KDockManager::startDrag( KDockWidget* w ) || ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) { w->prevSideDockPosBeforeDrag = w->currentDockPos; - if ( w->parentWidget()->inherits("KDockSplitter") ){ - KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget()); + if ( w->tqparentWidget()->inherits("KDockSplitter") ){ + KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget()); w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); } } @@ -1957,7 +1957,7 @@ void KDockManager::startDrag( KDockWidget* w ) curPos = KDockWidget::DockDesktop; dragging = true; - TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); + TQApplication::setOverrideCursor(TQCursor(tqsizeAllCursor)); } void KDockManager::dragMove( KDockWidget* dw, TQPoint pos ) @@ -2105,7 +2105,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b) { - return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false")); + return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false")); } @@ -2144,7 +2144,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName, TQStrListIterator it(list); for (; it.current(); ++it) { TQDomElement subel = doc.createElement(subTagName); - subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current()))); + subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current()))); el.appendChild(subel); } @@ -2214,7 +2214,7 @@ void KDockManager::writeConfig(TQDomElement &base) KDockWidget *obj1; while ( (obj1=(KDockWidget*)it.current()) ) { if ( obj1->parent() == main ) - mainWidgetStr = TQString::fromLatin1(obj1->name()); + mainWidgetStr = TQString::tqfromLatin1(obj1->name()); nList.append(obj1->name()); ++it; } @@ -2230,8 +2230,8 @@ void KDockManager::writeConfig(TQDomElement &base) TQStringList::Iterator nListIt=nList.begin(); while ( nListIt!=nList.end() ) { KDockWidget *obj = getDockWidgetFromName( *nListIt); - if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.find( obj->firstName.latin1() ) == -1 - || nameList.find(obj->lastName.latin1()) == -1)) { + if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.tqfind( obj->firstName.latin1() ) == -1 + || nameList.tqfind(obj->lastName.latin1()) == -1)) { // Skip until children are saved (why?) ++nListIt; // nList.next(); @@ -2279,7 +2279,7 @@ void KDockManager::writeConfig(TQDomElement &base) } } - groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name()))); + groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name()))); groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent())); if ( !obj->parent() ) { groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size()))); @@ -2401,7 +2401,7 @@ void KDockManager::readConfig(TQDomElement &base) KDockWidget *second = getDockWidgetFromName(secondName); if (first && second) { obj = first->manualDock(second, - (orientation == (int)Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, + (orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, separatorPos); if (obj) obj->setName(name.latin1()); @@ -2512,7 +2512,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget) { if (!autoCreateDock) return; autoCreateDock->setAutoDelete(false); - autoCreateDock->removeRef(pDockWidget); + autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget)); autoCreateDock->setAutoDelete(true); } @@ -2578,7 +2578,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } /*************************************************************************************************/ if ( obj->isGroup ){ - if ( (findList.find( obj->firstName ) != findList.end()) && (findList.find( obj->lastName ) != findList.end() )){ + if ( (findList.tqfind( obj->firstName ) != findList.end()) && (findList.tqfind( obj->lastName ) != findList.end() )){ c->writeEntry( cname+":type", "GROUP"); if ( !obj->parent() ){ @@ -2601,9 +2601,9 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } else { /*************************************************************************************************/ //debug(" Skip %s", nList.current()); - //if ( findList.find( obj->firstName ) == -1 ) + //if ( findList.tqfind( obj->firstName ) == -1 ) // debug(" ? Not found %s", obj->firstName); - //if ( findList.find( obj->lastName ) == -1 ) + //if ( findList.tqfind( obj->lastName ) == -1 ) // debug(" ? Not found %s", obj->lastName); ++nListIt; // if ( !nList.current() ) nList.first(); @@ -2758,7 +2758,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) Orientation p = (Orientation)c->readNumEntry( oname + ":orientation" ); if ( first && last ){ - obj = first->manualDock( last, ( p == Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); + obj = first->manualDock( last, ( p == Qt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); if (obj){ obj->setName( oname.latin1() ); } @@ -2889,8 +2889,8 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName ) KDockWidget* autoCreate = 0L; if ( autoCreateDock ){ kdDebug(282)<<"Autocreating dock: "<<dockName<<endl; - autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap("") ); - autoCreateDock->append( autoCreate ); + autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) ); + autoCreateDock->append( TQT_TQOBJECT(autoCreate) ); } return autoCreate; } @@ -2936,13 +2936,13 @@ void KDockManager::slotMenuPopup() ++it; if ( obj->mayBeHide() ) { - menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Hide %1").arg(obj->caption()), numerator++ ); + menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), TQString(i18n("Hide %1").arg(obj->caption())), numerator++ ); menuData->append( new MenuDockData( obj, true ) ); } if ( obj->mayBeShow() ) { - menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Show %1").arg(obj->caption()), numerator++ ); + menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), TQString(i18n("Show %1").arg(obj->caption())), numerator++ ); menuData->append( new MenuDockData( obj, false ) ); } } @@ -2994,14 +2994,14 @@ void KDockManager::drawDragRectangle() KDockMainWindow* pMain = 0L; KDockWidget* pTLDockWdg = 0L; TQWidget* topWdg; - if (pDockWdgAtRect->topLevelWidget() == main) { + if (pDockWdgAtRect->tqtopLevelWidget() == main) { isOverMainWdg = true; topWdg = pMain = (KDockMainWindow*) main; unclipped = pMain->testWFlags( WPaintUnclipped ); pMain->setWFlags( WPaintUnclipped ); } else { - topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget(); + topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget(); unclipped = pTLDockWdg->testWFlags( WPaintUnclipped ); pTLDockWdg->setWFlags( WPaintUnclipped ); } @@ -3016,7 +3016,7 @@ void KDockManager::drawDragRectangle() pTLDockWdg->clearWFlags(WPaintUnclipped); } // draw the rectangle - p.setRasterOp(Qt::NotXorROP); + p.setRasterOp(TQt::NotXorROP); TQRect r = oldAndNewDragRect[i]; r.moveTopLeft( r.topLeft() - topWdg->mapToGlobal(TQPoint(0,0)) ); p.drawRect(r.x(), r.y(), r.width(), r.height()); @@ -3101,7 +3101,7 @@ void KDockArea::slotDockWidgetUndocked() void KDockArea::resizeEvent(TQResizeEvent *rsize) { TQWidget::resizeEvent(rsize); - if (children()){ + if (!childrenListObject().isEmpty()){ #ifndef NO_KDE2 // kdDebug(282)<<"KDockArea::resize"<<endl; #endif @@ -3180,7 +3180,7 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) { if (parentDockWidget() && parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl; KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + tqparent()->tqqt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } @@ -3192,7 +3192,7 @@ void KDockContainer::deactivateOverlapMode() { if (parentDockWidget() && parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl; KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + tqparent()->tqqt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } @@ -3280,7 +3280,7 @@ void KDockContainer::prepareSave(TQStringList &names) TQWidget *KDockTabGroup::transientTo() { TQWidget *tT=0; for (int i=0;i<count();i++) { - KDockWidget *dw=static_cast<KDockWidget*>(page(i)->qt_cast("KDockWidget")); + KDockWidget *dw=static_cast<KDockWidget*>(page(i)->tqqt_cast("KDockWidget")); TQWidget *tmp; if ((tmp=dw->transientTo())) { if (!tT) tT=tmp; @@ -3326,6 +3326,6 @@ void KDockArea::virtual_hook( int, void* ) { /*KMainWindow::virtual_hook( id, data );*/ } -#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name #include "kdockwidget.moc" #endif diff --git a/kdeui/kdockwidget.h b/kdeui/kdockwidget.h index 4f1605c8c..3fb373dd7 100644 --- a/kdeui/kdockwidget.h +++ b/kdeui/kdockwidget.h @@ -100,7 +100,7 @@ namespace KMDI * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidgetAbstractHeader : public QFrame +class KDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame { Q_OBJECT public: @@ -149,7 +149,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public QFrame +class KDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame { Q_OBJECT public: @@ -360,7 +360,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockTabGroup : public QTabWidget +class KDEUI_EXPORT KDockTabGroup : public TQTabWidget { Q_OBJECT public: @@ -420,7 +420,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidget: public QWidget +class KDEUI_EXPORT KDockWidget: public TQWidget { Q_OBJECT friend class KDockManager; @@ -446,7 +446,7 @@ public: */ KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null, - const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0); + const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0); /** * Destructs a dockwidget. @@ -906,7 +906,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockManager: public QObject +class KDEUI_EXPORT KDockManager: public TQObject { Q_OBJECT friend class KDockWidget; @@ -1324,7 +1324,7 @@ public: * @param name internal object name * @param f Qt::WidgetFlags widget flags */ - KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); + KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); /** * Destructs a dockmainwindow. @@ -1365,7 +1365,7 @@ public: * @return a pointer to the new created dockwidget */ KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, - const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); + const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); /** * Saves the current dock window layout into a DOM tree below the given element. @@ -1470,7 +1470,7 @@ private: KDockMainWindowPrivate *d; }; -class KDEUI_EXPORT KDockArea : public QWidget +class KDEUI_EXPORT KDockArea : public TQWidget { Q_OBJECT @@ -1490,7 +1490,7 @@ public: KDockWidget* getMainDockWidget(){ return mainDockWidget; } KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, - const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); + const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); void writeDockConfig(TQDomElement &base); void readDockConfig(TQDomElement &base); diff --git a/kdeui/kdockwidget_private.cpp b/kdeui/kdockwidget_private.cpp index 9c98ae69a..c049d6fb1 100644 --- a/kdeui/kdockwidget_private.cpp +++ b/kdeui/kdockwidget_private.cpp @@ -61,10 +61,10 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1) divider->setLineWidth(1); divider->raise(); - if (m_orientation == Horizontal) - divider->setCursor(TQCursor(sizeVerCursor)); + if (m_orientation == Qt::Horizontal) + divider->setCursor(TQCursor(tqsizeVerCursor)); else - divider->setCursor(TQCursor(sizeHorCursor)); + divider->setCursor(TQCursor(tqsizeHorCursor)); divider->installEventFilter(this); initialised= true; @@ -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 == Horizontal) { + if (m_orientation == Qt::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 == Horizontal) ? "Horizontal":"Vertical") <<endl; +// kdDebug(282)<<"mKeepSize : "<< ((m_orientation == Qt::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 == Horizontal) { + if (m_orientation == Qt::Horizontal) { if (ev->oldSize().height() != ev->size().height()) { if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { // dockwidget is on the bottom. move xpos so that the size from child1 stays @@ -281,7 +281,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // xpos should not change, the docking is on the top // checkValue is *fuzzy* here, it leads to ugly rounding bugs // In truth, it is not needed, because it is called when calculating the "position". - xpos = qRound(((double)xpos) * ev->oldSize().height() / height()); + xpos = tqRound(((double)xpos) * ev->oldSize().height() / height()); } } } else { @@ -291,7 +291,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } else { // xpos should not change // checkValue is *fuzzy* here, it leads to ugly rounding bugs - xpos = qRound(((double)xpos) * ev->oldSize().width() / width()); + xpos = tqRound(((double)xpos) * ev->oldSize().width() / width()); } } } @@ -307,7 +307,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // values. // if ( isVisible()) { - if (m_orientation == Horizontal) { + if (m_orientation == Qt::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==Horizontal?"Horizontal":"Vertical") + kdDebug(282) << "Orientation : " << (m_orientation==Qt::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==Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || - ( (m_orientation==Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { + if( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || + ( (m_orientation==Qt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { if ((c0->getWidget()) && (dc=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 == Horizontal) { + if (m_orientation == Qt::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 == Horizontal) { + if (m_orientation == Qt::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 == Vertical ? width() : height()) * xpos / factor ); + int position = checkValue( (m_orientation == Qt::Vertical ? width() : height()) * xpos / factor ); int diff = 0; - if (m_orientation == Horizontal) { + if (m_orientation == Qt::Horizontal) { if ((c1->getWidget()) && (dc=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 == Vertical) { + if (m_orientation == Qt::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 == Horizontal + } else {// orientation == Qt::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 == Vertical) { + if (m_orientation == Qt::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 == Vertical) && (position > width())) + if ((m_orientation == Qt::Vertical) && (position > width())) position = width(); - if ((m_orientation == Horizontal) && (position > height())) + if ((m_orientation == Qt::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 == Horizontal) { + if (m_orientation == Qt::Horizontal) { if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; @@ -513,7 +513,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) if (tmp_xpos != xpos) { xpos = tmp_xpos; resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } } } else { @@ -529,7 +529,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) if (tmp_xpos != xpos) { xpos = tmp_xpos; resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } } } @@ -539,14 +539,14 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) child0->setUpdatesEnabled(true); child1->setUpdatesEnabled(true); mev= (TQMouseEvent*)e; - if (m_orientation == Horizontal){ + if (m_orientation == Qt::Horizontal){ if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } else { if ((fixedWidth0!=-1) || (fixedWidth1!=-1)) { @@ -554,7 +554,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width(); resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } handled= true; break; @@ -585,15 +585,15 @@ void KDockSplitter::updateName() if ( !initialised ) return; TQString new_name = TQString( child0->name() ) + "," + child1->name(); - parentWidget()->setName( new_name.latin1() ); - parentWidget()->setCaption( child0->caption() + "," + child1->caption() ); - parentWidget()->repaint( false ); + tqparentWidget()->setName( new_name.latin1() ); + tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() ); + tqparentWidget()->tqrepaint( false ); - ((KDockWidget*)parentWidget())->firstName = child0->name(); - ((KDockWidget*)parentWidget())->lastName = child1->name(); - ((KDockWidget*)parentWidget())->splitterOrientation = m_orientation; + ((KDockWidget*)tqparentWidget())->firstName = child0->name(); + ((KDockWidget*)tqparentWidget())->lastName = child1->name(); + ((KDockWidget*)tqparentWidget())->splitterOrientation = m_orientation; - TQWidget* p = parentWidget()->parentWidget(); + TQWidget* p = tqparentWidget()->tqparentWidget(); if ( p && p->inherits("KDockSplitter" ) ) ((KDockSplitter*)p)->updateName(); } @@ -625,7 +625,7 @@ KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name ) :TQPushButton( parent, name ) { moveMouse = false; - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); } KDockButton_Private::~KDockButton_Private() @@ -634,7 +634,7 @@ KDockButton_Private::~KDockButton_Private() void KDockButton_Private::drawButton( TQPainter* p ) { - p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) ); + p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) ); p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() ); if ( moveMouse && !isDown() ){ p->setPen( white ); @@ -642,12 +642,12 @@ void KDockButton_Private::drawButton( TQPainter* p ) p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->lineTo( width() - 1, height() - 1 ); p->lineTo( 0, height() - 1 ); } if ( isOn() || isDown() ){ - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->moveTo( 0, height() - 1 ); p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); @@ -661,13 +661,13 @@ void KDockButton_Private::drawButton( TQPainter* p ) void KDockButton_Private::enterEvent( TQEvent * ) { moveMouse = true; - repaint(); + tqrepaint(); } void KDockButton_Private::leaveEvent( TQEvent * ) { moveMouse = false; - repaint(); + tqrepaint(); } /*************************************************************************/ @@ -701,12 +701,12 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w) { if (w) { TQWidget* embeddedWdg = ((KDockWidget*)w)->getWidget(); - if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) { + if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) { embeddedWdg->setFocus(); } } } -#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name #include "kdockwidget_private.moc" #endif diff --git a/kdeui/kdockwidget_private.h b/kdeui/kdockwidget_private.h index c017f1d14..8e7323a7a 100644 --- a/kdeui/kdockwidget_private.h +++ b/kdeui/kdockwidget_private.h @@ -41,7 +41,7 @@ class KDockContainer; * * @author Max Judin. */ -class KDEUI_EXPORT KDockSplitter : public QWidget +class KDEUI_EXPORT KDockSplitter : public TQWidget { // NOTE: in theory the KDEUI_EXPORT above shouldn't be there, but it's needed for kexi, // which copies the whole definition of the class to be able to access separatorPosInPercent etc. @@ -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= Vertical, int pos= 50); + KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= Qt::Vertical, int pos= 50); virtual ~KDockSplitter(){} /** @@ -245,7 +245,7 @@ private: * * @author Max Judin. */ -class KDEUI_EXPORT KDockButton_Private : public QPushButton +class KDEUI_EXPORT KDockButton_Private : public TQPushButton { Q_OBJECT public: @@ -270,7 +270,7 @@ private: /** * additional KDockWidget stuff (private) */ -class KDockWidgetPrivate : public QObject +class KDockWidgetPrivate : public TQObject { Q_OBJECT public: @@ -311,7 +311,7 @@ public: }; class KDockWidgetHeaderPrivate - : public QObject + : public TQObject { public: KDockWidgetHeaderPrivate( TQObject* parent ) diff --git a/kdeui/kdualcolorbutton.cpp b/kdeui/kdualcolorbutton.cpp index 2b4c2ecfd..a02c2ead4 100644 --- a/kdeui/kdualcolorbutton.cpp +++ b/kdeui/kdualcolorbutton.cpp @@ -46,13 +46,13 @@ 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, SolidPattern); - bg = TQBrush(Qt::white, SolidPattern); + fg = TQBrush(Qt::black, Qt::SolidPattern); + bg = TQBrush(Qt::white, Qt::SolidPattern); curColor = Foreground; dragFlag = false; miniCtlFlag = false; - if(sizeHint().isValid()) - setMinimumSize(sizeHint()); + if(tqsizeHint().isValid()) + setMinimumSize(tqsizeHint()); setAcceptDrops(true); } @@ -67,13 +67,13 @@ 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, SolidPattern); - bg = TQBrush(bgColor, SolidPattern); + fg = TQBrush(fgColor, Qt::SolidPattern); + bg = TQBrush(bgColor, Qt::SolidPattern); curColor = Foreground; dragFlag = false; miniCtlFlag = false; - if(sizeHint().isValid()) - setMinimumSize(sizeHint()); + if(tqsizeHint().isValid()) + setMinimumSize(tqsizeHint()); setAcceptDrops(true); } @@ -104,23 +104,23 @@ TQColor KDualColorButton::currentColor() const return (curColor == Background ? bg.color() : fg.color()); } -TQSize KDualColorButton::sizeHint() const +TQSize KDualColorButton::tqsizeHint() const { return TQSize(34, 34); } void KDualColorButton::setForeground(const TQColor &c) { - fg = TQBrush(c, SolidPattern); - repaint(false); + fg = TQBrush(c, Qt::SolidPattern); + tqrepaint(false); emit fgChanged(fg.color()); } void KDualColorButton::setBackground(const TQColor &c) { - bg = TQBrush(c, SolidPattern); - repaint(false); + bg = TQBrush(c, Qt::SolidPattern); + tqrepaint(false); emit bgChanged(bg.color()); } @@ -128,16 +128,16 @@ void KDualColorButton::setBackground(const TQColor &c) void KDualColorButton::setCurrentColor(const TQColor &c) { if(curColor == Background) - bg = TQBrush(c, SolidPattern); + bg = TQBrush(c, Qt::SolidPattern); else - fg = TQBrush(c, SolidPattern); - repaint(false); + fg = TQBrush(c, Qt::SolidPattern); + tqrepaint(false); } void KDualColorButton::setCurrent(DualColor s) { curColor = s; - repaint(false); + tqrepaint(false); } void KDualColorButton::metrics(TQRect &fgRect, TQRect &bgRect) @@ -152,13 +152,13 @@ void KDualColorButton::paintEvent(TQPaintEvent *) TQPainter p(this); metrics(fgRect, bgRect); - TQBrush defBrush = colorGroup().brush(TQColorGroup::Button); + TQBrush defBrush = tqcolorGroup().brush(TQColorGroup::Button); - qDrawShadeRect(&p, bgRect, colorGroup(), curColor == Background, 2, 0, + qDrawShadeRect(&p, bgRect, tqcolorGroup(), curColor == Background, 2, 0, isEnabled() ? &bg : &defBrush); - qDrawShadeRect(&p, fgRect, colorGroup(), curColor == Foreground, 2, 0, + qDrawShadeRect(&p, fgRect, tqcolorGroup(), curColor == Foreground, 2, 0, isEnabled() ? &fg : &defBrush); - p.setPen(colorGroup().shadow()); + p.setPen(tqcolorGroup().shadow()); p.drawPixmap(fgRect.right()+2, 0, *arrowBitmap); p.drawPixmap(0, fgRect.bottom()+2, *resetPixmap); @@ -181,7 +181,7 @@ void KDualColorButton::dropEvent(TQDropEvent *ev) bg.setColor(c); emit(bgChanged(c)); } - repaint(false); + tqrepaint(false); } } @@ -217,7 +217,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) emit bgChanged(bg.color()); miniCtlFlag = true; } - repaint(false); + tqrepaint(false); } @@ -270,7 +270,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev) } } } - repaint(false); + tqrepaint(false); dragFlag = false; } else diff --git a/kdeui/kdualcolorbutton.h b/kdeui/kdualcolorbutton.h index 7b08ec0e3..a78b6a82a 100644 --- a/kdeui/kdualcolorbutton.h +++ b/kdeui/kdualcolorbutton.h @@ -45,7 +45,7 @@ class TQBitmap; * * @author Daniel M. Duley <mosfet@kde.org> */ -class KDEUI_EXPORT KDualColorButton : public QWidget +class KDEUI_EXPORT KDualColorButton : public TQWidget { Q_OBJECT Q_ENUMS( DualColor ) @@ -94,7 +94,7 @@ public: * Returns the minimum size needed to display the widget and all its * controls. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: /** * Sets the foreground color. diff --git a/kdeui/keditcl.h b/kdeui/keditcl.h index 19f828c2b..289919b3e 100644 --- a/kdeui/keditcl.h +++ b/kdeui/keditcl.h @@ -168,7 +168,7 @@ private: * @author Bernd Johannes Wuebben <wuebben@math.cornell.edu>, Waldo Bastian <bastian@kde.org> **/ -class KDEUI_EXPORT_DEPRECATED KEdit : public QMultiLineEdit +class KDEUI_EXPORT_DEPRECATED KEdit : public TQMultiLineEdit { Q_OBJECT @@ -401,7 +401,7 @@ protected: void contentsDropEvent(TQDropEvent* e); private: - TQTimer* repaintTimer; + TQTimer* tqrepaintTimer; QString killbufferstring; TQWidget *parent; diff --git a/kdeui/keditcl1.cpp b/kdeui/keditcl1.cpp index a77e1c523..e32081fa9 100644 --- a/kdeui/keditcl1.cpp +++ b/kdeui/keditcl1.cpp @@ -104,7 +104,7 @@ KEdit::insertText(TQTextStream *stream) // MS: read everything at once if file <= 1MB, // else read in 5000-line chunks to keep memory usage acceptable. - TQIODevice *dev=stream->device(); + TQIODevice *dev=stream->tqdevice(); if (dev && dev->size()>(1024*1024)) { while(1) { int i; @@ -128,7 +128,7 @@ KEdit::insertText(TQTextStream *stream) setCursorPosition(saveline, savecol); // setAutoUpdate(true); -// repaint(); +// tqrepaint(); setModified(true); setFocus(); @@ -140,7 +140,7 @@ KEdit::insertText(TQTextStream *stream) // TQString str = text(); // for (int i = 0; i < (int) str.length(); i++) - // printf("KEdit: U+%04X\n", str[i].unicode()); + // printf("KEdit: U+%04X\n", str[i].tqunicode()); } @@ -164,7 +164,7 @@ KEdit::cleanWhiteSpace() if (line.isEmpty()) { if (addSpace) - newText += TQString::fromLatin1("\n\n"); + newText += TQString::tqfromLatin1("\n\n"); if (firstLine) { if (firstChar.isSpace()) @@ -200,7 +200,7 @@ KEdit::cleanWhiteSpace() { deselect(); d->autoUpdate = true; - repaint(); + tqrepaint(); return; } if (wordWrap() == NoWrap) @@ -225,7 +225,7 @@ KEdit::cleanWhiteSpace() insert(newText); d->autoUpdate = true; - repaint(); + tqrepaint(); setModified(true); setFocus(); @@ -359,7 +359,7 @@ void KEdit::computePosition() while(find >=0 && find <= coltemp- 1 ){ - find = linetext.find('\t', find+start_of_line, true )-start_of_line; + find = linetext.tqfind('\t', find+start_of_line, true )-start_of_line; if( find >=0 && find <= coltemp - 1 ){ found_one = true; pos = pos + find - mem; @@ -471,7 +471,7 @@ void KEdit::keyPressEvent ( TQKeyEvent *e) else if ( isReadOnly() ) TQMultiLineEdit::keyPressEvent( e ); // If this is an unmodified printable key, send it directly to TQMultiLineEdit. - else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && e->text().unicode()->isPrint() ) + else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && TQString(e->text()).tqunicode()->isPrint() ) TQMultiLineEdit::keyPressEvent( e ); else if ( KStdAccel::paste().contains( key ) ) { paste(); diff --git a/kdeui/keditcl2.cpp b/kdeui/keditcl2.cpp index 36d1b8f3b..c885b6b27 100644 --- a/kdeui/keditcl2.cpp +++ b/kdeui/keditcl2.cpp @@ -162,7 +162,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive, string = textLine(i); - pos = string.find(s_pattern, i == line ? col : 0, case_sensitive); + pos = string.tqfind(s_pattern, i == line ? col : 0, case_sensitive); if( pos != -1){ @@ -191,7 +191,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive, string = textLine(i); int line_length = string.length(); - pos = string.findRev(s_pattern, line == i ? col : line_length , case_sensitive); + pos = string.tqfindRev(s_pattern, line == i ? col : line_length , case_sensitive); if (pos != -1){ @@ -528,10 +528,10 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, string = textLine(line_counter); if (replace_all){ - pos = string.find(s_pattern, replace_all_col, case_sensitive); + pos = string.tqfind(s_pattern, replace_all_col, case_sensitive); } else{ - pos = string.find(s_pattern, line_counter == line ? col : 0, case_sensitive); + pos = string.tqfind(s_pattern, line_counter == line ? col : 0, case_sensitive); } if (pos == -1 ){ @@ -554,7 +554,7 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, replace_all_col = pos + replacement.length(); replace_all_line = line_counter; - pos = stringnew.find(s_pattern, replace_all_col, case_sensitive); + pos = stringnew.tqfind(s_pattern, replace_all_col, case_sensitive); } while( pos != -1); @@ -595,13 +595,13 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, if (replace_all_col < 0) pos = -1; else - pos = string.findRev(s_pattern, replace_all_col , case_sensitive); + pos = string.tqfindRev(s_pattern, replace_all_col , case_sensitive); } else{ if ((line == line_counter) && (col < 0)) pos = -1; else - pos = string.findRev(s_pattern, + pos = string.tqfindRev(s_pattern, line == line_counter ? col : line_length , case_sensitive); } @@ -834,7 +834,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) { setWFlags( WType_TopLevel ); - setButtonBoxOrientation( Vertical ); + setButtonBoxOrientation( Qt::Vertical ); TQFrame *page = makeMainWidget(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); diff --git a/kdeui/keditlistbox.cpp b/kdeui/keditlistbox.cpp index b58244e93..2960252d4 100644 --- a/kdeui/keditlistbox.cpp +++ b/kdeui/keditlistbox.cpp @@ -79,7 +79,7 @@ void KEditListBox::init( bool checkAtEntering, int buttons, d->m_checkAtEntering = checkAtEntering; servNewButton = servRemoveButton = servUpButton = servDownButton = 0L; - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); TQGridLayout * grid = new TQGridLayout(this, 7, 2, @@ -195,7 +195,7 @@ void KEditListBox::typedSomething(const TQString& text) else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - bool enable = (!m_listBox->findItem( text, mode )); + bool enable = (!m_listBox->tqfindItem( text, mode )); servNewButton->setEnabled( enable ); } } @@ -266,7 +266,7 @@ void KEditListBox::addItem() else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - alreadyInList =(m_listBox->findItem(currentTextLE, mode) ); + alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) ); } } diff --git a/kdeui/keditlistbox.h b/kdeui/keditlistbox.h index 1b5e0f086..50271a261 100644 --- a/kdeui/keditlistbox.h +++ b/kdeui/keditlistbox.h @@ -41,12 +41,13 @@ class KEditListBoxPrivate; * \image html keditlistbox.png "KDE Edit List Box Widget" * */ -class KDEUI_EXPORT KEditListBox : public QGroupBox +class KDEUI_EXPORT KEditListBox : public TQGroupBox { Q_OBJECT + TQ_OBJECT - Q_SETS( Button ) - Q_PROPERTY( Button buttons READ buttons WRITE setButtons ) + TQ_SETS( Button ) + TQ_PROPERTY( Button buttons READ buttons WRITE setButtons ) Q_PROPERTY( TQStringList items READ items WRITE setItems ) public: diff --git a/kdeui/kedittoolbar.cpp b/kdeui/kedittoolbar.cpp index 2d01dc469..cb21c2160 100644 --- a/kdeui/kedittoolbar.cpp +++ b/kdeui/kedittoolbar.cpp @@ -85,7 +85,7 @@ public: typedef TQValueList<XmlData> XmlDataList; -class ToolbarItem : public QListViewItem +class ToolbarItem : public TQListViewItem { public: ToolbarItem(KListView *parent, const TQString& tag = TQString::null, const TQString& name = TQString::null, const TQString& statusText = TQString::null) @@ -127,7 +127,7 @@ private: }; #define TOOLBARITEMMIMETYPE "data/x-kde.toolbar.item" -class ToolbarItemDrag : public QStoredDrag +class ToolbarItemDrag : public TQStoredDrag { public: ToolbarItemDrag(ToolbarItem *toolbarItem, @@ -155,7 +155,7 @@ public: if (!e) return false; - TQByteArray data = e->encodedData(TOOLBARITEMMIMETYPE); + TQByteArray data = e->tqencodedData(TOOLBARITEMMIMETYPE); if ( data.isEmpty() ) return false; @@ -378,7 +378,7 @@ const char *KEditToolbar::s_defaultToolbar = 0L; KEditToolbar::KEditToolbar(KActionCollection *collection, const TQString& file, bool global, TQWidget* parent, const char* name) : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name), - m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), collection, file, global, this)) + m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), collection, file, global, this)) { init(); d->m_global = global; @@ -400,7 +400,7 @@ KEditToolbar::KEditToolbar(const TQString& defaultToolbar, KActionCollection *co KEditToolbar::KEditToolbar(KXMLGUIFactory* factory, TQWidget* parent, const char* name) : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name), - m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), factory, this)) + m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), factory, this)) { init(); d->m_factory = factory; @@ -427,7 +427,7 @@ void KEditToolbar::init() connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); enableButtonApply(false); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); s_defaultToolbar = 0L; } @@ -467,7 +467,7 @@ void KEditToolbar::slotDefault() if (TQDir::isRelativePath(file)) { const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance(); - file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file); + file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' ) + file); } else { @@ -485,10 +485,10 @@ void KEditToolbar::slotDefault() } else { - int slash = d->m_file.findRev('/')+1; + int slash = d->m_file.tqfindRev('/')+1; if (slash) d->m_file = d->m_file.mid(slash); - TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); + TQString xml_file = locateLocal("data", TQString::tqfromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); if ( TQFile::exists( xml_file ) ) if ( !TQFile::remove( xml_file ) ) @@ -547,7 +547,7 @@ KEditToolbarWidget::KEditToolbarWidget(KActionCollection *collection, // now load in our toolbar combo box loadToolbarCombo(); adjustSize(); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar, @@ -561,7 +561,7 @@ KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar, // now load in our toolbar combo box loadToolbarCombo(defaultToolbar); adjustSize(); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory, @@ -573,7 +573,7 @@ KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory, // now load in our toolbar combo box loadToolbarCombo(); adjustSize(); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar, @@ -586,7 +586,7 @@ KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar, // now load in our toolbar combo box loadToolbarCombo(defaultToolbar); adjustSize(); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } KEditToolbarWidget::~KEditToolbarWidget() @@ -816,7 +816,7 @@ void KEditToolbarWidget::setupLayout() // "change icon" button d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this ); - TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog")); + TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog")); d->m_hasKDialog = !kdialogExe.isEmpty(); d->m_changeIcon->setEnabled( d->m_hasKDialog ); @@ -853,7 +853,7 @@ void KEditToolbarWidget::setupLayout() connect(m_downAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton())); d->m_helpArea = new TQLabel(this); - d->m_helpArea->setAlignment( Qt::WordBreak ); + d->m_helpArea->tqsetAlignment( TQt::WordBreak ); // now start with our layouts TQVBoxLayout *top_layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -891,7 +891,7 @@ void KEditToolbarWidget::setupLayout() changeIcon_layout->addStretch( 1 ); list_layout->addLayout(inactive_layout); - list_layout->addLayout(button_layout); + list_layout->addLayout(TQT_TQLAYOUT(button_layout)); list_layout->addLayout(active_layout); top_layout->addLayout(name_layout); @@ -975,7 +975,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) if (it.tagName() == tagSeparator) { ToolbarItem *act = new ToolbarItem(m_activeList, tagSeparator, sep_name.arg(sep_num++), TQString::null); - bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::fromLatin1("true") ); + bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::tqfromLatin1("true") ); if(isLineSep) act->setText(1, LINESEPARATORSTRING); else @@ -1034,7 +1034,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) KAction *action = actionCollection->action( i ); // skip our active ones - if (active_list.contains(action->name())) + if (active_list.tqcontains(action->name())) continue; ToolbarItem *act = new ToolbarItem(m_inactiveList, tagActionList, action->name(), action->toolTip()); @@ -1361,7 +1361,7 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem) continue; TQDomElement toolbar = (*xit).m_document.documentElement().toElement(); - toolbar.replaceChild(elem, (*it)); + toolbar.tqreplaceChild(elem, (*it)); return; } @@ -1382,10 +1382,10 @@ void KEditToolbarWidget::slotChangeIcon() return; d->m_kdialogProcess = new KProcIO; - TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog")); + TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog")); (*d->m_kdialogProcess) << kdialogExe; (*d->m_kdialogProcess) << "--embed"; - (*d->m_kdialogProcess) << TQString::number( (ulong)topLevelWidget()->winId() ); + (*d->m_kdialogProcess) << TQString::number( (ulong)tqtopLevelWidget()->winId() ); (*d->m_kdialogProcess) << "--geticon"; (*d->m_kdialogProcess) << "Toolbar"; (*d->m_kdialogProcess) << "Actions"; diff --git a/kdeui/kfontcombo.cpp b/kdeui/kfontcombo.cpp index c664d226e..173b08cff 100644 --- a/kdeui/kfontcombo.cpp +++ b/kdeui/kfontcombo.cpp @@ -65,7 +65,7 @@ struct KFontComboPrivate TQString defaultFamily; }; -class KFontListItem : public QListBoxItem +class KFontListItem : public TQListBoxItem { public: KFontListItem(const TQString &fontName, KFontCombo *combo); @@ -132,7 +132,7 @@ void KFontListItem::paint(TQPainter *p) if (m_canPaintName) p->setFont(*m_font); else - t = TQString::fromLatin1("(%1)").arg(m_fontName); + t = TQString::tqfromLatin1("(%1)").arg(m_fontName); } TQFontMetrics fm(p->fontMetrics()); p->drawText(3, (m_combo->d->lineSpacing + fm.ascent() + fm.leading() / 2) / 2, t); @@ -212,7 +212,7 @@ void KFontCombo::setCurrentFont(const TQString &family) return; } } - int x = lowerName.find(" ["); + int x = lowerName.tqfind(" ["); if (x>-1) { lowerName = lowerName.left(x); @@ -251,7 +251,7 @@ void KFontCombo::setCurrentFont(const TQString &family) FcConfigSubstitute (config, pattern, FcMatchPattern); pattern = FcFontMatch(NULL, pattern, NULL); realFamily = (char*)FcNameUnparse(pattern); - realFamily.remove(realFamily.find(regExp), realFamily.length()); + realFamily.remove(realFamily.tqfind(regExp), realFamily.length()); if ( !realFamily.isEmpty() && realFamily != family ) setCurrentFont( realFamily ); diff --git a/kdeui/kfontdialog.cpp b/kdeui/kfontdialog.cpp index 4044c7b68..c64892d8a 100644 --- a/kdeui/kfontdialog.cpp +++ b/kdeui/kfontdialog.cpp @@ -66,7 +66,7 @@ static int minimumListWidth( const TQListBox *list ) } if( w == 0 ) { w = 40; } w += list->frameWidth() * 2; - w += list->verticalScrollBar()->sizeHint().width(); + w += list->verticalScrollBar()->tqsizeHint().width(); return w; } @@ -284,7 +284,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), TQT_SLOT(size_chosen_slot(const TQString&)) ); - sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. + sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(10)), true); // default to 10pt. row ++; @@ -295,7 +295,7 @@ KFontChooser::KFontChooser(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->tqsetAlignment(Qt::AlignCenter); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); TQString sampleEditWhatsThisText = i18n("This sample text illustrates the current settings. " @@ -331,8 +331,8 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, setSizeIsRelative( *sizeIsRelativeState ); KConfig *config = KGlobal::config(); - KConfigGroupSaver saver(config, TQString::fromLatin1("General")); - showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); + KConfigGroupSaver saver(config, TQString::tqfromLatin1("General")); + showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false)); } KFontChooser::~KFontChooser() @@ -403,9 +403,9 @@ TQButton::ToggleState KFontChooser::sizeIsRelative() const : TQButton::NoChange; } -TQSize KFontChooser::sizeHint( void ) const +TQSize KFontChooser::tqsizeHint( void ) const { - return minimumSizeHint(); + return tqminimumSizeHint(); } @@ -464,18 +464,18 @@ void KFontChooser::toggled_checkbox() void KFontChooser::family_chosen_slot(const TQString& family) { TQFontDatabase dbase; - TQStringList styles = TQStringList(dbase.styles(family)); + TQStringList styles = TQStringList(dbase.tqstyles(family)); styleListBox->clear(); currentStyles.clear(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString style = *it; - int pos = style.find("Plain"); + int pos = style.tqfind("Plain"); if(pos >=0) style = style.replace(pos,5,i18n("Regular")); - pos = style.find("Normal"); + pos = style.tqfind("Normal"); if(pos >=0) style = style.replace(pos,6,i18n("Regular")); - pos = style.find("Oblique"); + pos = style.tqfind("Oblique"); if(pos >=0) style = style.replace(pos,7,i18n("Italic")); - if(!styleListBox->findItem(style)) { + if(!styleListBox->tqfindItem(style)) { styleListBox->insertItem(i18n(style.utf8())); currentStyles.insert(i18n(style.utf8()), *it); } @@ -486,9 +486,9 @@ void KFontChooser::family_chosen_slot(const TQString& family) } styleListBox->blockSignals(true); - TQListBoxItem *item = styleListBox->findItem(selectedStyle); + TQListBoxItem *item = styleListBox->tqfindItem(selectedStyle); if (item) - styleListBox->setSelected(styleListBox->findItem(selectedStyle), true); + styleListBox->setSelected(styleListBox->tqfindItem(selectedStyle), true); else styleListBox->setSelected(0, true); styleListBox->blockSignals(false); @@ -526,7 +526,7 @@ void KFontChooser::style_chosen_slot(const TQString& style) fillSizeList(); } else { // is bitmap font. //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO - TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); + TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); if(sizes.count() > 0) { TQValueList<int>::iterator it; diff=1000; @@ -538,7 +538,7 @@ void KFontChooser::style_chosen_slot(const TQString& style) fillSizeList(); } sizeListBox->blockSignals(true); - sizeListBox->setSelected(sizeListBox->findItem(TQString::number(selectedSize)), true); + sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(selectedSize)), true); sizeListBox->blockSignals(false); sizeListBox->ensureCurrentVisible(); @@ -565,7 +565,7 @@ void KFontChooser::setupDisplay() { // Calling familyListBox->setCurrentItem() causes the value of selFont // to change, so we save the family, style and size beforehand. - TQString family = selFont.family().lower(); + TQString family = TQString(selFont.family()).lower(); int style = (selFont.bold() ? 2 : 0) + (selFont.italic() ? 1 : 0); int size = selFont.pointSize(); if (size == -1) @@ -587,7 +587,7 @@ void KFontChooser::setupDisplay() { if (family.contains('[')) { - family = family.left(family.find('[')).stripWhiteSpace(); + family = family.left(family.tqfind('[')).stripWhiteSpace(); for (i = 0; i < numEntries; i++) { if (family == familyListBox->text(i).lower()) { familyListBox->setCurrentItem(i); @@ -641,7 +641,7 @@ void KFontChooser::setupDisplay() void KFontChooser::getFontList( TQStringList &list, uint fontListCriteria) { TQFontDatabase dbase; - TQStringList lstSys(dbase.families()); + TQStringList lstSys(dbase.tqfamilies()); // if we have criteria; then check fonts before adding if (fontListCriteria) @@ -681,13 +681,13 @@ void KFontChooser::addFont( TQStringList &list, const char *xfont ) if ( !ptr ) return; - TQString font = TQString::fromLatin1(ptr + 1); + TQString font = TQString::tqfromLatin1(ptr + 1); int pos; - if ( ( pos = font.find( '-' ) ) > 0 ) { + if ( ( pos = font.tqfind( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 ) + if ( font.tqfind( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); @@ -711,11 +711,11 @@ void KFontChooser::showXLFDArea(bool show) { if( show ) { - xlfdEdit->parentWidget()->show(); + xlfdEdit->tqparentWidget()->show(); } else { - xlfdEdit->parentWidget()->hide(); + xlfdEdit->tqparentWidget()->hide(); } } diff --git a/kdeui/kfontdialog.h b/kdeui/kfontdialog.h index 266090c37..bc5b817eb 100644 --- a/kdeui/kfontdialog.h +++ b/kdeui/kfontdialog.h @@ -51,7 +51,7 @@ class KIntNumInput; * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org> * @version $Id$ */ -class KDEUI_EXPORT KFontChooser : public QWidget +class KDEUI_EXPORT KFontChooser : public TQWidget { Q_OBJECT Q_PROPERTY( TQFont font READ font WRITE setFont ) @@ -252,7 +252,7 @@ public: /** * Reimplemented for internal reasons. */ - virtual TQSize sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; signals: /** diff --git a/kdeui/kfontrequester.cpp b/kdeui/kfontrequester.cpp index 293f9d546..748a0654d 100644 --- a/kdeui/kfontrequester.cpp +++ b/kdeui/kfontrequester.cpp @@ -72,7 +72,7 @@ void KFontRequester::setTitle( const TQString &title ) void KFontRequester::buttonClicked() { - int result = KFontDialog::getFont( m_selFont, m_onlyFixed, parentWidget() ); + int result = KFontDialog::getFont( m_selFont, m_onlyFixed, tqparentWidget() ); if ( result == KDialog::Accepted ) { diff --git a/kdeui/kfontrequester.h b/kdeui/kfontrequester.h index bb554d2ba..859c61499 100644 --- a/kdeui/kfontrequester.h +++ b/kdeui/kfontrequester.h @@ -41,7 +41,7 @@ class TQPushButton; * @author Nadeem Hasan <nhasan@kde.org> * */ -class KDEUI_EXPORT KFontRequester : public QWidget +class KDEUI_EXPORT KFontRequester : public TQWidget { Q_OBJECT diff --git a/kdeui/kguiitem.cpp b/kdeui/kguiitem.cpp index 7b73c7401..abcc3868a 100644 --- a/kdeui/kguiitem.cpp +++ b/kdeui/kguiitem.cpp @@ -135,7 +135,7 @@ TQString KGuiItem::plainText() const int resultLength = 0; stripped.setLength(len); - const TQChar* data = d->m_text.unicode(); + const TQChar* data = d->m_text.tqunicode(); for ( int pos = 0; pos < len; ++pos ) { if ( data[ pos ] != '&' ) diff --git a/kdeui/khelpmenu.cpp b/kdeui/khelpmenu.cpp index c6557f044..093d46714 100644 --- a/kdeui/khelpmenu.cpp +++ b/kdeui/khelpmenu.cpp @@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu() // compatible. // const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData(); - TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(qApp->name()); + TQString appName = (aboutData)? aboutData->programName() : TQString::tqfromLatin1(tqApp->name()); mMenu = new KPopupMenu(); connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed())); @@ -127,7 +127,7 @@ KPopupMenu* KHelpMenu::menu() if (kapp->authorizeKAction("help_contents")) { mMenu->insertItem( BarIcon( "contents", KIcon::SizeSmall), - i18n( "%1 &Handbook" ).arg( appName) ,menuHelpContents ); + TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents ); mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) ); mMenu->setAccel( KStdAccel::shortcut(KStdAccel::Help), menuHelpContents ); need_separator = true; @@ -167,7 +167,7 @@ KPopupMenu* KHelpMenu::menu() if (kapp->authorizeKAction("help_about_app")) { mMenu->insertItem( kapp->miniIcon(), - i18n( "&About %1" ).arg(appName), menuAboutApp ); + TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp ); mMenu->connectItem( menuAboutApp, this, TQT_SLOT( aboutApplication() ) ); } @@ -306,7 +306,7 @@ void KHelpMenu::contextHelpActivated() TQWhatsThis::enterWhatsThisMode(); TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true ); while ( w && !w->isTopLevel() && !w->inherits("QXEmbed") ) - w = w->parentWidget(); + w = w->tqparentWidget(); #ifdef Q_WS_X11 if ( w && w->inherits("QXEmbed") ) (( QXEmbed*) w )->enterWhatsThisMode(); diff --git a/kdeui/khelpmenu.h b/kdeui/khelpmenu.h index fdece6510..331ef0875 100644 --- a/kdeui/khelpmenu.h +++ b/kdeui/khelpmenu.h @@ -128,7 +128,7 @@ class KHelpMenuPrivate; * @author Espen Sand (espen@kde.org) */ -class KDEUI_EXPORT KHelpMenu : public QObject +class KDEUI_EXPORT KHelpMenu : public TQObject { Q_OBJECT diff --git a/kdeui/kiconview.cpp b/kdeui/kiconview.cpp index 13b6183ad..357d6b2c4 100644 --- a/kdeui/kiconview.cpp +++ b/kdeui/kiconview.cpp @@ -217,7 +217,7 @@ void KIconView::slotAutoSelect() blockSignals( block ); viewport()->setUpdatesEnabled( update ); - repaintContents( redraw, false ); + tqrepaintContents( redraw, false ); emit selectionChanged(); @@ -258,7 +258,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos ) void KIconView::updateDragHoldItem( TQDropEvent *e ) { - TQIconViewItem *item = findItem( e->pos() ); + TQIconViewItem *item = tqfindItem( e->pos() ); if ( d->dragHoldItem != item) { @@ -307,10 +307,10 @@ void KIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { TQIconView::contentsMouseDoubleClickEvent( e ); - TQIconViewItem* item = findItem( e->pos() ); + TQIconViewItem* item = tqfindItem( e->pos() ); if( item ) { - if( (e->button() == LeftButton) && !m_bUseSingle ) + if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) emitExecute( item, e->globalPos() ); emit doubleClicked( item, e->globalPos() ); @@ -324,7 +324,7 @@ void KIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const TQP if( d->doubleClickIgnoreTimer.isActive() ) return; // Ignore double click - if( (btn == LeftButton) && item ) + if( (btn == Qt::LeftButton) && item ) emitExecute( item, pos ); } @@ -417,7 +417,7 @@ TQFontMetrics *KIconView::itemFontMetrics() const TQPixmap KIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const { TQPixmap m; - if ( d->maskCache.find( TQString::number( pix->serialNumber() ), m ) ) + if ( d->maskCache.tqfind( TQString::number( pix->serialNumber() ), m ) ) return m; m = KPixmapEffect::selectedPixmap( KPixmap(*pix), col ); d->maskCache.insert( TQString::number( pix->serialNumber() ), m ); @@ -485,7 +485,7 @@ void KIconViewItem::calcRect( const TQString& text_ ) KIconView *view = static_cast<KIconView *>(iconView()); TQRect itemIconRect = pixmapRect(); TQRect itemTextRect = textRect(); - TQRect itemRect = rect(); + TQRect tqitemRect = rect(); int pw = 0; int ph = 0; @@ -507,9 +507,9 @@ void KIconViewItem::calcRect( const TQString& text_ ) itemIconRect.setWidth( pw ); #if 1 // FIXME // There is a bug in Qt which prevents the item from being placed - // properly when the pixmapRect is not at the top of the itemRect, so we + // properly when the pixmapRect is not at the top of the tqitemRect, so we // have to increase the height of the pixmapRect and leave it at the top - // of the itemRect... + // of the tqitemRect... if ( d && !d->m_pixmapSize.isNull() ) itemIconRect.setHeight( d->m_pixmapSize.height() + 2 ); else @@ -574,8 +574,8 @@ void KIconViewItem::calcRect( const TQString& text_ ) h = itemTextRect.height() + itemIconRect.height() + 1; } - itemRect.setWidth( w ); - itemRect.setHeight( h ); + tqitemRect.setWidth( w ); + tqitemRect.setHeight( h ); int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width() int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height() itemTextRect = TQRect( ( width - itemTextRect.width() ) / 2, height - itemTextRect.height(), @@ -597,8 +597,8 @@ void KIconViewItem::calcRect( const TQString& text_ ) h = QMAX( itemTextRect.height(), itemIconRect.height() ); w = itemTextRect.width() + itemIconRect.width() + 1; - itemRect.setWidth( w ); - itemRect.setHeight( h ); + tqitemRect.setWidth( w ); + tqitemRect.setHeight( h ); int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width() int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height() @@ -621,8 +621,8 @@ void KIconViewItem::calcRect( const TQString& text_ ) setPixmapRect( itemIconRect ); if ( itemTextRect != textRect() ) setTextRect( itemTextRect ); - if ( itemRect != rect() ) - setItemRect( itemRect ); + if ( tqitemRect != rect() ) + setItemRect( tqitemRect ); // Done by setPixmapRect, setTextRect and setItemRect ! [and useless if no rect changed] //view->updateItemContainer( this ); @@ -680,7 +680,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg ) #if 1 // FIXME // Move the pixmap manually because the pixmapRect is at the - // top of the itemRect + // top of the tqitemRect // (won't be needed anymore in future versions of qt) if ( d && !d->m_pixmapSize.isNull() ) { @@ -723,7 +723,7 @@ void KIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) } p->setPen( TQPen( cg.highlightedText() ) ); } else { - if ( iconView()->itemTextBackground() != NoBrush ) + if ( iconView()->itemTextBackground() != Qt::NoBrush ) p->fillRect( textRect( false ), iconView()->itemTextBackground() ); p->setPen( cg.text() ); } diff --git a/kdeui/kiconview.h b/kdeui/kiconview.h index 0b0c49515..5d2735d10 100644 --- a/kdeui/kiconview.h +++ b/kdeui/kiconview.h @@ -39,7 +39,7 @@ * TQIconView::selectionChanged() signal. * **/ -class KDEUI_EXPORT KIconView : public QIconView +class KDEUI_EXPORT KIconView : public TQIconView { friend class KIconViewItem; Q_OBJECT @@ -223,7 +223,7 @@ class KWordWrap; * * @author David Faure <david@mandrakesoft.com> */ -class KDEUI_EXPORT KIconViewItem : public QIconViewItem +class KDEUI_EXPORT KIconViewItem : public TQIconViewItem { public: // Need to redefine all the constructors - I want Java ! diff --git a/kdeui/kiconviewsearchline.cpp b/kdeui/kiconviewsearchline.cpp index 701e15428..1ee76c9df 100644 --- a/kdeui/kiconviewsearchline.cpp +++ b/kdeui/kiconviewsearchline.cpp @@ -224,7 +224,7 @@ bool KIconViewSearchLine::itemMatches( const TQIconViewItem *item, return false; TQString itemtext = item->text(); - return ( itemtext.find( s, 0, caseSensitive() ) >= 0 ); + return ( itemtext.tqfind( s, 0, caseSensitive() ) >= 0 ); } void KIconViewSearchLine::init( TQIconView *iconView ) diff --git a/kdeui/kinputdialog.cpp b/kdeui/kinputdialog.cpp index 37f94e89e..06ceeecd4 100644 --- a/kdeui/kinputdialog.cpp +++ b/kdeui/kinputdialog.cpp @@ -17,6 +17,10 @@ Boston, MA 02110-1301, USA. */ +#ifdef USE_QT4 +#undef Status +#endif // USE_QT4 + #include <tqlayout.h> #include <tqlabel.h> #include <tqvalidator.h> @@ -225,7 +229,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, for ( TQStringList::ConstIterator it=select.begin(); it!=select.end(); ++it ) { - item = d->m_listBox->findItem( *it, CaseSensitive|ExactMatch ); + item = d->m_listBox->tqfindItem( *it, CaseSensitive|ExactMatch ); if ( item ) d->m_listBox->setSelected( item, true ); } @@ -238,7 +242,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, TQT_SLOT( slotOk() ) ); TQString text = select.first(); - item = d->m_listBox->findItem( text, CaseSensitive|ExactMatch ); + item = d->m_listBox->tqfindItem( text, CaseSensitive|ExactMatch ); if ( item ) d->m_listBox->setSelected( item, true ); } diff --git a/kdeui/kinputdialog.h b/kdeui/kinputdialog.h index c675a280c..76a5db2dd 100644 --- a/kdeui/kinputdialog.h +++ b/kdeui/kinputdialog.h @@ -20,7 +20,7 @@ #ifndef KINPUTDIALOG_H #define KINPUTDIALOG_H -#include <tqt.h> +// #include <tqt.h> #include <kdialogbase.h> diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp index 4fb398395..cb7da4a4f 100644 --- a/kdeui/kjanuswidget.cpp +++ b/kdeui/kjanuswidget.cpp @@ -45,7 +45,7 @@ #include "kpushbutton.h" #include "kguiitem.h" -class KJanusWidget::IconListItem : public QListBoxItem +class KJanusWidget::IconListItem : public TQListBoxItem { public: IconListItem( TQListBox *listbox, const TQPixmap &pixmap, @@ -254,7 +254,7 @@ TQFrame *KJanusWidget::addPage( const TQStringList &items, const TQString &heade void KJanusWidget::pageGone( TQObject *obj ) { - removePage( static_cast<TQWidget*>( obj ) ); + removePage( TQT_TQWIDGET( obj ) ); } void KJanusWidget::slotReopen( TQListViewItem * item ) @@ -413,7 +413,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap curPath << name; TQString key = curPath.join("_/_"); - if (mFolderIconMap.contains(key)) { + if (mFolderIconMap.tqcontains(key)) { TQPixmap p = mFolderIconMap[key]; newChild->setPixmap(0,p); } @@ -459,8 +459,8 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, TQString itemName = items.last(); IconListItem *item = new IconListItem( mIconList, pixmap, itemName ); mIconListToPageStack.insert(item, page); - mIconList->invalidateHeight(); - mIconList->invalidateWidth(); + mIconList->tqinvalidateHeight(); + mIconList->tqinvalidateWidth(); if (mIconList->isVisible()) mIconList->updateWidth(); @@ -515,10 +515,10 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) // // Hide old children // - TQObjectList *l = (TQObjectList*)mSwallowPage->children(); // silence please - for( uint i=0; i < l->count(); i++ ) + TQObjectList l = mSwallowPage->childrenListObject(); // silence please + for( uint i=0; i < l.count(); i++ ) { - TQObject *o = l->at(i); + TQObject *o = l.at(i); if( o->isWidgetType() ) { ((TQWidget*)o)->hide(); @@ -542,7 +542,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) } gbox->addWidget(widget, 0, 0 ); gbox->activate(); - mSwallowPage->setMinimumSize( widget->minimumSize() ); + mSwallowPage->setMinimumSize( widget->tqminimumSize() ); } return true; @@ -686,7 +686,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const // if( widget->isA("TQFrame") ) { - return d->mPageToInt[widget->parentWidget()]; + return d->mPageToInt[widget->tqparentWidget()]; } else { @@ -714,8 +714,8 @@ void KJanusWidget::slotFontChanged() TQFont listFont( mIconList->font() ); listFont.setBold( true ); mIconList->setFont( listFont ); - mIconList->invalidateHeight(); - mIconList->invalidateWidth(); + mIconList->tqinvalidateHeight(); + mIconList->tqinvalidateWidth(); } } @@ -758,31 +758,31 @@ void KJanusWidget::setFocus() } -TQSize KJanusWidget::minimumSizeHint() const +TQSize KJanusWidget::tqminimumSizeHint() const { if( mFace == TreeList || mFace == IconList ) { TQSize s1( KDialog::spacingHint(), KDialog::spacingHint()*2 ); TQSize s2(0,0); TQSize s3(0,0); - TQSize s4( mPageStack->sizeHint() ); + TQSize s4( mPageStack->tqsizeHint() ); if( mFace == TreeList ) { - s1.rwidth() += style().pixelMetric( TQStyle::PM_SplitterWidth ); - s2 = mTreeList->minimumSize(); + s1.rwidth() += tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth ); + s2 = mTreeList->tqminimumSize(); } else { mIconList->updateMinimumHeight(); mIconList->updateWidth(); - s2 = mIconList->minimumSize(); + s2 = mIconList->tqminimumSize(); } if( mTitleLabel->isVisible() ) { - s3 += mTitleLabel->sizeHint(); - s3.rheight() += mTitleSep->minimumSize().height(); + s3 += mTitleLabel->tqsizeHint(); + s3.rheight() += mTitleSep->tqminimumSize().height(); } // @@ -795,15 +795,15 @@ TQSize KJanusWidget::minimumSizeHint() const } else if( mFace == Tabbed ) { - return mTabControl->sizeHint(); + return mTabControl->tqsizeHint(); } else if( mFace == Swallow ) { - return mSwallowPage->minimumSize(); + return mSwallowPage->tqminimumSize(); } else if( mFace == Plain ) { - return mPlainPage->sizeHint(); + return mPlainPage->tqsizeHint(); } else { @@ -813,9 +813,9 @@ TQSize KJanusWidget::minimumSizeHint() const } -TQSize KJanusWidget::sizeHint() const +TQSize KJanusWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } @@ -914,7 +914,7 @@ bool KJanusWidget::eventFilter( TQObject *o, TQEvent *e ) if( item ) { int lw = item->width( mIconList ); - int sw = mIconList->verticalScrollBar()->sizeHint().width(); + int sw = mIconList->verticalScrollBar()->tqsizeHint().width(); mIconList->setFixedWidth( lw+sw+mIconList->frameWidth()*2 ); } } @@ -978,7 +978,7 @@ void KJanusWidget::IconListBox::updateWidth() if( verticalScrollBar()->isVisible() ) { - maxWidth += verticalScrollBar()->sizeHint().width(); + maxWidth += verticalScrollBar()->tqsizeHint().width(); } setFixedWidth( maxWidth + frameWidth()*2 ); @@ -987,13 +987,13 @@ void KJanusWidget::IconListBox::updateWidth() } -void KJanusWidget::IconListBox::invalidateHeight() +void KJanusWidget::IconListBox::tqinvalidateHeight() { mHeightValid = false; } -void KJanusWidget::IconListBox::invalidateWidth() +void KJanusWidget::IconListBox::tqinvalidateWidth() { mWidthValid = false; } @@ -1074,13 +1074,13 @@ void KJanusWidget::IconListItem::highlight( bool erase ) // For now, always disable highlighting erase = true; - TQRect r = listBox()->itemRect( this ); + TQRect r = listBox()->tqitemRect( this ); r.addCoords( 1, 1, -1, -1 ); TQPainter p( listBox()->viewport() ); p.setClipRegion( r ); - const TQColorGroup &cg = listBox()->colorGroup(); + const TQColorGroup &cg = listBox()->tqcolorGroup(); if ( erase ) { p.setPen( cg.base() ); @@ -1129,7 +1129,7 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap() void KJanusWidget::IconListItem::paint( TQPainter *painter ) { - TQRect itemPaintRegion( listBox()->itemRect( this ) ); + TQRect itemPaintRegion( listBox()->tqitemRect( this ) ); TQRect r( 1, 1, itemPaintRegion.width() - 2, itemPaintRegion.height() - 2); if ( isSelected() ) @@ -1137,7 +1137,7 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter ) painter->eraseRect( r ); painter->save(); - painter->setPen( listBox()->colorGroup().highlight().dark( 160 ) ); + painter->setPen( listBox()->tqcolorGroup().highlight().dark( 160 ) ); painter->drawRect( r ); painter->restore(); } @@ -1191,7 +1191,7 @@ void KJanusWidget::virtual_hook( int, void* ) // delete the node. void KJanusWidget::removePage( TQWidget *page ) { - if (!d || !d->mPageToInt.contains(page)) + if (!d || !d->mPageToInt.tqcontains(page)) return; int index = d->mPageToInt[page]; @@ -1237,7 +1237,7 @@ void KJanusWidget::removePage( TQWidget *page ) TQString KJanusWidget::pageTitle(int index) const { - if (!d || !d->mIntToTitle.contains(index)) + if (!d || !d->mIntToTitle.tqcontains(index)) return TQString::null; else return d->mIntToTitle[index]; @@ -1246,7 +1246,7 @@ TQString KJanusWidget::pageTitle(int index) const TQWidget *KJanusWidget::pageWidget(int index) const { - if (!d || !d->mIntToPage.contains(index)) + if (!d || !d->mIntToPage.tqcontains(index)) return 0; else return d->mIntToPage[index]; diff --git a/kdeui/kjanuswidget.h b/kdeui/kjanuswidget.h index cc22dc334..5f521612c 100644 --- a/kdeui/kjanuswidget.h +++ b/kdeui/kjanuswidget.h @@ -50,12 +50,12 @@ class KGuiItem; * This class provides KJanusWidget::TreeList, KJanusWidget::IconList, * KJanusWidget::Tabbed, KJanusWidget::Plain and KJanusWidget::Swallow layouts. * - * For all modes it is important that you specify the TQWidget::minimumSize() + * For all modes it is important that you specify the TQWidget::tqminimumSize() * on the page, plain widget or the swallowed widget. If you use a QLayout * on the page, plain widget or the swallowed widget this will be taken care * of automatically. The size is used when the KJanusWidget determines its * own minimum size. You get the minimum size by using the - * minimumSizeHint() or sizeHint() methods. + * tqminimumSizeHint() or tqsizeHint() methods. * * Pages that have been added in TreeList, IconList or Tabbed mode can be * removed by simply deleting the page. However, it would be preferable to use @@ -64,7 +64,7 @@ class KGuiItem; * * @author Espen Sand (espen@kde.org) */ -class KDEUI_EXPORT KJanusWidget : public QWidget +class KDEUI_EXPORT KJanusWidget : public TQWidget { Q_OBJECT @@ -77,8 +77,8 @@ class KDEUI_EXPORT KJanusWidget : public QWidget IconListBox( TQWidget *parent=0, const char *name=0, WFlags f=0 ); void updateMinimumHeight(); void updateWidth(); - void invalidateHeight(); - void invalidateWidth(); + void tqinvalidateHeight(); + void tqinvalidateWidth(); void setShowAll( bool showAll ); protected: @@ -186,7 +186,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * * @return The minimum size. */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * Returns the recommended size for the widget in order to be displayed @@ -194,7 +194,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * * @return The recommended size. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Returns the empty widget that is available in Plain mode. diff --git a/kdeui/kkeybutton.cpp b/kdeui/kkeybutton.cpp index 581d7bf40..27ae04c23 100644 --- a/kdeui/kkeybutton.cpp +++ b/kdeui/kkeybutton.cpp @@ -69,7 +69,7 @@ KKeyButton::KKeyButton(TQWidget *parent, const char *name) : TQPushButton( parent, name ) { d = new KKeyButtonPrivate; - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); m_bEditing = false; connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureShortcut()) ); setShortcut( KShortcut(), true ); @@ -85,7 +85,7 @@ void KKeyButton::setShortcut( const KShortcut& cut, bool bQtShortcut ) d->bQtShortcut = bQtShortcut; m_cut = cut; TQString keyStr = m_cut.toString(); - keyStr.replace('&', TQString::fromLatin1("&&")); + keyStr.replace('&', TQString::tqfromLatin1("&&")); setText( keyStr.isEmpty() ? i18n("None") : keyStr ); } @@ -98,7 +98,7 @@ void KKeyButton::setShortcut( const KShortcut& cut ) void KKeyButton::setText( const TQString& text ) { TQPushButton::setText( text ); - setFixedSize( sizeHint().width()+12, sizeHint().height()+8 ); + setFixedSize( tqsizeHint().width()+12, tqsizeHint().height()+8 ); } void KKeyButton::captureShortcut() @@ -106,7 +106,7 @@ void KKeyButton::captureShortcut() KShortcut cut; m_bEditing = true; - repaint(); + tqrepaint(); { KShortcutDialog dlg( m_cut, d->bQtShortcut, this ); @@ -117,7 +117,7 @@ void KKeyButton::captureShortcut() emit capturedShortcut( cut ); m_bEditing = false; - repaint(); + tqrepaint(); } void KKeyButton::drawButton( TQPainter *painter ) @@ -146,11 +146,11 @@ void KKeyButton::drawButton( TQPainter *painter ) painter->setClipping( false ); if( width() > 12 && height() > 8 ) qDrawShadePanel( painter, 6, 4, width() - 12, height() - 8, - colorGroup(), true, 1, 0L ); + tqcolorGroup(), true, 1, 0L ); if ( m_bEditing ) { - painter->setPen( colorGroup().base() ); - painter->setBrush( colorGroup().base() ); + painter->setPen( tqcolorGroup().base() ); + painter->setBrush( tqcolorGroup().base() ); } else { @@ -162,7 +162,7 @@ void KKeyButton::drawButton( TQPainter *painter ) drawButtonLabel( painter ); - painter->setPen( colorGroup().text() ); + painter->setPen( tqcolorGroup().text() ); painter->setBrush( NoBrush ); if( hasFocus() || m_bEditing ) { diff --git a/kdeui/kkeybutton.h b/kdeui/kkeybutton.h index 9e9b6265c..97895f8fe 100644 --- a/kdeui/kkeybutton.h +++ b/kdeui/kkeybutton.h @@ -37,7 +37,7 @@ * @author Mark Donohoe <donohoe@kde.org> * @internal */ -class KDEUI_EXPORT KKeyButton: public QPushButton +class KDEUI_EXPORT KKeyButton: public TQPushButton { Q_OBJECT diff --git a/kdeui/kkeydialog.cpp b/kdeui/kkeydialog.cpp index 13835b650..775f00661 100644 --- a/kdeui/kkeydialog.cpp +++ b/kdeui/kkeydialog.cpp @@ -106,7 +106,7 @@ class KKeyChooserItem : public KListViewItem }; // WhatsThis on KKeyChooserItems -class KKeyChooserWhatsThis : public QWhatsThis +class KKeyChooserWhatsThis : public TQWhatsThis { public: KKeyChooserWhatsThis( TQListView* listview ) @@ -340,7 +340,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) // fill up the split list box with the action/key pairs. // TQGridLayout *stackLayout = new TQGridLayout(2, 2, 2); - topLayout->addLayout( stackLayout, 10 ); + topLayout->addLayout( TQT_TQLAYOUT(stackLayout), 10 ); stackLayout->setRowStretch( 1, 10 ); // Only list will stretch d->pList = new KListView( this ); @@ -423,7 +423,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->pbtnShortcut = new KKeyButton(d->fCArea, "key"); d->pbtnShortcut->setEnabled( false ); connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const KShortcut&)), TQT_SLOT(capturedShortcut(const KShortcut&)) ); - grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 ); + grid->addRowSpacing( 1, d->pbtnShortcut->tqsizeHint().height() + 5 ); wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, " "you can press the key-combination which you would like to be assigned " @@ -439,7 +439,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->lInfo = new TQLabel(d->fCArea); //resize(0,0); - //d->lInfo->setAlignment( AlignCenter ); + //d->lInfo->tqsetAlignment( AlignCenter ); //d->lInfo->setEnabled( false ); //d->lInfo->hide(); grid->addMultiCellWidget( d->lInfo, 2, 2, 0, 3 ); @@ -532,7 +532,7 @@ void KKeyChooser::updateButtons() d->pbtnShortcut->setShortcut( pItem->shortcut(), bQtShortcut ); //item->setText( 1, keyStrCfg ); - pItem->repaint(); + pItem->tqrepaint(); d->lInfo->setText( i18n("Default key:") + TQString(" %1").arg(keyStrDef.isEmpty() ? i18n("None") : keyStrDef) ); // Select the appropriate radio button. @@ -601,7 +601,7 @@ void KKeyChooser::slotSettingsChanged( int category ) void KKeyChooser::fontChange( const TQFont & ) { - d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->sizeHint().height() ); + d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->tqsizeHint().height() ); int widget_width = 0; @@ -1010,7 +1010,7 @@ void KKeyChooserItem::setShortcut( const KShortcut& cut ) { m_cut = cut; m_bModified = (m_cut != m_pList->shortcut(m_iAction)); - listView()->repaintItem( this ); + listView()->tqrepaintItem( this ); } void KKeyChooserItem::commitChanges() diff --git a/kdeui/kkeydialog.h b/kdeui/kkeydialog.h index ab707ac8d..8b7390e0e 100644 --- a/kdeui/kkeydialog.h +++ b/kdeui/kkeydialog.h @@ -55,7 +55,7 @@ class KKeyChooserItem; * @see KKeyDialog * @author Nicolas Hadacek <hadacek@via.ecp.fr> */ -class KDEUI_EXPORT KKeyChooser : public QWidget +class KDEUI_EXPORT KKeyChooser : public TQWidget { Q_OBJECT public: diff --git a/kdeui/klanguagebutton.cpp b/kdeui/klanguagebutton.cpp index abbc4f5d3..469fef5a1 100644 --- a/kdeui/klanguagebutton.cpp +++ b/kdeui/klanguagebutton.cpp @@ -60,12 +60,12 @@ static void checkInsertPos( TQPopupMenu *popup, const TQString & str, static TQPopupMenu * checkInsertIndex( TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu ) { - int pos = tags->findIndex( submenu ); + int pos = tags->tqfindIndex( submenu ); TQPopupMenu *pi = 0; if ( pos != -1 ) { - TQMenuItem *p = popup->findItem( pos ); + TQMenuItem *p = popup->tqfindItem( pos ); pi = p ? p->popup() : 0; } if ( !pi ) @@ -131,12 +131,12 @@ KLanguageButton::~KLanguageButton() void KLanguageButton::insertLanguage( const TQString& path, const TQString& name, const TQString&, const TQString &submenu, int index ) { - TQString output = name + TQString::fromLatin1( " (" ) + path + - TQString::fromLatin1( ")" ); + TQString output = name + TQString::tqfromLatin1( " (" ) + path + + TQString::tqfromLatin1( ")" ); #if 0 // Nooooo ! Country != language TQPixmap flag( locate( "locale", sub + path + - TQString::fromLatin1( "/flag.png" ) ) ); + TQString::tqfromLatin1( "/flag.png" ) ) ); #endif insertItem( output, path, submenu, index ); } @@ -232,7 +232,7 @@ void KLanguageButton::clear() bool KLanguageButton::contains( const TQString & id ) const { - return m_ids->contains( id ) > 0; + return m_ids->tqcontains( id ) > 0; } TQString KLanguageButton::current() const @@ -276,7 +276,7 @@ void KLanguageButton::setCurrentItem( int i ) void KLanguageButton::setCurrentItem( const TQString & id ) { - int i = m_ids->findIndex( id ); + int i = m_ids->tqfindIndex( id ); if ( id.isNull() ) i = 0; if ( i != -1 ) diff --git a/kdeui/klanguagebutton.h b/kdeui/klanguagebutton.h index c167930db..4b381abe9 100644 --- a/kdeui/klanguagebutton.h +++ b/kdeui/klanguagebutton.h @@ -44,7 +44,7 @@ class TQPopupMenu; * Combined version of KTagCombo and KLanguageCombo but using a QPushButton * instead. */ -class KDEUI_EXPORT KLanguageButton : public QWidget +class KDEUI_EXPORT KLanguageButton : public TQWidget { Q_OBJECT diff --git a/kdeui/kled.cpp b/kdeui/kled.cpp index b7980203b..aebf6ce26 100644 --- a/kdeui/kled.cpp +++ b/kdeui/kled.cpp @@ -51,7 +51,7 @@ KLed::KLed(TQWidget *parent, const char *name) : TQWidget( parent, name), led_state(On), led_look(Raised), - led_shape(Circular) + led_tqshape(Circular) { TQColor col(green); d = new KLed::KLedPrivate; @@ -68,7 +68,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name) : TQWidget( parent, name), led_state(On), led_look(Raised), - led_shape(Circular) + led_tqshape(Circular) { d = new KLed::KLedPrivate; d->dark_factor = 300; @@ -81,11 +81,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name) } KLed::KLed(const TQColor& col, KLed::State state, - KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name ) + KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name ) : TQWidget(parent, name), led_state(state), led_look(look), - led_shape(shape) + led_tqshape(tqshape) { d = new KLed::KLedPrivate; d->dark_factor = 300; @@ -93,7 +93,7 @@ KLed::KLed(const TQColor& col, KLed::State state, d->off_map = 0; d->on_map = 0; - //setShape(shape); + //setShape(tqshape); setColor(col); } @@ -114,7 +114,7 @@ KLed::paintEvent(TQPaintEvent *) t.start(); for (int i=0; i<rounds; i++) { #endif - switch(led_shape) + switch(led_tqshape) { case Rectangular: switch (led_look) @@ -129,7 +129,7 @@ KLed::paintEvent(TQPaintEvent *) paintRect(); break; default : - qWarning("%s: in class KLed: no KLed::Look set",qApp->argv()[0]); + qWarning("%s: in class KLed: no KLed::Look set",tqApp->argv()[0]); } break; case Circular: @@ -145,11 +145,11 @@ KLed::paintEvent(TQPaintEvent *) paintSunken(); break; default: - qWarning("%s: in class KLed: no KLed::Look set",qApp->argv()[0]); + qWarning("%s: in class KLed: no KLed::Look set",tqApp->argv()[0]); } break; default: - qWarning("%s: in class KLed: no KLed::Shape set",qApp->argv()[0]); + qWarning("%s: in class KLed: no KLed::Shape set",tqApp->argv()[0]); break; } #ifdef PAINT_BENCH @@ -225,11 +225,11 @@ 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( TQBrush::SolidPattern ); + brush.setStyle( Qt::SolidPattern ); brush.setColor( color ); pen.setWidth( scale ); - color = colorGroup().dark(); + color = tqcolorGroup().dark(); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing @@ -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( TQBrush::SolidPattern ); + brush.setStyle( Qt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -325,10 +325,10 @@ KLed::paintRound() // paint a ROUND RAISED led lamp // avoid that the border can be erased by the bright spot of the LED pen.setWidth( 2 * scale + 1 ); - color = colorGroup().dark(); + color = tqcolorGroup().dark(); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing - brush.setStyle( TQBrush::NoBrush ); // Switch off the brush + brush.setStyle( Qt::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( TQBrush::SolidPattern ); + brush.setStyle( Qt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -421,14 +421,14 @@ 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( TQBrush::NoBrush ); // Switch off the brush + brush.setStyle( (Qt::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 // drawing the shadow border at 45° (45*16 = 720). int angle = -720; - color = colorGroup().light(); + color = tqcolorGroup().light(); for ( int arc = 120; arc < 2880; arc += 240 ) { pen.setColor( color ); @@ -525,12 +525,12 @@ KLed::state() const } KLed::Shape -KLed::shape() const +KLed::tqshape() const { - return led_shape; + return led_tqshape; } -QColor +TQColor KLed::color() const { return led_color; @@ -561,9 +561,9 @@ KLed::toggleState() void KLed::setShape(KLed::Shape s) { - if(led_shape!=s) + if(led_tqshape!=s) { - led_shape = s; + led_tqshape = s; update(); } } @@ -626,14 +626,14 @@ KLed::off() setState(Off); } -QSize -KLed::sizeHint() const +TQSize +KLed::tqsizeHint() const { return TQSize(16, 16); } -QSize -KLed::minimumSizeHint() const +TQSize +KLed::tqminimumSizeHint() const { return TQSize(16, 16 ); } diff --git a/kdeui/kled.h b/kdeui/kled.h index 580f01ab4..06683bbaa 100644 --- a/kdeui/kled.h +++ b/kdeui/kled.h @@ -42,12 +42,12 @@ class TQColor; * * @author Joerg Habenicht, Richard J. Moore (rich@kde.org) 1998, 1999 */ -class KDEUI_EXPORT KLed : public QWidget +class KDEUI_EXPORT KLed : public TQWidget { Q_OBJECT Q_ENUMS( State Shape Look ) Q_PROPERTY( State state READ state WRITE setState ) - Q_PROPERTY( Shape shape READ shape WRITE setShape ) + Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape ) Q_PROPERTY( Look look READ look WRITE setLook ) Q_PROPERTY( TQColor color READ color WRITE setColor ) Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor ) @@ -62,7 +62,7 @@ public: /** * Shades of the lamp. - * @short LED shape + * @short LED tqshape */ enum Shape { Rectangular, Circular }; @@ -114,12 +114,12 @@ public: * @param col Initial color of the LED. * @param state Sets the State. * @param look Sets the Look. - * @param shape Sets the Shape (rectangular or circular) + * @param tqshape Sets the Shape (rectangular or circular) * @param parent Will be handed over to TQWidget. * @param name Will be handed over to TQWidget. * @short Constructor */ - KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape shape, + KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape tqshape, TQWidget *parent=0, const char *name=0); @@ -137,7 +137,7 @@ public: */ State state() const; - Shape shape() const; + Shape tqshape() const; /** * Returns the color of the widget @@ -175,13 +175,13 @@ public: void setState( State state ); /** - * Set the shape of the LED to @p s. + * Set the tqshape of the LED to @p s. */ void setShape(Shape s); /** * Toggle the state of the LED from Off to On and vice versa. * - * The widget will be repainted when returning to the main + * The widget will be tqrepainted when returning to the main * event loop. * @short Toggles LED on->off / off->on. * @deprecated, use #toggle() instead. @@ -249,15 +249,15 @@ public: */ void setLook( Look look ); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; public slots: /** * Toggles the state of the led from Off to On or vice versa. * - * The widget repaints itself immediately. + * The widget tqrepaints itself immediately. */ void toggle(); @@ -317,7 +317,7 @@ private: State led_state; TQColor led_color; Look led_look; - Shape led_shape; + Shape led_tqshape; protected: virtual void virtual_hook( int id, void* data ); diff --git a/kdeui/klineedit.cpp b/kdeui/klineedit.cpp index f89f4cf25..d3d50795c 100644 --- a/kdeui/klineedit.cpp +++ b/kdeui/klineedit.cpp @@ -273,7 +273,7 @@ void KLineEdit::setReadOnly(bool readOnly) if (readOnly) { d->bgMode = backgroundMode (); - setBackgroundMode (Qt::PaletteBackground); + setBackgroundMode (TQt::PaletteBackground); if (d->enableSqueezedText && d->squeezedText.isEmpty()) { d->squeezedText = text(); @@ -526,9 +526,9 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { KeyBindingMap keys = getKeyBindings(); KGlobalSettings::Completion mode = completionMode(); - bool noModifier = (e->state() == NoButton || - e->state() == ShiftButton || - e->state() == Keypad); + bool noModifier = (e->state() == Qt::NoButton || + e->state() == TQt::ShiftButton || + e->state() == TQt::Keypad); if ( (mode == KGlobalSettings::CompletionAuto || mode == KGlobalSettings::CompletionPopupAuto || @@ -536,7 +536,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { if ( !d->userSelection && hasSelectedText() && ( e->key() == Key_Right || e->key() == Key_Left ) && - e->state()==NoButton ) + e->state()== Qt::NoButton ) { TQString old_txt = text(); d->disableRestoreSelection = true; @@ -575,7 +575,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) mode == KGlobalSettings::CompletionMan) && noModifier ) { TQString keycode = e->text(); - if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() || + if ( !keycode.isEmpty() && (keycode.tqunicode()->isPrint() || e->key() == Key_Backspace || e->key() == Key_Delete ) ) { bool hasUserSelection=d->userSelection; @@ -658,7 +658,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) // as if there was no selection. After processing the key event, we // can set the new autocompletion again. if (hadSelection && !hasUserSelection && start>cPos && - ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) || + ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) || e->key() == Key_Backspace || e->key() == Key_Delete ) ) { del(); @@ -679,7 +679,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) int len = txt.length(); if ( txt != old_txt && len/* && ( cursorPosition() == len || force )*/ && - ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) || + ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) || e->key() == Key_Backspace || e->key() == Key_Delete) ) { if ( e->key() == Key_Backspace ) @@ -841,7 +841,7 @@ void KLineEdit::mouseReleaseEvent( TQMouseEvent* e ) { TQLineEdit::mouseReleaseEvent( e ); if (TQApplication::clipboard()->supportsSelection() ) { - if ( e->button() == LeftButton ) { + if ( e->button() == Qt::LeftButton ) { // Fix copying of squeezed text if needed copySqueezedText( false ); } @@ -1006,12 +1006,12 @@ void KLineEdit::dropEvent(TQDropEvent *e) bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) { - if( o == this ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { - KCursor::autoHideEventFilter( this, ev ); + KCursor::autoHideEventFilter( TQT_TQOBJECT(this), ev ); if ( ev->type() == TQEvent::AccelOverride ) { - TQKeyEvent *e = static_cast<TQKeyEvent *>( ev ); + TQKeyEvent *e = TQT_TQKEYEVENT( ev ); if (overrideAccel (e)) { e->accept(); @@ -1020,15 +1020,15 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) } else if( ev->type() == TQEvent::KeyPress ) { - TQKeyEvent *e = static_cast<TQKeyEvent *>( ev ); + TQKeyEvent *e = TQT_TQKEYEVENT( ev ); if( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) { bool trap = d->completionBox && d->completionBox->isVisible(); bool stopEvent = trap || (d->grabReturnKeyEvents && - (e->state() == NoButton || - e->state() == Keypad)); + (e->state() == Qt::NoButton || + e->state() == TQt::Keypad)); // Qt will emit returnPressed() itself if we return false if ( stopEvent ) @@ -1182,7 +1182,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) int key = e->key(); ButtonState state = e->state(); if ((key == Key_Backtab || key == Key_Tab) && - (state == NoButton || (state & ShiftButton))) + (state == Qt::NoButton || (state & TQt::ShiftButton))) { return true; } @@ -1219,7 +1219,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) bool wasSelected = d->completionBox->isSelected( d->completionBox->currentItem() ); const TQString currentSelection = d->completionBox->currentText(); d->completionBox->setItems( items ); - TQListBoxItem* item = d->completionBox->findItem( currentSelection, Qt::ExactMatch ); + TQListBoxItem* item = d->completionBox->tqfindItem( currentSelection, TQt::ExactMatch ); // If no item is selected, that means the listbox hasn't been manipulated by the user yet, // because it's not possible otherwise to have no selected item. In such case make // always the first item current and unselected, so that the current item doesn't jump. @@ -1246,7 +1246,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) if ( d->autoSuggest && autoSuggest ) { - int index = items.first().find( txt ); + int index = items.first().tqfind( txt ); TQString newText = items.first().mid( index ); setUserSelection(false); setCompletedText(newText,true); diff --git a/kdeui/klineeditdlg.cpp b/kdeui/klineeditdlg.cpp index 9551fc1f6..2df4a14ad 100644 --- a/kdeui/klineeditdlg.cpp +++ b/kdeui/klineeditdlg.cpp @@ -44,7 +44,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, topLayout->addWidget( label, 1 ); edit = new KLineEdit( plainPage(), 0L ); - edit->setMinimumWidth(edit->sizeHint().width() * 3); + edit->setMinimumWidth(edit->tqsizeHint().width() * 3); label->setBuddy(edit); // please "scheck" style // connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); connect( edit, TQT_SIGNAL(textChanged(const TQString&)), @@ -75,7 +75,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, layout->addWidget(label, 0, 0, AlignLeft); edit = new KLineEdit( this, 0L ); - edit->setMinimumWidth(edit->sizeHint().width() * 3); + edit->setMinimumWidth(edit->tqsizeHint().width() * 3); connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); if ( _file_mode ) { diff --git a/kdeui/klineeditdlg.h b/kdeui/klineeditdlg.h index 6e6fc2d89..ac8d834e4 100644 --- a/kdeui/klineeditdlg.h +++ b/kdeui/klineeditdlg.h @@ -20,7 +20,7 @@ #ifndef __klineeditdlg_h__ #define __klineeditdlg_h__ -#include <tqt.h> +// #include <tqt.h> #include <kdialogbase.h> diff --git a/kdeui/klistbox.cpp b/kdeui/klistbox.cpp index 73a08b89a..13c5ab325 100644 --- a/kdeui/klistbox.cpp +++ b/kdeui/klistbox.cpp @@ -249,14 +249,14 @@ void KListBox::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) if( item ) { emit doubleClicked( item, e->globalPos() ); - if( (e->button() == LeftButton) && !m_bUseSingle ) + if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) emitExecute( item, e->globalPos() ); } } void KListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQPoint &pos ) { - if( (btn == LeftButton) && item ) + if( (btn == Qt::LeftButton) && item ) emitExecute( item, pos ); } diff --git a/kdeui/klistbox.h b/kdeui/klistbox.h index b19819c79..48d8cd1dc 100644 --- a/kdeui/klistbox.h +++ b/kdeui/klistbox.h @@ -37,7 +37,7 @@ * settings. If you want to get informed when the user selects * something connect to the TQListBox::selectionChanged() signal. **/ -class KDEUI_EXPORT KListBox : public QListBox +class KDEUI_EXPORT KListBox : public TQListBox { Q_OBJECT diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp index 332bc4e8c..2e9253ac7 100644 --- a/kdeui/klistview.cpp +++ b/kdeui/klistview.cpp @@ -37,7 +37,7 @@ #include "klistview.h" #include "klistviewlineedit.h" -class KListView::Tooltip : public QToolTip +class KListView::Tooltip : public TQToolTip { public: Tooltip (KListView* parent, TQToolTipGroup* group = 0L); @@ -197,7 +197,7 @@ void KListViewLineEdit::load(TQListViewItem *i, int c) item=i; col=c; - TQRect rect(p->itemRect(i)); + TQRect rect(p->tqitemRect(i)); setText(item->text(c)); home( true ); @@ -252,7 +252,7 @@ static TQListViewItem *prevItem (TQListViewItem *pi) /* Does what the TQListViewItem::previousSibling() * of my dreams would do. */ - if (pa && pa->parent() == pi->parent()) + if (pa && pa->tqparent() == pi->tqparent()) return pa; return 0; @@ -278,8 +278,8 @@ void KListViewLineEdit::selectNextCell (TQListViewItem *pitem, int column, bool const int ncols = p->columns(); const int dir = forward ? +1 : -1; const int restart = forward ? 0 : (ncols - 1); - TQListViewItem *top = (pitem && pitem->parent()) - ? pitem->parent()->firstChild() + TQListViewItem *top = (pitem && pitem->tqparent()) + ? pitem->tqparent()->firstChild() : p->firstChild(); TQListViewItem *pi = pitem; @@ -611,12 +611,12 @@ void KListView::slotAutoSelect() if( d->pCurrentItem ) { //Shift pressed? - if( (keybstate & Qt::ShiftButton) ) { + if( (keybstate & TQt::ShiftButton) ) { bool block = signalsBlocked(); blockSignals( true ); //No Ctrl? Then clear before! - if( !(keybstate & Qt::ControlButton) ) + if( !(keybstate & TQt::ControlButton) ) clearSelection(); bool select = !d->pCurrentItem->isSelected(); @@ -695,8 +695,8 @@ void KListView::emitExecute( TQListViewItem *item, const TQPoint &pos, int c ) d->autoSelect.stop(); - //Don´t emit executed if in SC mode and Shift or Ctrl are pressed - if( !( ((keybstate & Qt::ShiftButton) || (keybstate & Qt::ControlButton)) ) ) { + //Don't emit executed if in SC mode and Shift or Ctrl are pressed + if( !( ((keybstate & TQt::ShiftButton) || (keybstate & TQt::ControlButton)) ) ) { viewport()->unsetCursor(); emit executed( item ); emit executed( item, pos, c ); @@ -716,7 +716,7 @@ void KListView::focusInEvent( TQFocusEvent *fe ) && (currentItem())) { currentItem()->setSelected(true); - currentItem()->repaint(); + currentItem()->tqrepaint(); emit selectionChanged(); }; } @@ -736,7 +736,7 @@ void KListView::focusOutEvent( TQFocusEvent *fe ) && (!d->editor->isVisible())) { currentItem()->setSelected(false); - currentItem()->repaint(); + currentItem()->tqrepaint(); emit selectionChanged(); }; @@ -776,7 +776,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e ) if (currentItem()) { currentItem()->setSelected(false); - currentItem()->repaint(); + currentItem()->tqrepaint(); // emit selectionChanged(); } } @@ -790,7 +790,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e ) treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() ) && ( p.x() >= header()->cellPos( header()->mapToActual( 0 ) ) ); - if (e->button() == LeftButton && !rootDecoClicked) + if (e->button() == Qt::LeftButton && !rootDecoClicked) { //Start a drag d->startDragPos = e->pos(); @@ -847,7 +847,7 @@ void KListView::contentsMouseMoveEvent( TQMouseEvent *e ) void KListView::contentsMouseReleaseEvent( TQMouseEvent *e ) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { // If the row was already selected, maybe we want to start an in-place editing if ( d->pressedOnSelected && itemsRenameable() ) @@ -865,7 +865,7 @@ void KListView::contentsMouseReleaseEvent( TQMouseEvent *e ) if (!rootDecoClicked) { int col = header()->mapToLogical( header()->cellAt( p.x() ) ); - if ( d->renameable.contains(col) ) + if ( d->renameable.tqcontains(col) ) rename(at, col); } } @@ -883,7 +883,7 @@ void KListView::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() != LeftButton ) + if ( !e || e->button() != Qt::LeftButton ) return; TQPoint vp = contentsToViewport(e->pos()); @@ -895,14 +895,14 @@ void KListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e ) if( item ) { emit doubleClicked( item, e->globalPos(), col ); - if( (e->button() == LeftButton) && !d->bUseSingle ) + if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) emitExecute( item, e->globalPos(), col ); } } void KListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c ) { - if( (btn == LeftButton) && item ) + if( (btn == Qt::LeftButton) && item ) emitExecute(item, pos, c); } @@ -1008,7 +1008,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event) { cleanDropVisualizer(); d->mOldDropVisualizer=tmpRect; - viewport()->repaint(tmpRect); + viewport()->tqrepaint(tmpRect); } } if (dropHighlighter()) @@ -1018,7 +1018,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event) { cleanItemHighlighter(); d->mOldDropHighlighter=tmpRect; - viewport()->repaint(tmpRect); + viewport()->tqrepaint(tmpRect); } } } @@ -1045,7 +1045,7 @@ void KListView::cleanDropVisualizer() { TQRect rect=d->mOldDropVisualizer; d->mOldDropVisualizer = TQRect(); - viewport()->repaint(rect, true); + viewport()->tqrepaint(rect, true); } } @@ -1067,7 +1067,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView else { // Get the closest item before us ('atpos' or the one above, if any) - if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2)) + if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2)) above = atpos->itemAbove(); else above = atpos; @@ -1100,7 +1100,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView // Ok, there's one more level of complexity. We may want to become a new // sibling, but of an upper-level group, rather than the "above" item - TQListViewItem * betterAbove = above->parent(); + TQListViewItem * betterAbove = above->tqparent(); TQListViewItem * last = above; while ( betterAbove ) { @@ -1113,14 +1113,14 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView else break; // not enough on the left, so stop last = betterAbove; - betterAbove = betterAbove->parent(); // up one level + betterAbove = betterAbove->tqparent(); // up one level } else break; // we're among the child of betterAbove, not after the last one } } // set as sibling after = above; - parent = after ? after->parent() : 0L ; + parent = after ? after->tqparent() : 0L ; } TQListViewItem* KListView::lastChild () const @@ -1269,7 +1269,7 @@ void KListView::moveItem(TQListViewItem *item, TQListViewItem *parent, TQListVie { if(i == item) return; - i = i->parent(); + i = i->tqparent(); } if (after) @@ -1280,8 +1280,8 @@ void KListView::moveItem(TQListViewItem *item, TQListViewItem *parent, TQListVie // Basically reimplementing the TQListViewItem(TQListViewItem*, TQListViewItem*) constructor // in here, without ever deleting the item. - if (item->parent()) - item->parent()->takeItem(item); + if (item->tqparent()) + item->tqparent()->takeItem(item); else takeItem(item); @@ -1327,12 +1327,12 @@ TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent, it = it->firstChild(); } - insertmarker = itemRect (it ? it : after); + insertmarker = tqitemRect (it ? it : after); level = after->depth(); } else if (parent) { - insertmarker = itemRect (parent); + insertmarker = tqitemRect (parent); level = parent->depth() + 1; } insertmarker.setLeft( treeStepSize() * ( level + (rootIsDecorated() ? 1 : 0) ) + itemMargin() ); @@ -1355,11 +1355,11 @@ TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item) if (item) { - r = itemRect(item); + r = tqitemRect(item); r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize()); if (painter) - style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(), - TQStyle::Style_FocusAtBorder, colorGroup().highlight()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, tqcolorGroup(), + TQStyle::Style_FocusAtBorder, tqcolorGroup().highlight()); } return r; @@ -1371,13 +1371,13 @@ void KListView::cleanItemHighlighter () { TQRect rect=d->mOldDropHighlighter; d->mOldDropHighlighter = TQRect(); - viewport()->repaint(rect, true); + viewport()->tqrepaint(rect, true); } } void KListView::rename(TQListViewItem *item, int c) { - if (d->renameable.contains(c)) + if (d->renameable.tqcontains(c)) { ensureItemVisible(item); d->editor->load(item,c); @@ -1386,7 +1386,7 @@ void KListView::rename(TQListViewItem *item, int c) bool KListView::isRenameable (int col) const { - return d->renameable.contains(col); + return d->renameable.tqcontains(col); } void KListView::setRenameable (int col, bool renameable) @@ -1482,7 +1482,7 @@ void KListView::activateAutomaticSelection() if (currentItem()) { currentItem()->setSelected(true); - currentItem()->repaint(); + currentItem()->tqrepaint(); emit selectionChanged(); }; } @@ -1519,8 +1519,8 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) TQListViewItem* item = currentItem(); if (!item) return; - TQListViewItem* repaintItem1 = item; - TQListViewItem* repaintItem2 = 0L; + TQListViewItem* tqrepaintItem1 = item; + TQListViewItem* tqrepaintItem2 = 0L; TQListViewItem* visItem = 0L; TQListViewItem* nextItem = 0L; @@ -1532,7 +1532,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) if (tmpItem->isSelected()) selectedItems++; if (((!selectedItems) || ((selectedItems==1) && (d->selectedUsingMouse))) - && (e_state==NoButton) + && (e_state==Qt::NoButton) && ((e->key()==Key_Down) || (e->key()==Key_Up) || (e->key()==Key_Next) @@ -1579,7 +1579,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) if (nextItem) { - repaintItem2=nextItem; + tqrepaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); }; @@ -1614,7 +1614,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { if (d->selectedBySimpleMove) nextItem->setSelected(true); - repaintItem2=nextItem; + tqrepaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); }; @@ -1649,7 +1649,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { if (d->selectedBySimpleMove) nextItem->setSelected(true); - repaintItem2=nextItem; + tqrepaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); }; @@ -1671,7 +1671,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { if (d->selectedBySimpleMove) nextItem->setSelected(true); - repaintItem2=nextItem; + tqrepaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); } @@ -1684,7 +1684,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) // move to the first item and toggle selection of all items inbetween nextItem = firstChild(); visItem = nextItem; - repaintItem2 = visItem; + tqrepaintItem2 = visItem; if (d->selectedBySimpleMove) item->setSelected(false); if (shiftOrCtrl) @@ -1797,7 +1797,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) currentItem()->setSelected(true); emitSelectionChanged=true; } - repaintItem2=currentItem(); + tqrepaintItem2=currentItem(); if (realKey) visItem=currentItem(); break; @@ -1807,21 +1807,21 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) ensureItemVisible(visItem); TQRect ir; - if (repaintItem1) - ir = ir.unite( itemRect(repaintItem1) ); - if (repaintItem2) - ir = ir.unite( itemRect(repaintItem2) ); + if (tqrepaintItem1) + ir = ir.unite( tqitemRect(tqrepaintItem1) ); + if (tqrepaintItem2) + ir = ir.unite( tqitemRect(tqrepaintItem2) ); if ( !ir.isEmpty() ) - { // rectangle to be repainted + { // rectangle to be tqrepainted if ( ir.x() < 0 ) ir.moveBy( -ir.x(), 0 ); - viewport()->repaint( ir, false ); + viewport()->tqrepaint( ir, false ); } - /*if (repaintItem1) - repaintItem1->repaint(); - if (repaintItem2) - repaintItem2->repaint();*/ + /*if (tqrepaintItem1) + tqrepaintItem1->tqrepaint(); + if (tqrepaintItem2) + tqrepaintItem2->tqrepaint();*/ update(); if (emitSelectionChanged) emit selectionChanged(); @@ -1895,7 +1895,7 @@ void KListView::emitContextMenu (KListView*, TQListViewItem* i) TQPoint p; if (i) - p = viewport()->mapToGlobal(itemRect(i).center()); + p = viewport()->mapToGlobal(tqitemRect(i).center()); else p = mapToGlobal(rect().center()); @@ -1940,7 +1940,7 @@ void KListView::viewportPaintEvent(TQPaintEvent *e) TQPainter painter(viewport()); // This is where we actually draw the drop-highlighter - style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, tqcolorGroup(), TQStyle::Style_FocusAtBorder); } d->painting = false; @@ -2001,13 +2001,13 @@ const TQColor &KListView::alternateBackground() const void KListView::setAlternateBackground(const TQColor &c) { d->alternateBackground = c; - repaint(); + tqrepaint(); } void KListView::setShadeSortColumn(bool shadeSortColumn) { d->shadeSortColumn = shadeSortColumn; - repaint(); + tqrepaint(); } bool KListView::shadeSortColumn() const @@ -2231,7 +2231,7 @@ const TQColor &KListViewItem::backgroundColor() { if (isAlternate()) return static_cast< KListView* >(listView())->alternateBackground(); - return listView()->viewport()->colorGroup().base(); + return listView()->viewport()->tqcolorGroup().base(); } TQColor KListViewItem::backgroundColor(int column) @@ -2239,7 +2239,7 @@ TQColor KListViewItem::backgroundColor(int column) KListView* view = static_cast< KListView* >(listView()); TQColor color = isAlternate() ? view->alternateBackground() : - view->viewport()->colorGroup().base(); + view->viewport()->tqcolorGroup().base(); // 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()) ) @@ -2310,12 +2310,12 @@ bool KListViewItem::isAlternate() { KListViewItem *item; bool previous = true; - if (parent()) + if (tqparent()) { - item = dynamic_cast<KListViewItem *>(parent()); + item = dynamic_cast<KListViewItem *>(tqparent()); if (item) previous = item->m_odd; - item = dynamic_cast<KListViewItem *>(parent()->firstChild()); + item = dynamic_cast<KListViewItem *>(tqparent()->firstChild()); } else { @@ -2335,7 +2335,7 @@ bool KListViewItem::isAlternate() return false; } -void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup _cg = cg; TQListView* lv = listView(); @@ -2349,11 +2349,11 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, } else { - _cg.setColor((lv->viewport()->backgroundMode() == Qt::FixedColor) ? + _cg.setColor((lv->viewport()->backgroundMode() == TQt::FixedColor) ? TQColorGroup::Background : TQColorGroup::Base, backgroundColor(column)); } - TQListViewItem::paintCell(p, _cg, column, width, alignment); + TQListViewItem::paintCell(p, _cg, column, width, tqalignment); } void KListView::virtual_hook( int, void* ) diff --git a/kdeui/klistview.h b/kdeui/klistview.h index d78ec2724..a4e7d4b85 100644 --- a/kdeui/klistview.h +++ b/kdeui/klistview.h @@ -50,11 +50,12 @@ class KLineEdit; * Reimplement dragObject() and (possibly) startDrag(), * and setDragEnabled(true). */ -class KDEUI_EXPORT KListView : public QListView +class KDEUI_EXPORT KListView : public TQListView { friend class KListViewItem; Q_OBJECT + TQ_OBJECT Q_ENUMS( SelectionModeExt ) Q_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth ) Q_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable ) @@ -684,7 +685,7 @@ protected: */ inline bool below (TQListViewItem* i, const TQPoint& p) { - return below (itemRect(i), contentsToViewport(p)); + return below (tqitemRect(i), contentsToViewport(p)); } /** @@ -1006,7 +1007,7 @@ private: * * @short listview item with alternate background color support */ -class KDEUI_EXPORT KListViewItem : public QListViewItem +class KDEUI_EXPORT KListViewItem : public TQListViewItem { friend class KListView; public: @@ -1069,7 +1070,7 @@ public: TQColor backgroundColor(int column); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment); + int column, int width, int tqalignment); private: void init(); diff --git a/kdeui/klistviewsearchline.cpp b/kdeui/klistviewsearchline.cpp index 7bd26afc1..23fb14e18 100644 --- a/kdeui/klistviewsearchline.cpp +++ b/kdeui/klistviewsearchline.cpp @@ -145,7 +145,7 @@ void KListViewSearchLine::updateSearch(const TQString &s) it.current() && !currentItem; ++it) { - if(d->listView->itemRect(it.current()).isValid()) + if(d->listView->tqitemRect(it.current()).isValid()) currentItem = it.current(); } } @@ -214,14 +214,14 @@ bool KListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString TQValueList<int>::ConstIterator it = d->searchColumns.begin(); for(; it != d->searchColumns.end(); ++it) { if(*it < item->listView()->columns() && - item->text(*it).find(s, 0, d->caseSensitive) >= 0) + item->text(*it).tqfind(s, 0, d->caseSensitive) >= 0) return true; } } else { for(int i = 0; i < item->listView()->columns(); i++) { if(item->listView()->columnWidth(i) > 0 && - item->text(i).find(s, 0, d->caseSensitive) >= 0) + item->text(i).tqfind(s, 0, d->caseSensitive) >= 0) { return true; } @@ -260,7 +260,7 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu() columnText = i18n("Column number %1","Column No. %1").arg(visiblePosition); } subMenu->insertItem(columnText, visibleColumns); - if(d->searchColumns.isEmpty() || d->searchColumns.find(i) != d->searchColumns.end()) + if(d->searchColumns.isEmpty() || d->searchColumns.tqfind(i) != d->searchColumns.end()) subMenu->setItemChecked(visibleColumns, true); else allColumnsAreSearchColumns = false; @@ -320,7 +320,7 @@ void KListViewSearchLine::searchColumnsMenuActivated(int id) d->searchColumns.clear(); } else { - if(d->searchColumns.find(id) != d->searchColumns.end()) + if(d->searchColumns.tqfind(id) != d->searchColumns.end()) d->searchColumns.remove(id); else { if(d->searchColumns.isEmpty()) { diff --git a/kdeui/klistviewsearchline.h b/kdeui/klistviewsearchline.h index 92e4a2b75..4b7427803 100644 --- a/kdeui/klistviewsearchline.h +++ b/kdeui/klistviewsearchline.h @@ -216,7 +216,7 @@ private: * * @since 3.4 */ -class KDEUI_EXPORT KListViewSearchLineWidget : public QHBox +class KDEUI_EXPORT KListViewSearchLineWidget : public TQHBox { Q_OBJECT diff --git a/kdeui/kmainwindow.cpp b/kdeui/kmainwindow.cpp index 94baa34e7..2a0bad08d 100644 --- a/kdeui/kmainwindow.cpp +++ b/kdeui/kmainwindow.cpp @@ -105,8 +105,8 @@ public: n++; it.current()->savePropertiesInternal(config, n); } - config->setGroup(TQString::fromLatin1("Number")); - config->writeEntry(TQString::fromLatin1("NumberOfWindows"), n ); + config->setGroup(TQString::tqfromLatin1("Number")); + config->writeEntry(TQString::tqfromLatin1("NumberOfWindows"), n ); return true; } @@ -120,7 +120,7 @@ public: for (it.toFirst(); it.current() && !canceled;){ KMainWindow *window = *it; ++it; // Update now, the current window might get deleted - if ( !window->testWState( Qt::WState_ForceHide ) ) { + if ( !window->testWState( TQt::WState_ForceHide ) ) { TQCloseEvent e; TQApplication::sendEvent( window, &e ); canceled = !e.isAccepted(); @@ -147,7 +147,7 @@ public: KMainWindow* last = 0; for (it.toFirst(); it.current() && !canceled; ++it){ KMainWindow *window = *it; - if ( !window->testWState( Qt::WState_ForceHide ) ) { + if ( !window->testWState( TQt::WState_ForceHide ) ) { last = window; } } @@ -212,7 +212,7 @@ void KMainWindow::initKMainWindow(const char *name, int cflags) unusedNumber = 0; // add numbers only when needed } for(;;) { - TQWidgetList* list = kapp->topLevelWidgets(); + TQWidgetList* list = kapp->tqtopLevelWidgets(); TQWidgetListIt it( *list ); bool found = false; for( TQWidget* w = it.current(); @@ -286,8 +286,8 @@ void KMainWindow::parseGeometry(bool parsewidth) int w, h; int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); if (parsewidth) { - TQSize minSize = minimumSize(); - TQSize maxSize = maximumSize(); + TQSize minSize = tqminimumSize(); + TQSize maxSize = tqmaximumSize(); if ( !(m & WidthValue) ) w = width(); if ( !(m & HeightValue) ) @@ -356,8 +356,8 @@ bool KMainWindow::canBeRestored( int number ) KConfig *config = kapp->sessionConfig(); if ( !config ) return false; - config->setGroup( TQString::fromLatin1("Number") ); - int n = config->readNumEntry( TQString::fromLatin1("NumberOfWindows") , 1 ); + config->setGroup( TQString::tqfromLatin1("Number") ); + int n = config->readNumEntry( TQString::tqfromLatin1("NumberOfWindows") , 1 ); return number >= 1 && number <= n; } @@ -370,12 +370,12 @@ const TQString KMainWindow::classNameOfToplevel( int number ) return TQString::null; TQString s; s.setNum( number ); - s.prepend( TQString::fromLatin1("WindowProperties") ); + s.prepend( TQString::tqfromLatin1("WindowProperties") ); config->setGroup( s ); - if ( !config->hasKey( TQString::fromLatin1("ClassName") ) ) + if ( !config->hasKey( TQString::tqfromLatin1("ClassName") ) ) return TQString::null; else - return config->readEntry( TQString::fromLatin1("ClassName") ); + return config->readEntry( TQString::tqfromLatin1("ClassName") ); } void KMainWindow::show() @@ -424,7 +424,7 @@ bool KMainWindow::restore( int number, bool show ) KXMLGUIFactory *KMainWindow::guiFactory() { if ( !factory_ ) - factory_ = new KXMLGUIFactory( this, this, "guifactory" ); + factory_ = new KXMLGUIFactory( this, TQT_TQOBJECT(this), "guifactory" ); return factory_; } @@ -458,7 +458,7 @@ void KMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xm if( options & ToolBar ){ setStandardToolBarMenuEnabled( true ); - KStdAction::configureToolbars(this, + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection()); } @@ -696,13 +696,13 @@ void KMainWindow::savePropertiesInternal( KConfig *config, int number ) TQString s; s.setNum(number); - s.prepend(TQString::fromLatin1("WindowProperties")); + s.prepend(TQString::tqfromLatin1("WindowProperties")); config->setGroup(s); // store objectName, className, Width and Height for later restoring // (Only useful for session management) - config->writeEntry(TQString::fromLatin1("ObjectName"), name()); - config->writeEntry(TQString::fromLatin1("ClassName"), className()); + config->writeEntry(TQString::tqfromLatin1("ObjectName"), name()); + config->writeEntry(TQString::tqfromLatin1("ClassName"), className()); saveMainWindowSettings(config); // Menubar, statusbar and Toolbar settings. @@ -738,7 +738,7 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &config TQMenuBar* mb = internalMenuBar(); if (mb) { - TQString MenuBar = TQString::fromLatin1("MenuBar"); + TQString MenuBar = TQString::tqfromLatin1("MenuBar"); if(!config->hasDefault("MenuBar") && !mb->isHidden() ) config->revertToDefault("MenuBar"); else @@ -795,7 +795,7 @@ bool KMainWindow::isStandardToolBarMenuEnabled() const void KMainWindow::createStandardStatusBarAction(){ if(!d->showStatusBarAction){ - d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection()); + d->showStatusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(setSettingsDirty()), actionCollection()); KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already. connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool))); d->showStatusBarAction->setChecked(sb->isHidden()); @@ -810,13 +810,13 @@ bool KMainWindow::readPropertiesInternal( KConfig *config, int number ) // in order they are in toolbar list TQString s; s.setNum(number); - s.prepend(TQString::fromLatin1("WindowProperties")); + s.prepend(TQString::tqfromLatin1("WindowProperties")); config->setGroup(s); // restore the object name (window role) - if ( config->hasKey(TQString::fromLatin1("ObjectName" )) ) - setName( config->readEntry(TQString::fromLatin1("ObjectName")).latin1()); // latin1 is right here + if ( config->hasKey(TQString::tqfromLatin1("ObjectName" )) ) + setName( config->readEntry(TQString::tqfromLatin1("ObjectName")).latin1()); // latin1 is right here applyMainWindowSettings(config); // Menubar, statusbar and toolbar settings. @@ -901,7 +901,7 @@ void KMainWindow::finalizeGUI( bool force ) void KMainWindow::saveWindowSize( KConfig * config ) const { - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); int w, h; #if defined Q_WS_X11 @@ -918,8 +918,8 @@ void KMainWindow::saveWindowSize( KConfig * config ) const #endif TQRect size( desk.width(), w, desk.height(), h ); bool defaultSize = (size == d->defaultWindowSize); - TQString widthString = TQString::fromLatin1("Width %1").arg(desk.width()); - TQString heightString = TQString::fromLatin1("Height %1").arg(desk.height()); + TQString widthString = TQString::tqfromLatin1("Width %1").arg(desk.width()); + TQString heightString = TQString::tqfromLatin1("Height %1").arg(desk.height()); if (!config->hasDefault(widthString) && defaultSize) config->revertToDefault(widthString); else @@ -937,20 +937,20 @@ void KMainWindow::restoreWindowSize( KConfig * config ) parseGeometry(true); } else { // restore the size - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); if ( d->defaultWindowSize.isNull() ) // only once d->defaultWindowSize = TQRect(desk.width(), width(), desk.height(), height()); // store default values - TQSize size( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ), - config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ) ); + TQSize size( config->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ), + config->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ) ); if (size.isEmpty()) { // try the KDE 2.0 way - size = TQSize( config->readNumEntry( TQString::fromLatin1("Width"), 0 ), - config->readNumEntry( TQString::fromLatin1("Height"), 0 ) ); + size = TQSize( config->readNumEntry( TQString::tqfromLatin1("Width"), 0 ), + config->readNumEntry( TQString::tqfromLatin1("Height"), 0 ) ); if (!size.isEmpty()) { // make sure the other resolutions don't get old settings - config->writeEntry( TQString::fromLatin1("Width"), 0 ); - config->writeEntry( TQString::fromLatin1("Height"), 0 ); + config->writeEntry( TQString::tqfromLatin1("Width"), 0 ); + config->writeEntry( TQString::tqfromLatin1("Height"), 0 ); } } if ( !size.isEmpty() ) { @@ -1188,16 +1188,16 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size) { case KToolBar::Top: case KToolBar::Bottom: - size += TQSize(0, tb->sizeHint().height()); + size += TQSize(0, tb->tqsizeHint().height()); break; case KToolBar::Left: case KToolBar::Right: - size += TQSize(toolBar()->sizeHint().width(), 0); + size += TQSize(toolBar()->tqsizeHint().width(), 0); break; case KToolBar::Flat: - size += TQSize(0, 3+kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent )); + size += TQSize(0, 3+kapp->tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent )); break; default: @@ -1207,12 +1207,12 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size) KMenuBar *mb = internalMenuBar(); if (mb && !mb->isHidden()) { size += TQSize(0,mb->heightForWidth(size.width())); - if (style().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this)) + if (tqstyle().tqstyleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this)) size += TQSize( 0, dockWindowsMovable() ? 1 : 2); } TQStatusBar *sb = internalStatusBar(); if( sb && !sb->isHidden() ) - size += TQSize(0, sb->sizeHint().height()); + size += TQSize(0, sb->tqsizeHint().height()); return size; } diff --git a/kdeui/kmainwindow.h b/kdeui/kmainwindow.h index fbadc0471..43f9845bf 100644 --- a/kdeui/kmainwindow.h +++ b/kdeui/kmainwindow.h @@ -133,7 +133,7 @@ public: * KMainWindow *kmw = new KMainWindow (...); * \endcode **/ - KMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); + KMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); /** * Flags that can be passed in an argument to the constructor to @@ -155,7 +155,7 @@ public: * * @since 3.2 */ - KMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); + KMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); /** * \brief Destructor. @@ -444,10 +444,10 @@ public: * have been created and placed inside the main window (i.e. for 99% of * apps setCentralWidget()) * - Widgets that inherit from TQWidget (like game boards) should overload - * "virtual TQSize sizeHint() const;" to specify a default size rather + * "virtual TQSize tqsizeHint() const;" to specify a default size rather * than letting TQWidget::adjust use the default size of 0x0. */ - void setAutoSaveSettings( const TQString & groupName = TQString::fromLatin1("MainWindow"), + void setAutoSaveSettings( const TQString & groupName = TQString::tqfromLatin1("MainWindow"), bool saveWindowSize = true ); /** @@ -649,10 +649,10 @@ public: * * @deprecated You normally don't need this, the recommended way to achieve a * certain central widget size is as follows: - * @li Override sizeHint() in the central widget so that it + * @li Override tqsizeHint() in the central widget so that it * returns the desired size. * @li Call updateGeometry() in the central widget whenever the - * desired size changes. This ensures that the new sizeHint() is properly + * desired size changes. This ensures that the new tqsizeHint() is properly * propagated to any parent layout. * @li Now call adjustSize() in the mainwindow to resize the * mainwindow such that the central widget will become the desired size. @@ -1028,7 +1028,7 @@ template <typename T> inline void kRestoreMainWindows() { for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { const TQString className = KMainWindow::classNameOfToplevel( n ); - if ( className == TQString::fromLatin1( T::staticMetaObject()->className() ) ) + if ( className == TQString::tqfromLatin1( T::staticMetaObject()->className() ) ) (new T)->restore( n ); } } @@ -1040,9 +1040,9 @@ inline void kRestoreMainWindows() { classNames[1] = T1::staticMetaObject()->className(); for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { const TQString className = KMainWindow::classNameOfToplevel( n ); - if ( className == TQString::fromLatin1( classNames[0] ) ) + if ( className == TQString::tqfromLatin1( classNames[0] ) ) (new T0)->restore( n ); - else if ( className == TQString::fromLatin1( classNames[1] ) ) + else if ( className == TQString::tqfromLatin1( classNames[1] ) ) (new T1)->restore( n ); } } @@ -1055,11 +1055,11 @@ inline void kRestoreMainWindows() { classNames[2] = T2::staticMetaObject()->className(); for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { const TQString className = KMainWindow::classNameOfToplevel( n ); - if ( className == TQString::fromLatin1( classNames[0] ) ) + if ( className == TQString::tqfromLatin1( classNames[0] ) ) (new T0)->restore( n ); - else if ( className == TQString::fromLatin1( classNames[1] ) ) + else if ( className == TQString::tqfromLatin1( classNames[1] ) ) (new T1)->restore( n ); - else if ( className == TQString::fromLatin1( classNames[2] ) ) + else if ( className == TQString::tqfromLatin1( classNames[2] ) ) (new T2)->restore( n ); } } diff --git a/kdeui/kmainwindowiface.cpp b/kdeui/kmainwindowiface.cpp index d3117f0ec..0cee0f24b 100644 --- a/kdeui/kmainwindowiface.cpp +++ b/kdeui/kmainwindowiface.cpp @@ -33,7 +33,7 @@ KMainWindowInterface::KMainWindowInterface(KMainWindow * mainWindow) { m_MainWindow = mainWindow; m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this ); - m_dcopPropertyProxy = new KDCOPPropertyProxy(m_MainWindow); + m_dcopPropertyProxy = new KDCOPPropertyProxy(TQT_TQOBJECT(m_MainWindow)); } KMainWindowInterface::~KMainWindowInterface() diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp index d2accb61d..ceee8e222 100644 --- a/kdeui/kmenubar.cpp +++ b/kdeui/kmenubar.cpp @@ -48,6 +48,10 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> + +#ifndef None +#define None 0L +#endif #endif /* @@ -136,7 +140,7 @@ KMenuBar::KMenuBar(TQWidget *parent, const char *name) connect( &d->selection_timer, TQT_SIGNAL( timeout()), this, TQT_SLOT( selectionTimeout())); - connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize())); + connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize())); if ( kapp ) // toolbarAppearanceChanged(int) is sent when changing macstyle @@ -163,8 +167,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) top_level = true; d->wasTopLevel = top_level; - if( parentWidget() - && parentWidget()->topLevelWidget()->isFullScreen()) + if( tqparentWidget() + && tqparentWidget()->tqtopLevelWidget()->isFullScreen()) top_level = false; if ( isTopLevelMenu() == top_level ) @@ -185,19 +189,19 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) d->margin = margin(); d->fallback_mode = false; bool wasShown = !isHidden(); - reparent( parentWidget(), WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder, TQPoint(0,0), false ); + reparent( tqparentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false ); #ifdef Q_WS_X11 KWin::setType( winId(), NET::TopMenu ); - if( parentWidget()) - XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); + if( tqparentWidget()) + XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); #endif TQMenuBar::setFrameStyle( NoFrame ); TQMenuBar::setLineWidth( 0 ); TQMenuBar::setMargin( 0 ); updateFallbackSize(); d->min_size = TQSize( 0, 0 ); - if( parentWidget() && !parentWidget()->isTopLevel()) - setShown( parentWidget()->isVisible()); + if( tqparentWidget() && !tqparentWidget()->isTopLevel()) + setShown( tqparentWidget()->isVisible()); else if ( wasShown ) show(); } else @@ -213,8 +217,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) setMinimumSize( 0, 0 ); setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); updateMenuBarSize(); - if ( parentWidget() ) - reparent( parentWidget(), TQPoint(0,0), !isHidden()); + if ( tqparentWidget() ) + reparent( tqparentWidget(), TQPoint(0,0), !isHidden()); } } @@ -240,34 +244,34 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) { if ( d->topLevel ) { - if ( parentWidget() && obj == parentWidget()->topLevelWidget() ) + if ( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget()) ) { if( ev->type() == TQEvent::Resize ) return false; // ignore resizing of parent, TQMenuBar would try to adjust size if ( ev->type() == TQEvent::Accel || ev->type() == TQEvent::AccelAvailable ) { - if ( TQApplication::sendEvent( topLevelWidget(), ev ) ) + if ( TQApplication::sendEvent( tqtopLevelWidget(), ev ) ) return true; } if(ev->type() == TQEvent::ShowFullScreen ) // will update the state properly setTopLevelMenuInternal( d->topLevel ); } - if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent ) + if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()) && ev->type() == TQEvent::Reparent ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); #else //TODO: WIN32? #endif - setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible()); + setShown( tqparentWidget()->isTopLevel() || tqparentWidget()->isVisible()); } - if( parentWidget() && !parentWidget()->isTopLevel() && obj == parentWidget()) + if( tqparentWidget() && !tqparentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget())) { // if the parent is not toplevel, KMenuBar needs to match its visibility status if( ev->type() == TQEvent::Show ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); #else //TODO: WIN32? #endif @@ -279,10 +283,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) } else { - if( parentWidget() && obj == parentWidget()->topLevelWidget()) + if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget())) { if( ev->type() == TQEvent::WindowStateChange - && !parentWidget()->topLevelWidget()->isFullScreen() ) + && !tqparentWidget()->tqtopLevelWidget()->isFullScreen() ) setTopLevelMenuInternal( d->wasTopLevel ); } } @@ -390,7 +394,7 @@ void KMenuBar::checkSize( int& w, int& h ) { if( !d->topLevel || d->fallback_mode ) return; - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); w = s.width(); h = s.height(); // This is not done as setMinimumSize(), because that would set the minimum @@ -400,17 +404,17 @@ void KMenuBar::checkSize( int& w, int& h ) h = KMAX( h, d->min_size.height()); } -// QMenuBar's sizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet -TQSize KMenuBar::sizeHint() const +// QMenuBar's tqsizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet +TQSize KMenuBar::tqsizeHint() const { if( !d->topLevel || block_resize > 0 ) - return TQMenuBar::sizeHint(); - // Since TQMenuBar::sizeHint() may indirectly call resize(), + return TQMenuBar::tqsizeHint(); + // Since TQMenuBar::tqsizeHint() may indirectly call resize(), // avoid infinite recursion. ++block_resize; // find the minimum useful height, and enlarge the width until the menu fits in that height (one row) int h = heightForWidth( 1000000 ); - int w = TQMenuBar::sizeHint().width(); + int w = TQMenuBar::tqsizeHint().width(); // optimization - don't call heightForWidth() too many times while( heightForWidth( w + 12 ) > h ) w += 12; @@ -444,7 +448,7 @@ bool KMenuBar::x11Event( XEvent* ev ) void KMenuBar::updateMenuBarSize() { menuContentsChanged(); // trigger invalidating calculated size - resize( sizeHint()); // and resize to preferred size + resize( tqsizeHint()); // and resize to preferred size } void KMenuBar::setFrameStyle( int style ) @@ -509,25 +513,25 @@ void KMenuBar::drawContents( TQPainter* p ) p->eraseRect( rect() ); erase(); - TQColorGroup g = colorGroup(); + TQColorGroup g = tqcolorGroup(); bool e; for ( int i=0; i<(int)count(); i++ ) { - TQMenuItem *mi = findItem( idAt( i ) ); + TQMenuItem *mi = tqfindItem( idAt( i ) ); if ( !mi->text().isNull() || mi->pixmap() ) { - TQRect r = itemRect(i); + TQRect r = tqitemRect(i); if(r.isEmpty() || !mi->isVisible()) continue; e = mi->isEnabledAndVisible(); if ( e ) - g = isEnabled() ? ( isActiveWindow() ? palette().active() : - palette().inactive() ) : palette().disabled(); + g = isEnabled() ? ( isActiveWindow() ? tqpalette().active() : + tqpalette().inactive() ) : tqpalette().disabled(); else - g = palette().disabled(); + g = tqpalette().disabled(); bool item_active = ( actItem == i ); @@ -544,12 +548,12 @@ void KMenuBar::drawContents( TQPainter* p ) flags |= TQStyle::Style_Down; flags |= TQStyle::Style_HasFocus; - style().drawControl(TQStyle::CE_MenuBarItem, p, this, + tqstyle().tqdrawControl(TQStyle::CE_MenuBarItem, p, this, r, g, flags, TQStyleOption(mi)); } else { - style().drawItem(p, r, AlignCenter | AlignVCenter | ShowPrefix, + tqstyle().drawItem(p, r, AlignCenter | AlignVCenter | ShowPrefix, g, e, mi->pixmap(), mi->text()); } } diff --git a/kdeui/kmenubar.h b/kdeui/kmenubar.h index 548a0c12f..5dcf56484 100644 --- a/kdeui/kmenubar.h +++ b/kdeui/kmenubar.h @@ -39,7 +39,7 @@ * @version $Id$ */ -class KDEUI_EXPORT KMenuBar : public QMenuBar +class KDEUI_EXPORT KMenuBar : public TQMenuBar { Q_OBJECT @@ -84,7 +84,7 @@ public: virtual void setFrameStyle( int ); virtual void setLineWidth( int ); virtual void setMargin( int ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected slots: void slotReadConfig(); protected: diff --git a/kdeui/kmessagebox.cpp b/kdeui/kmessagebox.cpp index 8e9256677..87fa9d555 100644 --- a/kdeui/kmessagebox.cpp +++ b/kdeui/kmessagebox.cpp @@ -247,7 +247,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, if ( details.length() < 512 ) { KActiveLabel *label3 = new KActiveLabel(qrichtextify(details), detailsGroup); - label3->setMinimumSize(label3->sizeHint()); + label3->setMinimumSize(label3->tqsizeHint()); if (!(options & KMessageBox::AllowLink)) { TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)), @@ -288,7 +288,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, btn->setFocus(); if ( (options & KMessageBox::Notify) ) - sendNotification( text, strlist, notifyType, dialog->topLevelWidget()->winId()); + sendNotification( text, strlist, notifyType, dialog->tqtopLevelWidget()->winId()); if (KMessageBox_queue) { @@ -342,7 +342,7 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName, ButtonCode &result) { if ( dontShowAgainName.isEmpty() ) return true; - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); TQString dontAsk = config->readEntry(dontShowAgainName).lower(); @@ -361,7 +361,7 @@ bool KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return true; - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); return config->readBoolEntry(dontShowAgainName, true); @@ -372,7 +372,7 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName, ButtonCode result) { if ( dontShowAgainName.isEmpty() ) return; - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':')); @@ -383,7 +383,7 @@ void KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return; - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':')); @@ -423,7 +423,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No, @@ -474,7 +474,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -556,7 +556,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -628,7 +628,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownContinue(dontAskAgainName) ) return Continue; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -704,7 +704,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -755,7 +755,7 @@ void KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringList &strlist, const TQString &caption, int options) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes, @@ -785,7 +785,7 @@ KMessageBox::detailedErrorWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -832,7 +832,7 @@ void KMessageBox::sorryWId(WId parent_id, const TQString &text, const TQString &caption, int options) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes, @@ -862,7 +862,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -908,7 +908,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri if ( !shouldBeShownContinue(dontShowAgainName) ) return; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Information") : caption, KDialogBase::Yes, @@ -936,7 +936,7 @@ void KMessageBox::enableAllMessages() { KConfig *config = againConfig ? againConfig : KGlobal::config(); - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; @@ -956,7 +956,7 @@ void KMessageBox::enableMessage(const TQString &dontShowAgainName) { KConfig *config = againConfig ? againConfig : KGlobal::config(); - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp index 4d3075bb2..3db1bcf2b 100644 --- a/kdeui/knuminput.cpp +++ b/kdeui/knuminput.cpp @@ -86,7 +86,7 @@ void KNumInput::init() m_label = 0; m_slider = 0; - m_alignment = 0; + m_tqalignment = 0; } KNumInput::~KNumInput() @@ -103,17 +103,17 @@ void KNumInput::setLabel(const TQString & label, int a) if(label.isEmpty()) { delete m_label; m_label = 0; - m_alignment = 0; + m_tqalignment = 0; } else { if (m_label) m_label->setText(label); else m_label = new TQLabel(label, this, "KNumInput::TQLabel"); - m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter))) + m_label->tqsetAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter))) | AlignVCenter); - // if no vertical alignment set, use Top alignment + // if no vertical tqalignment set, use Top tqalignment if(!(a & (AlignTop|AlignBottom|AlignVCenter))) a |= AlignTop; - m_alignment = a; + m_tqalignment = a; } layout(true); @@ -130,16 +130,16 @@ void KNumInput::layout(bool deep) int w1 = m_colw1; int w2 = m_colw2; - // label sizeHint - m_sizeLabel = (m_label ? m_label->sizeHint() : TQSize(0,0)); + // label tqsizeHint + m_sizeLabel = (m_label ? m_label->tqsizeHint() : TQSize(0,0)); - if(m_label && (m_alignment & AlignVCenter)) + if(m_label && (m_tqalignment & AlignVCenter)) m_colw1 = m_sizeLabel.width() + 4; else m_colw1 = 0; - // slider sizeHint - m_sizeSlider = (m_slider ? m_slider->sizeHint() : TQSize(0, 0)); + // slider tqsizeHint + m_sizeSlider = (m_slider ? m_slider->tqsizeHint() : TQSize(0, 0)); doLayout(); @@ -187,9 +187,9 @@ TQSizePolicy KNumInput::sizePolicy() const return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } -TQSize KNumInput::sizeHint() const +TQSize KNumInput::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } void KNumInput::setSteps(int minor, int major) @@ -204,7 +204,7 @@ void KNumInput::setSteps(int minor, int major) KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name) : TQSpinBox(0, 99, 1, parent, name) { - editor()->setAlignment(AlignRight); + editor()->tqsetAlignment(AlignRight); val_base = 10; setValue(0); } @@ -217,7 +217,7 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base, TQWidget* parent, const char* name) : TQSpinBox(lower, upper, step, parent, name) { - editor()->setAlignment(AlignRight); + editor()->tqsetAlignment(AlignRight); val_base = base; setValue(value); } @@ -339,7 +339,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(), - TQSlider::Horizontal, this); + Qt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); connect(m_slider, TQT_SIGNAL(valueChanged(int)), m_spin, TQT_SLOT(setValue(int))); @@ -412,7 +412,7 @@ void KIntNumInput::setEditFocus(bool mark) m_spin->setEditFocus(mark); } -TQSize KIntNumInput::minimumSizeHint() const +TQSize KIntNumInput::tqminimumSizeHint() const { constPolish(); @@ -422,16 +422,16 @@ TQSize KIntNumInput::minimumSizeHint() const h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height()); // if in extra row, then count it here - if(m_label && (m_alignment & (AlignBottom|AlignTop))) + if(m_label && (m_tqalignment & (AlignBottom|AlignTop))) h += 4 + m_sizeLabel.height(); else // label is in the same row as the other widgets h = QMAX(h, m_sizeLabel.height() + 2); - w = m_slider ? m_slider->sizeHint().width() + 8 : 0; + w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; - if(m_alignment & (AlignTop|AlignBottom)) + if(m_tqalignment & (AlignTop|AlignBottom)) w = QMAX(w, m_sizeLabel.width() + 4); return TQSize(w, h); @@ -439,7 +439,7 @@ TQSize KIntNumInput::minimumSizeHint() const void KIntNumInput::doLayout() { - m_sizeSpin = m_spin->sizeHint(); + m_sizeSpin = m_spin->tqsizeHint(); m_colw2 = m_sizeSpin.width(); if (m_label) @@ -451,15 +451,15 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e) int w = m_colw1; int h = 0; - if(m_label && (m_alignment & AlignTop)) { + if(m_label && (m_tqalignment & AlignTop)) { m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height()); h += m_sizeLabel.height() + KDialog::spacingHint(); } - if(m_label && (m_alignment & AlignVCenter)) + if(m_label && (m_tqalignment & AlignVCenter)) m_label->setGeometry(0, 0, w, m_sizeSpin.height()); - if (qApp->reverseLayout()) + if (tqApp->reverseLayout()) { m_spin->setGeometry(w, h, m_slider ? m_colw2 : QMAX(m_colw2, e->size().width() - w), m_sizeSpin.height()); w += m_colw2 + 8; @@ -477,7 +477,7 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e) h += m_sizeSpin.height() + 2; - if(m_label && (m_alignment & AlignBottom)) + if(m_label && (m_tqalignment & AlignBottom)) m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height()); } @@ -653,7 +653,7 @@ void KDoubleNumInput::slotEmitRelativeValueChanged( double value ) emit relativeValueChanged( value / d->referencePoint ); } -TQSize KDoubleNumInput::minimumSizeHint() const +TQSize KDoubleNumInput::tqminimumSizeHint() const { constPolish(); @@ -663,16 +663,16 @@ TQSize KDoubleNumInput::minimumSizeHint() const h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height()); // if in extra row, then count it here - if(m_label && (m_alignment & (AlignBottom|AlignTop))) + if(m_label && (m_tqalignment & (AlignBottom|AlignTop))) h += 4 + m_sizeLabel.height(); else // label is in the same row as the other widgets h = QMAX(h, m_sizeLabel.height() + 2); - w = m_slider ? m_slider->sizeHint().width() + 8 : 0; + w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; - if(m_alignment & (AlignTop|AlignBottom)) + if(m_tqalignment & (AlignTop|AlignBottom)) w = QMAX(w, m_sizeLabel.width() + 4); return TQSize(w, h); @@ -683,15 +683,15 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e) int w = m_colw1; int h = 0; - if(m_label && (m_alignment & AlignTop)) { + if(m_label && (m_tqalignment & AlignTop)) { m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height()); h += m_sizeLabel.height() + 4; } - if(m_label && (m_alignment & AlignVCenter)) + if(m_label && (m_tqalignment & AlignVCenter)) m_label->setGeometry(0, 0, w, m_sizeEdit.height()); - if (qApp->reverseLayout()) + if (tqApp->reverseLayout()) { d->spin->setGeometry(w, h, m_slider ? m_colw2 : e->size().width() - w, m_sizeEdit.height()); @@ -713,13 +713,13 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e) h += m_sizeEdit.height() + 2; - if(m_label && (m_alignment & AlignBottom)) + if(m_label && (m_tqalignment & AlignBottom)) m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height()); } void KDoubleNumInput::doLayout() { - m_sizeEdit = d->spin->sizeHint(); + m_sizeEdit = d->spin->tqsizeHint(); m_colw2 = m_sizeEdit.width(); } @@ -767,7 +767,7 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, m_slider->setValue(slvalue); } else { m_slider = new TQSlider(slmin, slmax, slstep, slvalue, - TQSlider::Horizontal, this); + Qt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); // feedback line: when one moves, the other moves, too: connect(m_slider, TQT_SIGNAL(valueChanged(int)), @@ -886,7 +886,7 @@ class KDoubleSpinBoxValidator : public KDoubleValidator { public: KDoubleSpinBoxValidator( double bottom, double top, int decimals, KDoubleSpinBox* sb, const char *name ) - : KDoubleValidator( bottom, top, decimals, sb, name ), spinBox( sb ) { } + : KDoubleValidator( bottom, top, decimals, TQT_TQOBJECT(sb), name ), spinBox( sb ) { } virtual State validate( TQString& str, int& pos ) const; @@ -996,7 +996,7 @@ public: KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->setAlignment( Qt::AlignRight ); + editor()->tqsetAlignment( Qt::AlignRight ); d = new Private(); updateValidator(); connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); @@ -1007,7 +1007,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->setAlignment( Qt::AlignRight ); + editor()->tqsetAlignment( Qt::AlignRight ); d = new Private(); setRange( lower, upper, step, precision ); setValue( value ); diff --git a/kdeui/knuminput.h b/kdeui/knuminput.h index 4c4c90732..60be51bde 100644 --- a/kdeui/knuminput.h +++ b/kdeui/knuminput.h @@ -46,7 +46,7 @@ class KIntSpinBox; * for a different variable type * */ -class KDEUI_EXPORT KNumInput : public QWidget +class KDEUI_EXPORT KNumInput : public TQWidget { Q_OBJECT Q_PROPERTY( TQString label READ label WRITE setLabel ) @@ -67,7 +67,7 @@ public: ~KNumInput(); /** - * Sets the text and alignment of the main description label. + * Sets the text and tqalignment of the main description label. * * @param label The text of the label. * Use TQString::null to remove an existing one. @@ -76,7 +76,7 @@ public: * @p AlignTop, @p AlignVCenter, @p AlignBottom. * default is @p AlignLeft | @p AlignTop. * - * The vertical alignment flags have special meaning with this + * The vertical tqalignment flags have special meaning with this * widget: * * @li @p AlignTop The label is placed above the edit/slider @@ -116,7 +116,7 @@ public: * * @return the preferred size necessary to show the control */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected: /** @@ -143,7 +143,7 @@ protected: TQSlider* m_slider; TQSize m_sizeSlider, m_sizeLabel; - int m_alignment; + int m_tqalignment; private: void init(); @@ -312,11 +312,11 @@ public: /** * This method returns the minimum size necessary to display the * control. The minimum size is enough to show all the labels - * in the current font (font change may invalidate the return value). + * in the current font (font change may tqinvalidate the return value). * * @return the minimum size necessary to show the control */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; public slots: /** @@ -596,7 +596,7 @@ public: void setSpecialValueText(const TQString& text); virtual void setLabel(const TQString & label, int a = AlignLeft | AlignTop); - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; virtual bool eventFilter(TQObject*, TQEvent*); public slots: @@ -701,7 +701,7 @@ private: * The class provides an easy interface to use other * numeric systems than the decimal. */ -class KDEUI_EXPORT KIntSpinBox : public QSpinBox +class KDEUI_EXPORT KIntSpinBox : public TQSpinBox { Q_OBJECT Q_PROPERTY( int base READ base WRITE setBase ) @@ -871,7 +871,7 @@ public: int precision() const; /** Equivalent to setPrecision( @p precision, @p false ); Needed - since Qt's moc doesn't ignore trailing parameters with default + since Qt's tqmoc doesn't ignore trailing parameters with default args when searching for a property setter method. */ void setPrecision( int precision ); diff --git a/kdeui/knumvalidator.cpp b/kdeui/knumvalidator.cpp index 436f95431..4dba9d796 100644 --- a/kdeui/knumvalidator.cpp +++ b/kdeui/knumvalidator.cpp @@ -35,7 +35,7 @@ // KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { _base = base; if (_base < 2) _base = 2; @@ -45,7 +45,7 @@ KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) } KIntValidator::KIntValidator ( int bottom, int top, TQWidget * parent, int base, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { _base = base; if (_base > 36) _base = 36; @@ -67,7 +67,7 @@ TQValidator::State KIntValidator::validate ( TQString &str, int & ) const if (_base > 10) newStr = newStr.upper(); - if (newStr == TQString::fromLatin1("-")) // a special case + if (newStr == TQString::tqfromLatin1("-")) // a special case if ((_min || _max) && _min >= 0) ok = false; else @@ -162,7 +162,7 @@ public: KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -170,7 +170,7 @@ KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) } KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -179,7 +179,7 @@ KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, } KFloatValidator::KFloatValidator ( double bottom, double top, bool localeAware, TQWidget * parent, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers = localeAware; @@ -209,12 +209,12 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const TQString newStr; newStr = str.stripWhiteSpace(); - if (newStr == TQString::fromLatin1("-")) // a special case + if (newStr == TQString::tqfromLatin1("-")) // a special case if ((_min || _max) && _min >= 0) ok = false; else return TQValidator::Acceptable; - else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case + else if (newStr == TQString::tqfromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case return TQValidator::Acceptable; else if (newStr.length()) { @@ -339,17 +339,17 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const t = l->thousandsSeparator(); // first, delete p's and t's: if ( !p.isEmpty() ) - for ( int idx = s.find( p ) ; idx >= 0 ; idx = s.find( p, idx ) ) + for ( int idx = s.tqfind( p ) ; idx >= 0 ; idx = s.tqfind( p, idx ) ) s.remove( idx, p.length() ); if ( !t.isEmpty() ) - for ( int idx = s.find( t ) ; idx >= 0 ; idx = s.find( t, idx ) ) + for ( int idx = s.tqfind( t ) ; idx >= 0 ; idx = s.tqfind( t, idx ) ) s.remove( idx, t.length() ); // then, replace the d's and n's - if ( ( !n.isEmpty() && n.find('.') != -1 ) || - ( !d.isEmpty() && d.find('-') != -1 ) ) { + if ( ( !n.isEmpty() && n.tqfind('.') != -1 ) || + ( !d.isEmpty() && d.tqfind('-') != -1 ) ) { // make sure we don't replace something twice: kdWarning() << "KDoubleValidator: decimal symbol contains '-' or " "negative sign contains '.' -> improve algorithm" << endl; @@ -357,11 +357,11 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const } if ( !d.isEmpty() && d != "." ) - for ( int idx = s.find( d ) ; idx >= 0 ; idx = s.find( d, idx + 1 ) ) + for ( int idx = s.tqfind( d ) ; idx >= 0 ; idx = s.tqfind( d, idx + 1 ) ) s.replace( idx, d.length(), '.'); if ( !n.isEmpty() && n != "-" ) - for ( int idx = s.find( n ) ; idx >= 0 ; idx = s.find( n, idx + 1 ) ) + for ( int idx = s.tqfind( n ) ; idx >= 0 ; idx = s.tqfind( n, idx + 1 ) ) s.replace( idx, n.length(), '-' ); } diff --git a/kdeui/kpanelapplet.cpp b/kdeui/kpanelapplet.cpp index 817d9de60..d592f35cc 100644 --- a/kdeui/kpanelapplet.cpp +++ b/kdeui/kpanelapplet.cpp @@ -47,7 +47,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type, : TQFrame(parent, name, f) , _type(type) , _position( pBottom ) - , _alignment( LeftTop ) + , _tqalignment( LeftTop ) , _config(0) , _actions(actions) , d(new KPanelApplet::KPanelAppletPrivate()) @@ -78,11 +78,11 @@ void KPanelApplet::setPosition( Position p ) positionChange( p ); } -void KPanelApplet::setAlignment( Alignment a ) +void KPanelApplet::tqsetAlignment( Alignment a ) { - if( _alignment == a ) return; - _alignment = a; - alignmentChange( a ); + if( _tqalignment == a ) return; + _tqalignment = a; + tqalignmentChange( a ); } // FIXME: Remove implementation for KDE 4 @@ -97,9 +97,9 @@ void KPanelApplet::positionChange( Position ) Qt::Orientation KPanelApplet::orientation() const { if( _position == pTop || _position == pBottom ) { - return Horizontal; + return Qt::Horizontal; } else { - return Vertical; + return Qt::Vertical; } } @@ -146,15 +146,15 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch) if (watch) { - if (d->watchedForFocus.find(widget) == -1) + if (d->watchedForFocus.tqfind(TQT_TQOBJECT(widget)) == -1) { - d->watchedForFocus.append(widget); + d->watchedForFocus.append(TQT_TQOBJECT(widget)); widget->installEventFilter(this); } } - else if (d->watchedForFocus.find(widget) != -1) + else if (d->watchedForFocus.tqfind(TQT_TQOBJECT(widget)) != -1) { - d->watchedForFocus.remove(widget); + d->watchedForFocus.remove(TQT_TQOBJECT(widget)); widget->removeEventFilter(this); } } @@ -172,7 +172,7 @@ void KPanelApplet::needsFocus(bool focus) bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e) { - if (d->watchedForFocus.find(o) != -1) + if (d->watchedForFocus.tqfind(o) != -1) { if (e->type() == TQEvent::MouseButtonRelease || e->type() == TQEvent::FocusIn) diff --git a/kdeui/kpanelapplet.h b/kdeui/kpanelapplet.h index 7719c7b68..c53fb50ca 100644 --- a/kdeui/kpanelapplet.h +++ b/kdeui/kpanelapplet.h @@ -94,7 +94,7 @@ class TQPopupMenu; * * @author Matthias Elter <elter@kde.org> **/ -class KDEUI_EXPORT KPanelApplet : public QFrame +class KDEUI_EXPORT KPanelApplet : public TQFrame { Q_OBJECT @@ -224,7 +224,7 @@ public: /** * @internal **/ - void setAlignment( Alignment a ); + void tqsetAlignment( Alignment a ); signals: /** @@ -308,9 +308,9 @@ protected: **/ Position position() const { return _position; } /** - * @return the applet's alignment. (top/left, center, or bottom/right) + * @return the applet's tqalignment. (top/left, center, or bottom/right) **/ - Alignment alignment() const { return _alignment; } + Alignment tqalignment() const { return _tqalignment; } /** * The panel on which this applet resides has changed its position. @@ -320,11 +320,11 @@ protected: virtual void positionChange( Position p ); /** - * The panel on which this applet resides has changed its alignment. + * The panel on which this applet resides has changed its tqalignment. * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void alignmentChange( Alignment /*a*/ ) {} + virtual void tqalignmentChange( Alignment /*a*/ ) {} /** * Use this method to set the custom menu for this applet so that it can be shown @@ -383,7 +383,7 @@ protected: private: Type _type; Position _position; - Alignment _alignment; + Alignment _tqalignment; KConfig* _config; int _actions; protected: diff --git a/kdeui/kpanelappmenu.cpp b/kdeui/kpanelappmenu.cpp index 68783a339..4cc77b5fe 100644 --- a/kdeui/kpanelappmenu.cpp +++ b/kdeui/kpanelappmenu.cpp @@ -39,7 +39,7 @@ KPanelAppMenu::KPanelAppMenu(const TQString &title, TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject() { - init(TQString::null, title); + init(TQString(), title); } KPanelAppMenu::KPanelAppMenu(const TQPixmap &icon, const TQString &title, diff --git a/kdeui/kpanelextension.cpp b/kdeui/kpanelextension.cpp index 538756758..0a5ee11a7 100644 --- a/kdeui/kpanelextension.cpp +++ b/kdeui/kpanelextension.cpp @@ -49,7 +49,7 @@ KPanelExtension::KPanelExtension(const TQString& configFile, Type type, : TQFrame(parent, name) , _type(type) , _position( Top ) - , _alignment( LeftTop ) + , _tqalignment( LeftTop ) , _config(0) , _actions(actions) { @@ -71,11 +71,11 @@ void KPanelExtension::setPosition( Position p ) positionChange( p ); } -void KPanelExtension::setAlignment( Alignment a ) +void KPanelExtension::tqsetAlignment( Alignment a ) { - if( _alignment == a ) return; - _alignment = a; - alignmentChange( a ); + if( _tqalignment == a ) return; + _tqalignment = a; + tqalignmentChange( a ); } void KPanelExtension::setSize( Size size, int customSize ) @@ -101,9 +101,9 @@ void KPanelExtension::action( Action a ) Qt::Orientation KPanelExtension::orientation() { if (_position == Left || _position == Right) - return Vertical; + return Qt::Vertical; else - return Horizontal; + return Qt::Horizontal; } KPanelExtension::Size KPanelExtension::sizeSetting() const diff --git a/kdeui/kpanelextension.h b/kdeui/kpanelextension.h index 8fe97956d..486aa6fc5 100644 --- a/kdeui/kpanelextension.h +++ b/kdeui/kpanelextension.h @@ -94,7 +94,7 @@ class KPanelExtensionPrivate; * * @author Matthias Elter <elter@kde.org> **/ -class KDEUI_EXPORT KPanelExtension : public QFrame +class KDEUI_EXPORT KPanelExtension : public TQFrame { Q_OBJECT @@ -136,7 +136,7 @@ public: * location in the Window Manager Dock. Please note that the size can not be larger than the * maxsize given by the handler. **/ - virtual TQSize sizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } + virtual TQSize tqsizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } /** * Always use this KConfig object to save/load your extensions configuration. @@ -189,7 +189,7 @@ public: /** * @internal **/ - void setAlignment( Alignment a ); + void tqsetAlignment( Alignment a ); /** * @internal * @since 3.1 @@ -282,9 +282,9 @@ protected: Position position() const { return _position; } /** - * @return the extension's alignment. (left/top, center, or right/bottom) + * @return the extension's tqalignment. (left/top, center, or right/bottom) **/ - Alignment alignment() const { return _alignment; } + Alignment tqalignment() const { return _tqalignment; } /** * @return the extensions orientation. (horizontal or vertical) @@ -305,11 +305,11 @@ protected: virtual void positionChange( Position ) {} /** - * This extension has changed its alignment. + * This extension has changed its tqalignment. * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void alignmentChange( Alignment ) {} + virtual void tqalignmentChange( Alignment ) {} /** * Use this method to set the custom menu for this extensions so that it can be shown @@ -333,7 +333,7 @@ protected: private: Type _type; Position _position; - Alignment _alignment; + Alignment _tqalignment; KConfig* _config; int _actions; protected: diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp index 11db31eb5..37333ad21 100644 --- a/kdeui/kpassdlg.cpp +++ b/kdeui/kpassdlg.cpp @@ -69,10 +69,10 @@ static int * ourMaxLength( const KPasswordEdit* const e ) { d_ptr->setAutoDelete(true); qAddPostRoutine( cleanup_d_ptr ); } - int* ret = d_ptr->find( (void*) e ); + int* ret = d_ptr->tqfind( (void*) e ); if ( ! ret ) { ret = new int; - d_ptr->replace( (void*) e, ret ); + d_ptr->tqreplace( (void*) e, ret ); } return ret; } @@ -213,7 +213,7 @@ void KPasswordEdit::keyPressEvent(TQKeyEvent *e) } break; default: - const unsigned char ke = e->text().local8Bit()[0]; + const unsigned char ke = TQString(e->text()).local8Bit()[0]; if (ke >= 32) { insert(e->text()); } else @@ -339,7 +339,7 @@ void KPasswordDialog::init() KConfig* const cfg = KGlobal::config(); const KConfigGroupSaver saver(cfg, "Passwords"); - bool def = ( qstrcmp( qAppName(), "kdesu" ) == 0 ? defKeep : false ); + bool def = ( qstrcmp( tqAppName(), "kdesu" ) == 0 ? defKeep : false ); if (m_Keep && cfg->readBoolEntry("Keep", def)) ++m_Keep; @@ -354,14 +354,14 @@ void KPasswordDialog::init() if (!pix.isNull()) { lbl = new TQLabel(m_pMain); lbl->setPixmap(pix); - lbl->setAlignment(AlignHCenter|AlignVCenter); - lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 0, 0, AlignCenter); + lbl->tqsetAlignment(AlignHCenter|AlignVCenter); + lbl->setFixedSize(lbl->tqsizeHint()); + m_pGrid->addWidget(lbl, 0, 0, (TQ_Alignment)AlignCenter); } m_pHelpLbl = new TQLabel(m_pMain); - m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak); - m_pGrid->addWidget(m_pHelpLbl, 0, 2, AlignLeft); + m_pHelpLbl->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); + m_pGrid->addWidget(m_pHelpLbl, 0, 2, (TQ_Alignment)AlignLeft); m_pGrid->addRowSpacing(1, 10); m_pGrid->setRowStretch(1, 12); @@ -371,17 +371,17 @@ void KPasswordDialog::init() // Row 3: Password editor #1 lbl = new TQLabel(m_pMain); - lbl->setAlignment(AlignLeft|AlignVCenter); + lbl->tqsetAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Password:")); - lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 7, 0, AlignLeft); + lbl->setFixedSize(lbl->tqsizeHint()); + m_pGrid->addWidget(lbl, 7, 0, (TQ_Alignment)AlignLeft); TQHBoxLayout *h_lay = new TQHBoxLayout(); m_pGrid->addLayout(h_lay, 7, 2); m_pEdit = new KPasswordEdit(m_pMain); m_pEdit2 = 0; lbl->setBuddy(m_pEdit); - TQSize size = m_pEdit->sizeHint(); + TQSize size = m_pEdit->tqsizeHint(); m_pEdit->setFixedHeight(size.height()); m_pEdit->setMinimumWidth(size.width()); h_lay->addWidget(m_pEdit); @@ -392,26 +392,26 @@ void KPasswordDialog::init() m_pGrid->addRowSpacing(8, 10); m_pGrid->setRowStretch(8, 12); TQCheckBox* const cb = new TQCheckBox(i18n("&Keep password"), m_pMain); - cb->setFixedSize(cb->sizeHint()); + cb->setFixedSize(cb->tqsizeHint()); if (m_Keep > 1) cb->setChecked(true); else m_Keep = 0; connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool))); - m_pGrid->addWidget(cb, 9, 2, AlignLeft|AlignVCenter); + m_pGrid->addWidget(cb, 9, 2, (TQ_Alignment)(AlignLeft|AlignVCenter)); } else if (m_Type == NewPassword) { m_pGrid->addRowSpacing(8, 10); lbl = new TQLabel(m_pMain); - lbl->setAlignment(AlignLeft|AlignVCenter); + lbl->tqsetAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Verify:")); - lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 9, 0, AlignLeft); + lbl->setFixedSize(lbl->tqsizeHint()); + m_pGrid->addWidget(lbl, 9, 0, (TQ_Alignment)AlignLeft); h_lay = new TQHBoxLayout(); m_pGrid->addLayout(h_lay, 9, 2); m_pEdit2 = new KPasswordEdit(m_pMain); lbl->setBuddy(m_pEdit2); - size = m_pEdit2->sizeHint(); + size = m_pEdit2->tqsizeHint(); m_pEdit2->setFixedHeight(size.height()); m_pEdit2->setMinimumWidth(size.width()); h_lay->addWidget(m_pEdit2); @@ -424,7 +424,7 @@ void KPasswordDialog::init() strengthBox->setSpacing(10); m_pGrid->addMultiCellWidget(strengthBox, 11, 11, 0, 2); TQLabel* const passStrengthLabel = new TQLabel(strengthBox); - passStrengthLabel->setAlignment(AlignLeft|AlignVCenter); + passStrengthLabel->tqsetAlignment(AlignLeft|AlignVCenter); passStrengthLabel->setText(i18n("Password strength meter:")); d->m_strengthBar = new KProgress(100, strengthBox, "PasswordStrengthMeter"); d->m_strengthBar->setPercentageVisible(false); @@ -443,7 +443,7 @@ void KPasswordDialog::init() m_pGrid->setRowStretch(12, 12); d->m_MatchLabel = new TQLabel(m_pMain); - d->m_MatchLabel->setAlignment(AlignLeft|AlignVCenter|WordBreak); + d->m_MatchLabel->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); m_pGrid->addMultiCellWidget(d->m_MatchLabel, 13, 13, 0, 2); d->m_MatchLabel->setText(i18n("Passwords do not match")); @@ -490,14 +490,14 @@ void KPasswordDialog::addLine(TQString key, TQString value) return; TQLabel *lbl = new TQLabel(key, m_pMain); - lbl->setAlignment(AlignLeft|AlignTop); - lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, m_Row+2, 0, AlignLeft); + lbl->tqsetAlignment(AlignLeft|AlignTop); + lbl->setFixedSize(lbl->tqsizeHint()); + m_pGrid->addWidget(lbl, m_Row+2, 0, (TQ_Alignment)AlignLeft); lbl = new TQLabel(value, m_pMain); - lbl->setAlignment(AlignTop|WordBreak); + lbl->tqsetAlignment(AlignTop|WordBreak); lbl->setFixedSize(275, lbl->heightForWidth(275)); - m_pGrid->addWidget(lbl, m_Row+2, 2, AlignLeft); + m_pGrid->addWidget(lbl, m_Row+2, 2, (TQ_Alignment)AlignLeft); ++m_Row; } @@ -634,15 +634,15 @@ void KPasswordDialog::enableOkBtn() if (pwlength > 5) pwlength = 5; const TQRegExp numRxp("[0-9]", true, false); - int numeric = (int) (pass.contains(numRxp) / lengthFactor); + int numeric = (int) (pass.tqcontains(numRxp) / lengthFactor); if (numeric > 3) numeric = 3; const TQRegExp symbRxp("\\W", false, false); - int numsymbols = (int) (pass.contains(symbRxp) / lengthFactor); + int numsymbols = (int) (pass.tqcontains(symbRxp) / lengthFactor); if (numsymbols > 3) numsymbols = 3; const TQRegExp upperRxp("[A-Z]", true, false); - int upper = (int) (pass.contains(upperRxp) / lengthFactor); + int upper = (int) (pass.tqcontains(upperRxp) / lengthFactor); if (upper > 3) upper = 3; int pwstrength=((pwlength*10)-20) + (numeric*10) + (numsymbols*15) + (upper*10); diff --git a/kdeui/kpassdlg.h b/kdeui/kpassdlg.h index ab6156979..91a861f40 100644 --- a/kdeui/kpassdlg.h +++ b/kdeui/kpassdlg.h @@ -37,7 +37,7 @@ class TQWidget; */ class KDEUI_EXPORT KPasswordEdit - : public QLineEdit + : public TQLineEdit { Q_OBJECT diff --git a/kdeui/kpassivepopup.cpp b/kdeui/kpassivepopup.cpp index 4b870c794..95dd48546 100644 --- a/kdeui/kpassivepopup.cpp +++ b/kdeui/kpassivepopup.cpp @@ -43,11 +43,11 @@ public: static const int DEFAULT_POPUP_TYPE = KPassivePopup::Boxed; static const int DEFAULT_POPUP_TIME = 6*1000; -static const int POPUP_FLAGS = Qt::WStyle_Customize | Qt::WDestructiveClose | Qt::WX11BypassWM - | Qt::WStyle_StaysOnTop | Qt::WStyle_Tool | Qt::WStyle_NoBorder; +static const int POPUP_FLAGS = TQt::WStyle_Customize | TQt::WDestructiveClose | TQt::WX11BypassWM + | TQt::WStyle_StaysOnTop | TQt::WStyle_Tool | TQt::WStyle_NoBorder; KPassivePopup::KPassivePopup( TQWidget *parent, const char *name, WFlags f ) - : TQFrame( 0, name, f ? f : POPUP_FLAGS ), + : TQFrame( 0, name, (WFlags)(f ? (int)f : POPUP_FLAGS) ), window( parent ? parent->winId() : 0L ), msgView( 0 ), topLayout( 0 ), hideDelay( DEFAULT_POPUP_TIME ), hideTimer( new TQTimer( this, "hide_timer" ) ), m_autoDelete( false ) @@ -56,7 +56,7 @@ KPassivePopup::KPassivePopup( TQWidget *parent, const char *name, WFlags f ) } KPassivePopup::KPassivePopup( WId win, const char *name, WFlags f ) - : TQFrame( 0, name, f ? f : POPUP_FLAGS ), + : TQFrame( 0, name, (WFlags)(f ? (int)f : POPUP_FLAGS) ), window( win ), msgView( 0 ), topLayout( 0 ), hideDelay( DEFAULT_POPUP_TIME ), hideTimer( new TQTimer( this, "hide_timer" ) ), m_autoDelete( false ) @@ -65,7 +65,7 @@ KPassivePopup::KPassivePopup( WId win, const char *name, WFlags f ) } KPassivePopup::KPassivePopup( int popupStyle, TQWidget *parent, const char *name, WFlags f ) - : TQFrame( 0, name, f ? f : POPUP_FLAGS ), + : TQFrame( 0, name, (WFlags)(f ? (int)f : POPUP_FLAGS) ), window( parent ? parent->winId() : 0L ), msgView( 0 ), topLayout( 0 ), hideDelay( DEFAULT_POPUP_TIME ), hideTimer( new TQTimer( this, "hide_timer" ) ), m_autoDelete( false ) @@ -74,7 +74,7 @@ KPassivePopup::KPassivePopup( int popupStyle, TQWidget *parent, const char *name } KPassivePopup::KPassivePopup( int popupStyle, WId win, const char *name, WFlags f ) - : TQFrame( 0, name, f ? f : POPUP_FLAGS ), + : TQFrame( 0, name, (WFlags)(f ? (int)f : POPUP_FLAGS) ), window( win ), msgView( 0 ), topLayout( 0 ), hideDelay( DEFAULT_POPUP_TIME ), hideTimer( new TQTimer( this, "hide_timer" ) ), m_autoDelete( false ) @@ -138,7 +138,7 @@ TQVBox * KPassivePopup::standardView( const TQString& caption, hb->setSpacing( KDialog::spacingHint() ); ttlIcon = new TQLabel( hb, "title_icon" ); ttlIcon->setPixmap( icon ); - ttlIcon->setAlignment( AlignLeft ); + ttlIcon->tqsetAlignment( AlignLeft ); } if ( !caption.isEmpty() ) { @@ -146,14 +146,14 @@ TQVBox * KPassivePopup::standardView( const TQString& caption, TQFont fnt = ttl->font(); fnt.setBold( true ); ttl->setFont( fnt ); - ttl->setAlignment( Qt::AlignHCenter ); + ttl->tqsetAlignment( Qt::AlignHCenter ); if ( hb ) hb->setStretchFactor( ttl, 10 ); // enforce centering } if ( !text.isEmpty() ) { msg = new TQLabel( text, vb, "msg_label" ); - msg->setAlignment( AlignLeft ); + msg->tqsetAlignment( AlignLeft ); } return vb; @@ -194,8 +194,8 @@ void KPassivePopup::mouseReleaseEvent( TQMouseEvent *e ) void KPassivePopup::show() { - if ( size() != sizeHint() ) - resize( sizeHint() ); + if ( size() != tqsizeHint() ) + resize( tqsizeHint() ); if ( d->fixedPosition.isNull() ) positionSelf(); diff --git a/kdeui/kpassivepopup.h b/kdeui/kpassivepopup.h index 326c995cb..ecac2a90b 100644 --- a/kdeui/kpassivepopup.h +++ b/kdeui/kpassivepopup.h @@ -65,7 +65,7 @@ class TQVBox; * @author Richard Moore, rich@kde.org * @author Sascha Cunz, sascha.cunz@tiscali.de */ -class KDEUI_EXPORT KPassivePopup : public QFrame +class KDEUI_EXPORT KPassivePopup : public TQFrame { Q_OBJECT Q_PROPERTY (bool autoDelete READ autoDelete WRITE setAutoDelete ) diff --git a/kdeui/kpixmapio.cpp b/kdeui/kpixmapio.cpp index 74c68b82e..4d1e3c06a 100644 --- a/kdeui/kpixmapio.cpp +++ b/kdeui/kpixmapio.cpp @@ -468,7 +468,7 @@ TQImage KPixmapIO::convertFromXImage() cmap, ncells); image.setNumColors(ncells); for (i=0; i<ncells; i++) - image.setColor(i, qRgb(cmap[i].red, cmap[i].green, cmap[i].blue >> 8)); + image.setColor(i, tqRgb(cmap[i].red, cmap[i].green, cmap[i].blue >> 8)); } else image.create(width, height, 32); @@ -485,12 +485,12 @@ TQImage KPixmapIO::convertFromXImage() case bo16_RGB_565: case bo16_BGR_565: { - Q_INT32 pixel, *src; - QRgb *dst, val; + TQ_INT32 pixel, *src; + TQRgb *dst, val; for (y=0; y<height; y++) { - src = (Q_INT32 *) (data + y*bpl); - dst = (QRgb *) image.scanLine(y); + src = (TQ_INT32 *) (data + y*bpl); + dst = (TQRgb *) image.scanLine(y); for (x=0; x<width/2; x++) { pixel = *src++; @@ -516,12 +516,12 @@ TQImage KPixmapIO::convertFromXImage() case bo16_RGB_555: case bo16_BGR_555: { - Q_INT32 pixel, *src; - QRgb *dst, val; + TQ_INT32 pixel, *src; + TQRgb *dst, val; for (y=0; y<height; y++) { - src = (Q_INT32 *) (data + y*bpl); - dst = (QRgb *) image.scanLine(y); + src = (TQ_INT32 *) (data + y*bpl); + dst = (TQRgb *) image.scanLine(y); for (x=0; x<width/2; x++) { pixel = *src++; @@ -547,18 +547,18 @@ TQImage KPixmapIO::convertFromXImage() case bo24_RGB: { char *src; - QRgb *dst; + TQRgb *dst; int w1 = width/4; - Q_INT32 d1, d2, d3; + TQ_INT32 d1, d2, d3; for (y=0; y<height; y++) { src = data + y*bpl; - dst = (QRgb *) image.scanLine(y); + dst = (TQRgb *) image.scanLine(y); for (x=0; x<w1; x++) { - d1 = *((Q_INT32 *)src); - d2 = *((Q_INT32 *)src + 1); - d3 = *((Q_INT32 *)src + 2); + d1 = *((TQ_INT32 *)src); + d2 = *((TQ_INT32 *)src + 1); + d3 = *((TQ_INT32 *)src + 2); src += 12; *dst++ = d1; *dst++ = (d1 >> 24) | (d2 << 8); @@ -579,18 +579,18 @@ TQImage KPixmapIO::convertFromXImage() case bo24_BGR: { char *src; - QRgb *dst; + TQRgb *dst; int w1 = width/4; - Q_INT32 d1, d2, d3; + TQ_INT32 d1, d2, d3; for (y=0; y<height; y++) { src = data + y*bpl; - dst = (QRgb *) image.scanLine(y); + dst = (TQRgb *) image.scanLine(y); for (x=0; x<w1; x++) { - d1 = *((Q_INT32 *)src); - d2 = *((Q_INT32 *)src + 1); - d3 = *((Q_INT32 *)src + 2); + d1 = *((TQ_INT32 *)src); + d2 = *((TQ_INT32 *)src + 1); + d3 = *((TQ_INT32 *)src + 2); src += 12; *dst++ = d1; *dst++ = (d1 >> 24) | (d2 << 8); @@ -637,12 +637,12 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (img.depth() == 32) { - QRgb *src, pixel; - Q_INT32 *dst, val; + TQRgb *src, pixel; + TQ_INT32 *dst, val; for (y=0; y<height; y++) { - src = (QRgb *) img.scanLine(y); - dst = (Q_INT32 *) (data + y*bpl); + src = (TQRgb *) img.scanLine(y); + dst = (TQ_INT32 *) (data + y*bpl); for (x=0; x<width/2; x++) { pixel = *src++; @@ -656,19 +656,19 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (width%2) { pixel = *src++; - *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 9) | + *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 9) | ((pixel & 0xf800) >> 6) | ((pixel & 0xff) >> 3); } } } else { uchar *src; - Q_INT32 val, *dst; - QRgb pixel, *clut = img.colorTable(); + TQ_INT32 val, *dst; + TQRgb pixel, *clut = img.tqcolorTable(); for (y=0; y<height; y++) { - src = img.scanLine(y); - dst = (Q_INT32 *) (data + y*bpl); + src = const_cast<TQImage&>(img).scanLine(y); + dst = (TQ_INT32 *) (data + y*bpl); for (x=0; x<width/2; x++) { pixel = clut[*src++]; @@ -682,7 +682,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (width%2) { pixel = clut[*src++]; - *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 9) | + *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 9) | ((pixel & 0xf800) >> 6) | ((pixel & 0xff) >> 3); } } @@ -694,12 +694,12 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (img.depth() == 32) { - QRgb *src, pixel; - Q_INT32 *dst, val; + TQRgb *src, pixel; + TQ_INT32 *dst, val; for (y=0; y<height; y++) { - src = (QRgb *) img.scanLine(y); - dst = (Q_INT32 *) (data + y*bpl); + src = (TQRgb *) img.scanLine(y); + dst = (TQ_INT32 *) (data + y*bpl); for (x=0; x<width/2; x++) { pixel = *src++; @@ -713,19 +713,19 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (width%2) { pixel = *src++; - *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 8) | + *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 8) | ((pixel & 0xfc00) >> 5) | ((pixel & 0xff) >> 3); } } } else { uchar *src; - Q_INT32 val, *dst; - QRgb pixel, *clut = img.colorTable(); + TQ_INT32 val, *dst; + TQRgb pixel, *clut = img.tqcolorTable(); for (y=0; y<height; y++) { - src = img.scanLine(y); - dst = (Q_INT32 *) (data + y*bpl); + src = const_cast<TQImage&>(img).scanLine(y); + dst = (TQ_INT32 *) (data + y*bpl); for (x=0; x<width/2; x++) { pixel = clut[*src++]; @@ -739,7 +739,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (width%2) { pixel = clut[*src++]; - *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 8) | + *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 8) | ((pixel & 0xfc00) >> 5) | ((pixel & 0xff) >> 3); } } @@ -752,10 +752,10 @@ void KPixmapIO::convertToXImage(const TQImage &img) { char *dst; int w1 = width/4; - QRgb *src, d1, d2, d3, d4; + TQRgb *src, d1, d2, d3, d4; for (y=0; y<height; y++) { - src = (QRgb *) img.scanLine(y); + src = (TQRgb *) img.scanLine(y); dst = data + y*bpl; for (x=0; x<w1; x++) { @@ -763,27 +763,27 @@ void KPixmapIO::convertToXImage(const TQImage &img) d2 = (*src++ & 0xffffff); d3 = (*src++ & 0xffffff); d4 = (*src++ & 0xffffff); - *((Q_INT32 *)dst) = d1 | (d2 << 24); - *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); - *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); + *((TQ_INT32 *)dst) = d1 | (d2 << 24); + *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); + *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); dst += 12; } for (x=w1*4; x<width; x++) { d1 = *src++; - *dst++ = qRed(d1); - *dst++ = qGreen(d1); - *dst++ = qBlue(d1); + *dst++ = tqRed(d1); + *dst++ = tqGreen(d1); + *dst++ = tqBlue(d1); } } } else { uchar *src, *dst; int w1 = width/4; - QRgb *clut = img.colorTable(), d1, d2, d3, d4; + TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4; for (y=0; y<height; y++) { - src = img.scanLine(y); + src = const_cast<TQImage&>(img).scanLine(y); dst = (uchar *) data + y*bpl; for (x=0; x<w1; x++) { @@ -791,17 +791,17 @@ void KPixmapIO::convertToXImage(const TQImage &img) d2 = (clut[*src++] & 0xffffff); d3 = (clut[*src++] & 0xffffff); d4 = (clut[*src++] & 0xffffff); - *((Q_INT32 *)dst) = d1 | (d2 << 24); - *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); - *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); + *((TQ_INT32 *)dst) = d1 | (d2 << 24); + *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); + *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); dst += 12; } for (x=w1*4; x<width; x++) { d1 = clut[*src++]; - *dst++ = qRed(d1); - *dst++ = qGreen(d1); - *dst++ = qBlue(d1); + *dst++ = tqRed(d1); + *dst++ = tqGreen(d1); + *dst++ = tqBlue(d1); } } } @@ -812,11 +812,11 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (img.depth() == 32) { char *dst; - QRgb *src, d1, d2, d3, d4; + TQRgb *src, d1, d2, d3, d4; int w1 = width/4; for (y=0; y<height; y++) { - src = (QRgb *) img.scanLine(y); + src = (TQRgb *) img.scanLine(y); dst = data + y*bpl; for (x=0; x<w1; x++) { @@ -824,27 +824,27 @@ void KPixmapIO::convertToXImage(const TQImage &img) d2 = (*src++ & 0xffffff); d3 = (*src++ & 0xffffff); d4 = (*src++ & 0xffffff); - *((Q_INT32 *)dst) = d1 | (d2 << 24); - *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); - *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); + *((TQ_INT32 *)dst) = d1 | (d2 << 24); + *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); + *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); dst += 12; } for (x=w1*4; x<width; x++) { d1 = *src++; - *dst++ = qBlue(d1); - *dst++ = qGreen(d1); - *dst++ = qRed(d1); + *dst++ = tqBlue(d1); + *dst++ = tqGreen(d1); + *dst++ = tqRed(d1); } } } else { uchar *src, *dst; int w1 = width/4; - QRgb *clut = img.colorTable(), d1, d2, d3, d4; + TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4; for (y=0; y<height; y++) { - src = img.scanLine(y); + src = const_cast<TQImage&>(img).scanLine(y); dst = (uchar *) data + y*bpl; for (x=0; x<w1; x++) { @@ -852,17 +852,17 @@ void KPixmapIO::convertToXImage(const TQImage &img) d2 = (clut[*src++] & 0xffffff); d3 = (clut[*src++] & 0xffffff); d4 = (clut[*src++] & 0xffffff); - *((Q_INT32 *)dst) = d1 | (d2 << 24); - *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); - *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); + *((TQ_INT32 *)dst) = d1 | (d2 << 24); + *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); + *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); dst += 12; } for (x=w1*4; x<width; x++) { d1 = clut[*src++]; - *dst++ = qBlue(d1); - *dst++ = qGreen(d1); - *dst++ = qRed(d1); + *dst++ = tqBlue(d1); + *dst++ = tqGreen(d1); + *dst++ = tqRed(d1); } } } @@ -878,11 +878,11 @@ void KPixmapIO::convertToXImage(const TQImage &img) } else { uchar *src; - QRgb *dst, *clut = img.colorTable(); + TQRgb *dst, *clut = img.tqcolorTable(); for (y=0; y<height; y++) { - src = img.scanLine(y); - dst = (QRgb *) (data + y*bpl); + src = const_cast<TQImage&>(img).scanLine(y); + dst = (TQRgb *) (data + y*bpl); for (x=0; x<width; x++) *dst++ = clut[*src++]; } diff --git a/kdeui/kpixmapregionselectorwidget.cpp b/kdeui/kpixmapregionselectorwidget.cpp index ada867bba..320f6569e 100644 --- a/kdeui/kpixmapregionselectorwidget.cpp +++ b/kdeui/kpixmapregionselectorwidget.cpp @@ -47,7 +47,7 @@ KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent, vboxLayout->addStretch(); m_label = new TQLabel(this, "pixmapHolder"); - m_label->setBackgroundMode( Qt::NoBackground ); + m_label->setBackgroundMode( TQt::NoBackground ); m_label->installEventFilter( this ); vboxLayout->addWidget(m_label); @@ -108,7 +108,7 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_linedPixmap = m_originalPixmap; painter.begin(&m_linedPixmap); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(), TQBrush( TQColor(255,255,255), Qt::BDiagPattern) ); painter.end(); @@ -125,7 +125,7 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_originalPixmap, m_selectedRegion ); painter.setPen( TQColor(255,255,255) ); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.drawRect( m_selectedRegion ); @@ -141,13 +141,13 @@ KPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); KAction *action = new KAction(i18n("&Rotate Clockwise"), "rotate_cw", - 0, this, TQT_SLOT(rotateClockwise()), - popup, "rotateclockwise"); + 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), + TQT_TQOBJECT(popup), "rotateclockwise"); action->plug(popup); action = new KAction(i18n("Rotate &Counterclockwise"), "rotate_ccw", - 0, this, TQT_SLOT(rotateCounterclockwise()), - popup, "rotatecounterclockwise"); + 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), + TQT_TQOBJECT(popup), "rotatecounterclockwise"); action->plug(popup); /* @@ -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() == RightButton ) + if ( mev->button() == Qt::RightButton ) { KPopupMenu *popup = createPopupMenu( ); popup->exec( mev->globalPos() ); @@ -426,7 +426,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) { /* We have to resize the pixmap to get it complete on the screen */ TQImage image=m_originalPixmap.convertToImage(); - m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) ); + m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) ); double oldZoomFactor = m_zoomFactor; m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width(); diff --git a/kdeui/kpixmapregionselectorwidget.h b/kdeui/kpixmapregionselectorwidget.h index f88119755..647f6d76e 100644 --- a/kdeui/kpixmapregionselectorwidget.h +++ b/kdeui/kpixmapregionselectorwidget.h @@ -41,7 +41,7 @@ class KPopupMenu; * @author Antonio Larrosa <larrosa@kde.org> * @since 3.4 */ -class KDEUI_EXPORT KPixmapRegionSelectorWidget : public QWidget +class KDEUI_EXPORT KPixmapRegionSelectorWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeui/kpopupmenu.cpp b/kdeui/kpopupmenu.cpp index 6765216b4..6b63a951c 100644 --- a/kdeui/kpopupmenu.cpp +++ b/kdeui/kpopupmenu.cpp @@ -20,6 +20,11 @@ #include <tqpainter.h> #include <tqtimer.h> #include <tqfontmetrics.h> + +#ifdef USE_QT4 +#undef None +#endif // USE_QT4 + #include <tqstyle.h> #include "kpopupmenu.h" @@ -85,14 +90,14 @@ void KPopupTitle::paintEvent(TQPaintEvent *) { TQRect r(rect()); TQPainter p(this); - kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active()); + kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, tqpalette().active()); if (!miniicon.isNull()) p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon); if (!titleStr.isNull()) { - p.setPen(palette().active().text()); + p.setPen(tqpalette().active().text()); TQFont f = p.font(); f.setBold(true); p.setFont(f); @@ -110,9 +115,9 @@ void KPopupTitle::paintEvent(TQPaintEvent *) } } -TQSize KPopupTitle::sizeHint() const +TQSize KPopupTitle::tqsizeHint() const { - return minimumSize(); + return tqminimumSize(); } class KPopupMenu::KPopupMenuPrivate @@ -145,7 +150,7 @@ public: TQString originalText; int lastHitIndex; - Qt::ButtonState state; + TQt::ButtonState state; // support for RMB menus on menus TQPopupMenu* m_ctxMenu; @@ -198,7 +203,7 @@ int KPopupMenu::insertTitle(const TQPixmap &icon, const TQString &text, int id, void KPopupMenu::changeTitle(int id, const TQString &text) { - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) ((KPopupTitle *)item->widget())->setTitle(text); @@ -215,7 +220,7 @@ void KPopupMenu::changeTitle(int id, const TQString &text) void KPopupMenu::changeTitle(int id, const TQPixmap &icon, const TQString &text) { - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) ((KPopupTitle *)item->widget())->setTitle(text, &icon); @@ -234,7 +239,7 @@ TQString KPopupMenu::title(int id) const { if(id == -1) // obsolete return d->m_lastTitle; - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) return ((KPopupTitle *)item->widget())->title(); @@ -248,7 +253,7 @@ TQString KPopupMenu::title(int id) const TQPixmap KPopupMenu::titlePixmap(int id) const { - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) return ((KPopupTitle *)item->widget())->icon(); @@ -277,7 +282,7 @@ void KPopupMenu::activateItemAt(int index) TQPopupMenu::activateItemAt(index); } -Qt::ButtonState KPopupMenu::state() const +TQt::ButtonState KPopupMenu::state() const { return d->state; } @@ -348,7 +353,7 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) // therefore the lastHitIndex is valid i = d->lastHitIndex; } - } else if (key == Key_Backspace && parentMenu) { + } else if (key == Key_Backspace && tqparentMenu) { // backspace with no chars in the buffer... go back a menu. hide(); resetKeyboardVars(); @@ -377,13 +382,13 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) // if there is an accelerator present, remove it if ((int)accel(j) != 0) - thisText = thisText.replace("&", TQString::null); + thisText = thisText.tqreplace("&", TQString()); // chop text to the search length thisText = thisText.left(seqLen); // do the search - if (!thisText.find(d->keySeq, 0, false)) { + if (!thisText.tqfind(d->keySeq, 0, false)) { if (firstpass) { // match @@ -424,8 +429,8 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) activateItemAt(d->lastHitIndex); resetKeyboardVars(); - } else if (findItem(idAt(d->lastHitIndex)) && - findItem(idAt(d->lastHitIndex))->popup()) { + } else if (tqfindItem(idAt(d->lastHitIndex)) && + tqfindItem(idAt(d->lastHitIndex))->popup()) { // only activate sub-menus activateItemAt(d->lastHitIndex); resetKeyboardVars(); @@ -502,7 +507,7 @@ void KPopupMenu::mousePressEvent(TQMouseEvent* e) void KPopupMenu::mouseReleaseEvent(TQMouseEvent* e) { // Save the button, and the modifiers from state() - d->state = Qt::ButtonState(e->button() | (e->state() & KeyButtonMask)); + d->state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask)); if ( !d->m_ctxMenu || !d->m_ctxMenu->isVisible() ) TQPopupMenu::mouseReleaseEvent(e); @@ -552,7 +557,7 @@ void KPopupMenu::itemHighlighted(int /* whichItem */) void KPopupMenu::showCtxMenu(TQPoint pos) { - TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem); + TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem); if (item) { TQPopupMenu* subMenu = item->popup(); @@ -572,7 +577,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos) emit aboutToShowContextMenu(this, KPopupMenuPrivate::s_highlightedItem, d->m_ctxMenu); - TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup(); + TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu())); @@ -596,7 +601,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos) */ void KPopupMenu::ctxMenuHideShowingMenu() { - TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem); + TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem); if (item) { TQPopupMenu* subMenu = item->popup(); @@ -611,7 +616,7 @@ void KPopupMenu::ctxMenuHiding() { if (KPopupMenuPrivate::s_highlightedItem) { - TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup(); + TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); diff --git a/kdeui/kpopupmenu.h b/kdeui/kpopupmenu.h index 55ebbad8d..c6dc61191 100644 --- a/kdeui/kpopupmenu.h +++ b/kdeui/kpopupmenu.h @@ -35,7 +35,7 @@ * * @author Daniel M. Duley <mosfet@kde.org> */ -class KDEUI_EXPORT KPopupTitle : public QWidget +class KDEUI_EXPORT KPopupTitle : public TQWidget { Q_OBJECT @@ -74,7 +74,7 @@ public: */ TQPixmap icon() const { return miniicon; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: /// @since 3.1 @@ -239,7 +239,7 @@ public: * when the last menuitem was activated. * @since 3.4 */ - Qt::ButtonState state() const; + TQt::ButtonState state() const; signals: /** diff --git a/kdeui/kprogress.cpp b/kdeui/kprogress.cpp index 17994eb88..e10cb0f7b 100644 --- a/kdeui/kprogress.cpp +++ b/kdeui/kprogress.cpp @@ -132,9 +132,9 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps) if (!totalSteps) return false; TQString newString(mFormat); - newString.replace(TQString::fromLatin1("%v"), + newString.replace(TQString::tqfromLatin1("%v"), TQString::number(progress)); - newString.replace(TQString::fromLatin1("%m"), + newString.replace(TQString::tqfromLatin1("%m"), TQString::number(totalSteps)); if (totalSteps > INT_MAX / 1000) { @@ -142,7 +142,7 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps) totalSteps /= 1000; } - newString.replace(TQString::fromLatin1("%p"), + newString.replace(TQString::tqfromLatin1("%p"), TQString::number((progress * 100) / totalSteps)); if (newString != indicator) diff --git a/kdeui/kprogress.h b/kdeui/kprogress.h index b86e28598..e17cf0040 100644 --- a/kdeui/kprogress.h +++ b/kdeui/kprogress.h @@ -43,7 +43,7 @@ * * @author Aaron Seigo */ -class KDEUI_EXPORT KProgress : public QProgressBar +class KDEUI_EXPORT KProgress : public TQProgressBar { Q_OBJECT diff --git a/kdeui/kpushbutton.cpp b/kdeui/kpushbutton.cpp index 52679c0e5..57011da3b 100644 --- a/kdeui/kpushbutton.cpp +++ b/kdeui/kpushbutton.cpp @@ -98,7 +98,7 @@ void KPushButton::init( const KGuiItem &item ) setIconSet( d->item.iconSet() ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); TQToolTip::add( this, item.toolTip() ); @@ -193,7 +193,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e ) return; } - if ( (e->state() & LeftButton) && + if ( (e->state() & Qt::LeftButton) && (e->pos() - startPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) { diff --git a/kdeui/kpushbutton.h b/kdeui/kpushbutton.h index 7cf2b20e1..b0664c807 100644 --- a/kdeui/kpushbutton.h +++ b/kdeui/kpushbutton.h @@ -34,7 +34,7 @@ class TQDragObject; * @short A TQPushButton with drag-support and KGuiItem support * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KDEUI_EXPORT KPushButton : public QPushButton +class KDEUI_EXPORT KPushButton : public TQPushButton { Q_OBJECT Q_PROPERTY(int stdItem READ guiItm WRITE setGuiItm ) diff --git a/kdeui/krootpixmap.cpp b/kdeui/krootpixmap.cpp index cf6af3fdf..d583a243d 100644 --- a/kdeui/krootpixmap.cpp +++ b/kdeui/krootpixmap.cpp @@ -66,7 +66,7 @@ void KRootPixmap::init() m_bCustomPaint = false; connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); + connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint())); #ifdef Q_WS_X11 connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); @@ -75,7 +75,7 @@ void KRootPixmap::init() connect(d->kwin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int))); #endif - d->toplevel = m_pWidget->topLevelWidget(); + d->toplevel = m_pWidget->tqtopLevelWidget(); d->toplevel->installEventFilter(this); m_pWidget->installEventFilter(this); } @@ -113,7 +113,7 @@ void KRootPixmap::start() return; } if (m_bInit) - repaint(true); + tqrepaint(true); } @@ -134,7 +134,7 @@ void KRootPixmap::setFadeEffect(double fade, const TQColor &color) m_Fade = fade; m_FadeColor = color; - if ( m_bActive && m_bInit ) repaint(true); + if ( m_bActive && m_bInit ) tqrepaint(true); } @@ -163,7 +163,7 @@ bool KRootPixmap::eventFilter(TQObject *, TQEvent *event) case TQEvent::Reparent: d->toplevel->removeEventFilter(this); - d->toplevel = m_pWidget->topLevelWidget(); + d->toplevel = m_pWidget->tqtopLevelWidget(); d->toplevel->installEventFilter(this); break; @@ -181,31 +181,31 @@ void KRootPixmap::desktopChanged(int desktop) return; #ifdef Q_WS_X11 - if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops && + if (KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop() == NET::OnAllDesktops && pixmapName(m_Desk) != pixmapName(desktop)) #endif - repaint(true); + tqrepaint(true); } void KRootPixmap::desktopChanged( WId window, unsigned int properties ) { #ifdef Q_WS_X11 if( !(properties & NET::WMDesktop) || - (window != m_pWidget->topLevelWidget()->winId())) + (window != m_pWidget->tqtopLevelWidget()->winId())) return; #endif kdDebug() << k_funcinfo << endl; - repaint(true); + tqrepaint(true); } -void KRootPixmap::repaint() +void KRootPixmap::tqrepaint() { - repaint(false); + tqrepaint(false); } -void KRootPixmap::repaint(bool force) +void KRootPixmap::tqrepaint(bool force) { TQPoint p1 = m_pWidget->mapToGlobal(m_pWidget->rect().topLeft()); TQPoint p2 = m_pWidget->mapToGlobal(m_pWidget->rect().bottomRight()); @@ -226,7 +226,7 @@ void KRootPixmap::repaint(bool force) } m_Rect = TQRect(p1, p2); #ifdef Q_WS_X11 - m_Desk = KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop(); + m_Desk = KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop(); if (m_Desk == NET::OnAllDesktops) m_Desk = currentDesktop(); @@ -326,7 +326,7 @@ void KRootPixmap::slotBackgroundChanged(int desk) return; if (desk == m_Desk) - repaint(true); + tqrepaint(true); } #include "krootpixmap.moc" diff --git a/kdeui/krootpixmap.h b/kdeui/krootpixmap.h index d714c93ef..60f9ac549 100644 --- a/kdeui/krootpixmap.h +++ b/kdeui/krootpixmap.h @@ -43,7 +43,7 @@ class KRootPixmapData; * @author Geert Jansen <jansen@kde.org> * @version $Id$ */ -class KDEUI_EXPORT KRootPixmap: public QObject +class KDEUI_EXPORT KRootPixmap: public TQObject { Q_OBJECT @@ -137,16 +137,16 @@ public slots: * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. * - * @param force Force a repaint, even if the contents did not change. + * @param force Force a tqrepaint, even if the contents did not change. */ - void repaint( bool force ); + void tqrepaint( bool force ); /** * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. This is equivalent to calling - * repaint( false ). + * tqrepaint( false ). */ - void repaint(); + void tqrepaint(); /** * Enables custom handling of the background painting. If custom diff --git a/kdeui/kruler.cpp b/kdeui/kruler.cpp index c50cf9620..56d3703d8 100644 --- a/kdeui/kruler.cpp +++ b/kdeui/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(Horizontal) + dir(Qt::Horizontal) { init(); setFixedHeight(FIX_WIDTH); @@ -108,7 +108,7 @@ KRuler::KRuler(Orientation orient, dir(orient) { init(); - if (orient == Horizontal) + if (orient == Qt::Horizontal) setFixedHeight(FIX_WIDTH); else setFixedWidth(FIX_WIDTH); @@ -123,7 +123,7 @@ KRuler::KRuler(Orientation orient, int widgetWidth, { init(); - if (orient == Horizontal) + if (orient == Qt::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 == Vertical) { + if (dir == Qt::Vertical) { TQFont font = this->font(); font.setPointSize(LABEL_SIZE); TQFontMetrics fm(font); @@ -432,19 +432,19 @@ KRuler::setRulerMetricStyle(KRuler::MetricStyle style) } switch (style) { case Pixel: - setEndLabel(TQString::fromLatin1("pixel")); + setEndLabel(TQString::tqfromLatin1("pixel")); break; case Inch: - setEndLabel(TQString::fromLatin1("inch")); + setEndLabel(TQString::tqfromLatin1("inch")); break; case Millimetres: - setEndLabel(TQString::fromLatin1("mm")); + setEndLabel(TQString::tqfromLatin1("mm")); break; case Centimetres: - setEndLabel(TQString::fromLatin1("cm")); + setEndLabel(TQString::tqfromLatin1("cm")); break; case Metres: - setEndLabel(TQString::fromLatin1("m")); + setEndLabel(TQString::tqfromLatin1("m")); default: /* never reached, see above switch */ /* empty command */; } @@ -550,16 +550,16 @@ KRuler::slotNewValue(int _value) return; } // get the rectangular of the old and the new ruler pointer - // and repaint only him - if (dir == Horizontal) { + // and tqrepaint only him + if (dir == Qt::Horizontal) { TQRect oldrec(-5+oldvalue,10, 11,6); TQRect newrec(-5+_value,10, 11,6); - repaint( oldrec.unite(newrec) ); + tqrepaint( oldrec.unite(newrec) ); } else { TQRect oldrec(10,-5+oldvalue, 6,11); TQRect newrec(10,-5+_value, 6,11); - repaint( oldrec.unite(newrec) ); + tqrepaint( oldrec.unite(newrec) ); } } @@ -569,7 +569,7 @@ KRuler::slotNewOffset(int _offset) if (offset_ != _offset) { //setOffset(_offset); offset_ = _offset; - repaint(contentsRect()); + tqrepaint(contentsRect()); } } @@ -586,7 +586,7 @@ KRuler::slotEndOffset(int offset) } if (d->endOffset_length != tmp) { d->endOffset_length = tmp; - repaint(contentsRect()); + tqrepaint(contentsRect()); } } @@ -604,7 +604,7 @@ KRuler::drawContents(TQPainter *p) int value = range.value(), minval = range.minValue(), maxval; - if (dir == Horizontal) { + if (dir == Qt::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 == Horizontal) { + if (dir == Qt::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 == Horizontal) { + if (dir == Qt::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 == Horizontal) { + if (dir == Qt::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 == Horizontal) { + if (dir == Qt::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 == Horizontal) { + if (dir == Qt::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 == Horizontal) { + if (dir == Qt::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 == Horizontal) { + if (dir == Qt::Horizontal) { pa.setPoints(3, value-5, 10, value+5, 10, value/*+0*/,15); } else { diff --git a/kdeui/kruler.h b/kdeui/kruler.h index 997eb5c36..1abeb5985 100644 --- a/kdeui/kruler.h +++ b/kdeui/kruler.h @@ -55,12 +55,12 @@ * To receive mouse clicks or mouse moves, * the class has to be overloaded. * - * For performance reasons, the public methods don't call TQWidget::repaint(). + * For performance reasons, the public methods don't call TQWidget::tqrepaint(). * (Slots do, see documentation below.) * All the changed settings will be painted once after leaving * to the main event loop. * For performance painting the slot methods should be used, - * they do a fast TQWidget::repaint() call after changing the values. + * they do a fast TQWidget::tqrepaint() call after changing the values. * For setting multiple values like minValue(), maxValue(), offset() etc. * using the public methods is recommended * so the widget will be painted only once when entering the main event loop. @@ -68,7 +68,7 @@ * @short A ruler widget. * @author Jörg Habenicht */ -class KDEUI_EXPORT KRuler : public QFrame +class KDEUI_EXPORT KRuler : public TQFrame { Q_OBJECT Q_PROPERTY( int minValue READ minValue WRITE setMinValue ) @@ -428,7 +428,7 @@ public slots: * Sets the pointer to a new position. * * The offset is NOT updated. - * TQWidget::repaint() is called afterwards. + * TQWidget::tqrepaint() is called afterwards. **/ void slotNewValue(int); @@ -436,7 +436,7 @@ public slots: * Sets the ruler marks to a new position. * * The pointer is NOT updated. - * TQWidget::repaint() is called afterwards. + * TQWidget::tqrepaint() is called afterwards. **/ void slotNewOffset(int); diff --git a/kdeui/ksconfig.cpp b/kdeui/ksconfig.cpp index a8849e8fe..807917ca5 100644 --- a/kdeui/ksconfig.cpp +++ b/kdeui/ksconfig.cpp @@ -266,7 +266,7 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, TQString extension; - int i = dname.find('-'); + int i = dname.tqfind('-'); if ( i != -1 ) { extension = dname.mid(i+1); @@ -363,8 +363,8 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, } //We have explicitly chosen English as the default here. - if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") && - lname==TQString::fromLatin1("en") ) || + if ( ( KGlobal::locale()->language() == TQString::tqfromLatin1("C") && + lname==TQString::tqfromLatin1("en") ) || KGlobal::locale()->language() == lname ) return true; @@ -406,9 +406,9 @@ KSpellConfig::fillInDialog () int whichelement=-1; if ( dictFromList() ) - whichelement = langfnames.findIndex(dictionary()); + whichelement = langfnames.tqfindIndex(dictionary()); - dictcombo->setMinimumWidth (dictcombo->sizeHint().width()); + dictcombo->setMinimumWidth (dictcombo->tqsizeHint().width()); if (dictionary().isEmpty() || whichelement!=-1) { @@ -742,7 +742,7 @@ KSpellConfig::fillDicts( TQComboBox* box, TQStringList* dictionaries ) } } } - int whichelement = langfnames.findIndex(qsdict); + int whichelement = langfnames.tqfindIndex(qsdict); if ( whichelement >= 0 ) { box->setCurrentItem( whichelement ); } @@ -788,7 +788,7 @@ KSpellConfig::setDictionary (const TQString s) qsdict=s; //.copy(); if (qsdict.length()>5) - if ((signed)qsdict.find(".hash")==(signed)qsdict.length()-5) + if ((signed)qsdict.tqfind(".hash")==(signed)qsdict.length()-5) qsdict.remove (qsdict.length()-5,5); @@ -797,7 +797,7 @@ KSpellConfig::setDictionary (const TQString s) int whichelement=-1; if (dictFromList()) { - whichelement = langfnames.findIndex(s); + whichelement = langfnames.tqfindIndex(s); if(whichelement >= 0) { @@ -1003,7 +1003,7 @@ KSpellConfig::setIgnoreList (TQStringList _ignorelist) ignorelist=_ignorelist; } -QStringList +TQStringList KSpellConfig::ignoreList () const { return ignorelist; @@ -1016,7 +1016,7 @@ KSpellConfig::setReplaceAllList (TQStringList _replacelist) d->replacelist=_replacelist; } -QStringList +TQStringList KSpellConfig::replaceAllList() const { return d->replacelist; diff --git a/kdeui/ksconfig.h b/kdeui/ksconfig.h index 0c688d459..7663a2c5f 100644 --- a/kdeui/ksconfig.h +++ b/kdeui/ksconfig.h @@ -84,7 +84,7 @@ enum KSpellClients { * @see KSpell */ -class KDEUI_EXPORT KSpellConfig : public QWidget +class KDEUI_EXPORT KSpellConfig : public TQWidget { Q_OBJECT diff --git a/kdeui/kscrollview.h b/kdeui/kscrollview.h index cca289e75..5611e6c3e 100644 --- a/kdeui/kscrollview.h +++ b/kdeui/kscrollview.h @@ -27,7 +27,7 @@ * * **/ -class KDEUI_EXPORT KScrollView : public QScrollView +class KDEUI_EXPORT KScrollView : public TQScrollView { Q_OBJECT diff --git a/kdeui/kselect.cpp b/kdeui/kselect.cpp index a5fd0f613..8801f5570 100644 --- a/kdeui/kselect.cpp +++ b/kdeui/kselect.cpp @@ -53,7 +53,7 @@ KXYSelector::~KXYSelector() void KXYSelector::setRange( int _minX, int _minY, int _maxX, int _maxY ) { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); px = w; py = w; minX = _minX; @@ -74,7 +74,7 @@ void KXYSelector::setYValue( int _yPos ) void KXYSelector::setValues( int _xPos, int _yPos ) { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) w = 5; xPos = _xPos; @@ -98,7 +98,7 @@ void KXYSelector::setValues( int _xPos, int _yPos ) TQRect KXYSelector::contentsRect() const { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) { w = 5; } @@ -113,7 +113,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev ) TQRect paintRect = ev->rect(); TQRect borderRect = rect(); - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) { w = 5 - w; } @@ -122,8 +122,8 @@ void KXYSelector::paintEvent( TQPaintEvent *ev ) TQPainter painter; painter.begin( this ); - style().drawPrimitive(TQStyle::PE_Panel, &painter, - borderRect, colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter, + borderRect, tqcolorGroup(), TQStyle::Style_Sunken); drawContents( &painter ); @@ -135,7 +135,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev ) } else if (paintRect.intersects(cursorRect)) { - repaint( cursorRect, false); + tqrepaint( cursorRect, false); } painter.end(); @@ -150,7 +150,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e ) { int xVal, yVal; - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); valuesFromPosition( e->pos().x() - w, e->pos().y() - w, xVal, yVal ); setValues( xVal, yVal ); @@ -170,7 +170,7 @@ void KXYSelector::wheelEvent( TQWheelEvent *e ) void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) w = 5; xVal = ( (maxX-minX) * (x-w) ) / ( width()-2*w ); yVal = maxY - ( ( (maxY-minY) * (y-w) ) / ( height()-2*w ) ); @@ -188,7 +188,7 @@ void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const void KXYSelector::setPosition( int xp, int yp ) { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) w = 5; if ( xp < w ) xp = w; @@ -238,7 +238,7 @@ void KXYSelector::drawCursor( TQPainter *p, int xp, int yp ) KSelector::KSelector( TQWidget *parent, const char *name ) : TQWidget( parent, name ), TQRangeControl() { - _orientation = Horizontal; + _orientation = Qt::Horizontal; _indent = true; } @@ -256,9 +256,9 @@ KSelector::~KSelector() TQRect KSelector::contentsRect() const { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw ); else return TQRect( iw, w, width() - 2 * iw, height() - w * 2 - 5 ); @@ -267,7 +267,7 @@ TQRect KSelector::contentsRect() const void KSelector::paintEvent( TQPaintEvent * ) { TQPainter painter; - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; painter.begin( this ); @@ -277,12 +277,12 @@ void KSelector::paintEvent( TQPaintEvent * ) if ( indent() ) { TQRect r = rect(); - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) r.addCoords(0, iw - w, -iw, w - iw); else r.addCoords(iw - w, 0, w - iw, -iw); - style().drawPrimitive(TQStyle::PE_Panel, &painter, - r, colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter, + r, tqcolorGroup(), TQStyle::Style_Sunken); } @@ -329,10 +329,10 @@ void KSelector::valueChange() void KSelector::moveArrow( const TQPoint &pos ) { int val; - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) val = ( maxValue() - minValue() ) * (height()-pos.y()-5+w) / (height()-iw*2) + minValue(); else @@ -346,9 +346,9 @@ TQPoint KSelector::calcArrowPos( int val ) { TQPoint p; - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) { p.setY( height() - ( (height()-2*iw) * val / ( maxValue() - minValue() ) + 5 ) ); @@ -374,10 +374,10 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos ) TQPointArray array(3); painter->setPen( TQPen() ); - painter->setBrush( TQBrush( colorGroup().buttonText() ) ); + painter->setBrush( TQBrush( tqcolorGroup().buttonText() ) ); array.setPoint( 0, pos.x()+0, pos.y()+0 ); array.setPoint( 1, pos.x()+5, pos.y()+5 ); - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) { array.setPoint( 2, pos.x()+5, pos.y()-5 ); } @@ -390,13 +390,13 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos ) } else { - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) { - repaint(pos.x(), pos.y()-5, 6, 11, true); + tqrepaint(pos.x(), pos.y()-5, 6, 11, true); } else { - repaint(pos.x()-5, pos.y(), 11, 6, true); + tqrepaint(pos.x()-5, pos.y(), 11, 6, true); } } } @@ -442,7 +442,7 @@ void KGradientSelector::drawContents( TQPainter *painter ) int greenDiff = color2.green() - color1.green(); int blueDiff = color2.blue() - color1.blue(); - if ( orientation() == Vertical ) + if ( orientation() == Qt::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() == Vertical ) + if ( orientation() == Qt::Vertical ) { int yPos = contentsRect().top() + painter->fontMetrics().ascent() + 2; int xPos = contentsRect().left() + (contentsRect().width() - diff --git a/kdeui/kselect.h b/kdeui/kselect.h index cc9d57d48..7a1c1ef4d 100644 --- a/kdeui/kselect.h +++ b/kdeui/kselect.h @@ -40,7 +40,7 @@ * A custom drawing routine for the widget surface has * to be provided by the subclass. */ -class KDEUI_EXPORT KXYSelector : public QWidget +class KDEUI_EXPORT KXYSelector : public TQWidget { Q_OBJECT Q_PROPERTY( int xValue READ xValue WRITE setXValue ) @@ -156,7 +156,7 @@ private: * A custom drawing routine for the widget surface has * to be provided by the subclass. */ -class KDEUI_EXPORT KSelector : public TQWidget, public QRangeControl +class KDEUI_EXPORT KSelector : public TQWidget, public TQRangeControl { Q_OBJECT Q_PROPERTY( int value READ value WRITE setValue ) @@ -351,8 +351,8 @@ public: protected: virtual void drawContents( TQPainter * ); - virtual TQSize minimumSize() const - { return sizeHint(); } + virtual TQSize tqminimumSize() const + { return tqsizeHint(); } private: void init(); diff --git a/kdeui/kseparator.cpp b/kdeui/kseparator.cpp index 3b6523917..1c1f43e96 100644 --- a/kdeui/kseparator.cpp +++ b/kdeui/kseparator.cpp @@ -49,7 +49,7 @@ void KSeparator::setOrientation(int orientation) { switch(orientation) { - case Vertical: + case Qt::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 Horizontal: + case Qt::Horizontal: case HLine: setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); setMinimumSize(0, 2); @@ -83,7 +83,7 @@ void KSeparator::drawFrame(TQPainter *p) { QPoint p1, p2; QRect r = frameRect(); - const TQColorGroup & g = colorGroup(); + const TQColorGroup & g = tqcolorGroup(); if ( frameStyle() & HLine ) { p1 = TQPoint( r.x(), r.height()/2 ); @@ -95,12 +95,12 @@ void KSeparator::drawFrame(TQPainter *p) } TQStyleOption opt( lineWidth(), midLineWidth() ); - style().drawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g, + tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g, TQStyle::Style_Sunken, opt ); } -TQSize KSeparator::sizeHint() const +TQSize KSeparator::tqsizeHint() const { if ( frameStyle() & VLine ) return TQSize(2, 0); diff --git a/kdeui/kseparator.h b/kdeui/kseparator.h index 008403a15..885f39ed5 100644 --- a/kdeui/kseparator.h +++ b/kdeui/kseparator.h @@ -30,7 +30,7 @@ * @author Michael Roth <mroth@wirlweb.de> * @version $Id$ */ -class KDEUI_EXPORT KSeparator : public QFrame +class KDEUI_EXPORT KSeparator : public TQFrame { Q_OBJECT Q_PROPERTY( int orientation READ orientation WRITE setOrientation ) @@ -70,7 +70,7 @@ class KDEUI_EXPORT KSeparator : public QFrame /** * The recommended height (width) for a horizontal (vertical) separator. **/ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected: /** diff --git a/kdeui/ksharedpixmap.cpp b/kdeui/ksharedpixmap.cpp index 002b4290f..a062d2f8b 100644 --- a/kdeui/ksharedpixmap.cpp +++ b/kdeui/ksharedpixmap.cpp @@ -102,7 +102,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) // already active return false; - TQPixmap::resize(0, 0); // invalidate + TQPixmap::resize(0, 0); // tqinvalidate TQString str = TQString("KDESHPIXMAP:%1").arg(name); d->selection = XInternAtom(qt_xdisplay(), str.latin1(), true); diff --git a/kdeui/ksharedpixmap.h b/kdeui/ksharedpixmap.h index a4f4eb88c..4474cc3f5 100644 --- a/kdeui/ksharedpixmap.h +++ b/kdeui/ksharedpixmap.h @@ -16,6 +16,10 @@ #include <kpixmap.h> +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 #include <tqstring.h> diff --git a/kdeui/kshortcutdialog.cpp b/kdeui/kshortcutdialog.cpp index 27d721626..fbdd46519 100644 --- a/kdeui/kshortcutdialog.cpp +++ b/kdeui/kshortcutdialog.cpp @@ -169,8 +169,8 @@ void KShortcutDialog::updateShortcutDisplay() this->setFocus(); } - s[0].replace('&', TQString::fromLatin1("&&")); - s[1].replace('&', TQString::fromLatin1("&&")); + s[0].replace('&', TQString::tqfromLatin1("&&")); + s[1].replace('&', TQString::tqfromLatin1("&&")); m_simple->m_txtShortcut->setText( s[0] ); m_adv->m_txtPrimary->setText( s[0] ); diff --git a/kdeui/kshortcutdialog_advanced.ui b/kdeui/kshortcutdialog_advanced.ui index 9c371523f..7caa7f9ed 100644 --- a/kdeui/kshortcutdialog_advanced.ui +++ b/kdeui/kshortcutdialog_advanced.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KShortcutDialogAdvanced</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KShortcutDialogAdvanced</cstring> </property> @@ -27,7 +27,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_frameMore</cstring> </property> @@ -47,7 +47,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>m_btnAlternate</cstring> </property> @@ -58,7 +58,7 @@ <string>Alternate shortcut:</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>m_btnPrimary</cstring> </property> @@ -69,7 +69,7 @@ <string>Primary shortcut:</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="2"> + <widget class="TQLayoutWidget" row="1" column="2"> <property name="name"> <cstring>layout6</cstring> </property> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -120,7 +120,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> <cstring>layout7</cstring> </property> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -174,7 +174,7 @@ </spacer> </hbox> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>m_btnClearPrimary</cstring> </property> @@ -188,7 +188,7 @@ <string>Clear shortcut</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>m_btnClearAlternate</cstring> </property> @@ -202,7 +202,7 @@ <string>Clear shortcut</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_btnMultiKey</cstring> </property> diff --git a/kdeui/kshortcutdialog_simple.ui b/kdeui/kshortcutdialog_simple.ui index a7fb651ff..8e43d618f 100644 --- a/kdeui/kshortcutdialog_simple.ui +++ b/kdeui/kshortcutdialog_simple.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KShortcutDialogSimple</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KShortcutDialogSimple</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -71,7 +71,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>m_btnClearShortcut</cstring> </property> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kdeui/kspell.cpp b/kdeui/kspell.cpp index c4ea85ec6..0df7b0842 100644 --- a/kdeui/kspell.cpp +++ b/kdeui/kspell.cpp @@ -393,7 +393,7 @@ bool KSpell::addPersonal( const TQString & word ) TQString qs = word.simplifyWhiteSpace(); //we'll let ispell do the work here b/c we can - if ( qs.find(' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ + if ( qs.tqfind(' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ return false; qs.prepend( "*" ); @@ -404,7 +404,7 @@ bool KSpell::addPersonal( const TQString & word ) bool KSpell::writePersonalDictionary() { - return proc->writeStdin("#"); + return proc->writeStdin(TQString("#")); } bool KSpell::ignore( const TQString & word ) @@ -412,7 +412,7 @@ bool KSpell::ignore( const TQString & word ) TQString qs = word.simplifyWhiteSpace(); //we'll let ispell do the work here b/c we can - if ( qs.find (' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ + if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ return false; qs.prepend( "@" ); @@ -483,7 +483,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) d->checking = true; TQString qs = buffer.simplifyWhiteSpace(); - if ( qs.find (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ + if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ d->checkNextTimer->start( 0, true ); return false; } @@ -505,7 +505,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) OUTPUT(checkWord2); // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); - proc->writeStdin( "%" ); // turn off terse mode + proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell return true; @@ -525,7 +525,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) d->checking = true; TQString qs = buffer.simplifyWhiteSpace(); - if ( qs.find (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ + if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ d->checkNextTimer->start( 0, true ); return false; } @@ -549,7 +549,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) OUTPUT(checkWord2); // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); - proc->writeStdin( "%" ); // turn off terse mode + proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell return true; @@ -660,7 +660,7 @@ TQString KSpell::funnyWord( const TQString & word ) i = j-1; - if ( !( k = qs.findRev(shorty) ) || k != -1 ) + if ( !( k = qs.tqfindRev(shorty) ) || k != -1 ) qs.remove( k, shorty.length() ); else { @@ -699,7 +699,7 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi int i,j; - word = buffer.mid( 2, buffer.find( ' ', 3 ) -2 ); + word = buffer.mid( 2, buffer.tqfind( ' ', 3 ) -2 ); //check() needs this orig=word; @@ -717,18 +717,18 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi //We don't take advantage of ispell's ignore function because //we can't interrupt ispell's output (when checking a large //buffer) to add a word to _it's_ ignore-list. - if ( ignorelist.findIndex( word.lower() ) != -1 ) + if ( ignorelist.tqfindIndex( word.lower() ) != -1 ) return IGNORE; //// Position in line /// TQString qs2; - if ( buffer.find( ':' ) != -1 ) - qs2 = buffer.left( buffer.find(':') ); + if ( buffer.tqfind( ':' ) != -1 ) + qs2 = buffer.left( buffer.tqfind(':') ); else qs2 = buffer; - posinline = qs2.right( qs2.length()-qs2.findRev(' ') ).toInt()-1; + posinline = qs2.right( qs2.length()-qs2.tqfindRev(' ') ).toInt()-1; ///// Replace-list stuff //// TQStringList::Iterator it = replacelist.begin(); @@ -745,14 +745,14 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi /////// Suggestions ////// if ( buffer[0] != '#' ) { - TQString qs = buffer.mid( buffer.find(':')+2, buffer.length() ); + TQString qs = buffer.mid( buffer.tqfind(':')+2, buffer.length() ); qs += ','; sugg.clear(); i = j = 0; while( (unsigned int)i < qs.length() ) { - TQString temp = qs.mid( i, (j=qs.find (',',i)) - i ); + TQString temp = qs.mid( i, (j=qs.tqfind (',',i)) - i ); sugg.append( funnyWord(temp) ); i=j+2; @@ -794,7 +794,7 @@ bool KSpell::checkList (TQStringList *_wordlist, bool _usedialog) //set the dialog signal handler dialog3slot = TQT_SLOT (checkList4 ()); - proc->writeStdin ("%"); // turn off terse mode & check one word at a time + proc->writeStdin (TQString("%")); // turn off terse mode & check one word at a time //lastpos now counts which *word number* we are at in checkListReplaceCurrent() lastpos = -1; @@ -1008,7 +1008,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) // KProcIO calls check2 when read from ispell OUTPUT( check2 ); - proc->writeStdin( "!" ); + proc->writeStdin(TQString("!")); //lastpos is a position in newbuffer (it has offset in it) offset = lastlastline = lastpos = lastline = 0; @@ -1016,7 +1016,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) emitProgress(); // send first buffer line - int i = origbuffer.find( '\n', 0 ) + 1; + int i = origbuffer.tqfind( '\n', 0 ) + 1; qs = origbuffer.mid( 0, i ); cleanFputs( qs, false ); @@ -1130,7 +1130,7 @@ void KSpell::check2( KProcIO * ) //kdDebug(750) << "[EOL](" << tempe << ")[" << temp << "]" << endl; lastpos = (lastlastline=lastline) + offset; //do we really want this? - i = origbuffer.find('\n', lastline) + 1; + i = origbuffer.tqfind('\n', lastline) + 1; qs = origbuffer.mid( lastline, i-lastline ); cleanFputs( qs, false ); lastline = i; @@ -1220,10 +1220,10 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl TQString marker( "_MARKER_" ); tmpBuf.replace( lastpos, word.length(), marker ); TQString context = tmpBuf.mid(QMAX(lastpos-18,0), 2*18+marker.length()); - context.replace( '\n',TQString::fromLatin1(" ")); - context.replace( '<', TQString::fromLatin1("<") ); - context.replace( '>', TQString::fromLatin1(">") ); - context.replace( marker, TQString::fromLatin1("<b>%1</b>").arg( word ) ); + context.replace( '\n',TQString::tqfromLatin1(" ")); + context.replace( '<', TQString::tqfromLatin1("<") ); + context.replace( '>', TQString::tqfromLatin1(">") ); + context.replace( marker, TQString::tqfromLatin1("<b>%1</b>").arg( word ) ); context = "<qt>" + context + "</qt>"; ksdlg->init( word, &sugg, context ); @@ -1419,7 +1419,7 @@ void KSpell::slotSpellCheckerCorrected( const TQString & oldText, const TQString void KSpell::slotModalReady() { - //kdDebug() << qApp->loopLevel() << endl; + //kdDebug() << tqApp->loopLevel() << endl; //kdDebug(750) << "MODAL READY------------------" << endl; Q_ASSERT( m_status == Running ); @@ -1439,7 +1439,7 @@ void KSpell::slotModalDone( const TQString &/*_buffer*/ ) cleanUp(); //kdDebug() << "ABOUT TO EXIT LOOP" << endl; - //qApp->exit_loop(); + //tqApp->exit_loop(); //modalWidgetHack->close(true); slotModalSpellCheckerFinished(); diff --git a/kdeui/kspell.h b/kdeui/kspell.h index 29ff7faf7..def1f4f3a 100644 --- a/kdeui/kspell.h +++ b/kdeui/kspell.h @@ -43,7 +43,7 @@ class KSpellDlg; * @see KSpellConfig, KSyntaxHighlighter */ -class KDEUI_EXPORT KSpell : public QObject +class KDEUI_EXPORT KSpell : public TQObject { Q_OBJECT diff --git a/kdeui/kspelldlg.cpp b/kdeui/kspelldlg.cpp index d21b6975e..fe428aad7 100644 --- a/kdeui/kspelldlg.cpp +++ b/kdeui/kspelldlg.cpp @@ -100,7 +100,7 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b TQT_SLOT(slotConfigChanged()) ); setHelp( "spelldlg", "kspell" ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); emit ready( false ); } diff --git a/kdeui/kspellui.ui b/kdeui/kspellui.ui index 496662797..2477e373e 100644 --- a/kdeui/kspellui.ui +++ b/kdeui/kspellui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSpellUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSpellUI</cstring> </property> @@ -30,7 +30,7 @@ <property name="resizeMode"> <enum>Minimum</enum> </property> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -44,7 +44,7 @@ </qt></string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>m_unknownWord</cstring> </property> @@ -61,7 +61,7 @@ </qt></string> </property> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -77,7 +77,7 @@ </qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="6"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>m_contextLabel</cstring> </property> @@ -87,7 +87,7 @@ <property name="text"> <string>... the <b>misspelled</b> word shown in context ...</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> <property name="toolTip" stdset="0"> @@ -99,7 +99,7 @@ </qt></string> </property> </widget> - <widget class="QPushButton" row="1" column="4" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="4" rowspan="1" colspan="2"> <property name="name"> <cstring>m_addBtn</cstring> </property> @@ -123,14 +123,14 @@ Click here if you consider that the unknown word is not misspelled and you want <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="4" column="5"> + <widget class="TQPushButton" row="4" column="5"> <property name="name"> <cstring>m_replaceAllBtn</cstring> </property> @@ -143,7 +143,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QListView" row="3" column="0" rowspan="5" colspan="5"> + <widget class="TQListView" row="3" column="0" rowspan="5" colspan="5"> <column> <property name="text"> <string>Suggested Words</string> @@ -171,7 +171,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QPushButton" row="3" column="5"> + <widget class="TQPushButton" row="3" column="5"> <property name="name"> <cstring>m_replaceBtn</cstring> </property> @@ -184,7 +184,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -201,7 +201,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QPushButton" row="5" column="5"> + <widget class="TQPushButton" row="5" column="5"> <property name="name"> <cstring>m_skipBtn</cstring> </property> @@ -215,7 +215,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QPushButton" row="6" column="5"> + <widget class="TQPushButton" row="6" column="5"> <property name="name"> <cstring>m_skipAllBtn</cstring> </property> @@ -229,7 +229,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="2" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>m_replacement</cstring> </property> @@ -240,7 +240,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QPushButton" row="2" column="5"> + <widget class="TQPushButton" row="2" column="5"> <property name="name"> <cstring>m_suggestBtn</cstring> </property> @@ -248,7 +248,7 @@ Click here if you consider that the unknown word is not misspelled and you want <string>S&uggest</string> </property> </widget> - <widget class="QComboBox" row="8" column="1" rowspan="1" colspan="4"> + <widget class="TQComboBox" row="8" column="1" rowspan="1" colspan="4"> <item> <property name="text"> <string>English</string> @@ -276,7 +276,7 @@ Click here if you consider that the unknown word is not misspelled and you want <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kdeui/ksplashscreen.h b/kdeui/ksplashscreen.h index 1e1f217af..38cee3413 100644 --- a/kdeui/ksplashscreen.h +++ b/kdeui/ksplashscreen.h @@ -38,7 +38,7 @@ class TQPixmap; * @author Chris Howells (howells@kde.org) * @since 3.2 */ -class KDEUI_EXPORT KSplashScreen : public QSplashScreen +class KDEUI_EXPORT KSplashScreen : public TQSplashScreen { Q_OBJECT diff --git a/kdeui/ksqueezedtextlabel.cpp b/kdeui/ksqueezedtextlabel.cpp index f44b38916..42d6776b9 100644 --- a/kdeui/ksqueezedtextlabel.cpp +++ b/kdeui/ksqueezedtextlabel.cpp @@ -22,30 +22,30 @@ KSqueezedTextLabel::KSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } KSqueezedTextLabel::KSqueezedTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } void KSqueezedTextLabel::resizeEvent( TQResizeEvent * ) { squeezeTextToLabel(); } -TQSize KSqueezedTextLabel::minimumSizeHint() const +TQSize KSqueezedTextLabel::tqminimumSizeHint() const { - TQSize sh = TQLabel::minimumSizeHint(); + TQSize sh = TQLabel::tqminimumSizeHint(); sh.setWidth(-1); return sh; } -TQSize KSqueezedTextLabel::sizeHint() const +TQSize KSqueezedTextLabel::tqsizeHint() const { - return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); + return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); } void KSqueezedTextLabel::setText( const TQString &text ) { @@ -73,11 +73,11 @@ void KSqueezedTextLabel::squeezeTextToLabel() { } } -void KSqueezedTextLabel::setAlignment( int alignment ) +void KSqueezedTextLabel::tqsetAlignment( int tqalignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::setAlignment(alignment); + TQLabel::tqsetAlignment(tqalignment); fullText = tmpFull; } diff --git a/kdeui/ksqueezedtextlabel.h b/kdeui/ksqueezedtextlabel.h index 9ad81d9dd..7d69e7ef1 100644 --- a/kdeui/ksqueezedtextlabel.h +++ b/kdeui/ksqueezedtextlabel.h @@ -53,12 +53,12 @@ public: KSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); KSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); - virtual TQSize minimumSizeHint() const; - virtual TQSize sizeHint() const; + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; /** * Overridden for internal reasons; the API remains unaffected. */ - virtual void setAlignment( int ); + virtual void tqsetAlignment( int ); public slots: void setText( const TQString & ); diff --git a/kdeui/kstatusbar.cpp b/kdeui/kstatusbar.cpp index b70c8ae9c..a04cbf875 100644 --- a/kdeui/kstatusbar.cpp +++ b/kdeui/kstatusbar.cpp @@ -42,7 +42,7 @@ KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id, setLineWidth (0); setFrameStyle (TQFrame::NoFrame); - setAlignment( AlignHCenter | AlignVCenter | SingleLine ); + tqsetAlignment( AlignHCenter | AlignVCenter | SingleLine ); connect (this, TQT_SIGNAL(itemPressed(int)), parent, TQT_SIGNAL(pressed(int))); connect (this, TQT_SIGNAL(itemReleased(int)), parent, TQT_SIGNAL(released(int))); @@ -65,8 +65,8 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name ) // ...but off by default (sven) KConfig *config = KGlobal::config(); TQString group(config->group()); - config->setGroup(TQString::fromLatin1("StatusBar style")); - bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false); + config->setGroup(TQString::tqfromLatin1("StatusBar style")); + bool grip_enabled = config->readBoolEntry(TQString::tqfromLatin1("SizeGripEnabled"), false); setSizeGripEnabled(grip_enabled); config->setGroup(group); } @@ -129,7 +129,7 @@ void KStatusBar::setItemAlignment (int id, int align) KStatusBarLabel *l = items[id]; if (l) { - l->setAlignment(align); + l->tqsetAlignment(align); } else kdDebug() << "KStatusBar::setItemAlignment: bad item id: " << id << endl; diff --git a/kdeui/kstatusbar.h b/kdeui/kstatusbar.h index 97ec7881d..bacc700bb 100644 --- a/kdeui/kstatusbar.h +++ b/kdeui/kstatusbar.h @@ -32,7 +32,7 @@ class KStatusBar; * Internal label class for use in KStatusBar * @internal */ -class KDEUI_EXPORT KStatusBarLabel : public QLabel +class KDEUI_EXPORT KStatusBarLabel : public TQLabel { Q_OBJECT @@ -84,7 +84,7 @@ signals: * @see KActionCollection */ -class KDEUI_EXPORT KStatusBar : public QStatusBar +class KDEUI_EXPORT KStatusBar : public TQStatusBar { Q_OBJECT @@ -167,8 +167,8 @@ public: void changeItem( const TQString& text, int id ); /** - * Sets the alignment of item @p id. By default all fields are aligned - * @p AlignHCenter | @p AlignVCenter. See TQLabel::setAlignment for details. + * Sets the tqalignment of item @p id. By default all fields are aligned + * @p AlignHCenter | @p AlignVCenter. See TQLabel::tqsetAlignment for details. * */ void setItemAlignment(int id, int align); diff --git a/kdeui/kstdaction.cpp b/kdeui/kstdaction.cpp index 3dae8f281..e9a87d71d 100644 --- a/kdeui/kstdaction.cpp +++ b/kdeui/kstdaction.cpp @@ -72,7 +72,7 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch else aboutData = KGlobal::instance()->aboutData(); */ - TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(qApp->name()); + TQString appName = (aboutData) ? aboutData->programName() : TQString::tqfromLatin1(tqApp->name()); sLabel = i18n(pInfo->psLabel).arg(appName); } break; diff --git a/kdeui/kstdguiitem.cpp b/kdeui/kstdguiitem.cpp index 8391819ed..fa9d99341 100644 --- a/kdeui/kstdguiitem.cpp +++ b/kdeui/kstdguiitem.cpp @@ -62,34 +62,34 @@ KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum ) TQString KStdGuiItem::stdItem( StdItem ui_enum ) { switch (ui_enum ) { - case Ok : return TQString::fromLatin1("ok"); - case Cancel : return TQString::fromLatin1("cancel"); - case Yes : return TQString::fromLatin1("yes"); - case No : return TQString::fromLatin1("no"); - case Discard : return TQString::fromLatin1("discard"); - case Save : return TQString::fromLatin1("save"); - case DontSave : return TQString::fromLatin1("dontSave"); - case SaveAs : return TQString::fromLatin1("saveAs"); - case Apply : return TQString::fromLatin1("apply"); - case Help : return TQString::fromLatin1("help"); - case Close : return TQString::fromLatin1("close"); - case Defaults : return TQString::fromLatin1("defaults"); - case Back : return TQString::fromLatin1("back"); - case Forward : return TQString::fromLatin1("forward"); - case Print : return TQString::fromLatin1("print"); - case Continue : return TQString::fromLatin1("continue"); - case Open : return TQString::fromLatin1("open"); - case Quit : return TQString::fromLatin1("quit"); - case AdminMode: return TQString::fromLatin1("adminMode"); - case Delete : return TQString::fromLatin1("delete"); - case Insert : return TQString::fromLatin1("insert"); - case Find : return TQString::fromLatin1("find"); - case Stop : return TQString::fromLatin1("stop"); - case Add : return TQString::fromLatin1("add"); - case Remove : return TQString::fromLatin1("remove"); - case Test : return TQString::fromLatin1("test"); - case Properties : return TQString::fromLatin1("properties"); - case Overwrite : return TQString::fromLatin1("overwrite"); + case Ok : return TQString::tqfromLatin1("ok"); + case Cancel : return TQString::tqfromLatin1("cancel"); + case Yes : return TQString::tqfromLatin1("yes"); + case No : return TQString::tqfromLatin1("no"); + case Discard : return TQString::tqfromLatin1("discard"); + case Save : return TQString::tqfromLatin1("save"); + case DontSave : return TQString::tqfromLatin1("dontSave"); + case SaveAs : return TQString::tqfromLatin1("saveAs"); + case Apply : return TQString::tqfromLatin1("apply"); + case Help : return TQString::tqfromLatin1("help"); + case Close : return TQString::tqfromLatin1("close"); + case Defaults : return TQString::tqfromLatin1("defaults"); + case Back : return TQString::tqfromLatin1("back"); + case Forward : return TQString::tqfromLatin1("forward"); + case Print : return TQString::tqfromLatin1("print"); + case Continue : return TQString::tqfromLatin1("continue"); + case Open : return TQString::tqfromLatin1("open"); + case Quit : return TQString::tqfromLatin1("quit"); + case AdminMode: return TQString::tqfromLatin1("adminMode"); + case Delete : return TQString::tqfromLatin1("delete"); + case Insert : return TQString::tqfromLatin1("insert"); + case Find : return TQString::tqfromLatin1("find"); + case Stop : return TQString::tqfromLatin1("stop"); + case Add : return TQString::tqfromLatin1("add"); + case Remove : return TQString::tqfromLatin1("remove"); + case Test : return TQString::tqfromLatin1("test"); + case Properties : return TQString::tqfromLatin1("properties"); + case Overwrite : return TQString::tqfromLatin1("overwrite"); default : return TQString::null; }; } @@ -197,9 +197,9 @@ KGuiItem KStdGuiItem::forward( BidiMode useBidi ) i18n( "Go forward one step" ) ); } -QPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward() +TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward() { - return qMakePair( back( UseRTL ), forward( UseRTL ) ); + return tqMakePair( back( UseRTL ), forward( UseRTL ) ); } KGuiItem KStdGuiItem::print() diff --git a/kdeui/kstdguiitem.h b/kdeui/kstdguiitem.h index bf2182191..438f419fe 100644 --- a/kdeui/kstdguiitem.h +++ b/kdeui/kstdguiitem.h @@ -141,7 +141,7 @@ public: * locales. If you have a reason for wanting the 'Western' back/forward * buttons, please use the back() and forward() items instead. */ - static QPair<KGuiItem, KGuiItem> backAndForward(); + static TQPair<KGuiItem, KGuiItem> backAndForward(); static KGuiItem quit(); diff --git a/kdeui/kstringvalidator.cpp b/kdeui/kstringvalidator.cpp index f783a4b9f..2e0d3b167 100644 --- a/kdeui/kstringvalidator.cpp +++ b/kdeui/kstringvalidator.cpp @@ -30,12 +30,12 @@ TQValidator::State KStringListValidator::validate( TQString & input, int& ) cons if ( input.isEmpty() ) return Intermediate; if ( isRejecting() ) // anything not in mStringList is acceptable: - if ( mStringList.find( input ) == mStringList.end() ) + if ( mStringList.tqfind( input ) == mStringList.end() ) return Acceptable; else return Intermediate; else // only what is in mStringList is acceptable: - if ( mStringList.find( input ) != mStringList.end() ) + if ( mStringList.tqfind( input ) != mStringList.end() ) return Acceptable; else for ( TQStringList::ConstIterator it = mStringList.begin() ; @@ -84,7 +84,7 @@ TQValidator::State KMimeTypeValidator::validate( TQString & input, int& ) const void KMimeTypeValidator::fixup( TQString & input ) const { TQRegExp invalidChars("[^/" ALLOWED_CHARS "]+"); - input.replace( invalidChars, TQString::null); + input.tqreplace( invalidChars, TQString()); } #include "kstringvalidator.moc" diff --git a/kdeui/kstringvalidator.h b/kdeui/kstringvalidator.h index 77b26d6db..37627abee 100644 --- a/kdeui/kstringvalidator.h +++ b/kdeui/kstringvalidator.h @@ -116,7 +116,7 @@ private: * * @author Marc Mutz <mutz@kde.org> **/ -class KDEUI_EXPORT KMimeTypeValidator : public QValidator +class KDEUI_EXPORT KMimeTypeValidator : public TQValidator { Q_OBJECT public: diff --git a/kdeui/kswitchlanguagedialog.cpp b/kdeui/kswitchlanguagedialog.cpp index 3cfcc011b..ee7a26e83 100644 --- a/kdeui/kswitchlanguagedialog.cpp +++ b/kdeui/kswitchlanguagedialog.cpp @@ -100,7 +100,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog( topLayout->addLayout(languageHorizontalLayout); d->languagesLayout = new TQGridLayout(0 , 2); - languageHorizontalLayout->addLayout(d->languagesLayout); + languageHorizontalLayout->addLayout(TQT_TQLAYOUT(d->languagesLayout)); languageHorizontalLayout->addStretch(); TQStringList defaultLanguages = d->applicationLanguageList(); @@ -142,7 +142,7 @@ void KSwitchLanguageDialog::slotAddLanguageButton() void KSwitchLanguageDialog::removeButtonClicked() { - TQObject const *signalSender = sender(); + TQObject const *signalSender = TQT_TQOBJECT_CONST(sender()); if (signalSender == NULL) { @@ -150,7 +150,7 @@ void KSwitchLanguageDialog::removeButtonClicked() return; } - KPushButton *removeButton = const_cast<KPushButton*>(::qt_cast<const KPushButton*>(signalSender)); + KPushButton *removeButton = const_cast<KPushButton*>(::tqqt_cast<const KPushButton*>(signalSender)); if (removeButton == NULL) { @@ -158,7 +158,7 @@ void KSwitchLanguageDialog::removeButtonClicked() return; } - TQMap<KPushButton *, LanguageRowData>::iterator it = d->languageRows.find(removeButton); + TQMap<KPushButton *, LanguageRowData>::iterator it = d->languageRows.tqfind(removeButton); if (it == d->languageRows.end()) { @@ -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::AlignAuto ); - languagesLayout->addWidget( languageButton, numRows + 1, 2, Qt::AlignAuto ); + languagesLayout->addWidget( languageLabel, numRows + 1, 1, (TQ_Alignment)TQt::AlignAuto ); + languagesLayout->addWidget( languageButton, numRows + 1, 2, (TQ_Alignment)TQt::AlignAuto ); if (primaryLanguage == false) { - languagesLayout->addWidget( removeButton, numRows + 1, 3, Qt::AlignAuto ); + languagesLayout->addWidget( removeButton, numRows + 1, 3, (TQ_Alignment)TQt::AlignAuto ); languageRowData.setRowWidgets( languageLabel, diff --git a/kdeui/ksyntaxhighlighter.cpp b/kdeui/ksyntaxhighlighter.cpp index a5485841f..bd01ad2a9 100644 --- a/kdeui/ksyntaxhighlighter.cpp +++ b/kdeui/ksyntaxhighlighter.cpp @@ -148,14 +148,14 @@ int KSyntaxHighlighter::highlightParagraph( const TQString &text, int ) } TQString simplified = text; - simplified = simplified.replace( TQRegExp( "\\s" ), TQString::null ).replace( '|', TQString::fromLatin1(">") ); - while ( simplified.startsWith( TQString::fromLatin1(">>>>") ) ) + simplified = TQString(simplified.tqreplace( TQRegExp( "\\s" ), TQString() )).tqreplace( '|', TQString::tqfromLatin1(">") ); + while ( simplified.startsWith( TQString::tqfromLatin1(">>>>") ) ) simplified = simplified.mid(3); - if ( simplified.startsWith( TQString::fromLatin1(">>>") ) || simplified.startsWith( TQString::fromLatin1("> > >") ) ) + if ( simplified.startsWith( TQString::tqfromLatin1(">>>") ) || simplified.startsWith( TQString::tqfromLatin1("> > >") ) ) setFormat( 0, text.length(), d->col2 ); - else if ( simplified.startsWith( TQString::fromLatin1(">>") ) || simplified.startsWith( TQString::fromLatin1("> >") ) ) + else if ( simplified.startsWith( TQString::tqfromLatin1(">>") ) || simplified.startsWith( TQString::tqfromLatin1("> >") ) ) setFormat( 0, text.length(), d->col3 ); - else if ( simplified.startsWith( TQString::fromLatin1(">") ) ) + else if ( simplified.startsWith( TQString::tqfromLatin1(">") ) ) setFormat( 0, text.length(), d->col4 ); else setFormat( 0, text.length(), d->col5 ); @@ -189,7 +189,7 @@ int KSpellingHighlighter::highlightParagraph( const TQString &text, // leave #includes, diffs, and quoted replies alone TQString diffAndCo( ">|" ); - bool isCode = diffAndCo.find(text[0]) != -1; + bool isCode = diffAndCo.tqfind(text[0]) != -1; if ( !text.endsWith(" ") ) d->alwaysEndsWithSpace = false; @@ -375,7 +375,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word ) // get tricky... // For auto detection ignore signature and reply prefix if ( !d->autoReady ) - d->autoIgnoreDict.replace( word, Ignore ); + d->autoIgnoreDict.tqreplace( word, Ignore ); // "dict" is used as a cache to store the results of KSpell TQDict<int>* dict = ( d->globalConfig ? d->sDict() : d->mDict ); @@ -383,14 +383,14 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word ) if ( d->autoReady && ( d->autoDict[word] != NotOkay )) { if ( !d->autoIgnoreDict[word] ) ++d->errorCount; - d->autoDict.replace( word, NotOkay ); + d->autoDict.tqreplace( word, NotOkay ); } return d->active; } if ( !dict->isEmpty() && (*dict)[word] == Okay ) { if ( d->autoReady && !d->autoDict[word] ) { - d->autoDict.replace( word, Okay ); + d->autoDict.tqreplace( word, Okay ); } return false; } @@ -399,7 +399,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word ) int para, index; textEdit()->getCursorPosition( ¶, &index ); ++d->wordCount; - dict->replace( word, Unknown ); + dict->tqreplace( word, Unknown ); ++d->checksRequested; if (currentParagraph() != para) d->completeRehighlightRequired = true; @@ -425,9 +425,9 @@ void KDictSpellingHighlighter::slotMisspelling (const TQString &originalWord, co Q_UNUSED( suggestions ); // kdDebug() << suggestions.join( " " ).latin1() << endl; if ( d->globalConfig ) - d->sDict()->replace( originalWord, NotOkay ); + d->sDict()->tqreplace( originalWord, NotOkay ); else - d->mDict->replace( originalWord, NotOkay ); + d->mDict->tqreplace( originalWord, NotOkay ); //Emit this baby so that apps that want to have suggestions in a popup over //the misspelled word can catch them. @@ -441,7 +441,7 @@ void KDictSpellingHighlighter::slotCorrected(const TQString &word, { TQDict<int>* dict = ( d->globalConfig ? d->sDict() : d->mDict ); if ( !dict->isEmpty() && (*dict)[word] == Unknown ) { - dict->replace( word, Okay ); + dict->tqreplace( word, Okay ); } ++d->checksDone; if (d->checksDone == d->checksRequested) { @@ -609,7 +609,7 @@ void KDictSpellingHighlighter::slotKSpellNotResponding() bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) { - if (o == textEdit() && (e->type() == TQEvent::FocusIn)) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::FocusIn)) { if ( d->globalConfig ) { TQString skey = spellKey(); if ( d->spell && d->spellKey != skey ) { @@ -619,8 +619,8 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) } } - if (o == textEdit() && (e->type() == TQEvent::KeyPress)) { - TQKeyEvent *k = static_cast<TQKeyEvent *>(e); + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::KeyPress)) { + TQKeyEvent *k = TQT_TQKEYEVENT(e); d->autoReady = true; if (d->rehighlightRequest->isActive()) // try to stay out of the users way d->rehighlightRequest->changeInterval( 500 ); @@ -661,7 +661,7 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) } } - else if ( o == textEdit()->viewport() && + else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()->viewport()) && ( e->type() == TQEvent::MouseButtonPress )) { d->autoReady = true; if ( intraWordEditing() ) { diff --git a/kdeui/ksyntaxhighlighter.h b/kdeui/ksyntaxhighlighter.h index 2fd0d43a9..9f6e80158 100644 --- a/kdeui/ksyntaxhighlighter.h +++ b/kdeui/ksyntaxhighlighter.h @@ -39,7 +39,7 @@ class KSpellConfig; /** * \brief Syntax sensitive text highlighter */ -class KDEUI_EXPORT KSyntaxHighlighter : public QSyntaxHighlighter +class KDEUI_EXPORT KSyntaxHighlighter : public TQSyntaxHighlighter { public: enum SyntaxMode { diff --git a/kdeui/ksystemtray.cpp b/kdeui/ksystemtray.cpp index 5742eb174..c9bebc47d 100644 --- a/kdeui/ksystemtray.cpp +++ b/kdeui/ksystemtray.cpp @@ -57,7 +57,7 @@ public: }; KSystemTray::KSystemTray( TQWidget* parent, const char* name ) - : TQLabel( parent, name, WType_TopLevel ) + : TQLabel( parent, name, (WFlags)WType_TopLevel ) { #ifdef Q_WS_X11 QXEmbed::initialize(); @@ -67,7 +67,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->actionCollection = new KActionCollection(this); #ifdef Q_WS_X11 - KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): qt_xrootwin() ); + KWin::setSystemTrayWindowFor( winId(), parent?parent->tqtopLevelWidget()->winId(): qt_xrootwin() ); #endif setBackgroundMode(X11ParentRelative); setBackgroundOrigin(WindowOrigin); @@ -75,15 +75,15 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) menu = new KPopupMenu( this ); menu->insertTitle( kapp->miniIcon(), kapp->caption() ); move( -1000, -1000 ); - KStdAction::quit(this, TQT_SLOT(maybeQuit()), d->actionCollection); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection); - if (parentWidget()) + if (tqparentWidget()) { new KAction(i18n("Minimize"), KShortcut(), - this, TQT_SLOT( minimizeRestoreAction() ), + TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); #ifdef Q_WS_X11 - KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId()); + KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId()); d->on_all_desktops = info.onAllDesktops(); #else d->on_all_desktops = false; @@ -94,7 +94,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->on_all_desktops = false; } setCaption( KGlobal::instance()->aboutData()->programName()); - setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); + tqsetAlignment( tqalignment() | Qt::AlignVCenter | Qt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications setScaledContents(true); @@ -146,15 +146,15 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e ) return; switch ( e->button() ) { - case LeftButton: + case Qt::LeftButton: toggleActive(); break; - case MidButton: + case Qt::MidButton: // fall through - case RightButton: - if ( parentWidget() ) { + case Qt::RightButton: + if ( tqparentWidget() ) { KAction* action = d->actionCollection->action("minimizeRestore"); - if ( parentWidget()->isVisible() ) + if ( tqparentWidget()->isVisible() ) action->setText( i18n("&Minimize") ); else action->setText( i18n("&Restore") ); @@ -182,8 +182,8 @@ void KSystemTray::contextMenuAboutToShow( KPopupMenu* ) // entry is "minimize", otherwise it's "restore" void KSystemTray::minimizeRestoreAction() { - if ( parentWidget() ) { - bool restore = !( parentWidget()->isVisible() ); + if ( tqparentWidget() ) { + bool restore = !( tqparentWidget()->isVisible() ); minimizeRestore( restore ); } } @@ -207,13 +207,13 @@ void KSystemTray::maybeQuit() // KDE4: stop closing the parent widget? it results in complex application code // instead make applications connect to the quitSelected() signal - if (parentWidget()) + if (tqparentWidget()) { - parentWidget()->close(); + tqparentWidget()->close(); } else { - qApp->closeAllWindows(); + tqApp->closeAllWindows(); } } @@ -237,7 +237,7 @@ void KSystemTray::setInactive() // (just like taskbar); otherwise hide it void KSystemTray::activateOrHide() { - TQWidget *pw = parentWidget(); + TQWidget *pw = tqparentWidget(); if ( !pw ) return; @@ -283,7 +283,7 @@ void KSystemTray::activateOrHide() void KSystemTray::minimizeRestore( bool restore ) { - TQWidget* pw = parentWidget(); + TQWidget* pw = tqparentWidget(); if( !pw ) return; #ifdef Q_WS_X11 diff --git a/kdeui/ksystemtray.h b/kdeui/ksystemtray.h index 861de3f3b..0e22b1d6a 100644 --- a/kdeui/ksystemtray.h +++ b/kdeui/ksystemtray.h @@ -60,7 +60,7 @@ class KSystemTrayPrivate; * * @author Matthias Ettrich <ettrich@kde.org> **/ -class KDEUI_EXPORT KSystemTray : public QLabel +class KDEUI_EXPORT KSystemTray : public TQLabel { Q_OBJECT public: @@ -163,7 +163,7 @@ protected: /** Reimplemented to provide the standard show/raise behavior - for the parentWidget() and the context menu. + for the tqparentWidget() and the context menu. Feel free to reimplement this if you need something special. */ @@ -171,7 +171,7 @@ protected: /** Reimplemented to provide the standard show/raise behavior - for the parentWidget() and the context menu. + for the tqparentWidget() and the context menu. Feel free to reimplement this if you need something special. */ diff --git a/kdeui/ktabbar.cpp b/kdeui/ktabbar.cpp index e95eb54ca..f5682ae3f 100644 --- a/kdeui/ktabbar.cpp +++ b/kdeui/ktabbar.cpp @@ -76,18 +76,18 @@ void KTabBar::setTabEnabled( int id, bool enabled ) if ( t->isEnabled() ) { r = r.unite( t->rect() ); - tablist->append( tablist->take( tablist->findRef( t ) ) ); + tablist->append( tablist->take( tablist->tqfindRef( t ) ) ); emit selected( t->identifier() ); } } - repaint( r ); + tqrepaint( r ); } } } void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != LeftButton ) + if( e->button() != Qt::LeftButton ) return; TQTab *tab = selectTab( e->pos() ); @@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabBar::mousePressEvent( TQMouseEvent *e ) { - if( e->button() == LeftButton ) { + if( e->button() == Qt::LeftButton ) { mEnableCloseButtonTimer->stop(); mDragStart = e->pos(); } - else if( e->button() == RightButton ) { + else if( e->button() == Qt::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() == LeftButton ) { + if ( e->state() == Qt::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() == MidButton ) { + else if ( e->state() == Qt::MidButton ) { if (mReorderStartTab==-1) { int delay = KGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); @@ -144,7 +144,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) TQTab *tab = selectTab( e->pos() ); if( tab && mTabReorderingEnabled ) { mReorderStartTab = indexOf( tab->identifier() ); - grabMouse( sizeAllCursor ); + grabMouse( tqsizeAllCursor ); return; } } @@ -172,8 +172,8 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) int xoff = 0, yoff = 0; // The additional offsets were found by try and error, TODO: find the rational behind them if ( t == tab( currentTab() ) ) { - xoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3; - yoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4; + xoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3; + yoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4; } else { xoff = 7; @@ -181,7 +181,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } rect.moveLeft( t->rect().left() + 2 + xoff ); rect.moveTop( t->rect().center().y()-pixmap.height()/2 + yoff ); - if ( rect.contains( e->pos() ) ) { + if ( rect.tqcontains( e->pos() ) ) { if ( mHoverCloseButton ) { if ( mHoverCloseButtonTab == t ) return; @@ -230,7 +230,7 @@ void KTabBar::activateDragSwitchTab() void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) { - if( e->button() == MidButton ) { + if( e->button() == Qt::MidButton ) { if ( mReorderStartTab==-1 ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { @@ -240,7 +240,7 @@ void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) } else { releaseMouse(); - setCursor( arrowCursor ); + setCursor( tqarrowCursor ); mReorderStartTab=-1; mReorderPreviousTab=-1; } @@ -253,7 +253,7 @@ void KTabBar::dragMoveEvent( TQDragMoveEvent *e ) TQTab *tab = selectTab( e->pos() ); if( tab ) { bool accept = false; - // The receivers of the testCanDecode() signal has to adjust + // The tqreceivers of the testCanDecode() signal has to adjust // 'accept' accordingly. emit testCanDecode( e, accept); if ( accept && tab != TQTabBar::tab( currentTab() ) ) { @@ -282,7 +282,7 @@ void KTabBar::dropEvent( TQDropEvent *e ) #ifndef QT_NO_WHEELEVENT void KTabBar::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Horizontal ) + if ( e->orientation() == Qt::Horizontal ) return; emit( wheelDelta( e->delta() ) ); @@ -294,16 +294,16 @@ void KTabBar::setTabColor( int id, const TQColor& color ) TQTab *t = tab( id ); if ( t ) { mTabColors.insert( id, color ); - repaint( t->rect(), false ); + tqrepaint( t->rect(), false ); } } const TQColor &KTabBar::tabColor( int id ) const { - if ( mTabColors.contains( id ) ) + if ( mTabColors.tqcontains( id ) ) return mTabColors[id]; - return colorGroup().foreground(); + return tqcolorGroup().foreground(); } int KTabBar::insertTab( TQTab *t, int index ) @@ -312,7 +312,7 @@ int KTabBar::insertTab( TQTab *t, int index ) if ( mTabCloseActivatePrevious && count() > 2 ) { TQPtrList<TQTab> *tablist = tabList(); - tablist->insert( count()-2, tablist->take( tablist->findRef( t ) ) ); + tablist->insert( count()-2, tablist->take( tablist->tqfindRef( t ) ) ); } return res; @@ -341,8 +341,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, r.setLeft( r.left() + pixw + 4 ); r.setRight( r.right() + 2 ); - int inactiveXShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ); - int inactiveYShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ); + int inactiveXShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ); + int inactiveYShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ); int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2; @@ -358,12 +358,12 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, if ( has_focus ) flags |= TQStyle::Style_HasFocus; - TQColorGroup cg( colorGroup() ); - if ( mTabColors.contains( t->identifier() ) ) + TQColorGroup cg( tqcolorGroup() ); + if ( mTabColors.tqcontains( t->identifier() ) ) cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] ); - style().drawControl( TQStyle::CE_TabBarLabel, p, this, r, - t->isEnabled() ? cg : palette().disabled(), + tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r, + t->isEnabled() ? cg : tqpalette().disabled(), flags, TQStyleOption(t) ); } diff --git a/kdeui/ktabbar.h b/kdeui/ktabbar.h index a1928aab7..4ec9822ef 100644 --- a/kdeui/ktabbar.h +++ b/kdeui/ktabbar.h @@ -32,7 +32,7 @@ class KTabBarPrivate; /** * @since 3.2 */ -class KDEUI_EXPORT KTabBar: public QTabBar +class KDEUI_EXPORT KTabBar: public TQTabBar { Q_OBJECT diff --git a/kdeui/ktabctl.cpp b/kdeui/ktabctl.cpp index a4b3c8ac8..5ec13f20e 100644 --- a/kdeui/ktabctl.cpp +++ b/kdeui/ktabctl.cpp @@ -56,8 +56,8 @@ void KTabCtl::resizeEvent(TQResizeEvent *) for (i=0; i<(int)pages.size(); i++) { pages[i]->setGeometry(r); } - if( ( tabs->shape() == TQTabBar::RoundedBelow ) || - ( tabs->shape() == TQTabBar::TriangularBelow ) ) { + if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) || + ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) { tabs->move( 0, height()-tabs->height()-4 ); } } @@ -104,7 +104,7 @@ bool KTabCtl::isTabEnabled(const TQString& name) unsigned int i; for(i = 0; i < pages.size(); i++) - if (TQString::fromLatin1(pages[i]->name()) == name) + if (TQString::tqfromLatin1(pages[i]->name()) == name) return tabs->isTabEnabled(i); /* return the enabled status */ return false; /* tab does not exist */ } @@ -117,7 +117,7 @@ void KTabCtl::setTabEnabled(const TQString& name, bool state) return; for (i = 0; i < pages.size(); i++) - if (TQString::fromLatin1(pages[i]->name()) == name) + if (TQString::tqfromLatin1(pages[i]->name()) == name) tabs->setTabEnabled(i, state); } @@ -125,11 +125,11 @@ void KTabCtl::setSizes() { unsigned i; - TQSize min(tabs->sizeHint()); /* the minimum required size for the tabbar */ + TQSize min(tabs->tqsizeHint()); /* the minimum required size for the tabbar */ tabs->resize(min); /* make sure that the tabbar does not require more space than actually needed. */ - TQSize max(QCOORD_MAX,QCOORD_MAX); + TQSize max(TQCOORD_MAX,TQCOORD_MAX); //int th = min.height(); /* the height of the tabbar itself (without pages and stuff) */ for (i = 0; i < pages.size(); i++) { @@ -138,14 +138,14 @@ void KTabCtl::setSizes() * check the actual minimum and maximum sizes */ - if (pages[i]->maximumSize().height() < max.height()) - max.setHeight(pages[i]->maximumSize().height()); - if (pages[i]->maximumSize().width() < max.width()) - max.setWidth( pages[i]->maximumSize().width()); - if ( pages[i]->minimumSize().height() > min.height()) - min.setHeight( pages[i]->minimumSize().height()); - if ( pages[i]->minimumSize().width() > min.width()) - min.setWidth( pages[i]->minimumSize().width()); + if (pages[i]->tqmaximumSize().height() < max.height()) + max.setHeight(pages[i]->tqmaximumSize().height()); + if (pages[i]->tqmaximumSize().width() < max.width()) + max.setWidth( pages[i]->tqmaximumSize().width()); + if ( pages[i]->tqminimumSize().height() > min.height()) + min.setHeight( pages[i]->tqminimumSize().height()); + if ( pages[i]->tqminimumSize().width() > min.width()) + min.setWidth( pages[i]->tqminimumSize().width()); } // BL: min and max are sizes of children, not tabcontrol @@ -184,22 +184,22 @@ void KTabCtl::setBorder( bool state ) blBorder = state; } -void KTabCtl::setShape( TQTabBar::Shape shape ) +void KTabCtl::setShape( TQTabBar::Shape tqshape ) { - tabs->setShape( shape ); + tabs->setShape( tqshape ); } -QSize -KTabCtl::sizeHint() const +TQSize +KTabCtl::tqsizeHint() const { /* desired size of the tabbar */ - TQSize hint(tabs->sizeHint()); + TQSize hint(tabs->tqsizeHint()); /* overall desired size of all pages */ TQSize pageHint; for (unsigned int i = 0; i < pages.size(); i++) { - TQSize sizeI(pages[i]->sizeHint()); + TQSize sizeI(pages[i]->tqsizeHint()); if (sizeI.isValid()) { @@ -229,7 +229,7 @@ KTabCtl::sizeHint() const } /* - * If not at least a one page has a valid sizeHint we have to return + * If not at least a one page has a valid tqsizeHint we have to return * an invalid size as well. */ return (pageHint); @@ -251,16 +251,16 @@ void KTabCtl::paintEvent(TQPaintEvent *) int x1 = getChildRect().right() + 2; int x0 = getChildRect().left() - 1; - p.setPen(colorGroup().light()); + p.setPen(tqcolorGroup().light()); p.drawLine(x0, y0 - 1, x1 - 1, y0 - 1); /* 1st top line */ - p.setPen(colorGroup().midlight()); + p.setPen(tqcolorGroup().midlight()); p.drawLine(x0, y0, x1 - 1, y0); /* 2nd top line */ - p.setPen(colorGroup().light()); + p.setPen(tqcolorGroup().light()); p.drawLine(x0, y0 + 1, x0, y1); /* left line */ p.setPen(black); p.drawLine(x1, y1, x0, y1); /* bottom line */ p.drawLine(x1, y1 - 1, x1, y0); - p.setPen(colorGroup().dark()); + p.setPen(tqcolorGroup().dark()); p.drawLine(x0 + 1, y1 - 1, x1 - 1, y1 - 1); /* bottom */ p.drawLine(x1 - 1, y1 - 2, x1 - 1, y0 + 1); p.end(); @@ -273,8 +273,8 @@ void KTabCtl::paintEvent(TQPaintEvent *) TQRect KTabCtl::getChildRect() const { - if( ( tabs->shape() == TQTabBar::RoundedBelow ) || - ( tabs->shape() == TQTabBar::TriangularBelow ) ) { + if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) || + ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) { return TQRect(2, 1, width() - 4, height() - tabs->height() - 4); } else { diff --git a/kdeui/ktabctl.h b/kdeui/ktabctl.h index 9c390351f..1151eb22e 100644 --- a/kdeui/ktabctl.h +++ b/kdeui/ktabctl.h @@ -45,7 +45,7 @@ * @author Alexander Sanda (alex@darkstar.ping.at) * @version $Id$ */ -class KDEUI_EXPORT KTabCtl : public QWidget +class KDEUI_EXPORT KTabCtl : public TQWidget { Q_OBJECT @@ -61,8 +61,8 @@ public: bool isTabEnabled(const TQString& ); void setTabEnabled(const TQString&, bool); void setBorder(bool); - void setShape( TQTabBar::Shape shape ); - virtual TQSize sizeHint() const; + void setShape( TQTabBar::Shape tqshape ); + virtual TQSize tqsizeHint() const; protected: void paintEvent(TQPaintEvent *); diff --git a/kdeui/ktabwidget.cpp b/kdeui/ktabwidget.cpp index 5a431ecd2..bc28b5d4d 100644 --- a/kdeui/ktabwidget.cpp +++ b/kdeui/ktabwidget.cpp @@ -163,8 +163,8 @@ bool KTabWidget::tabCloseActivatePrevious() const unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) { int hframe, overlap; - hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() ); - overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() ); + hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() ); + overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() ); TQFontMetrics fm = tabBar()->fontMetrics(); int x = 0; @@ -177,7 +177,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) int iw = 0; if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, + x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( QMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } @@ -253,7 +253,7 @@ void KTabWidget::resizeTabs( int changeTabIndex ) newMaxLength=d->m_maxLength; uint lcw=0, rcw=0; - int tabBarHeight = tabBar()->sizeHint().height(); + int tabBarHeight = tabBar()->tqsizeHint().height(); if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() ) lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight ); if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() ) @@ -301,7 +301,7 @@ void KTabWidget::dragMoveEvent( TQDragMoveEvent *e ) { if ( isEmptyTabbarSpace( e->pos() ) ) { bool accept = false; - // The receivers of the testCanDecode() signal has to adjust + // The tqreceivers of the testCanDecode() signal has to adjust // 'accept' accordingly. emit testCanDecode( e, accept); e->accept( accept ); @@ -323,7 +323,7 @@ void KTabWidget::dropEvent( TQDropEvent *e ) #ifndef QT_NO_WHEELEVENT void KTabWidget::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Horizontal ) + if ( e->orientation() == Qt::Horizontal ) return; if ( isEmptyTabbarSpace( e->pos() ) ) @@ -351,7 +351,7 @@ void KTabWidget::wheelDelta( int delta ) void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != LeftButton ) + if( e->button() != Qt::LeftButton ) return; if ( isEmptyTabbarSpace( e->pos() ) ) { @@ -363,12 +363,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == RightButton ) { + if ( e->button() == Qt::RightButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( contextMenu( mapToGlobal( e->pos() ) ) ); return; } - } else if ( e->button() == MidButton ) { + } else if ( e->button() == Qt::MidButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( mouseMiddleClick() ); return; @@ -451,7 +451,7 @@ void KTabWidget::removePage( TQWidget * w ) { bool KTabWidget::isEmptyTabbarSpace( const TQPoint &point ) const { - TQSize size( tabBar()->sizeHint() ); + TQSize size( tabBar()->tqsizeHint() ); if ( ( tabPosition()==Top && point.y()< size.height() ) || ( tabPosition()==Bottom && point.y()>(height()-size.height() ) ) ) { TQWidget *rightcorner = cornerWidget( TopRight ); if ( rightcorner ) { diff --git a/kdeui/ktabwidget.h b/kdeui/ktabwidget.h index 2ce850744..9629eb9e8 100644 --- a/kdeui/ktabwidget.h +++ b/kdeui/ktabwidget.h @@ -33,7 +33,7 @@ class KTabWidgetPrivate; * * @since 3.2 */ -class KDEUI_EXPORT KTabWidget : public QTabWidget +class KDEUI_EXPORT KTabWidget : public TQTabWidget { Q_OBJECT Q_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled ) diff --git a/kdeui/ktextbrowser.cpp b/kdeui/ktextbrowser.cpp index 6b3685a81..dfd283455 100644 --- a/kdeui/ktextbrowser.cpp +++ b/kdeui/ktextbrowser.cpp @@ -60,7 +60,7 @@ void KTextBrowser::setSource( const TQString& name ) return; } - if( name.find('@') > -1 ) + if( name.tqfind('@') > -1 ) { if( !mNotifyClick ) { diff --git a/kdeui/ktextbrowser.h b/kdeui/ktextbrowser.h index fd20d9cef..9c9fd929d 100644 --- a/kdeui/ktextbrowser.h +++ b/kdeui/ktextbrowser.h @@ -39,7 +39,7 @@ * @author Espen Sand (espensa@online.no) */ -class KDEUI_EXPORT KTextBrowser : public QTextBrowser +class KDEUI_EXPORT KTextBrowser : public TQTextBrowser { Q_OBJECT Q_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick ) diff --git a/kdeui/ktextedit.cpp b/kdeui/ktextedit.cpp index 0951fe066..fda46df76 100644 --- a/kdeui/ktextedit.cpp +++ b/kdeui/ktextedit.cpp @@ -182,7 +182,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e ) // ignore Ctrl-Return so that KDialogs can close the dialog else if ( e->state() == ControlButton && (e->key() == Key_Return || e->key() == Key_Enter) && - topLevelWidget()->inherits( "KDialog" ) ) + tqtopLevelWidget()->inherits( "KDialog" ) ) { e->ignore(); return; @@ -351,7 +351,7 @@ void KTextEdit::checkSpelling() { delete d->spell; d->spell = new KSpell( this, i18n( "Spell Checking" ), - this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); connect( d->spell, TQT_SIGNAL( death() ), this, TQT_SLOT( spellCheckerFinished() ) ); diff --git a/kdeui/ktextedit.h b/kdeui/ktextedit.h index 7735beb34..a93d36fe1 100644 --- a/kdeui/ktextedit.h +++ b/kdeui/ktextedit.h @@ -40,7 +40,7 @@ class KSpell; * @author Carsten Pfeiffer <pfeiffer@kde.org> * @since 3.1 */ -class KDEUI_EXPORT KTextEdit : public QTextEdit +class KDEUI_EXPORT KTextEdit : public TQTextEdit { Q_OBJECT diff --git a/kdeui/ktimewidget.cpp b/kdeui/ktimewidget.cpp index 3a5ec3936..4d48b2129 100644 --- a/kdeui/ktimewidget.cpp +++ b/kdeui/ktimewidget.cpp @@ -9,7 +9,7 @@ class KTimeWidget::KTimeWidgetPrivate { public: - QTimeEdit * timeWidget; + TQTimeEdit * timeWidget; }; KTimeWidget::KTimeWidget(TQWidget * parent, const char * name) @@ -39,7 +39,7 @@ void KTimeWidget::init() TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); layout->setAutoAdd(true); - d->timeWidget = new QTimeEdit(this); + d->timeWidget = new TQTimeEdit(this); connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)), TQT_SIGNAL(valueChanged(const TQTime &))); diff --git a/kdeui/ktimewidget.h b/kdeui/ktimewidget.h index b9808f0e8..0d6f18873 100644 --- a/kdeui/ktimewidget.h +++ b/kdeui/ktimewidget.h @@ -34,7 +34,7 @@ * @author Hans Petter Bieker <bieker@kde.org> * @since 3.2 */ -class KDEUI_EXPORT KTimeWidget : public QWidget +class KDEUI_EXPORT KTimeWidget : public TQWidget { Q_OBJECT Q_PROPERTY( TQTime time READ time WRITE setTime ) diff --git a/kdeui/ktip.cpp b/kdeui/ktip.cpp index ae619a173..269a7c472 100644 --- a/kdeui/ktip.cpp +++ b/kdeui/ktip.cpp @@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile) { TQString tipFile = _tipFile; if (tipFile.isEmpty()) - tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"; + tipFile = TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"; loadTips(tipFile); @@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles ) { if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) ) { - addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"); + addTips(TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"); } else { @@ -115,12 +115,12 @@ void KTipDatabase::addTips(const TQString& tipFile ) const TQRegExp rx("\\n+"); int pos = -1; - while ((pos = content.find("<html>", pos + 1, false)) != -1) + while ((pos = content.tqfind("<html>", pos + 1, false)) != -1) { // to make translations work, tip extraction here must exactly // match what is done by the preparetips script TQString tip = content - .mid(pos + 6, content.find("</html>", pos, false) - pos - 6) + .mid(pos + 6, content.tqfind("</html>", pos, false) - pos - 6) .replace(rx, "\n"); if (!tip.endsWith("\n")) tip += "\n"; @@ -191,7 +191,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) KIconEffect::colorize(img, mBlendedColor, 1.0); QRgb colPixel( img.pixel(0,0) ); - mBlendedColor = TQColor(qRed(colPixel),qGreen(colPixel),qBlue(colPixel)); + mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel)); } mBaseColor = KGlobalSettings::alternateBackgroundColor(); @@ -223,7 +223,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) titlePane->setBackgroundPixmap(locate("data", "kdeui/pics/ktip-background.png")); titlePane->setText(i18n("Did you know...?\n")); titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold)); - titlePane->setAlignment(TQLabel::AlignCenter); + titlePane->tqsetAlignment(TQLabel::AlignCenter); pl->addWidget(titlePane, 100); } @@ -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->tqsetAlignment(Qt::AlignRight | Qt::AlignBottom); resize(550, 230); TQSize sh = size(); @@ -347,10 +347,10 @@ void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bo const int oneDay = 24*60*60; TQDateTime lastShown = configGroup.readDateTimeEntry("TipLastShown"); // Show tip roughly once a week - if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (kapp->random() % (10*oneDay)))) + if (lastShown.secsTo(TQDateTime::tqcurrentDateTime()) < (oneDay + (kapp->random() % (10*oneDay)))) return; } - configGroup.writeEntry("TipLastShown", TQDateTime::currentDateTime()); + configGroup.writeEntry("TipLastShown", TQDateTime::tqcurrentDateTime()); kapp->config()->sync(); if (!hasLastShown) return; // Don't show tip on first start @@ -384,7 +384,7 @@ static TQString fixTip(TQString tip) void KTipDialog::prevTip() { mDatabase->prevTip(); - TQString currentTip = TQString::fromLatin1( + TQString currentTip = TQString::tqfromLatin1( "<qt text=\"%1\" bgcolor=\"%2\">%3</qt>") .arg(mTextColor.name()) .arg(mBaseColor.name()) @@ -399,7 +399,7 @@ static TQString fixTip(TQString tip) void KTipDialog::nextTip() { mDatabase->nextTip(); - TQString currentTip = TQString::fromLatin1( + TQString currentTip = TQString::tqfromLatin1( "<qt text=\"%1\" bgcolor=\"%2\">%3</qt>") .arg(mTextColor.name()) .arg(mBaseColor.name()) @@ -425,7 +425,7 @@ static TQString fixTip(TQString tip) bool KTipDialog::eventFilter(TQObject *o, TQEvent *e) { - if (o == mTipText && e->type()== TQEvent::KeyPress && + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mTipText) && e->type()== TQEvent::KeyPress && (((TQKeyEvent *)e)->key() == Key_Return || ((TQKeyEvent *)e)->key() == Key_Space )) accept(); diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp index 79607099a..fc61ee2ff 100644 --- a/kdeui/ktoolbar.cpp +++ b/kdeui/ktoolbar.cpp @@ -90,7 +90,7 @@ public: m_xmlguiClient = 0; - oldPos = Qt::DockUnmanaged; + oldPos = TQt::DockUnmanaged; modified = m_isHorizontal = positioned = false; @@ -122,16 +122,16 @@ public: struct ToolBarInfo { - ToolBarInfo() : index( -1 ), offset( -1 ), newline( false ), dock( Qt::DockTop ) {} - ToolBarInfo( Qt::Dock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {} + ToolBarInfo() : index( -1 ), offset( -1 ), newline( false ), dock( TQt::DockTop ) {} + ToolBarInfo( TQt::Dock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {} int index, offset; bool newline; - Qt::Dock dock; + TQt::Dock dock; }; ToolBarInfo toolBarInfo; TQValueList<int> iconSizes; - TQTimer repaintTimer; + TQTimer tqrepaintTimer; // Default Values. bool HiddenDefault; @@ -166,11 +166,11 @@ void KToolBarSeparator::drawContents( TQPainter* p ) if ( line ) { TQStyle::SFlags flags = TQStyle::Style_Default; - if ( orientation() == Horizontal ) + if ( orientation() == Qt::Horizontal ) flags = flags | TQStyle::Style_Horizontal; - style().drawPrimitive(TQStyle::PE_DockWindowSeparator, p, - contentsRect(), colorGroup(), flags); + tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p, + contentsRect(), tqcolorGroup(), flags); } else { TQFrame::drawContents(p); } @@ -181,10 +181,10 @@ void KToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize KToolBarSeparator::sizeHint() const +TQSize KToolBarSeparator::tqsizeHint() const { - int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); - return orientation() == Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); + int dim = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); + return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); } TQSizePolicy KToolBarSeparator::sizePolicy() const @@ -193,7 +193,7 @@ TQSizePolicy KToolBarSeparator::sizePolicy() const } KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig ) - : TQToolBar( TQString::fromLatin1( name ), + : TQToolBar( TQString::tqfromLatin1( name ), dynamic_cast<TQMainWindow*>(parent), parent, false, name ? name : "mainToolBar") @@ -202,7 +202,7 @@ KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool re } KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig ) - : TQToolBar( TQString::fromLatin1( name ), + : TQToolBar( TQString::tqfromLatin1( name ), parentWindow, dock, newLine, name ? name : "mainToolBar") { @@ -210,7 +210,7 @@ KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock, } KToolBar::KToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig ) - : TQToolBar( TQString::fromLatin1( name ), + : TQToolBar( TQString::tqfromLatin1( name ), parentWindow, dock, newLine, name ? name : "mainToolBar") { @@ -232,7 +232,7 @@ void KToolBar::init( bool readConfig, bool honorStyle ) layoutTimer = new TQTimer( this ); connect( layoutTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( rebuildLayout() ) ); - connect( &(d->repaintTimer), TQT_SIGNAL( timeout() ), + connect( &(d->tqrepaintTimer), TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRepaint() ) ); if ( kapp ) { // may be null when started inside designer @@ -427,7 +427,7 @@ int KToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slot, KAnimWidget *KToolBar::animatedWidget( int id ) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; KAnimWidget *aw = dynamic_cast<KAnimWidget *>(*it); @@ -610,7 +610,7 @@ TQString KToolBar::getComboItem (int id, int index) const KComboBox * KToolBar::getCombo(int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; return dynamic_cast<KComboBox *>( *it ); @@ -619,7 +619,7 @@ KComboBox * KToolBar::getCombo(int id) KLineEdit * KToolBar::getLined (int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; return dynamic_cast<KLineEdit *>( *it ); @@ -628,7 +628,7 @@ KLineEdit * KToolBar::getLined (int id) KToolBarButton * KToolBar::getButton (int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; return dynamic_cast<KToolBarButton *>( *it ); @@ -637,7 +637,7 @@ KToolBarButton * KToolBar::getButton (int id) void KToolBar::alignItemRight (int id, bool right ) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return; if ( rightAligned && !right && (*it) == rightAligned ) @@ -649,7 +649,7 @@ void KToolBar::alignItemRight (int id, bool right ) TQWidget *KToolBar::getWidget (int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); return ( it == id2widget.end() ) ? 0 : (*it); } @@ -677,7 +677,7 @@ void KToolBar::clear () void KToolBar::removeItem(int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) { kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl; @@ -693,7 +693,7 @@ void KToolBar::removeItem(int id) void KToolBar::removeItemDelayed(int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) { kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl; @@ -729,7 +729,7 @@ void KToolBar::showItem (int id) int KToolBar::itemIndex (int id) { TQWidget *w = getWidget(id); - return w ? widgets.findRef(w) : -1; + return w ? widgets.tqfindRef(w) : -1; } int KToolBar::idAt (int index) @@ -911,7 +911,7 @@ int KToolBar::iconSize() const int KToolBar::iconSizeDefault() const { - if (!::qstrcmp(TQObject::name(), "mainToolBar")) + if (!::qstrcmp(name(), "mainToolBar")) return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); return KGlobal::iconLoader()->currentSize(KIcon::Toolbar); @@ -1005,7 +1005,7 @@ void KToolBar::saveState() if ( curname == barname ) { just_append = false; - local.documentElement().replaceChild( current, elem ); + local.documentElement().tqreplaceChild( current, elem ); break; } } @@ -1158,7 +1158,7 @@ void KToolBar::mousePressEvent ( TQMouseEvent *m ) return; TQMainWindow *mw = mainWindow(); if ( mw->toolBarsMovable() && d->m_enableContext ) { - if ( m->button() == RightButton ) { + if ( m->button() == Qt::RightButton ) { TQGuardedPtr<KToolBar> guard( this ); int i = contextMenu()->exec( m->globalPos(), 0 ); // "Configure Toolbars" recreates toolbars, so we might not exist anymore. @@ -1239,7 +1239,7 @@ void KToolBar::rebuildLayout() continue; KToolBarSeparator *ktbs = dynamic_cast<KToolBarSeparator *>(w); if ( ktbs && !ktbs->showLine() ) { - l->addSpacing( orientation() == Vertical ? w->sizeHint().height() : w->sizeHint().width() ); + l->addSpacing( orientation() == Qt::Vertical ? w->tqsizeHint().height() : w->tqsizeHint().width() ); w->hide(); continue; } @@ -1247,7 +1247,7 @@ void KToolBar::rebuildLayout() continue; l->addWidget( w ); w->show(); - if ((orientation() == Horizontal) && dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? + if ((orientation() == Qt::Horizontal) && dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? l->addSpacing(2); // A little bit extra spacing behind it. } if ( rightAligned ) { @@ -1262,7 +1262,7 @@ void KToolBar::rebuildLayout() if ( stretchableWidget ) l->setStretchFactor( stretchableWidget, 10 ); } - l->invalidate(); + l->tqinvalidate(); TQApplication::postEvent( this, new TQEvent( TQEvent::LayoutHint ) ); } @@ -1279,7 +1279,7 @@ void KToolBar::childEvent( TQChildEvent *e ) if ( !dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu // prevent items that have been explicitly inserted by insert*() from // being inserted again - if ( !widget2id.contains( w ) ) + if ( !widget2id.tqcontains( w ) ) { int dummy = -1; insertWidgetInternal( w, dummy, -1 ); @@ -1336,13 +1336,13 @@ void KToolBar::setStretchableWidget( TQWidget *w ) TQSizePolicy KToolBar::sizePolicy() const { - if ( orientation() == Horizontal ) + if ( orientation() == Qt::Horizontal ) return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); else return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); } -TQSize KToolBar::sizeHint() const +TQSize KToolBar::tqsizeHint() const { TQSize minSize(0,0); KToolBar *ncThis = const_cast<KToolBar *>(this); @@ -1356,13 +1356,13 @@ TQSize KToolBar::sizeHint() const case KToolBar::Bottom: for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() ) { - TQSize sh = w->sizeHint(); - if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) + TQSize sh = w->tqsizeHint(); + if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) sh.setWidth( 1 ); - if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) + if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) sh.setHeight( 1 ); - sh = sh.boundedTo( w->maximumSize() ) - .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) ); + sh = sh.boundedTo( w->tqmaximumSize() ) + .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) ); minSize = minSize.expandedTo(TQSize(0, sh.height())); minSize += TQSize(sh.width()+1, 0); @@ -1370,7 +1370,7 @@ TQSize KToolBar::sizeHint() const minSize += TQSize(2, 0); // A little bit extra spacing behind it. } - minSize += TQSize(TQApplication::style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0); + minSize += TQSize(TQApplication::tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0); minSize += TQSize(margin*2, margin*2); break; @@ -1378,36 +1378,36 @@ TQSize KToolBar::sizeHint() const case KToolBar::Right: for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() ) { - TQSize sh = w->sizeHint(); - if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) + TQSize sh = w->tqsizeHint(); + if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) sh.setWidth( 1 ); - if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) + if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) sh.setHeight( 1 ); - sh = sh.boundedTo( w->maximumSize() ) - .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) ); + sh = sh.boundedTo( w->tqmaximumSize() ) + .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) ); minSize = minSize.expandedTo(TQSize(sh.width(), 0)); minSize += TQSize(0, sh.height()+1); } - minSize += TQSize(0, TQApplication::style().pixelMetric( TQStyle::PM_DockWindowHandleExtent )); + minSize += TQSize(0, TQApplication::tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent )); minSize += TQSize(margin*2, margin*2); break; default: - minSize = TQToolBar::sizeHint(); + minSize = TQToolBar::tqsizeHint(); break; } return minSize; } -TQSize KToolBar::minimumSize() const +TQSize KToolBar::tqminimumSize() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -TQSize KToolBar::minimumSizeHint() const +TQSize KToolBar::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } bool KToolBar::highlight() const @@ -1434,8 +1434,8 @@ void KToolBar::resizeEvent( TQResizeEvent *e ) { if (layoutTimer->isActive()) { - // Wait with repainting till layout is complete. - d->repaintTimer.start( 100, true ); + // Wait with tqrepainting till layout is complete. + d->tqrepaintTimer.start( 100, true ); } else { @@ -1481,25 +1481,25 @@ void KToolBar::slotAppearanceChanged() //static bool KToolBar::highlightSetting() { - TQString grpToolbar(TQString::fromLatin1("Toolbar style")); + TQString grpToolbar(TQString::tqfromLatin1("Toolbar style")); KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true); + return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("Highlighting"),true); } //static bool KToolBar::transparentSetting() { - TQString grpToolbar(TQString::fromLatin1("Toolbar style")); + TQString grpToolbar(TQString::tqfromLatin1("Toolbar style")); KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true); + return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("TransparentMoving"),true); } //static KToolBar::IconText KToolBar::iconTextSetting() { - TQString grpToolbar(TQString::fromLatin1("Toolbar style")); + TQString grpToolbar(TQString::tqfromLatin1("Toolbar style")); KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - TQString icontext = KGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly")); + TQString icontext = KGlobal::config()->readEntry(TQString::tqfromLatin1("IconText"),TQString::tqfromLatin1("IconOnly")); if ( icontext == "IconTextRight" ) return IconTextRight; else if ( icontext == "IconTextBottom" ) @@ -1541,7 +1541,7 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG TQString iconText = d->IconTextDefault; // this is the first iteration - TQString grpToolbar(TQString::fromLatin1("Toolbar style")); + TQString grpToolbar(TQString::tqfromLatin1("Toolbar style")); { // start block for KConfigGroupSaver KConfigGroupSaver saver(gconfig, grpToolbar); @@ -1711,7 +1711,7 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool bool KToolBar::event( TQEvent *e ) { if ( (e->type() == TQEvent::LayoutHint) && isUpdatesEnabled() ) - d->repaintTimer.start( 100, true ); + d->tqrepaintTimer.start( 100, true ); if (e->type() == TQEvent::ChildInserted ) { @@ -1735,7 +1735,7 @@ void KToolBar::slotRepaint() resizeEvent(&ev); TQApplication::sendPostedEvents( this, TQEvent::LayoutHint ); setUpdatesEnabled( true ); - repaint( true ); + tqrepaint( true ); } void KToolBar::toolBarPosChanged( TQToolBar *tb ) @@ -2061,7 +2061,7 @@ KPopupMenu *KToolBar::contextMenu() TQValueList<int> avSizes; if (theme) { - if (!::qstrcmp(TQObject::name(), "mainToolBar")) + if (!::qstrcmp(name(), "mainToolBar")) avSizes = theme->querySizes( KIcon::MainToolbar); else avSizes = theme->querySizes( KIcon::Toolbar); @@ -2151,7 +2151,7 @@ void KToolBar::slotContextAboutToShow() configureAction = kmw->actionCollection()->action(actionName); if ( configureAction ) configureAction->plug(context); - KEditToolbar::setDefaultToolbar(TQObject::name()); + KEditToolbar::setDefaultToolbar(name()); for(int i = CONTEXT_ICONS; i <= CONTEXT_TEXTUNDER; ++i) context->setItemChecked(i, false); @@ -2245,7 +2245,7 @@ void KToolBar::widgetDestroyed() void KToolBar::removeWidgetInternal( TQWidget * w ) { widgets.removeRef( w ); - TQMap< TQWidget*, int >::Iterator it = widget2id.find( w ); + TQMap< TQWidget*, int >::Iterator it = widget2id.tqfind( w ); if ( it == widget2id.end() ) return; id2widget.remove( *it ); diff --git a/kdeui/ktoolbar.h b/kdeui/ktoolbar.h index 9c85e5fc2..aff0331e6 100644 --- a/kdeui/ktoolbar.h +++ b/kdeui/ktoolbar.h @@ -55,13 +55,14 @@ class KXMLGUIClient; class KToolBarPrivate; -class KDEUI_EXPORT KToolBarSeparator : public QFrame +class KDEUI_EXPORT KToolBarSeparator : public TQFrame { Q_OBJECT + TQ_OBJECT public: KToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; Orientation orientation() const { return orient; } TQSizePolicy sizePolicy() const; bool showLine() const { return line; } @@ -90,7 +91,7 @@ private: * Once you have a KToolBar object, you can insert items into it with the * insert... methods, or remove them with the removeItem() method. This * can be done at any time; the toolbar will be automatically updated. - * There are also many methods to set per-child properties like alignment + * There are also many methods to set per-child properties like tqalignment * and toggle behavior. * * KToolBar uses a global config group to load toolbar settings on @@ -100,9 +101,10 @@ private: * @author Reginald Stadlbauer <reggie@kde.org>, Stephan Kulow <coolo@kde.org>, Sven Radej <radej@kde.org>. */ -class KDEUI_EXPORT KToolBar : public QToolBar +class KDEUI_EXPORT KToolBar : public TQToolBar { Q_OBJECT + TQ_OBJECT Q_ENUMS( IconText BarPosition ) Q_PROPERTY( IconText iconText READ iconText WRITE setIconText ) Q_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos ) @@ -943,9 +945,9 @@ public: void setStretchableWidget( TQWidget *w ); TQSizePolicy sizePolicy() const; bool highlight() const; - TQSize sizeHint() const; - TQSize minimumSizeHint() const; - TQSize minimumSize() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; + TQSize tqminimumSize() const; void hide(); void show(); diff --git a/kdeui/ktoolbarbutton.cpp b/kdeui/ktoolbarbutton.cpp index 765b2e433..42f0d9b90 100644 --- a/kdeui/ktoolbarbutton.cpp +++ b/kdeui/ktoolbarbutton.cpp @@ -124,7 +124,7 @@ KToolBarButton::KToolBarButton( const TQString& _icon, int _id, this, TQT_SLOT( modeChange() )); } - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); // connect all of our slots and start trapping events connect(this, TQT_SIGNAL( clicked() ), @@ -157,7 +157,7 @@ KToolBarButton::KToolBarButton( const TQPixmap& pixmap, int _id, this, TQT_SLOT( modeChange() )); } - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); // connect all of our slots and start trapping events connect(this, TQT_SIGNAL( clicked() ), @@ -246,7 +246,7 @@ void KToolBarButton::modeChange() break; } - mysize = style().sizeFromContents(TQStyle::CT_ToolButton, this, mysize). + mysize = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, mysize). expandedTo(TQApplication::globalStrut()); // make sure that this isn't taller then it is wide @@ -263,7 +263,7 @@ void KToolBarButton::setTextLabel( const TQString& text, bool tipToo) return; TQString txt(text); - if (txt.endsWith(TQString::fromLatin1("..."))) + if (txt.endsWith(TQString::tqfromLatin1("..."))) txt.truncate(txt.length() - 3); TQToolButton::setTextLabel(txt, tipToo); @@ -376,7 +376,7 @@ void KToolBarButton::leaveEvent(TQEvent *) { d->m_isRaised = false; d->m_isActive = false; - repaint(false); + tqrepaint(false); } emit highlighted(d->m_id, false); @@ -398,7 +398,7 @@ void KToolBarButton::enterEvent(TQEvent *) d->m_isActive = false; } - repaint(false); + tqrepaint(false); } emit highlighted(d->m_id, true); } @@ -414,12 +414,12 @@ bool KToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { if (ev->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); d->m_mousePressPos = mev->pos(); } else if (ev->type() == TQEvent::MouseMove) { - TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if ((mev->pos() - d->m_mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay()) { @@ -450,10 +450,10 @@ void KToolBarButton::mousePressEvent( TQMouseEvent * e ) { d->m_buttonDown = true; - if ( e->button() == MidButton ) + if ( e->button() == Qt::MidButton ) { // Get TQToolButton to show the button being down while pressed - TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQToolButton::mousePressEvent(&ev); return; } @@ -462,10 +462,10 @@ void KToolBarButton::mousePressEvent( TQMouseEvent * e ) void KToolBarButton::mouseReleaseEvent( TQMouseEvent * e ) { - Qt::ButtonState state = Qt::ButtonState(e->button() | (e->state() & KeyButtonMask)); - if ( e->button() == MidButton ) + TQt::ButtonState state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask)); + if ( e->button() == Qt::MidButton ) { - TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQToolButton::mouseReleaseEvent(&ev); } else @@ -494,8 +494,8 @@ void KToolBarButton::drawButton( TQPainter *_painter ) if (hasFocus()) flags |= TQStyle::Style_HasFocus; // Draw a styled toolbutton - style().drawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(), - colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption()); + tqstyle().tqdrawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(), + tqcolorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption()); int dx, dy; TQFont tmp_font(KGlobalSettings::toolBarFont()); @@ -513,7 +513,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) { dx = ( width() - pixmap.width() ) / 2; dy = ( height() - pixmap.height() ) / 2; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -531,7 +531,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) { dx = 4; dy = ( height() - pixmap.height() ) / 2; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -547,7 +547,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) else dx = 4; dy = 0; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -562,7 +562,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) textFlags = AlignVCenter|AlignLeft; dx = (width() - fm.width(textLabel())) / 2; dy = (height() - fm.lineSpacing()) / 2; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -580,7 +580,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) { dx = (width() - pixmap.width()) / 2; dy = (height() - fm.lineSpacing() - pixmap.height()) / 2; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -594,7 +594,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) dx = (width() - fm.width(textLabel())) / 2; dy = height() - fm.lineSpacing() - 4; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -608,11 +608,11 @@ void KToolBarButton::drawButton( TQPainter *_painter ) { _painter->setFont(KGlobalSettings::toolBarFont()); if (!isEnabled()) - _painter->setPen(palette().disabled().dark()); + _painter->setPen(tqpalette().disabled().dark()); else if(d->m_isRaised) _painter->setPen(KGlobalSettings::toolBarHighlightColor()); else - _painter->setPen( colorGroup().buttonText() ); + _painter->setPen( tqcolorGroup().buttonText() ); _painter->drawText(textRect, textFlags, textLabel()); } @@ -623,8 +623,8 @@ void KToolBarButton::drawButton( TQPainter *_painter ) if (isDown()) arrowFlags |= TQStyle::Style_Down; if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; - style().drawPrimitive(TQStyle::PE_ArrowDown, _painter, - TQRect(width()-7, height()-7, 7, 7), colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter, + TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(), arrowFlags, TQStyleOption() ); } } @@ -634,7 +634,7 @@ void KToolBarButton::paletteChange(const TQPalette &) if(!d->m_isSeparator) { modeChange(); - repaint(false); // no need to delete it first therefore only false + tqrepaint(false); // no need to delete it first therefore only false } } @@ -671,8 +671,8 @@ void KToolBarButton::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 = KApplication::keyboardMouseState(); - if ( ( state & MouseButtonMask ) == NoButton ) - state = ButtonState( LeftButton | state ); + if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton ) + state = ButtonState( Qt::LeftButton | state ); emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton } } @@ -698,7 +698,7 @@ void KToolBarButton::setNoStyle(bool no_style) modeChange(); d->m_iconText = KToolBar::IconTextRight; - repaint(false); + tqrepaint(false); } void KToolBarButton::setRadio (bool f) @@ -716,13 +716,13 @@ void KToolBarButton::on(bool flag) setDown(flag); leaveEvent((TQEvent *) 0); } - repaint(); + tqrepaint(); } void KToolBarButton::toggle() { setOn(!isOn()); - repaint(); + tqrepaint(); } void KToolBarButton::setToggle(bool flag) @@ -734,17 +734,17 @@ void KToolBarButton::setToggle(bool flag) disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); } -TQSize KToolBarButton::sizeHint() const +TQSize KToolBarButton::tqsizeHint() const { return d->size; } -TQSize KToolBarButton::minimumSizeHint() const +TQSize KToolBarButton::tqminimumSizeHint() const { return d->size; } -TQSize KToolBarButton::minimumSize() const +TQSize KToolBarButton::tqminimumSize() const { return d->size; } diff --git a/kdeui/ktoolbarbutton.h b/kdeui/ktoolbarbutton.h index 2cb05d9ac..7abe34927 100644 --- a/kdeui/ktoolbarbutton.h +++ b/kdeui/ktoolbarbutton.h @@ -41,7 +41,7 @@ class TQPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class KDEUI_EXPORT KToolBarButton : public TQToolButton { Q_OBJECT @@ -263,7 +263,7 @@ signals: * and whether any keyboard modifiers were held. * @since 3.4 */ - void buttonClicked(int, Qt::ButtonState state); + void buttonClicked(int, TQt::ButtonState state); void doubleClicked(int); void pressed(int); void released(int); @@ -291,9 +291,9 @@ protected: /// @since 3.4 void mouseReleaseEvent( TQMouseEvent * ); void showMenu(); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; - TQSize minimumSize() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; + TQSize tqminimumSize() const; /// @since 3.1 bool isRaised() const; diff --git a/kdeui/ktoolbarhandler.cpp b/kdeui/ktoolbarhandler.cpp index 5d8a49d8f..f1bce69c6 100644 --- a/kdeui/ktoolbarhandler.cpp +++ b/kdeui/ktoolbarhandler.cpp @@ -55,7 +55,7 @@ namespace if ( !toolBar ) continue; - if ( oldToolBarList.findRef( toolBar ) == -1 ) + if ( oldToolBarList.tqfindRef( toolBar ) == -1 ) m_needsRebuild = true; m_toolBars.append( toolBar ); @@ -209,7 +209,7 @@ void ToolBarHandler::init( KMainWindow *mainWindow ) if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::fromLatin1( guiDescription ) + TQString completeDescription = TQString::tqfromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); diff --git a/kdeui/ktoolbarlabelaction.cpp b/kdeui/ktoolbarlabelaction.cpp index aab7717b8..005ce559e 100644 --- a/kdeui/ktoolbarlabelaction.cpp +++ b/kdeui/ktoolbarlabelaction.cpp @@ -68,7 +68,7 @@ KToolBarLabelAction::KToolBarLabelAction(TQLabel* label, : KWidgetAction(label, label->text(), cut, receiver, slot, parent, name), d(new KToolBarLabelActionPrivate) { - Q_ASSERT(TQString::fromLatin1("kde toolbar widget") == label->name()); + Q_ASSERT(TQString::tqfromLatin1("kde toolbar widget") == label->name()); init(); } @@ -83,10 +83,10 @@ void KToolBarLabelAction::init() d->m_label = static_cast<TQLabel*>(widget()); /* these lines were copied from Konqueror's KonqDraggableLabel class in konq_misc.cc */ - d->m_label->setBackgroundMode(Qt::PaletteButton); - d->m_label->setAlignment((TQApplication::reverseLayout() + d->m_label->setBackgroundMode(TQt::PaletteButton); + d->m_label->tqsetAlignment((TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | - Qt::AlignVCenter | Qt::ShowPrefix ); + Qt::AlignVCenter | TQt::ShowPrefix ); d->m_label->adjustSize(); } diff --git a/kdeui/ktoolbarradiogroup.cpp b/kdeui/ktoolbarradiogroup.cpp index ab8e50e08..190b1e395 100644 --- a/kdeui/ktoolbarradiogroup.cpp +++ b/kdeui/ktoolbarradiogroup.cpp @@ -53,15 +53,15 @@ void KToolBarRadioGroup::addButton (int id) void KToolBarRadioGroup::removeButton (int id) { - if (!buttons->find(id)) + if (!buttons->tqfind(id)) return; - buttons->find(id)->setRadio(false); + buttons->tqfind(id)->setRadio(false); buttons->remove(id); } void KToolBarRadioGroup::slotToggled(int id) { - if (buttons->find(id) && buttons->find(id)->isOn()) + if (buttons->tqfind(id) && buttons->tqfind(id)->isOn()) { TQIntDictIterator<KToolBarButton> it(*buttons); while (it.current()) diff --git a/kdeui/ktoolbarradiogroup.h b/kdeui/ktoolbarradiogroup.h index 2fbf08174..f0e793bf2 100644 --- a/kdeui/ktoolbarradiogroup.h +++ b/kdeui/ktoolbarradiogroup.h @@ -46,7 +46,7 @@ class KToolBarRadioGroupPrivate; * * @author Sven Radej <radej@kde.org> */ -class KDEUI_EXPORT KToolBarRadioGroup : public QObject +class KDEUI_EXPORT KToolBarRadioGroup : public TQObject { Q_OBJECT diff --git a/kdeui/kurllabel.cpp b/kdeui/kurllabel.cpp index d4d4ff7c0..884ff6a59 100644 --- a/kdeui/kurllabel.cpp +++ b/kdeui/kurllabel.cpp @@ -87,7 +87,7 @@ KURLLabel::KURLLabel (const TQString& url, const TQString& text, setFont (font()); setUseCursor (true); setLinkColor (d->LinkColor); - setFocusPolicy( TQWidget::StrongFocus ); //better accessibility + setFocusPolicy( TQ_StrongFocus ); //better accessibility setMouseTracking (true); } @@ -98,7 +98,7 @@ KURLLabel::KURLLabel (TQWidget* parent, const char* name) setFont (font()); setUseCursor (true); setLinkColor (d->LinkColor); - setFocusPolicy( TQWidget::StrongFocus ); //better accessibility + setFocusPolicy( TQ_StrongFocus ); //better accessibility setMouseTracking (true); } @@ -122,17 +122,17 @@ void KURLLabel::mouseReleaseEvent (TQMouseEvent* e) switch (e->button()) { - case LeftButton: + case Qt::LeftButton: emit leftClickedURL (); emit leftClickedURL (d->URL); break; - case MidButton: + case Qt::MidButton: emit middleClickedURL (); emit middleClickedURL (d->URL); break; - case RightButton: + case Qt::RightButton: emit rightClickedURL (); emit rightClickedURL (d->URL); break; @@ -308,7 +308,7 @@ void KURLLabel::enterEvent (TQEvent* e) TQLabel::enterEvent (e); TQRect r( activeRect() ); - if (!r.contains( static_cast<TQMouseEvent*>(e)->pos() )) + if (!r.contains( TQT_TQMOUSEEVENT(e)->pos() )) return; if (!d->AltPixmap.isNull() && pixmap()) @@ -353,10 +353,10 @@ bool KURLLabel::event (TQEvent *e) { if (e && e->type() == TQEvent::ParentPaletteChange) { - // use parentWidget() unless you are a toplevel widget, then try qAapp - TQPalette p = parentWidget() ? parentWidget()->palette() : qApp->palette(); + // use tqparentWidget() unless you are a toplevel widget, then try qAapp + TQPalette p = tqparentWidget() ? tqparentWidget()->palette() : tqApp->palette(); p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); - p.setColor(TQColorGroup::Foreground, palette().active().foreground()); + p.setColor(TQColorGroup::Foreground, tqpalette().active().foreground()); setPalette(p); d->LinkColor = KGlobalSettings::linkColor(); setLinkColor(d->LinkColor); @@ -367,12 +367,12 @@ bool KURLLabel::event (TQEvent *e) if (result && hasFocus()) { TQPainter p(this); TQRect r( activeRect() ); - style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, tqcolorGroup() ); } return result; } else if (e->type() == TQEvent::KeyPress) { - TQKeyEvent* ke = static_cast<TQKeyEvent*>(e); + TQKeyEvent* ke = TQT_TQKEYEVENT(e); if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) { setLinkColor (d->HighlightedLinkColor); d->Timer->start (300); @@ -384,12 +384,12 @@ bool KURLLabel::event (TQEvent *e) } else if (e->type() == TQEvent::MouseButtonPress) { TQRect r( activeRect() ); - d->MousePressed = r.contains(static_cast<TQMouseEvent*>(e)->pos()); + d->MousePressed = r.contains(TQT_TQMOUSEEVENT(e)->pos()); } else if (e->type() == TQEvent::MouseMove) { if (d->Cursor) { TQRect r( activeRect() ); - bool inside = r.contains(static_cast<TQMouseEvent*>(e)->pos()); + bool inside = r.contains(TQT_TQMOUSEEVENT(e)->pos()); if (d->WasInsideRect != inside) { if (inside) TQLabel::setCursor(*d->Cursor); @@ -407,7 +407,7 @@ TQRect KURLLabel::activeRect() const TQRect r( contentsRect() ); if (text().isEmpty() || (!d->MarginAltered && sizePolicy() == TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed))) return r; //fixed size is sometimes used with pixmap - int hAlign = TQApplication::horizontalAlignment( alignment() ); + int hAlign = TQApplication::horizontalAlignment( tqalignment() ); int indentX = (hAlign && indent()>0) ? indent() : 0; TQFontMetrics fm(font()); r.setWidth( QMIN(fm.width(text()), r.width())); @@ -428,17 +428,17 @@ void KURLLabel::setMargin( int margin ) d->MarginAltered = true; } -void KURLLabel::setFocusPolicy( FocusPolicy policy ) +void KURLLabel::setFocusPolicy( TQ_FocusPolicy policy ) { TQLabel::setFocusPolicy(policy); if (!d->MarginAltered) { - TQLabel::setMargin(policy == NoFocus ? 0 : 3); //better default : better look when focused + TQLabel::setMargin(policy == TQ_NoFocus ? 0 : 3); //better default : better look when focused } } -void KURLLabel::setSizePolicy ( TQSizePolicy policy ) +void KURLLabel::tqsetSizePolicy ( TQSizePolicy policy ) { - TQLabel::setSizePolicy(policy); + TQLabel::tqsetSizePolicy(policy); if (!d->MarginAltered && policy.horData()==TQSizePolicy::Fixed && policy.verData()==TQSizePolicy::Fixed) { TQLabel::setMargin(0); //better default : better look when fixed size } diff --git a/kdeui/kurllabel.h b/kdeui/kurllabel.h index b39d65d92..30ef78a39 100644 --- a/kdeui/kurllabel.h +++ b/kdeui/kurllabel.h @@ -68,7 +68,7 @@ class TQPixmap; * @version $Id$ * */ -class KDEUI_EXPORT KURLLabel : public QLabel +class KDEUI_EXPORT KURLLabel : public TQLabel { Q_OBJECT Q_PROPERTY (TQString url READ url WRITE setURL) @@ -161,12 +161,12 @@ public: /** * Reimplemented for internal reasons, the API is not affected. */ - virtual void setFocusPolicy ( FocusPolicy policy ); + virtual void setFocusPolicy ( TQ_FocusPolicy policy ); /** * Reimplemented for internal reasons, the API is not affected. */ - virtual void setSizePolicy ( TQSizePolicy ); + virtual void tqsetSizePolicy ( TQSizePolicy ); public slots: /** diff --git a/kdeui/kwhatsthismanager.cpp b/kdeui/kwhatsthismanager.cpp index a2f3cf0f6..0ec05e5c4 100644 --- a/kdeui/kwhatsthismanager.cpp +++ b/kdeui/kwhatsthismanager.cpp @@ -26,7 +26,7 @@ KWhatsThisManager *KWhatsThisManager::s_instance = 0; -class KWhatsThisUndefined : public QWhatsThis +class KWhatsThisUndefined : public TQWhatsThis { public: KWhatsThisUndefined (TQWidget *); @@ -52,8 +52,8 @@ TQString KWhatsThisUndefined::text (const TQPoint &) " describe the widget, you are welcome to <a href=\"submit" "-whatsthis\">send us your own \"What's This?\" help</a> for it."); TQString parent; - if (m_widget -> parentWidget ()) - parent = TQWhatsThis::textFor (m_widget -> parentWidget ()); + if (m_widget -> tqparentWidget ()) + parent = TQWhatsThis::textFor (m_widget -> tqparentWidget ()); if (parent != txt) if (! parent . isEmpty ()) return parent; @@ -68,11 +68,11 @@ bool KWhatsThisUndefined::clicked (const TQString& href) body . append ("Widget text: '" + (m_widget -> property ("text") . toString ()) + "'\n"); TQString dsc = TQString ("current --> ") + m_widget -> name (); dsc . append (TQString (" (") + m_widget -> className () + ")\n"); - for (w = m_widget; w && w != m_widget -> topLevelWidget (); w = w -> parentWidget ()) { + for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> tqparentWidget ()) { dsc . append (w -> name ()); dsc . append (TQString (" (") + w -> className () + ")\n"); } - w = m_widget -> topLevelWidget (); + w = m_widget -> tqtopLevelWidget (); if (w) { dsc . append ("toplevel --> "); dsc . append (w -> name ()); @@ -80,7 +80,7 @@ bool KWhatsThisUndefined::clicked (const TQString& href) } body . append (dsc); TQString subj ("What's This submission: "); - subj . append (qApp -> argv () [0]); + subj . append (tqApp -> argv () [0]); body . append ("\nPlease type in your what's this help between these lines: " "\n--%-----------------------------------------------------------------------\n" "\n--%-----------------------------------------------------------------------"); @@ -99,7 +99,7 @@ void KWhatsThisManager::init () KWhatsThisManager::KWhatsThisManager () { // go away... - // qApp -> installEventFilter (this); + // tqApp -> installEventFilter (this); } bool KWhatsThisManager::eventFilter (TQObject * /*o*/, TQEvent *e) diff --git a/kdeui/kwhatsthismanager_p.h b/kdeui/kwhatsthismanager_p.h index f797dc4d3..919ffd197 100644 --- a/kdeui/kwhatsthismanager_p.h +++ b/kdeui/kwhatsthismanager_p.h @@ -43,7 +43,7 @@ class TQTextEdit; * @see QWhatsThis * @author Peter Rockai (mornfall) <mornfall@danill.sk> **/ -class KDEUI_EXPORT KWhatsThisManager : public QObject +class KDEUI_EXPORT KWhatsThisManager : public TQObject { Q_OBJECT public: diff --git a/kdeui/kwindowinfo.h b/kdeui/kwindowinfo.h index efd797c91..167d3e0a9 100644 --- a/kdeui/kwindowinfo.h +++ b/kdeui/kwindowinfo.h @@ -38,7 +38,7 @@ * @author Richard Moore, rich@kde.org * @since 3.1 */ -class KDEUI_EXPORT KWindowInfo : public QObject +class KDEUI_EXPORT KWindowInfo : public TQObject { Q_OBJECT diff --git a/kdeui/kwindowlistmenu.cpp b/kdeui/kwindowlistmenu.cpp index de9cd0c08..10538a67c 100644 --- a/kdeui/kwindowlistmenu.cpp +++ b/kdeui/kwindowlistmenu.cpp @@ -85,7 +85,7 @@ int NameSortedInfoList::compareItems( TQPtrCollection::Item s1, TQPtrCollection: KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name) : KPopupMenu(parent, name) { - kwin_module = new KWinModule(this); + kwin_module = new KWinModule(TQT_TQOBJECT(this)); connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); } @@ -186,7 +186,7 @@ void KWindowListMenu::init() } // Avoid creating unwanted accelerators. - itemText.replace('&', TQString::fromLatin1("&&")); + itemText.replace('&', TQString::tqfromLatin1("&&")); insertItem( pm, itemText, i); map.insert(i, info->win()); if (info->win() == active_window) @@ -242,12 +242,12 @@ void KWindowListMenu::selectActiveWindow() void KWindowListMenu::slotUnclutterWindows() { - kapp->dcopClient()->send(kwinName(), "KWinInterface", "unclutterDesktop()", ""); + kapp->dcopClient()->send(kwinName(), "KWinInterface", "unclutterDesktop()", TQString("")); } void KWindowListMenu::slotCascadeWindows() { - kapp->dcopClient()->send(kwinName(), "KWinInterface", "cascadeDesktop()", ""); + kapp->dcopClient()->send(kwinName(), "KWinInterface", "cascadeDesktop()", TQString("")); } void KWindowListMenu::virtual_hook( int id, void* data ) diff --git a/kdeui/kwindowlistmenu.h b/kdeui/kwindowlistmenu.h index 4b69799d2..3e05cf63f 100644 --- a/kdeui/kwindowlistmenu.h +++ b/kdeui/kwindowlistmenu.h @@ -28,6 +28,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kpopupmenu.h> #include <tqmap.h> +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 // not yet available for non-X11 class KWinModule; diff --git a/kdeui/kwizard.h b/kdeui/kwizard.h index 81a2c2d65..977ea5d86 100644 --- a/kdeui/kwizard.h +++ b/kdeui/kwizard.h @@ -43,7 +43,7 @@ * @author Harri Porten <porten@kde.org> * @version 0.3 */ -class KDEUI_EXPORT KWizard : public QWizard +class KDEUI_EXPORT KWizard : public TQWizard { Q_OBJECT public: diff --git a/kdeui/kwordwrap.cpp b/kdeui/kwordwrap.cpp index 9c6427eb5..0bdcf52dd 100644 --- a/kdeui/kwordwrap.cpp +++ b/kdeui/kwordwrap.cpp @@ -35,7 +35,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla { KWordWrap* kw = new KWordWrap( r ); // The wordwrap algorithm - // The variable names and the global shape of the algorithm are inspired + // The variable names and the global tqshape of the algorithm are inspired // from QTextFormatterBreakWords::format(). //kdDebug() << "KWordWrap::formatText " << str << " r=" << r.x() << "," << r.y() << " " << r.width() << "x" << r.height() << endl; int height = fm.height(); @@ -198,7 +198,7 @@ void KWordWrap::drawFadeoutText(TQPainter *p, int x, int y, int maxW, p->drawText( x, y, t.left( tl - 3 ) ); x += fm.width( t.left( tl - 3 ) ); } - int n = QMIN( tl, 3); + int n = TQMIN( tl, 3); for (int i = 0; i < n; i++) { p->setPen( mixColors( 0.70 - i * 0.25, textColor, bgColor ) ); TQString s( t.at( tl - n + i ) ); diff --git a/kdeui/kwordwrap.h b/kdeui/kwordwrap.h index 22fcf940a..5971525da 100644 --- a/kdeui/kwordwrap.h +++ b/kdeui/kwordwrap.h @@ -91,17 +91,17 @@ public: /** * Draw the text that has been previously wrapped, at position x,y. - * Flags are for alignment, e.g. Qt::AlignHCenter. Default is + * Flags are for tqalignment, e.g. Qt::AlignHCenter. Default is * Qt::AlignAuto. * @param painter the TQPainter to use. * @param x the horizontal position of the text * @param y the vertical position of the text - * @param flags the ORed text alignment flags from the Qt namespace, + * @param flags the ORed text tqalignment flags from the Qt namespace, * ORed with FadeOut if you want the text to fade out if it * does not fit (the @p painter's background must be set * accordingly) */ - void drawText( TQPainter *painter, int x, int y, int flags = Qt::AlignAuto ) const; + void drawText( TQPainter *painter, int x, int y, int flags = TQt::AlignAuto ) const; /** * Destructor. diff --git a/kdeui/kxmlguibuilder.cpp b/kdeui/kxmlguibuilder.cpp index 305ce135c..e6412fa6d 100644 --- a/kdeui/kxmlguibuilder.cpp +++ b/kdeui/kxmlguibuilder.cpp @@ -70,24 +70,24 @@ KXMLGUIBuilder::KXMLGUIBuilder( TQWidget *widget ) d = new KXMLGUIBuilderPrivate; d->m_widget = widget; - d->tagMainWindow = TQString::fromLatin1( "mainwindow" ); - d->tagMenuBar = TQString::fromLatin1( "menubar" ); - d->tagMenu = TQString::fromLatin1( "menu" ); - d->tagToolBar = TQString::fromLatin1( "toolbar" ); - d->tagStatusBar = TQString::fromLatin1( "statusbar" ); + d->tagMainWindow = TQString::tqfromLatin1( "mainwindow" ); + d->tagMenuBar = TQString::tqfromLatin1( "menubar" ); + d->tagMenu = TQString::tqfromLatin1( "menu" ); + d->tagToolBar = TQString::tqfromLatin1( "toolbar" ); + d->tagStatusBar = TQString::tqfromLatin1( "statusbar" ); - d->tagSeparator = TQString::fromLatin1( "separator" ); - d->tagTearOffHandle = TQString::fromLatin1( "tearoffhandle" ); - d->tagMenuTitle = TQString::fromLatin1( "title" ); + d->tagSeparator = TQString::tqfromLatin1( "separator" ); + d->tagTearOffHandle = TQString::tqfromLatin1( "tearoffhandle" ); + d->tagMenuTitle = TQString::tqfromLatin1( "title" ); - d->attrName = TQString::fromLatin1( "name" ); - d->attrLineSeparator = TQString::fromLatin1( "lineseparator" ); + d->attrName = TQString::tqfromLatin1( "name" ); + d->attrLineSeparator = TQString::tqfromLatin1( "lineseparator" ); - d->attrText1 = TQString::fromLatin1( "text" ); - d->attrText2 = TQString::fromLatin1( "Text" ); - d->attrContext = TQString::fromLatin1( "context" ); + d->attrText1 = TQString::tqfromLatin1( "text" ); + d->attrText2 = TQString::tqfromLatin1( "Text" ); + d->attrContext = TQString::tqfromLatin1( "context" ); - d->attrIcon = TQString::fromLatin1( "icon" ); + d->attrIcon = TQString::tqfromLatin1( "icon" ); d->m_instance = 0; d->m_client = 0; @@ -117,7 +117,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ if ( element.tagName().lower() == d->tagMainWindow ) { KMainWindow *mainwindow = 0; - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) mainwindow = static_cast<KMainWindow *>(d->m_widget); return mainwindow; @@ -127,7 +127,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ { KMenuBar *bar; - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) bar = static_cast<KMainWindow *>(d->m_widget)->menuBar(); else bar = new KMenuBar( d->m_widget ); @@ -145,8 +145,8 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ // And we don't want to set the parent for a standalone popupmenu, // otherwise its shortcuts appear. TQWidget* p = parent; - while ( p && !::qt_cast<KMainWindow *>( p ) ) - p = p->parentWidget(); + while ( p && !::tqqt_cast<KMainWindow *>( p ) ) + p = p->tqparentWidget(); TQCString name = element.attribute( d->attrName ).utf8(); @@ -181,14 +181,14 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ pix = SmallIconSet( icon, 16, instance ); } - if ( parent && ::qt_cast<KMenuBar *>( parent ) ) + if ( parent && ::tqqt_cast<KMenuBar *>( parent ) ) { if ( !icon.isEmpty() ) id = static_cast<KMenuBar *>(parent)->insertItem( pix, i18nText, popup, -1, index ); else id = static_cast<KMenuBar *>(parent)->insertItem( i18nText, popup, -1, index ); } - else if ( parent && ::qt_cast<TQPopupMenu *>( parent ) ) + else if ( parent && ::tqqt_cast<TQPopupMenu *>( parent ) ) { if ( !icon.isEmpty() ) id = static_cast<TQPopupMenu *>(parent)->insertItem( pix, i18nText, popup, -1, index ); @@ -205,13 +205,13 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ TQCString name = element.attribute( d->attrName ).utf8(); - KToolBar *bar = static_cast<KToolBar*>(d->m_widget->child( name, "KToolBar" )); + KToolBar *bar = static_cast<KToolBar*>(TQT_TQWIDGET(d->m_widget->child( name, "KToolBar" ))); if( !bar ) { bar = new KToolBar( d->m_widget, name, honor, false ); } - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) { if ( d->m_client && !d->m_client->xmlFile().isEmpty() ) bar->setXMLGUIClient( d->m_client ); @@ -224,7 +224,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ if ( element.tagName().lower() == d->tagStatusBar ) { - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) { KMainWindow *mainWin = static_cast<KMainWindow *>(d->m_widget); mainWin->statusBar()->show(); @@ -241,26 +241,26 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD { // Warning parent can be 0L - if ( ::qt_cast<TQPopupMenu *>( container ) ) + if ( ::tqqt_cast<TQPopupMenu *>( container ) ) { if ( parent ) { - if ( ::qt_cast<KMenuBar *>( parent ) ) + if ( ::tqqt_cast<KMenuBar *>( parent ) ) static_cast<KMenuBar *>(parent)->removeItem( id ); - else if ( ::qt_cast<TQPopupMenu *>( parent ) ) + else if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) static_cast<TQPopupMenu *>(parent)->removeItem( id ); } delete container; } - else if ( ::qt_cast<KToolBar *>( container ) ) + else if ( ::tqqt_cast<KToolBar *>( container ) ) { KToolBar *tb = static_cast<KToolBar *>( container ); tb->saveState( element ); delete tb; } - else if ( ::qt_cast<KMenuBar *>( container ) ) + else if ( ::tqqt_cast<KMenuBar *>( container ) ) { KMenuBar *mb = static_cast<KMenuBar *>( container ); mb->hide(); @@ -269,9 +269,9 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD // sure that TQMainWindow::d->mb does not point to a deleted // menubar object. } - else if ( ::qt_cast<KStatusBar *>( container ) ) + else if ( ::tqqt_cast<KStatusBar *>( container ) ) { - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) container->hide(); else delete static_cast<KStatusBar *>(container); @@ -291,7 +291,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo { if ( element.tagName().lower() == d->tagSeparator ) { - if ( ::qt_cast<TQPopupMenu *>( parent ) ) + if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) { // Don't insert multiple separators in a row TQPopupMenu *menu = static_cast<TQPopupMenu *>(parent); @@ -317,9 +317,9 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo else return menu->insertSeparator( index ); } - else if ( ::qt_cast<TQMenuBar *>( parent ) ) + else if ( ::tqqt_cast<TQMenuBar *>( parent ) ) return static_cast<TQMenuBar *>(parent)->insertSeparator( index ); - else if ( ::qt_cast<KToolBar *>( parent ) ) + else if ( ::tqqt_cast<KToolBar *>( parent ) ) { KToolBar *bar = static_cast<KToolBar *>( parent ); @@ -332,7 +332,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo TQDomAttr attr = attributes.item( i ).toAttr(); if ( attr.name().lower() == d->attrLineSeparator && - attr.value().lower() == TQString::fromLatin1("false") ) + attr.value().lower() == TQString::tqfromLatin1("false") ) { isLineSep = false; break; @@ -351,12 +351,12 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo } else if ( element.tagName().lower() == d->tagTearOffHandle ) { - if ( ::qt_cast<TQPopupMenu *>( parent ) && KGlobalSettings::insertTearOffHandle()) + if ( ::tqqt_cast<TQPopupMenu *>( parent ) && KGlobalSettings::insertTearOffHandle()) return static_cast<TQPopupMenu *>(parent)->insertTearOffHandle( -1, index ); } else if ( element.tagName().lower() == d->tagMenuTitle ) { - if ( ::qt_cast<KPopupMenu *>( parent ) ) + if ( ::tqqt_cast<KPopupMenu *>( parent ) ) { TQString i18nText; TQCString text = element.text().utf8(); @@ -389,11 +389,11 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo void KXMLGUIBuilder::removeCustomElement( TQWidget *parent, int id ) { - if ( ::qt_cast<TQPopupMenu *>( parent ) ) + if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) static_cast<TQPopupMenu *>(parent)->removeItem( id ); - else if ( ::qt_cast<TQMenuBar *>( parent ) ) + else if ( ::tqqt_cast<TQMenuBar *>( parent ) ) static_cast<TQMenuBar *>(parent)->removeItem( id ); - else if ( ::qt_cast<KToolBar *>( parent ) ) + else if ( ::tqqt_cast<KToolBar *>( parent ) ) static_cast<KToolBar *>(parent)->removeItemDelayed( id ); } @@ -421,7 +421,7 @@ void KXMLGUIBuilder::setBuilderInstance( KInstance *instance ) void KXMLGUIBuilder::finalizeGUI( KXMLGUIClient * ) { - if ( !d->m_widget || !::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( !d->m_widget || !::tqqt_cast<KMainWindow *>( d->m_widget ) ) return; #if 0 KToolBar *toolbar = 0; diff --git a/kdeui/kxmlguiclient.cpp b/kdeui/kxmlguiclient.cpp index f857f3109..cfe7e6a8f 100644 --- a/kdeui/kxmlguiclient.cpp +++ b/kdeui/kxmlguiclient.cpp @@ -143,7 +143,7 @@ TQString KXMLGUIClient::localXMLFile() const if ( !TQDir::isRelativePath(d->m_xmlFile) ) return TQString::null; // can't save anything here - return locateLocal( "data", TQString::fromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile ); + return locateLocal( "data", TQString::tqfromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile ); } @@ -178,7 +178,7 @@ void KXMLGUIClient::setXMLFile( const TQString& _file, bool merge, bool setXMLDo { TQString doc; - TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + _file; + TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + _file; TQStringList allFiles = instance()->dirs()->findAllResources( "data", filter ) + instance()->dirs()->findAllResources( "data", _file ); @@ -269,7 +269,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, // tag, in any event and just replace the old with the new if ( additive.attribute(attrNoMerge) == attrOne ) // ### use toInt() instead? (Simon) { - base.parentNode().replaceChild(additive, base); + base.tqparentNode().tqreplaceChild(additive, base); return true; } @@ -291,7 +291,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, if ( tag == tagAction ) { TQCString name = e.attribute( attrName ).utf8(); // WABA - if ( !actionCollection->action( name ) || + if ( !actionCollection->action( name.data() ) || (kapp && !kapp->authorizeKAction(name))) { // remove this child as we aren't using it @@ -452,7 +452,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, // if base contains an implemented action, then we must not get // deleted (note that the actionCollection contains both, // "global" and "local" actions - if ( actionCollection->action( e.attribute( attrName ).utf8() ) ) + if ( actionCollection->action( e.attribute( attrName ).utf8().data() ) ) { deleteMe = false; break; @@ -699,7 +699,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri else { TQString f = (*local).file; - TQString backup = f + TQString::fromLatin1( ".backup" ); + TQString backup = f + TQString::tqfromLatin1( ".backup" ); TQDir dir; dir.rename( f, backup ); } @@ -734,7 +734,7 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) case ST_AFTER_OPEN: { //Jump to gui.. - int guipos = xml.find("gui", pos, false /*case-insensitive*/); + int guipos = xml.tqfind("gui", pos, false /*case-insensitive*/); if (guipos == -1) return TQString::null; //Reject @@ -747,7 +747,7 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) break; case ST_EXPECT_VERSION: { - int verpos = xml.find("version=\"", pos, false /*case-insensitive*/); + int verpos = xml.tqfind("version=\"", pos, false /*case-insensitive*/); if (verpos == -1) return TQString::null; //Reject @@ -760,9 +760,9 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) unsigned int endpos; for (endpos = pos; endpos < xml.length(); endpos++) { - if (xml[endpos].unicode() >= '0' && xml[endpos].unicode() <= '9') + if (xml[endpos].tqunicode() >= '0' && xml[endpos].tqunicode() <= '9') continue; //Number.. - if (xml[endpos].unicode() == '"') //End of parameter + if (xml[endpos].tqunicode() == '"') //End of parameter break; else //This shouldn't be here.. { @@ -810,7 +810,7 @@ KXMLGUIClient::ActionPropertiesMap KXMLGUIClient::extractActionProperties( const if ( actionName.isEmpty() ) continue; - TQMap<TQString, TQMap<TQString, TQString> >::Iterator propIt = properties.find( actionName ); + TQMap<TQString, TQMap<TQString, TQString> >::Iterator propIt = properties.tqfind( actionName ); if ( propIt == properties.end() ) propIt = properties.insert( actionName, TQMap<TQString, TQString>() ); @@ -874,7 +874,7 @@ void KXMLGUIClient::addStateActionEnabled(const TQString& state, stateChange.actionsToEnable.append( action ); //kdDebug() << "KXMLGUIClient::addStateActionEnabled( " << state << ", " << action << ")" << endl; - m_actionsStateMap.replace( state, stateChange ); + m_actionsStateMap.tqreplace( state, stateChange ); } @@ -886,7 +886,7 @@ void KXMLGUIClient::addStateActionDisabled(const TQString& state, stateChange.actionsToDisable.append( action ); //kdDebug() << "KXMLGUIClient::addStateActionDisabled( " << state << ", " << action << ")" << endl; - m_actionsStateMap.replace( state, stateChange ); + m_actionsStateMap.tqreplace( state, stateChange ); } diff --git a/kdeui/kxmlguifactory.cpp b/kdeui/kxmlguifactory.cpp index c166df861..5778e74d0 100644 --- a/kdeui/kxmlguifactory.cpp +++ b/kdeui/kxmlguifactory.cpp @@ -110,7 +110,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu xml_file = filename; else { - xml_file = locate("data", TQString::fromLatin1(instance->instanceName() + '/' ) + filename); + xml_file = locate("data", TQString::tqfromLatin1(instance->instanceName() + '/' ) + filename); if ( !TQFile::exists( xml_file ) ) xml_file = locate( "data", filename ); } @@ -120,7 +120,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu { kdError(240) << "No such XML file " << filename << endl; if ( never_null ) - return TQString::fromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" ); + return TQString::tqfromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" ); else return TQString::null; } @@ -146,7 +146,7 @@ bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc, TQString xml_file(filename); if (TQDir::isRelativePath(xml_file)) - xml_file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + xml_file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' ) + filename); TQFile file( xml_file ); @@ -240,7 +240,7 @@ void KXMLGUIFactory::addClient( KXMLGUIClient *client ) d->guiClient = client; // add this client to our client list - if ( !d->m_clients.containsRef( client ) ) + if ( !d->m_clients.tqcontainsRef( client ) ) d->m_clients.append( client ); else kdDebug(1002) << "XMLGUI client already added " << client << endl; @@ -566,7 +566,7 @@ int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSe TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc ) { - const TQString tagActionProp = TQString::fromLatin1("ActionProperties"); + const TQString tagActionProp = TQString::tqfromLatin1("ActionProperties"); // first, lets see if we have existing properties TQDomElement elem; TQDomNode it = doc.documentElement().firstChild(); diff --git a/kdeui/kxmlguifactory.h b/kdeui/kxmlguifactory.h index fa534e093..59b75c14b 100644 --- a/kdeui/kxmlguifactory.h +++ b/kdeui/kxmlguifactory.h @@ -59,7 +59,7 @@ class BuildHelper; * according to the XML and the merging rules of previously inserted clients. Container widgets * are built via a KXMLGUIBuilder , which has to be provided with the KXMLGUIFactory constructor. */ -class KDEUI_EXPORT KXMLGUIFactory : public QObject +class KDEUI_EXPORT KXMLGUIFactory : public TQObject { friend class KXMLGUI::BuildHelper; Q_OBJECT diff --git a/kdeui/kxmlguifactory_p.cpp b/kdeui/kxmlguifactory_p.cpp index 4bd5ad68e..f7955f471 100644 --- a/kdeui/kxmlguifactory_p.cpp +++ b/kdeui/kxmlguifactory_p.cpp @@ -136,7 +136,7 @@ ContainerNode *ContainerNode::findContainer( const TQString &name, const TQStrin { for (; nIt.current(); ++nIt ) if ( nIt.current()->name == name && - !excludeList->containsRef( nIt.current()->container ) ) + !excludeList->tqcontainsRef( nIt.current()->container ) ) { res = nIt.current(); break; @@ -149,7 +149,7 @@ ContainerNode *ContainerNode::findContainer( const TQString &name, const TQStrin for (; nIt.current(); ++nIt ) { if ( nIt.current()->tagName == tagName && - !excludeList->containsRef( nIt.current()->container ) + !excludeList->tqcontainsRef( nIt.current()->container ) /* * It is a bad idea to also compare the client, because * we don't want to do so in situations like these: @@ -226,7 +226,7 @@ void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::I TQString k( mergingIdx.mergingName ); - if ( k.find( tagActionList ) == -1 ) + if ( k.tqfind( tagActionList ) == -1 ) return; k = k.mid( tagActionList.length() ); @@ -268,7 +268,7 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList: TQString k = mergingIdx.mergingName; - if ( k.find( tagActionList ) == -1 ) + if ( k.tqfind( tagActionList ) == -1 ) return; k = k.mid( tagActionList.length() ); @@ -283,7 +283,7 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList: TQString::null, mergingIndices.end() ); - ActionListMap::Iterator lIt( client->actionLists.find( k ) ); + ActionListMap::Iterator lIt( client->actionLists.tqfind( k ) ); if ( lIt == client->actionLists.end() ) return; @@ -568,9 +568,9 @@ void BuildHelper::processElement( const TQDomElement &e ) bool isActionTag = ( tag == tagAction ); - if ( isActionTag || customTags.findIndex( tag ) != -1 ) + if ( isActionTag || customTags.tqfindIndex( tag ) != -1 ) processActionOrCustomElement( e, isActionTag ); - else if ( containerTags.findIndex( tag ) != -1 ) + else if ( containerTags.tqfindIndex( tag ) != -1 ) processContainerElement( e, tag, currName ); else if ( tag == tagMerge || tag == tagDefineGroup || tag == tagActionList ) processMergeElement( tag, currName, e ); diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp index 7ec1db3a2..fa21446ed 100644 --- a/kdeui/qxembed.cpp +++ b/kdeui/qxembed.cpp @@ -150,10 +150,10 @@ namespace { // L0200: This application wide event filter handles focus // issues in the embedded client. - class QXEmbedAppFilter : public QObject + class QXEmbedAppFilter : public TQObject { public: - QXEmbedAppFilter() { qApp->installEventFilter( this ); } + QXEmbedAppFilter() { tqApp->installEventFilter( this ); } ~QXEmbedAppFilter() { } bool eventFilter( TQObject *, TQEvent * ); }; @@ -174,7 +174,7 @@ static XKeyEvent last_key_event; // the toplevel window is embedded using the XEMBED protocol (L0680). // Handle `parentWinId' then records the id of the embedding window. -class QPublicWidget : public QWidget +class QPublicWidget : public TQWidget { public: QTLWExtra* topData() { return TQWidget::topData(); } @@ -311,8 +311,8 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // active and has just been given the Qt focus (L0614) or // because the widget already had the Qt focus and just became // active (L0615). - if ( qApp->focusWidget() == o && - ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->embedded ) { + if ( TQT_BASE_OBJECT(tqApp->tqfocusWidget()) == TQT_BASE_OBJECT(o) && + ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) { TQFocusEvent* fe = (TQFocusEvent*) e; if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse || fe->reason() == TQFocusEvent::Shortcut*/ ) { @@ -320,8 +320,12 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // Variable `obeyFocus' suggests that this is the result of mouse // activity in the client. The XEMBED_REQUEST_FOCUS message causes // the embedding widget to take the Qt focus (L2085). - WId window = ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->parentWinId; - focusMap->remove( qApp->focusWidget()->topLevelWidget() ); +#ifdef USE_QT4 + WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->effectiveWinId(); +#else // USE_QT4 + WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->parentWinId; +#endif // USE_QT4 + focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() ); sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS ); } else if ( fe->reason() == TQFocusEvent::ActiveWindow ) { // L0615: Both the embedder and the embedded client became active. @@ -329,20 +333,20 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // So we clear the Qt focus for now. If indeed the QXEmbed widget // has the focus, it will receive a FocusIn message (L1530) and // tell us to restore the focus (L0680, L0683). - focusMap->remove( qApp->focusWidget()->topLevelWidget() ); - focusMap->insert( qApp->focusWidget()->topLevelWidget(), - new TQGuardedPtr<TQWidget>(qApp->focusWidget()->topLevelWidget()->focusWidget() ) ); - // L0616: qApp->focusWidget() might belong to a modal dialog and not be - // equal to qApp->focusWidget()->topLevelWidget()->focusWidget() ! - qApp->focusWidget()->clearFocus(); + focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() ); + focusMap->insert( tqApp->tqfocusWidget()->tqtopLevelWidget(), + new TQGuardedPtr<TQWidget>(tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() ) ); + // L0616: tqApp->tqfocusWidget() might belong to a modal dialog and not be + // equal to tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() ! + tqApp->tqfocusWidget()->clearFocus(); // L0617: ??? [why not {obeyFocus=false; return true;} here?] } obeyFocus = false; } break; case TQEvent::KeyPress: - if (qApp->focusWidget() == o && - ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->embedded ) { + if (TQT_BASE_OBJECT(tqApp->tqfocusWidget()) == TQT_BASE_OBJECT(o) && + ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) { // L0620: The following code replaces the Qt code that // handles focus focus changes with the tab key. See the // XEMBED specification for details. The keypress event @@ -356,35 +360,47 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // (L0653, L0654) which then performs tab navigation // (L2081). TQKeyEvent *k = (TQKeyEvent *)e; - TQWidget *w = qApp->focusWidget(); + TQWidget *w = tqApp->tqfocusWidget(); // L0621: The following tests are copied from TQWidget::event(). bool res = false; bool tabForward = true; if ( !(k->state() & ControlButton || k->state() & AltButton) ) { if ( k->key() == Key_Backtab || (k->key() == Key_Tab && (k->state() & ShiftButton)) ) { +#ifdef USE_QT4 + res = ((QPublicWidget*)w)->focusNextPrev( tabForward = false ); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Backtab ); res = ((QPublicWidget*)w)->focusNextPrev( tabForward = false ); TQFocusEvent::resetReason(); +#endif // USE_QT4 } else if ( k->key() == Key_Tab ) { +#ifdef USE_QT4 + res = ((QPublicWidget*)w)->focusNextPrev( tabForward = true ); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Tab ); res = ((QPublicWidget*)w)->focusNextPrev( tabForward = true ); TQFocusEvent::resetReason(); +#endif // USE_QT4 } } if (res) { // L0625: We changed the focus because of tab/backtab key // Now check whether we have been looping around. TQFocusData *fd = ((QPublicWidget*)w)->focusData(); - WId window = ((QPublicWidget*)w->topLevelWidget())->topData()->parentWinId; +#ifdef USE_QT4 + WId window = ((QPublicWidget*)w->tqtopLevelWidget())->effectiveWinId(); +#else // USE_QT4 + WId window = ((QPublicWidget*)w->tqtopLevelWidget())->topData()->parentWinId; +#endif // USE_QT4 TQWidget *cw = 0; TQWidget *fw = fd->home(); if (tabForward && window) { - while (cw != w && cw != fw && cw != w->topLevelWidget()) + while (cw != w && cw != fw && cw != w->tqtopLevelWidget()) cw = fd->prev(); if (cw != w) sendXEmbedMessage( window, XEMBED_FOCUS_NEXT ); } else if (window) { - while (cw != w && cw != fw && cw != w->topLevelWidget()) + while (cw != w && cw != fw && cw != w->tqtopLevelWidget()) cw = fd->next(); if (cw != w) sendXEmbedMessage( window, XEMBED_FOCUS_PREV ); @@ -422,16 +438,21 @@ static int qxembed_x11_event_filter( XEvent* e) // L0671: Keep Qt message time up to date if ( msgtime > qt_x_time ) qt_x_time = msgtime; - TQWidget* w = TQWidget::find( e->xclient.window ); + TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); if ( !w ) break; switch ( message) { case XEMBED_EMBEDDED_NOTIFY: { // L0675: We just have been embedded into a XEMBED aware widget. - QTLWExtra *extra = ((QPublicWidget*)w->topLevelWidget())->topData(); + QTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData(); extra->embedded = 1; +#ifdef USE_QT4 + // [FIXME] + printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r"); +#else // USE_QT4 extra->parentWinId = e->xclient.data.l[3]; - w->topLevelWidget()->show(); +#endif // USE_QT4 + w->tqtopLevelWidget()->show(); break; } case XEMBED_WINDOW_ACTIVATE: { @@ -444,10 +465,10 @@ static int qxembed_x11_event_filter( XEvent* e) memset(&ev, 0, sizeof(ev)); ev.xfocus.display = qt_xdisplay(); ev.xfocus.type = XFocusIn; - ev.xfocus.window = w->topLevelWidget()->winId(); + ev.xfocus.window = w->tqtopLevelWidget()->winId(); ev.xfocus.mode = NotifyNormal; ev.xfocus.detail = NotifyAncestor; - qApp->x11ProcessEvent( &ev ); + tqApp->x11ProcessEvent( &ev ); } break; case XEMBED_WINDOW_DEACTIVATE: { @@ -458,10 +479,10 @@ static int qxembed_x11_event_filter( XEvent* e) memset(&ev, 0, sizeof(ev)); ev.xfocus.display = qt_xdisplay(); ev.xfocus.type = XFocusOut; - ev.xfocus.window = w->topLevelWidget()->winId(); + ev.xfocus.window = w->tqtopLevelWidget()->winId(); ev.xfocus.mode = NotifyNormal; ev.xfocus.detail = NotifyAncestor; - qApp->x11ProcessEvent( &ev ); + tqApp->x11ProcessEvent( &ev ); } break; case XEMBED_FOCUS_IN: @@ -469,11 +490,11 @@ static int qxembed_x11_event_filter( XEvent* e) { // L0681: Search saved focus widget. TQWidget* focusCurrent = 0; - TQGuardedPtr<TQWidget>* fw = focusMap->find( w->topLevelWidget() ); + TQGuardedPtr<TQWidget>* fw = focusMap->tqfind( w->tqtopLevelWidget() ); if ( fw ) { focusCurrent = *fw; // L0682: Remove it from the map - focusMap->remove( w->topLevelWidget() ); + focusMap->remove( w->tqtopLevelWidget() ); } switch ( detail ) { case XEMBED_FOCUS_CURRENT: @@ -483,25 +504,35 @@ static int qxembed_x11_event_filter( XEvent* e) if( QXEmbed* emb = dynamic_cast< QXEmbed* >( focusCurrent )) emb->updateEmbeddedFocus( true ); } - else if ( !w->topLevelWidget()->focusWidget() ) - w->topLevelWidget()->setFocus(); + else if ( !w->tqtopLevelWidget()->tqfocusWidget() ) + w->tqtopLevelWidget()->setFocus(); break; case XEMBED_FOCUS_FIRST: { // L0684: Search first widget in tab chain +#ifdef USE_QT4 + w->tqtopLevelWidget()->setFocus(); + ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Tab ); - w->topLevelWidget()->setFocus(); - ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true); + w->tqtopLevelWidget()->setFocus(); + ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true); TQFocusEvent::resetReason(); +#endif // USE_QT4 } break; case XEMBED_FOCUS_LAST: { // L0686: Search last widget in tab chain +#ifdef USE_QT4 + w->tqtopLevelWidget()->setFocus(); + ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Backtab ); - w->topLevelWidget()->setFocus(); - ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false); + w->tqtopLevelWidget()->setFocus(); + ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false); TQFocusEvent::resetReason(); +#endif // USE_QT4 } break; default: @@ -513,12 +544,12 @@ static int qxembed_x11_event_filter( XEvent* e) // L0688: Embedding application takes the focus away // We first record what the focus widget was // and clear the Qt focus. - if ( w->topLevelWidget()->focusWidget() ) { - if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget())) + if ( w->tqtopLevelWidget()->tqfocusWidget() ) { + if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->tqtopLevelWidget()->tqfocusWidget())) emb->updateEmbeddedFocus( false ); - focusMap->insert( w->topLevelWidget(), - new TQGuardedPtr<TQWidget>(w->topLevelWidget()->focusWidget() ) ); - w->topLevelWidget()->focusWidget()->clearFocus(); + focusMap->insert( w->tqtopLevelWidget(), + new TQGuardedPtr<TQWidget>(w->tqtopLevelWidget()->tqfocusWidget() ) ); + w->tqtopLevelWidget()->tqfocusWidget()->clearFocus(); } break; default: @@ -526,7 +557,7 @@ static int qxembed_x11_event_filter( XEvent* e) } } else if ( e->xclient.format == 32 && e->xclient.message_type ) { if ( e->xclient.message_type == qt_wm_protocols ) { - TQWidget* w = TQWidget::find( e->xclient.window ); + TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); if ( !w ) break; // L0690: This is for the embedding side! @@ -621,7 +652,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // whole embedding application. They compete between themselves and // against Qt (L0690, L0914, L1040, L1310, L1510, L1580). // This would be much simpler if implemented within Qt. - d->focusProxy = new TQWidget( topLevelWidget(), "xembed_focus" ); + d->focusProxy = new TQWidget( tqtopLevelWidget(), "xembed_focus" ); d->focusProxy->setGeometry( -1, -1, 1, 1 ); d->focusProxy->show(); // make sure it's shown - for XSetInputFocus @@ -631,7 +662,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // See L0660, L0671, L0685. initialize(); window = 0; - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); setKeyCompression( false ); // L0910: Trick Qt to create extraData(); @@ -656,13 +687,13 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // L0913: all application events pass through eventFilter(). // This is mostly used to force the X11 focus on the // proxy focus window. See L1300. - topLevelWidget()->installEventFilter( this ); - qApp->installEventFilter( this ); + tqtopLevelWidget()->installEventFilter( this ); + tqApp->installEventFilter( this ); // L0914: Start moving the X11 focus on the focus proxy window. // See L1581 to know why we do not use isActiveWindow(). - if ( qApp->activeWindow() == topLevelWidget() ) - if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) + if ( tqApp->activeWindow() == tqtopLevelWidget() ) + if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), RevertToParent, qt_x_time ); // L0915: ??? [drag&drop?] @@ -716,7 +747,7 @@ QXEmbed::~QXEmbed() int revert; XGetInputFocus( qt_xdisplay(), &focus, &revert ); if( focus == d->focusProxy->winId()) - XSetInputFocus( qt_xdisplay(), topLevelWidget()->winId(), RevertToParent, qt_x_time ); + XSetInputFocus( qt_xdisplay(), tqtopLevelWidget()->winId(), RevertToParent, qt_x_time ); // L01045: Delete our private data. delete d; } @@ -780,10 +811,10 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) switch ( e->type() ) { case TQEvent::WindowActivate: - if ( o == topLevelWidget() ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqtopLevelWidget()) ) { // L1310: Qt thinks the application window has just been activated. // Make sure the X11 focus is on the focus proxy window. See L0686. - if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) + if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) if (! hasFocus() ) XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), RevertToParent, qt_x_time ); @@ -796,7 +827,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) } break; case TQEvent::WindowDeactivate: - if ( o == topLevelWidget() ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqtopLevelWidget()) ) { if (d->xplain) // L1321: Activation has changed. Grab state might change. See L2800. checkGrab(); @@ -808,9 +839,9 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) case TQEvent::Move: { TQWidget* pos = this; - while( pos != o && pos != topLevelWidget()) - pos = pos->parentWidget(); - if( pos == o ) { + while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(tqtopLevelWidget())) + pos = pos->tqparentWidget(); + if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) { // L1390: Send fake configure notify events whenever the // global position of the client changes. See L2900. TQPoint globalPos = mapToGlobal(TQPoint(0,0)); @@ -864,8 +895,8 @@ void QXEmbed::focusInEvent( TQFocusEvent * e ){ return; // L1510: This is a good time to set the X11 focus on the focus proxy window. // Except if the the embedding application itself is embedded into another. - if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) - if ( qApp->activeWindow() == topLevelWidget() ) + if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) + if ( tqApp->activeWindow() == tqtopLevelWidget() ) // L1511: Alter X focus only when window is active. // This is dual safety here because FocusIn implies this. // But see L1581 for an example where this really matters. @@ -913,8 +944,8 @@ void QXEmbed::focusOutEvent( TQFocusEvent * ){ // is properly set to the X11 focus widget. We do this because // the client application might have moved the X11 focus after // receiving the fake focus messages. - if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) - if ( qApp->activeWindow() == topLevelWidget() ) + if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) + if ( tqApp->activeWindow() == tqtopLevelWidget() ) // L1581: Alter X focus only when window is active. // The test above is not the same as isActiveWindow(). // Function isActiveWindow() also returns true when a modal @@ -950,7 +981,7 @@ static bool wstate_withdrawn( WId winid ) // L1610: Non managed windows have no WM_STATE property. // Returning true ensures that the loop L1711 stops. if ( r == Success && data && format == 32 ) { - Q_UINT32 *wstate = (Q_UINT32*)data; + TQ_UINT32 *wstate = (TQ_UINT32*)data; withdrawn = (*wstate == WithdrawnState ); XFree( (char *)data ); } @@ -1004,7 +1035,7 @@ void QXEmbed::embed(WId w) // time to create the embedded application main window. Window parent = 0; get_parent(w, &parent); - kdDebug() << TQString("> before reparent: parent=0x%1").arg(parent,0,16) << endl; + kdDebug() << TQString(TQString("> before reparent: parent=0x%1").arg(parent,0,16)) << endl; for (int i = 0; i < 50; i++) { // this is done once more when finishing embedding, but it's done also here // just in case we crash before reaching that place @@ -1012,15 +1043,15 @@ void QXEmbed::embed(WId w) XAddToSaveSet( qt_xdisplay(), w ); XReparentWindow(qt_xdisplay(), w, winId(), 0, 0); if (get_parent(w, &parent) && parent == winId()) { - kdDebug() << TQString("> Loop %1: ").arg(i) - << TQString("> reparent of 0x%1").arg(w,0,16) - << TQString(" into 0x%1").arg(winId(),0,16) + kdDebug() << TQString(TQString("> Loop %1: ").arg(i)) + << TQString(TQString("> reparent of 0x%1").arg(w,0,16)) + << TQString(TQString(" into 0x%1").arg(winId(),0,16)) << TQString(" successful") << endl; break; } - kdDebug() << TQString("> Loop %1: ").arg(i) - << TQString("> reparent of 0x%1").arg(w,0,16) - << TQString(" into 0x%1").arg(winId(),0,16) + kdDebug() << TQString(TQString("> Loop %1: ").arg(i)) + << TQString(TQString("> reparent of 0x%1").arg(w,0,16)) + << TQString(TQString(" into 0x%1").arg(winId(),0,16)) << TQString(" failed") << endl; USLEEP(1000); } @@ -1138,9 +1169,13 @@ bool QXEmbed::x11Event( XEvent* e) if (d->xplain && d->xgrab) { // L2060: The passive grab has intercepted a mouse click // in the embedded client window. Take the focus. +#ifdef USE_QT4 + setFocus(); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Mouse ); setFocus(); TQFocusEvent::resetReason(); +#endif // USE_QT4 // L2064: Resume X11 event processing. XAllowEvents(qt_xdisplay(), ReplayPointer, CurrentTime); // L2065: Qt should not know about this. @@ -1176,15 +1211,23 @@ bool QXEmbed::x11Event( XEvent* e) break; // L2085: The client asks for the focus. case XEMBED_REQUEST_FOCUS: - if( ((QPublicWidget*)topLevelWidget())->topData()->embedded ) { - focusMap->remove( topLevelWidget() ); - focusMap->insert( topLevelWidget(), new TQGuardedPtr<TQWidget>( this )); - WId window = ((QPublicWidget*)topLevelWidget())->topData()->parentWinId; + if( ((QPublicWidget*)tqtopLevelWidget())->topData()->embedded ) { + focusMap->remove( tqtopLevelWidget() ); + focusMap->insert( tqtopLevelWidget(), new TQGuardedPtr<TQWidget>( this )); +#ifdef USE_QT4 + WId window = ((QPublicWidget*)tqtopLevelWidget())->effectiveWinId(); +#else // USE_QT4 + WId window = ((QPublicWidget*)tqtopLevelWidget())->topData()->parentWinId; +#endif // USE_QT4 sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS ); } else { +#ifdef USE_QT4 + setFocus(); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Mouse ); setFocus(); TQFocusEvent::resetReason(); +#endif // USE_QT4 } break; default: @@ -1276,7 +1319,12 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) XReparentWindow(qt_xdisplay(), client->winId(), window, 0, 0); // L2451: These two lines are redundant. See L0680. ((QXEmbed*)client)->topData()->embedded = true; +#ifdef USE_QT4 + // [FIXME] + printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r"); +#else // USE_QT4 ((QXEmbed*)client)->topData()->parentWinId = window; +#endif // USE_QT4 // L2452: This seems redundant because L2020 maps the window. // But calling show() might also set Qt internal flags. client->show(); @@ -1285,7 +1333,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) // L2500: Specifies that this widget can use additional space, -// and that it can survive on less than sizeHint(). +// and that it can survive on less than tqsizeHint(). TQSizePolicy QXEmbed::sizePolicy() const { return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); @@ -1293,13 +1341,13 @@ TQSizePolicy QXEmbed::sizePolicy() const // L2520: Returns a size sufficient for the embedded window -TQSize QXEmbed::sizeHint() const +TQSize QXEmbed::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } // L2550: Returns the minimum size specified by the embedded window. -TQSize QXEmbed::minimumSizeHint() const +TQSize QXEmbed::tqminimumSizeHint() const { int minw = 0; int minh = 0; diff --git a/kdeui/qxembed.h b/kdeui/qxembed.h index 3b345554f..c9dcac05d 100644 --- a/kdeui/qxembed.h +++ b/kdeui/qxembed.h @@ -25,6 +25,10 @@ #include <tqwidget.h> #include <kdelibs_export.h> +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 class QXEmbedData; @@ -55,9 +59,10 @@ class QXEmbedData; * * @short The QXEmbed widget is a graphical socket that can embed an external X-Window. */ -class KDEUI_EXPORT QXEmbed : public QWidget +class KDEUI_EXPORT QXEmbed : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -183,8 +188,8 @@ public: bool autoDelete() const; /* Reimp */ - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; TQSizePolicy sizePolicy() const; bool eventFilter( TQObject *, TQEvent * ); bool customWhatsThis() const; diff --git a/kdeui/tests/itemcontainertest.h b/kdeui/tests/itemcontainertest.h index 9af239c60..4334bd805 100644 --- a/kdeui/tests/itemcontainertest.h +++ b/kdeui/tests/itemcontainertest.h @@ -9,7 +9,7 @@ class KListBox; class TQButtonGroup; class TQLabel; -class TopLevel : public QWidget +class TopLevel : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/kalphaicontest.h b/kdeui/tests/kalphaicontest.h index 6143b569d..201f96cd6 100644 --- a/kdeui/tests/kalphaicontest.h +++ b/kdeui/tests/kalphaicontest.h @@ -5,7 +5,7 @@ #include <kimageeffect.h> #include <kalphapainter.h> -class KAlphaTest : public QWidget +class KAlphaTest : public TQWidget { public: KAlphaTest(); diff --git a/kdeui/tests/kblendtest.cpp b/kdeui/tests/kblendtest.cpp index e2d36a575..59a57dc6a 100644 --- a/kdeui/tests/kblendtest.cpp +++ b/kdeui/tests/kblendtest.cpp @@ -11,7 +11,7 @@ KBlendWidget::KBlendWidget(TQWidget *parent, const char *name) :TQWidget(parent, name) { - bgnd = qRgb(255, 255, 255); + bgnd = tqRgb(255, 255, 255); image = TQImage("testimage.png"); diff --git a/kdeui/tests/kblendtest.h b/kdeui/tests/kblendtest.h index b0f4485dd..f35afbb5f 100644 --- a/kdeui/tests/kblendtest.h +++ b/kdeui/tests/kblendtest.h @@ -10,7 +10,7 @@ #include <tqwidget.h> #include <tqimage.h> -class KBlendWidget : public QWidget +class KBlendWidget : public TQWidget { public: KBlendWidget(TQWidget *parent=0, const char *name=0); diff --git a/kdeui/tests/kbuttonboxtest.cpp b/kdeui/tests/kbuttonboxtest.cpp index 1773c47f9..86850f0ce 100644 --- a/kdeui/tests/kbuttonboxtest.cpp +++ b/kdeui/tests/kbuttonboxtest.cpp @@ -37,8 +37,8 @@ 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->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); TQPushButton *b = bbox->addButton("OK"); @@ -65,8 +65,8 @@ 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->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -91,8 +91,8 @@ 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->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -120,8 +120,8 @@ 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->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -152,8 +152,8 @@ 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->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -182,8 +182,8 @@ int main(int argc, char **argv) { "to make vertically aligned buttons\n" "too?" ,w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); TQPushButton *b = bbox->addButton("OK"); diff --git a/kdeui/tests/kcharselecttest.cpp b/kdeui/tests/kcharselecttest.cpp index facd17bca..5880c436a 100644 --- a/kdeui/tests/kcharselecttest.cpp +++ b/kdeui/tests/kcharselecttest.cpp @@ -7,7 +7,7 @@ int main (int argc,char **argv) KApplication app( argc, argv, "kcharselecttest" ); KCharSelect selector( 0, "char selector" ); - selector.resize( selector.sizeHint() ); + selector.resize( selector.tqsizeHint() ); selector.show(); selector.setCaption( "KCharSelect Test" ); diff --git a/kdeui/tests/kcolortest.cpp b/kdeui/tests/kcolortest.cpp index d4a5c2625..46f5b42bc 100644 --- a/kdeui/tests/kcolortest.cpp +++ b/kdeui/tests/kcolortest.cpp @@ -51,9 +51,9 @@ void KColorWidget::doIntensityLoop() for (int i=0;i<size; i++, qptr++) { qrgb=*(QRgb *)qptr; - *qptr=qRgb((int)(qRed(qrgb)*1./max), - (int)(qGreen(qrgb)*1./max), - (int)(qBlue(qrgb)*1./max)); + *qptr=tqRgb((int)(tqRed(qrgb)*1./max), + (int)(tqGreen(qrgb)*1./max), + (int)(tqBlue(qrgb)*1./max)); } } pixmap.convertFromImage(image); diff --git a/kdeui/tests/kcolortest.h b/kdeui/tests/kcolortest.h index ac8716d59..529a1ad74 100644 --- a/kdeui/tests/kcolortest.h +++ b/kdeui/tests/kcolortest.h @@ -5,7 +5,7 @@ #include <tqimage.h> #include <kpixmap.h> -class KColorWidget : public QWidget +class KColorWidget : public TQWidget { public: KColorWidget(TQWidget *parent=0, const char *name=0); diff --git a/kdeui/tests/kcomboboxtest.cpp b/kdeui/tests/kcomboboxtest.cpp index 44b849b44..e8fd35f7e 100644 --- a/kdeui/tests/kcomboboxtest.cpp +++ b/kdeui/tests/kcomboboxtest.cpp @@ -36,7 +36,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) TQHBox* hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); TQLabel* lbl = new TQLabel("&QCombobox:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" ); lbl->setBuddy (m_qc); @@ -48,7 +48,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel("&Read-Only Combo:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_ro = new KComboBox(hbox, "ReadOnlyCombo" ); lbl->setBuddy (m_ro); @@ -61,7 +61,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel("&Editable Combo:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_rw = new KComboBox( true, hbox, "ReadWriteCombo" ); lbl->setBuddy (m_rw); @@ -78,7 +78,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel("&History Combo:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_hc = new KHistoryCombo( true, hbox, "HistoryCombo" ); lbl->setBuddy (m_hc); @@ -94,7 +94,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel( "&Konq's Combo:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_konqc = new KComboBox( true, hbox, "KonqyCombo" ); lbl->setBuddy (m_konqc); diff --git a/kdeui/tests/kcomboboxtest.h b/kdeui/tests/kcomboboxtest.h index ac6d48338..6566c9097 100644 --- a/kdeui/tests/kcomboboxtest.h +++ b/kdeui/tests/kcomboboxtest.h @@ -9,7 +9,7 @@ class TQPushButton; class KComboBox; -class KComboBoxTest : public QWidget +class KComboBoxTest : public TQWidget { Q_OBJECT diff --git a/kdeui/tests/kcompletiontest.cpp b/kdeui/tests/kcompletiontest.cpp index bdd47ab48..fd44307d3 100644 --- a/kdeui/tests/kcompletiontest.cpp +++ b/kdeui/tests/kcompletiontest.cpp @@ -42,7 +42,7 @@ Form1::Form1( TQWidget* parent, const char* name ) GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setMargin( 0 ); GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); + GroupBox1Layout->tqsetAlignment( Qt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); diff --git a/kdeui/tests/kcompletiontest.h b/kdeui/tests/kcompletiontest.h index 55b01a82d..9443401eb 100644 --- a/kdeui/tests/kcompletiontest.h +++ b/kdeui/tests/kcompletiontest.h @@ -25,7 +25,7 @@ class KHistoryCombo; class KLineEdit; -class Form1 : public QWidget +class Form1 : public TQWidget { Q_OBJECT diff --git a/kdeui/tests/kdesattest.cpp b/kdeui/tests/kdesattest.cpp index 28f7d4cf2..e75b320a7 100644 --- a/kdeui/tests/kdesattest.cpp +++ b/kdeui/tests/kdesattest.cpp @@ -23,7 +23,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name) void KDesatWidget::change(double) { desat_value = slide->value(); - repaint(false); + tqrepaint(false); } void KDesatWidget::paintEvent(TQPaintEvent */*ev*/) diff --git a/kdeui/tests/kdesattest.h b/kdeui/tests/kdesattest.h index 67329d578..8e04c08c6 100644 --- a/kdeui/tests/kdesattest.h +++ b/kdeui/tests/kdesattest.h @@ -11,7 +11,7 @@ #include <tqimage.h> #include <knuminput.h> -class KDesatWidget : public QWidget +class KDesatWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/kdialogbasetest.cpp b/kdeui/tests/kdialogbasetest.cpp index 5e62115fa..ec77e7453 100644 --- a/kdeui/tests/kdialogbasetest.cpp +++ b/kdeui/tests/kdialogbasetest.cpp @@ -64,7 +64,7 @@ int main(int argc, char** argv) widget may change before the dialog is shown. Additionally, setting a help chapter may cause a need for adjustment since it modifies the height of the upper frame. */ - dialog.resize(dialog.minimumSize()); + dialog.resize(dialog.tqminimumSize()); /* The dialog object is used just as any other TQDialog: */ if(dialog.exec()) { diff --git a/kdeui/tests/kdockwidgetdemo.cpp b/kdeui/tests/kdockwidgetdemo.cpp index 15b83d14e..2f2c59d94 100644 --- a/kdeui/tests/kdockwidgetdemo.cpp +++ b/kdeui/tests/kdockwidgetdemo.cpp @@ -82,7 +82,7 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const :TQDialog(0L,name,true) { KConfig* config = kapp->config(); - config->setGroup( TQString::fromLatin1("SFileDialogData:") + name ); + config->setGroup( TQString::tqfromLatin1("SFileDialogData:") + name ); if ( initially.isNull() ){ initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() ); } @@ -242,7 +242,7 @@ void PixmapView::setPixmap( const TQPixmap &pix ) { pixmap = pix; resizeContents( pixmap.size().width(), pixmap.size().height() ); - viewport()->repaint( true ); + viewport()->tqrepaint( true ); } void PixmapView::drawContents( TQPainter *p, int, int, int, int ) @@ -777,13 +777,13 @@ int main(int argc, char* argv[]) { #endif #if 0 - qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::fromLatin1("All (*)"), - TQString::fromLatin1("DockWidget Demo"), "dialog1" ) ); + qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::tqfromLatin1("All (*)"), + TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ) ); #endif #if 1 - TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::fromLatin1("All (*)"), - TQString::fromLatin1("DockWidget Demo"), "dialog1" ); + TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::tqfromLatin1("All (*)"), + TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ); TQStringList::Iterator it = s.begin(); for ( ; it != s.end(); ++it ){ qDebug( "%s", (*it).local8Bit().data() ); diff --git a/kdeui/tests/kdockwidgetdemo.h b/kdeui/tests/kdockwidgetdemo.h index ff9b1451b..b6f029cd5 100644 --- a/kdeui/tests/kdockwidgetdemo.h +++ b/kdeui/tests/kdockwidgetdemo.h @@ -28,7 +28,7 @@ class CustomFileDialog; class Preview; class DirectoryView; -class SFileDialog : public QDialog +class SFileDialog : public TQDialog {Q_OBJECT public: @@ -67,7 +67,7 @@ private: TQToolButton *b_preview; }; /******************************************************************************************************/ -class Directory : public QListViewItem +class Directory : public TQListViewItem { public: Directory( TQListView * parent, const TQString& filename ); @@ -86,7 +86,7 @@ private: bool readable; }; -class DirectoryView : public QListView +class DirectoryView : public TQListView {Q_OBJECT public: DirectoryView( TQWidget *parent = 0, const char *name = 0 ); @@ -107,7 +107,7 @@ private: TQString fullPath(TQListViewItem* item); }; /******************************************************************************************************/ -class PixmapView : public QScrollView +class PixmapView : public TQScrollView {Q_OBJECT public: PixmapView( TQWidget *parent ); @@ -118,7 +118,7 @@ private: TQPixmap pixmap; }; -class Preview : public QWidgetStack +class Preview : public TQWidgetStack {Q_OBJECT public: Preview( TQWidget *parent ); @@ -132,7 +132,7 @@ private: PixmapView *pixmap; }; -class CustomFileDialog : public QFileDialog +class CustomFileDialog : public TQFileDialog {Q_OBJECT public: CustomFileDialog( TQWidget* parent ); diff --git a/kdeui/tests/kdockwidgettest.cpp b/kdeui/tests/kdockwidgettest.cpp index 08a7e42b3..b2f7b8bd9 100644 --- a/kdeui/tests/kdockwidgettest.cpp +++ b/kdeui/tests/kdockwidgettest.cpp @@ -101,7 +101,7 @@ DockApplication::DockApplication( const char* name ) l->setBackgroundColor(white); l->setMinimumSize(100,100); dock5->setWidget(l); - if (l->qt_cast("KDockContainer")) qDebug("KDockContainer created for dock 5"); + if (l->tqqt_cast("KDockContainer")) qDebug("KDockContainer created for dock 5"); /*****************************************************/ /*****************************************************/ @@ -112,7 +112,7 @@ DockApplication::DockApplication( const char* name ) l->setBackgroundColor(white); l->setMinimumSize(100,100); dock6->setWidget(l); - if (l->qt_cast("KDockContainer")) qDebug("KDockContainer created for dock 6"); + if (l->tqqt_cast("KDockContainer")) qDebug("KDockContainer created for dock 6"); /*****************************************************/ diff --git a/kdeui/tests/kdualcolortest.cpp b/kdeui/tests/kdualcolortest.cpp index 2060a9842..507030132 100644 --- a/kdeui/tests/kdualcolortest.cpp +++ b/kdeui/tests/kdualcolortest.cpp @@ -10,8 +10,8 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) { lbl = new TQLabel("Testing, testing, 1, 2, 3...", this); KDualColorButton *colorBtn = - new KDualColorButton(lbl->colorGroup().text(), - lbl->colorGroup().background(), this); + new KDualColorButton(lbl->tqcolorGroup().text(), + lbl->tqcolorGroup().background(), this); connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)), TQT_SLOT(slotFgChanged(const TQColor &))); connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)), @@ -23,7 +23,7 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) layout->addWidget(colorBtn, 0); layout->addWidget(lbl, 1); layout->activate(); - resize(sizeHint()); + resize(tqsizeHint()); } void KDualColorWidget::slotFgChanged(const TQColor &c) diff --git a/kdeui/tests/kdualcolortest.h b/kdeui/tests/kdualcolortest.h index bcd9b271e..2c38b7af0 100644 --- a/kdeui/tests/kdualcolortest.h +++ b/kdeui/tests/kdualcolortest.h @@ -4,7 +4,7 @@ #include <tqlabel.h> #include <kdualcolorbutton.h> -class KDualColorWidget : public QWidget +class KDualColorWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/keditlistboxtest.cpp b/kdeui/tests/keditlistboxtest.cpp index 90dbb74d0..fdc90a742 100644 --- a/kdeui/tests/keditlistboxtest.cpp +++ b/kdeui/tests/keditlistboxtest.cpp @@ -7,14 +7,14 @@ int main( int argc, char **argv ) KApplication app( argc, argv, "keditlistboxtest" ); KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) ); - KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"), + KEditListBox *box = new KEditListBox( TQString::tqfromLatin1("KEditListBox"), editor ); - box->insertItem( TQString::fromLatin1("Test") ); - box->insertItem( TQString::fromLatin1("for") ); - box->insertItem( TQString::fromLatin1("this") ); - box->insertItem( TQString::fromLatin1("KEditListBox") ); - box->insertItem( TQString::fromLatin1("Widget") ); + box->insertItem( TQString::tqfromLatin1("Test") ); + box->insertItem( TQString::tqfromLatin1("for") ); + box->insertItem( TQString::tqfromLatin1("this") ); + box->insertItem( TQString::tqfromLatin1("KEditListBox") ); + box->insertItem( TQString::tqfromLatin1("Widget") ); box->show(); return app.exec(); diff --git a/kdeui/tests/kgradienttest.h b/kdeui/tests/kgradienttest.h index a793bfa5c..ba99c8313 100644 --- a/kdeui/tests/kgradienttest.h +++ b/kdeui/tests/kgradienttest.h @@ -10,7 +10,7 @@ #include <tqwidget.h> #include <kpixmap.h> -class KGradientWidget : public QWidget +class KGradientWidget : public TQWidget { public: KGradientWidget(TQWidget *parent=0, const char *name=0) diff --git a/kdeui/tests/khashtest.h b/kdeui/tests/khashtest.h index 3d4e8a3fa..05de5c435 100644 --- a/kdeui/tests/khashtest.h +++ b/kdeui/tests/khashtest.h @@ -10,7 +10,7 @@ #include <tqwidget.h> #include <kpixmap.h> -class KHashWidget : public QWidget +class KHashWidget : public TQWidget { Q_OBJECT diff --git a/kdeui/tests/kledtest.cpp b/kdeui/tests/kledtest.cpp index d68f1e366..f8d031530 100644 --- a/kdeui/tests/kledtest.cpp +++ b/kdeui/tests/kledtest.cpp @@ -50,14 +50,14 @@ KLedTest::KLedTest(TQWidget* parent) } else { y=Grid; index=0; - for( int shape=0; (int)shape<2; shape=(KLed::Shape)(shape+1)) { + for( int tqshape=0; (int)tqshape<2; tqshape=(KLed::Shape)(tqshape+1)) { x=Grid; 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, (KLed::Look)(look+1), - (KLed::Shape)(shape+1), this); + (KLed::Shape)(tqshape+1), this); leds[index]->setGeometry(x, y, LedWidth, LedHeight); ++index; x+=Grid+LedWidth; @@ -108,7 +108,7 @@ KLedTest::nextLook() { ledlook = static_cast<KLed::Look>(tmp); l->setLook(ledlook); //qDebug("painting look %i", ledlook); - //l->repaint(); + //l->tqrepaint(); } diff --git a/kdeui/tests/kledtest.h b/kdeui/tests/kledtest.h index 33c70fe83..5d660f5a3 100644 --- a/kdeui/tests/kledtest.h +++ b/kdeui/tests/kledtest.h @@ -6,7 +6,7 @@ #include <stdlib.h> #include <kled.h> -class KLedTest : public QWidget +class KLedTest : public TQWidget { Q_OBJECT protected: @@ -15,7 +15,7 @@ protected: const int LedWidth; const int LedHeight; const int Grid; - KLed::Shape shape; + KLed::Shape tqshape; KLed::Look look; KLed::State state; int x, y, index; diff --git a/kdeui/tests/klineedittest.h b/kdeui/tests/klineedittest.h index fc2b74a30..6fee4dbc4 100644 --- a/kdeui/tests/klineedittest.h +++ b/kdeui/tests/klineedittest.h @@ -9,7 +9,7 @@ class TQPushButton; class KLineEdit; -class KLineEditTest : public QWidget +class KLineEditTest : public TQWidget { Q_OBJECT diff --git a/kdeui/tests/kmessageboxtest.cpp b/kdeui/tests/kmessageboxtest.cpp index 1b926739f..e63d24fca 100644 --- a/kdeui/tests/kmessageboxtest.cpp +++ b/kdeui/tests/kmessageboxtest.cpp @@ -25,18 +25,18 @@ ExampleWidget::ExampleWidget( TQWidget *parent, const char *name ) // and sub-layouts. TQSize sh; setText("<p>Hello.</p>"); - sh = sizeHint(); + sh = tqsizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); setText("Hello."); - sh = sizeHint(); + sh = tqsizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); setText("<p>Hello<br>World</p>"); - sh = sizeHint(); + sh = tqsizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); // setText("Hello\nWorld"); - sh = sizeHint(); + sh = tqsizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -79,11 +79,11 @@ case 1: i = KMessageBox::warningContinueCancel(w, "You are about to <Print>.\n" "Are you sure?", - "Print", TQString::fromLatin1("&Print"), "dontask", false); + "Print", TQString::tqfromLatin1("&Print"), "dontask", false); i = KMessageBox::warningContinueCancel(0, "You are about to <Print>.\n" "Are you sure?", - "Print", TQString::fromLatin1("&Print"), "dontask", KMessageBox::AllowLink); + "Print", TQString::tqfromLatin1("&Print"), "dontask", KMessageBox::AllowLink); i = KMessageBox::questionYesNo(0, "<p>Do you have a printer? thisisaverylongdkldhklghklghklashgkllasghkdlsghkldfghklsabla bla bbla bla. It also has <a href=http://www.kde.org>this URL</a>.</p>", TQString("Bla"), TQString("Yes"), TQString("No"), "bla", KMessageBox::AllowLink); break; @@ -96,7 +96,7 @@ case 2: case 3: i = KMessageBox::questionYesNo(0, "Does your printer support color or only black and white?", - "Printer setup", TQString::fromLatin1("&Color"), TQString::fromLatin1("&Black & White")); + "Printer setup", TQString::tqfromLatin1("&Color"), TQString::tqfromLatin1("&Black & White")); break; case 4: @@ -123,13 +123,13 @@ case 6: i = KMessageBox::warningContinueCancel(0, "You are about to print.\n" "Are you sure?", - "Print", TQString::fromLatin1("&Print")); + "Print", TQString::tqfromLatin1("&Print")); break; case 7: i = KMessageBox::warningContinueCancel(0, "You are about to <Print>.\n" "Are you sure?", - "Print", TQString::fromLatin1("&Print"), "dontask", false); + "Print", TQString::tqfromLatin1("&Print"), "dontask", false); break; case 8: @@ -142,14 +142,14 @@ case 9: i = KMessageBox::warningYesNoCancel(0, "Your document contains unsaved changes.\n" "Do you want to save your changes?\n", - TQString::fromLatin1("Close")); + TQString::tqfromLatin1("Close")); break; case 10: i = KMessageBox::warningYesNoCancel(0, "Your document contains unsaved changes.\n" "Do you want to save or discard your changes?\n", - "Close", TQString::fromLatin1("&Save"), TQString::fromLatin1("&Discard") ); + "Close", TQString::tqfromLatin1("&Save"), TQString::tqfromLatin1("&Discard") ); break; case 11: diff --git a/kdeui/tests/knuminputtest.h b/kdeui/tests/knuminputtest.h index f32e1c4b4..32a9e9098 100644 --- a/kdeui/tests/knuminputtest.h +++ b/kdeui/tests/knuminputtest.h @@ -6,7 +6,7 @@ class KIntNumInput; class KDoubleNumInput; -class TopLevel : public QWidget +class TopLevel : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/kpanelmenutest.cpp b/kdeui/tests/kpanelmenutest.cpp index 6f2d8f2be..e081e467f 100644 --- a/kdeui/tests/kpanelmenutest.cpp +++ b/kdeui/tests/kpanelmenutest.cpp @@ -20,7 +20,7 @@ TestWidget::TestWidget(TQWidget *parent, const char *name) init(); setText("We added \"Client Test\" to kicker. Click the K Menu to check."); - resize(sizeHint()); + resize(tqsizeHint()); } void TestWidget::init() diff --git a/kdeui/tests/kpanelmenutest.h b/kdeui/tests/kpanelmenutest.h index ec76a4498..361ae545a 100644 --- a/kdeui/tests/kpanelmenutest.h +++ b/kdeui/tests/kpanelmenutest.h @@ -4,7 +4,7 @@ #include <kpanelappmenu.h> #include <tqlabel.h> -class TestWidget : public QLabel +class TestWidget : public TQLabel { Q_OBJECT public: diff --git a/kdeui/tests/kpopuptest.cpp b/kdeui/tests/kpopuptest.cpp index 96f4b3d32..3db71106b 100644 --- a/kdeui/tests/kpopuptest.cpp +++ b/kdeui/tests/kpopuptest.cpp @@ -24,7 +24,7 @@ public: menu->insertItem("Item1"); menu->insertItem("Item2"); menu->insertSeparator(); - menu->insertItem("Quit", qApp, TQT_SLOT(quit())); + menu->insertItem("Quit", tqApp, TQT_SLOT(quit())); } }; diff --git a/kdeui/tests/krulertest.cpp b/kdeui/tests/krulertest.cpp index ad2f5630a..8d64a53f4 100644 --- a/kdeui/tests/krulertest.cpp +++ b/kdeui/tests/krulertest.cpp @@ -140,7 +140,7 @@ KRulerTest::KRulerTest( const char *name ) beginMark = new KIntNumInput(0, lineEdit); beginMark->setRange(-1000, 1000, 1, false); beginMark->move(5, 15); - beginMark->setFixedSize(beginMark->sizeHint()); + beginMark->setFixedSize(beginMark->tqsizeHint()); connect(beginMark, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotNewOffset(int)) ); connect(beginMark, TQT_SIGNAL(valueChanged(int)), @@ -148,7 +148,7 @@ KRulerTest::KRulerTest( const char *name ) endMark = new KIntNumInput(0, lineEdit); endMark->setRange(-1000, 1000, 1, false); endMark->move(5, 35); - endMark->setFixedSize(endMark->sizeHint()); + endMark->setFixedSize(endMark->tqsizeHint()); connect(endMark, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotEndOffset(int)) ); connect(endMark, TQT_SIGNAL(valueChanged(int)), @@ -156,7 +156,7 @@ KRulerTest::KRulerTest( const char *name ) lengthInput = new KIntNumInput(0, lineEdit); lengthInput->setRange(-1000, 1000, 1, false); lengthInput->move(5, 55); - lengthInput->setFixedSize(lengthInput->sizeHint()); + lengthInput->setFixedSize(lengthInput->tqsizeHint()); connect(lengthInput, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotEndOffset(int)) ); connect(lengthInput, TQT_SIGNAL(valueChanged(int)), @@ -169,21 +169,21 @@ KRulerTest::KRulerTest( const char *name ) transX = new KDoubleNumInput(0.0, vertrot); transX->setRange(-1000, 1000, 1, false); transX->move(5, 15); - transX->setFixedSize(transX->sizeHint()); + transX->setFixedSize(transX->tqsizeHint()); //transX->setLabel("transx", AlignLeft); connect(transX, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetXTrans(double)) ); transY = new KDoubleNumInput(-12.0, vertrot); transY->setRange(-1000, 1000, 1, false); transY->move(5, 35); - transY->setFixedSize(transY->sizeHint()); + transY->setFixedSize(transY->tqsizeHint()); //transY->setLabel("transy", AlignLeft); connect(transY, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetYTrans(double)) ); rotV = new KDoubleNumInput(90.0, vertrot); rotV->setRange(-1000, 1000, 1, false); rotV->move(5, 55); - rotV->setFixedSize(rotV->sizeHint()); + rotV->setFixedSize(rotV->tqsizeHint()); //rotV->setLabel("rot", AlignLeft); connect(rotV, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetRotate(double)) ); diff --git a/kdeui/tests/krulertest.h b/kdeui/tests/krulertest.h index fe552467c..d180e93a0 100644 --- a/kdeui/tests/krulertest.h +++ b/kdeui/tests/krulertest.h @@ -19,7 +19,7 @@ class TQCheckBox; class TQGroupBox; -class MouseWidget : public QFrame +class MouseWidget : public TQFrame { Q_OBJECT public: diff --git a/kdeui/tests/ktabctltest.h b/kdeui/tests/ktabctltest.h index 8b4632411..6dd3b932a 100644 --- a/kdeui/tests/ktabctltest.h +++ b/kdeui/tests/ktabctltest.h @@ -10,7 +10,7 @@ class KTabCtl; class TQPushButton; class TQMultiLineEdit; -class TopLevel : public QWidget +class TopLevel : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/ktabwidgettest.cpp b/kdeui/tests/ktabwidgettest.cpp index 32ed5c89f..5f9fb3dcc 100644 --- a/kdeui/tests/ktabwidgettest.cpp +++ b/kdeui/tests/ktabwidgettest.cpp @@ -73,9 +73,9 @@ Test::Test( TQWidget* parent, const char *name ) gridlayout->addWidget( mTabsBottom, 3, 0 ); connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) ); - TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid ); - gridlayout->addWidget( tabshape, 3, 1 ); - connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); + TQCheckBox * tabtqshape = new TQCheckBox( "Triangular tab tqshape", grid ); + gridlayout->addWidget( tabtqshape, 3, 1 ); + connect( tabtqshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid ); gridlayout->addWidget( tabClose, 4, 0 ); diff --git a/kdeui/tests/ktabwidgettest.h b/kdeui/tests/ktabwidgettest.h index 2bd056cf8..7c178bd32 100644 --- a/kdeui/tests/ktabwidgettest.h +++ b/kdeui/tests/ktabwidgettest.h @@ -13,7 +13,7 @@ #include <tqcheckbox.h> #include <tqtoolbutton.h> -class Test : public QVBox +class Test : public TQVBox { Q_OBJECT public: diff --git a/kdeui/tests/kunbalancedgrdtest.cpp b/kdeui/tests/kunbalancedgrdtest.cpp index 7f5b2cc78..9f616496d 100644 --- a/kdeui/tests/kunbalancedgrdtest.cpp +++ b/kdeui/tests/kunbalancedgrdtest.cpp @@ -159,7 +159,7 @@ void myTopWidget::rebalance() if ((otime - itime )> 500) { - grds->repaint(false); + grds->tqrepaint(false); itime = time.elapsed(); } } diff --git a/kdeui/tests/kunbalancedgrdtest.h b/kdeui/tests/kunbalancedgrdtest.h index bc282b1ce..8b7893772 100644 --- a/kdeui/tests/kunbalancedgrdtest.h +++ b/kdeui/tests/kunbalancedgrdtest.h @@ -13,7 +13,7 @@ #include <tqlabel.h> #include <tqdatetime.h> -class KGradientWidget : public QWidget +class KGradientWidget : public TQWidget { public: KGradientWidget(TQWidget *parent=0, const char *name=0); @@ -28,7 +28,7 @@ private: }; -class myTopWidget: public QWidget +class myTopWidget: public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/kwizardtest.cpp b/kdeui/tests/kwizardtest.cpp index 91974263e..dd9e9eeaf 100644 --- a/kdeui/tests/kwizardtest.cpp +++ b/kdeui/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->tqsetAlignment(Qt::AlignCenter); label->setFixedSize(300, 200); layout->addWidget(label); TQString title = TQString("%1. page").arg(i); |