From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksplashml/themeengine/redmond/previewredmond.cpp | 4 ++-- ksplashml/themeengine/redmond/previewredmond.h | 2 +- ksplashml/themeengine/redmond/themeredmond.cpp | 6 +++--- ksplashml/themeengine/redmond/themeredmond.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'ksplashml/themeengine/redmond') diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp index 3bfb80203..1fcf0161f 100644 --- a/ksplashml/themeengine/redmond/previewredmond.cpp +++ b/ksplashml/themeengine/redmond/previewredmond.cpp @@ -43,7 +43,7 @@ PreviewRedmond::PreviewRedmond( TQWidget* parent ) m_showWelcomeString (true), m_showUserString (true), m_showUserIcon (true), - m_showStatusString (true) + m_showtqStatusString (true) { _updateCache(); } @@ -99,7 +99,7 @@ void PreviewRedmond::_updateCache() if( m_showUserIcon ) p.drawPixmap( rect().width()/2 + 10, rect().height()/2, m_icon ); - if( m_showStatusString ) + if( m_showtqStatusString ) { TQPoint statusTextPos( rect().width()/2 + m_icon.width() + 20, rect().height()/2 + (int)(p.fontMetrics().height()*0.85) + 15 ); diff --git a/ksplashml/themeengine/redmond/previewredmond.h b/ksplashml/themeengine/redmond/previewredmond.h index 69bef6b43..253da329a 100644 --- a/ksplashml/themeengine/redmond/previewredmond.h +++ b/ksplashml/themeengine/redmond/previewredmond.h @@ -98,7 +98,7 @@ protected: TQColor m_welcomeColor, m_welcomeShadowColor, m_userColor, m_statusColor; TQPixmap m_icon; - bool m_showWelcomeString, m_showUserString, m_showUserIcon, m_showStatusString; + bool m_showWelcomeString, m_showUserString, m_showUserIcon, m_showtqStatusString; }; #endif 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 ); } }; -- cgit v1.2.1