diff options
Diffstat (limited to 'ksplashml')
-rw-r--r-- | ksplashml/kcmksplash/installer.cpp | 22 | ||||
-rw-r--r-- | ksplashml/themeengine/default/themelegacy.cpp | 4 | ||||
-rw-r--r-- | ksplashml/themeengine/objkstheme.cpp | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/redmond/previewredmond.h | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/redmond/themeredmond.cpp | 6 | ||||
-rw-r--r-- | ksplashml/themeengine/redmond/themeredmond.h | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/themestandard.cpp | 4 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndicon.cpp | 8 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndicon.h | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndstatus.cpp | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndstatus.h | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/themeengine.cpp | 8 | ||||
-rw-r--r-- | ksplashml/themeengine/themeengine.h | 4 |
13 files changed, 34 insertions, 34 deletions
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index 335611a9f..172ab8520 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -99,7 +99,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn hbox->setStretchFactor( leftbox, 1 ); mThemesList = new ThemeListBox(this); - mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + mThemesList->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int))); connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&))); leftbox->addWidget(mThemesList); @@ -120,16 +120,16 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn hbox->setStretchFactor( rightbox, 3 ); mPreview = new TQLabel(this); - mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + mPreview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); mPreview->setMinimumSize(TQSize(320,240)); - mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); + mPreview->tqsetAlignment(Qt::AlignHCenter|Qt::AlignVCenter); rightbox->addWidget(mPreview); rightbox->setStretchFactor( mPreview, 3 ); mText = new TQTextEdit(this); - mText->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); - mText->setMinimumSize(mText->sizeHint()); + mText->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + mText->setMinimumSize(mText->tqsizeHint()); mText->setReadOnly(true); rightbox->addWidget(mText); rightbox->setStretchFactor( mText, 1 ); @@ -164,7 +164,7 @@ void SplashInstaller::addNewTheme(const KURL &srcURL) TQString dir = KGlobal::dirs()->saveLocation("ksplashthemes"); KURL url; TQString filename = srcURL.fileName(); - int i = filename.findRev('.'); + int i = filename.tqfindRev('.'); // Convert extension to lower case. if (i >= 0) filename = filename.left(i)+filename.mid(i).lower(); @@ -275,9 +275,9 @@ void SplashInstaller::save() if (cur < 0) return; TQString path = mThemesList->text(cur); - if ( mThemesList->text2path.contains( path ) ) + if ( mThemesList->text2path.tqcontains( path ) ) path = mThemesList->text2path[path]; - cur = path.findRev('/'); + cur = path.tqfindRev('/'); cnf.writeEntry("Theme", path.mid(cur+1) ); cnf.sync(); emit changed( false ); @@ -331,7 +331,7 @@ void SplashInstaller::slotSetTheme(int id) { TQString error = i18n("(Could not load theme)"); path = mThemesList->text(id); - if ( mThemesList->text2path.contains( path ) ) + if ( mThemesList->text2path.tqcontains( path ) ) path = mThemesList->text2path[path]; enabled = false; KURL url; @@ -339,7 +339,7 @@ void SplashInstaller::slotSetTheme(int id) if (!path.isEmpty()) { // Make sure the correct plugin is installed. - int i = path.findRev('/'); + int i = path.tqfindRev('/'); if (i >= 0) themeName = path.mid(i+1); url.setPath( path + "/Theme.rc" ); @@ -459,7 +459,7 @@ void SplashInstaller::slotTest() if (i < 0) return; TQString themeName = mThemesList->text2path[mThemesList->text(i)]; - int r = themeName.findRev('/'); + int r = themeName.tqfindRev('/'); if (r >= 0) themeName = themeName.mid(r+1); 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: |