From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksplashml/themeengine/default/themelegacy.cpp | 4 ++-- ksplashml/themeengine/objkstheme.cpp | 2 +- ksplashml/themeengine/redmond/previewredmond.h | 2 +- ksplashml/themeengine/redmond/themeredmond.cpp | 6 +++--- ksplashml/themeengine/redmond/themeredmond.h | 2 +- ksplashml/themeengine/standard/themestandard.cpp | 4 ++-- ksplashml/themeengine/standard/wndicon.cpp | 8 ++++---- ksplashml/themeengine/standard/wndicon.h | 2 +- ksplashml/themeengine/standard/wndstatus.cpp | 2 +- ksplashml/themeengine/standard/wndstatus.h | 2 +- ksplashml/themeengine/themeengine.cpp | 8 ++++---- ksplashml/themeengine/themeengine.h | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) (limited to 'ksplashml/themeengine') diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index 77274da99..5e918cef3 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -164,7 +164,7 @@ void ThemeDefault::_initUi() mProgressBar->setPaletteBackgroundPixmap( blimage ); bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) ); - bottom_label->setFixedHeight( mLabel->sizeHint().height()+4 ); + bottom_label->setFixedHeight( mLabel->tqsizeHint().height()+4 ); // 3 pixels of whitespace between the label and the progressbar. mLabel->resize( bottom_label->width(), bottom_label->height() ); @@ -274,7 +274,7 @@ TQPixmap ThemeDefault::updateBarPixmap( int state ) p.drawPixmap(0, 0, *mInactivePixmap, 0, 0, tmp.width()-offs ); else #endif - p.drawPixmap(offs, 0, *mInactivePixmap, offs, 0); + p.tqdrawPixmap(offs, 0, *mInactivePixmap, offs, 0); return tmp ; } diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index 9aa6d2b26..dfcec5c4d 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -41,7 +41,7 @@ ObjKsTheme::ObjKsTheme( const TQString& theme ) if (desktop->isVirtualDesktop() && mXineramaScreen != -2) { TQRect rect = desktop->screenGeometry( mXineramaScreen ); - if (!rect.contains(TQCursor::pos())) + if (!rect.tqcontains(TQCursor::pos())) TQCursor::setPos(rect.center()); } diff --git a/ksplashml/themeengine/redmond/previewredmond.h b/ksplashml/themeengine/redmond/previewredmond.h index 69bef6b43..5fc5558c2 100644 --- a/ksplashml/themeengine/redmond/previewredmond.h +++ b/ksplashml/themeengine/redmond/previewredmond.h @@ -25,7 +25,7 @@ * images, so we'll just use a nice shade of gray or black as the * background... */ -class PreviewRedmond: public QWidget +class PreviewRedmond: public TQWidget { Q_OBJECT public: diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 5c7118441..175863f74 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -199,11 +199,11 @@ void ThemeRedmond::_initUi() kdmconfig->setGroup("X-*-Greeter"); TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; TQString fs = kdmconfig->readEntry( "FaceSource" ); - if (fs == TQString::fromLatin1("UserOnly")) + if (fs == TQString::tqfromLatin1("UserOnly")) faceSource = fUserOnly; - else if (fs == TQString::fromLatin1("PreferUser")) + else if (fs == TQString::tqfromLatin1("PreferUser")) faceSource = fUserFirst; - else if (fs == TQString::fromLatin1("PreferAdmin")) + else if (fs == TQString::tqfromLatin1("PreferAdmin")) faceSource = fAdminFirst; else faceSource = fAdminOnly; // Admin Only diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h index 6f8cc1550..3ae82031a 100644 --- a/ksplashml/themeengine/redmond/themeredmond.h +++ b/ksplashml/themeengine/redmond/themeredmond.h @@ -57,7 +57,7 @@ public slots: if( mText != s ) { mText = s; - repaint( false ); + tqrepaint( false ); } }; diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index c7e9220e2..b0ceff516 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -156,8 +156,8 @@ void ThemeStandard::_readSettings() if( mSbFontItalic ) mSbFont.setItalic( true ); - mSbFg = cfg->readColorEntry( "Statusbar Foreground", &Qt::white ); - mSbBg = cfg->readColorEntry( "Statusbar Background", &Qt::black ); + mSbFg = cfg->readColorEntry( "Statusbar Foreground", &TQt::white ); + mSbBg = cfg->readColorEntry( "Statusbar Background", &TQt::black ); mSbIcon = cfg->readEntry( "Statusbar Icon", "run" ); mIconsVisible = cfg->readBoolEntry( "Icons Visible", true); mIconsJumping = cfg->readBoolEntry( "Icons Jumping", true); diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index ce153e461..87ac35a1a 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -42,7 +42,7 @@ WndIcon::WndIcon( Position icon_position, bool statusAtTop, bool iconsJumping ) - :TQHBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ), + :TQHBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), mStatusText(text), mIconPos(icon_position), mXineramaScreen( xineramaScreen ), mPosX(0), mPosY(0), mGroundX(0), mGroundY(0), mVelocity(8.0), mInitialVelocity(8.0), mGravity(0.8), mIconNum(icon_num), mStatusHeight(status_height), mIconSize(icon_std_width), mStatusAtTop(statusAtTop), @@ -53,10 +53,10 @@ WndIcon::WndIcon( TQLabel *w = new TQLabel( this ); w->setFixedSize( pix.width(), pix.height() ); w->setPixmap( pix ); - if(pix.mask()) + if(pix.tqmask()) { - setMask(*pix.mask()); - w->setMask(*pix.mask()); + setMask(*pix.tqmask()); + w->setMask(*pix.tqmask()); } resize( pix.width(), pix.height() ); diff --git a/ksplashml/themeengine/standard/wndicon.h b/ksplashml/themeengine/standard/wndicon.h index d488f85df..5338835a4 100644 --- a/ksplashml/themeengine/standard/wndicon.h +++ b/ksplashml/themeengine/standard/wndicon.h @@ -26,7 +26,7 @@ * @short Displays an icon on the screen. */ class WndIcon: - public QHBox + public TQHBox { Q_OBJECT public: diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index 04685d9cf..6227de9b1 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -37,7 +37,7 @@ WndStatus::WndStatus( TQPalette /*pal*/, const TQColor& fgc, const TQColor & bgc, const TQString& icon ) - :TQHBox( 0, "wndStatus", WStyle_Customize|WX11BypassWM ) + :TQHBox( 0, "wndStatus", (WFlags)(WStyle_Customize|WX11BypassWM) ) { setFrameStyle( TQFrame::NoFrame ); //setPalette( pal ); diff --git a/ksplashml/themeengine/standard/wndstatus.h b/ksplashml/themeengine/standard/wndstatus.h index 63e253d1d..bc908779d 100644 --- a/ksplashml/themeengine/standard/wndstatus.h +++ b/ksplashml/themeengine/standard/wndstatus.h @@ -25,7 +25,7 @@ class KProgress; /** @short Window displaying status and progress bar. */ class WndStatus: - public QHBox + public TQHBox { Q_OBJECT public: diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index 79e47bfe1..bf1fd4a8a 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -41,7 +41,7 @@ struct ThemeEngine::ThemeEnginePrivate }; ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args ) - : TQVBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ), d(0) + : TQVBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), d(0) { d = new ThemeEnginePrivate; kapp->installX11EventFilter( this ); @@ -74,7 +74,7 @@ ThemeEngine::~ThemeEngine() bool ThemeEngine::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Show && o->isWidgetType()) - addSplashWindow( static_cast< TQWidget* >( o )); + addSplashWindow( TQT_TQWIDGET( o )); return false; } @@ -87,7 +87,7 @@ void ThemeEngine::addSplashWindow( TQWidget* w ) { if( !w->isTopLevel()) return; - if( d->mSplashWindows.contains( w->winId())) + if( d->mSplashWindows.tqcontains( w->winId())) return; if( !w->testWFlags( WX11BypassWM )) { // All toplevel widgets should be probably required to be WX11BypassWM @@ -104,7 +104,7 @@ void ThemeEngine::addSplashWindow( TQWidget* w ) void ThemeEngine::splashWindowDestroyed( TQObject* obj ) { - d->mSplashWindows.remove( static_cast< TQWidget* >( obj )->winId()); + d->mSplashWindows.remove( TQT_TQWIDGET( obj )->winId()); } bool ThemeEngine::x11Event( XEvent* e ) diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h index d62497a07..c9fdd3528 100644 --- a/ksplashml/themeengine/themeengine.h +++ b/ksplashml/themeengine/themeengine.h @@ -25,7 +25,7 @@ class TQMouseEvent; /** * @short The base for the ThemeEngine's configuration widget. */ -class KDE_EXPORT ThemeEngineConfig: public QVBox +class KDE_EXPORT ThemeEngineConfig: public TQVBox { Q_OBJECT public: @@ -48,7 +48,7 @@ protected: * @short Base class for all theme engines. Member functions need to be * overridden by derived classes in order to provide actual functionality. */ -class KDE_EXPORT ThemeEngine: public QVBox +class KDE_EXPORT ThemeEngine: public TQVBox { Q_OBJECT public: -- cgit v1.2.3