From a7dcba0bccd505f672310722d7205c60f57c9c17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 1 Jul 2011 06:50:25 +0000 Subject: TQt4 port ksplash-engine-moodin This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ksplash-engine-moodin@1238987 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/thememoodin.cpp | 142 ++++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'src/thememoodin.cpp') diff --git a/src/thememoodin.cpp b/src/thememoodin.cpp index 1af5d87..bc6547e 100644 --- a/src/thememoodin.cpp +++ b/src/thememoodin.cpp @@ -20,13 +20,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "magiclabel.h" #include "thememoodin.h" @@ -34,8 +34,8 @@ K_EXPORT_COMPONENT_FACTORY(ksplashmoodin, KGenericFactory("ksplash")) -ThemeMoodin::ThemeMoodin(QWidget* parent, const char* name, const QStringList& args) - :ThemeEngine(parent, name, args) +ThemeMoodin::ThemeMoodin(TQWidget* tqparent, const char* name, const TQStringList& args) + :ThemeEngine(tqparent, name, args) { readSettings(); init(); @@ -44,7 +44,7 @@ ThemeMoodin::ThemeMoodin(QWidget* parent, const char* name, const QStringList& a void ThemeMoodin::readSettings() { - const QRect screen = kapp->desktop()->screenGeometry(mTheme->xineramaScreen()); + const TQRect screen = kapp->desktop()->screenGeometry(mTheme->xineramaScreen()); if (!mTheme) return; @@ -54,18 +54,18 @@ void ThemeMoodin::readSettings() if (!cfg) return; - cfg->setGroup(QString("KSplash Theme: %1").arg(mTheme->theme())); + cfg->setGroup(TQString("KSplash Theme: %1").tqarg(mTheme->theme())); - QFont defaultFont("Trebuchet MS", 10); - QFont defaultStatusFont("Trebuchet MS", 12, QFont::Bold); - QColor defaultColor(0xFF, 0xFF, 0xFF); - QColor defaultShadowColor(0x6D, 0x6D, 0x6D); - QPoint defaultPoint(-1, -1), defaultOffset(0, 0); - QString defaultIcon; + TQFont defaultFont("Trebuchet MS", 10); + TQFont defaultStatusFont("Trebuchet MS", 12, TQFont::Bold); + TQColor defaultColor(0xFF, 0xFF, 0xFF); + TQColor defaultShadowColor(0x6D, 0x6D, 0x6D); + TQPoint defaultPoint(-1, -1), defaultOffset(0, 0); + TQString defaultIcon; mCurrentStatusIndex = 0; mSplashRect = cfg->readRectEntry("SplashRect", &screen); - mBackgroundImage = cfg->readEntry("Background", QString::null); + mBackgroundImage = cfg->readEntry("Background", TQString()); mStatusColor = cfg->readColorEntry("StatusColor", &defaultColor); mStatusFont = cfg->readFontEntry("StatusFont", &defaultStatusFont); mStatusCoords = cfg->readPointEntry("StatusCoords", &defaultPoint); @@ -81,8 +81,8 @@ void ThemeMoodin::readSettings() mImageSpacer = cfg->readNumEntry("ImageSpacer", mUseIconSet ? mIconSetSize : 0); mUsersBackground = cfg->readBoolEntry("UsersBackground", false); mLabelCount = cfg->readNumEntry("Labels", 0); - mLabelShadowOffset = cfg->readPointEntry("LabelShadowOffset", new QPoint(2, 2)); - mBaseResolution = cfg->readSizeEntry("BaseResolution", new QSize(1280, 1024)); + mLabelShadowOffset = cfg->readPointEntry("LabelShadowOffset", new TQPoint(2, 2)); + mBaseResolution = cfg->readSizeEntry("BaseResolution", new TQSize(1280, 1024)); mTranslate = cfg->readBoolEntry("Translate", true); mLineUpImages = cfg->readBoolEntry("LineUpImages", false); mKubuntuStyle = cfg->readBoolEntry("KubuntuStyle", false); @@ -90,7 +90,7 @@ void ThemeMoodin::readSettings() // so we can centre icons, JRiddell int iconX = mBaseResolution.width(); int iconY = mBaseResolution.height(); - QRect defaultScreen = kapp->desktop()->screenGeometry(0); + TQRect defaultScreen = kapp->desktop()->screenGeometry(0); float scaleRatioWidth = ((float)mBaseResolution.width()) / ((float)defaultScreen.width()); // unused. float scaleRatioHeight = ((float)mBaseResolution.height()) / ((float)desktopWidget.height()); @@ -106,26 +106,26 @@ void ThemeMoodin::readSettings() if (mUseIconSet) defaultIcon = statusPixmaps()[i]; else - defaultIcon = QString("%1.png").arg(i + 1); + defaultIcon = TQString("%1.png").tqarg(i + 1); - mStatusIcons.append(cfg->readEntry(QString("Image%1").arg(i + 1), defaultIcon)); + mStatusIcons.append(cfg->readEntry(TQString("Image%1").tqarg(i + 1), defaultIcon)); if (mKubuntuStyle) { - QPoint *mypoint; - mypoint = new QPoint((int)(iconX + (i * (mIconSetSize+mImageSpacer) * scaleRatioWidth)), iconY); + TQPoint *mypoint; + mypoint = new TQPoint((int)(iconX + (i * (mIconSetSize+mImageSpacer) * scaleRatioWidth)), iconY); mStatusIconCoords.append( *mypoint ); } else { - mStatusIconCoords.append(cfg->readPointEntry(QString("ImageCoords%1").arg(i + 1), &defaultPoint)); + mStatusIconCoords.append(cfg->readPointEntry(TQString("ImageCoords%1").tqarg(i + 1), &defaultPoint)); } - mStatusImageOffsets.append(cfg->readPointEntry(QString("ImageOffset%1").arg(i + 1), &defaultOffset)); - mStatusMessages.append(cfg->readEntry(QString("StatusMessage%1").arg(i + 1), QString::null)); + mStatusImageOffsets.append(cfg->readPointEntry(TQString("ImageOffset%1").tqarg(i + 1), &defaultOffset)); + mStatusMessages.append(cfg->readEntry(TQString("StatusMessage%1").tqarg(i + 1), TQString())); } for (int i = 0; i < mLabelCount; i++) { - mLabels.append(cfg->readEntry(QString("Label%1").arg(i + 1), QString::null)); - mLabelCoords.append(cfg->readPointEntry(QString("LabelCoords%1").arg(i + 1), &defaultPoint)); - mLabelFonts.append(cfg->readFontEntry(QString("LabelFont%1").arg(i + 1), &defaultFont)); - mLabelColors.append(cfg->readColorEntry(QString("LabelColor%1").arg(i + 1), &defaultColor)); + mLabels.append(cfg->readEntry(TQString("Label%1").tqarg(i + 1), TQString())); + mLabelCoords.append(cfg->readPointEntry(TQString("LabelCoords%1").tqarg(i + 1), &defaultPoint)); + mLabelFonts.append(cfg->readFontEntry(TQString("LabelFont%1").tqarg(i + 1), &defaultFont)); + mLabelColors.append(cfg->readColorEntry(TQString("LabelColor%1").tqarg(i + 1), &defaultColor)); } } @@ -135,14 +135,14 @@ void ThemeMoodin::init() setBackgroundMode(NoBackground); setFixedSize(mSplashRect.size()); - mContainer = new QWidget(this); + mContainer = new TQWidget(this); mContainer->setFixedSize(size()); mScaler = new Scaler(mBaseResolution, size()); mCache = new Cache(mScaler, mTheme->themeEngine(), mTheme->theme()); mBG = new KPixmap(); mBG->resize(size()); - QPainter p; + TQPainter p; p.begin(mBG); initBackground(&p); @@ -155,12 +155,12 @@ void ThemeMoodin::init() } -void ThemeMoodin::initBackground(QPainter* p) +void ThemeMoodin::initBackground(TQPainter* p) { if (!p) return; - QString bgImage; + TQString bgImage; if (mUsersBackground) { @@ -168,8 +168,8 @@ void ThemeMoodin::initBackground(QPainter* p) kdesktoprc.setGroup("Background Common"); int num = kdesktoprc.readNumEntry("DeskNum", 0); - kdesktoprc.setGroup(QString("Desktop%1").arg(num)); - bgImage = kdesktoprc.readPathEntry("Wallpaper", QString::null); + kdesktoprc.setGroup(TQString("Desktop%1").tqarg(num)); + bgImage = kdesktoprc.readPathEntry("Wallpaper", TQString()); } else { @@ -178,7 +178,7 @@ void ThemeMoodin::initBackground(QPainter* p) } if (bgImage.isEmpty()) - bgImage = mTheme->locateThemeData(QString("Background-%1x%2.jpg").arg(width()).arg(height())); + bgImage = mTheme->locateThemeData(TQString("Background-%1x%2.jpg").tqarg(width()).tqarg(height())); if (bgImage.isEmpty()) bgImage = mTheme->locateThemeData("Background.jpg"); @@ -189,29 +189,29 @@ void ThemeMoodin::initBackground(QPainter* p) return; } - QImage* bg = mCache->cacheFile(bgImage); + TQImage* bg = mCache->cacheFile(bgImage); p->drawImage(0, 0, *bg); delete bg; if (mKubuntuStyle) { //central Dialogue, JRiddell - QImage* central = new QImage( mTheme->locateThemeData("Dialog.png") ); + TQImage* central = new TQImage( mTheme->locateThemeData("Dialog.png") ); p->drawImage((mBG->width() / 2) - (462 / 2), (mBG->height() / 2) - (324 / 2), *central); delete central; } } -void ThemeMoodin::initLabels(QPainter* p) +void ThemeMoodin::initLabels(TQPainter* p) { if ((mLabelCount == 0) || (!p)) return; for (int i = 0; i < mLabelCount; i++) { - QString s = mLabels[i]; - QPoint pt = mLabelCoords[i]; - QColor c = mLabelColors[i]; - QFont f = mLabelFonts[i]; + TQString s = mLabels[i]; + TQPoint pt = mLabelCoords[i]; + TQColor c = mLabelColors[i]; + TQFont f = mLabelFonts[i]; if (s.isNull() || s.isEmpty()) continue; @@ -238,12 +238,12 @@ void ThemeMoodin::initLabels(QPainter* p) void ThemeMoodin::initEffectWidgets() { - EffectWidget::setBackgroundImage(new QImage(mBG->convertToImage())); + EffectWidget::setBackgroundImage(new TQImage(mBG->convertToImage())); EffectWidget *fadeWidget = 0; - QImage *image = 0; + TQImage *image = 0; int index = -1; - for (QStringList::ConstIterator it = mStatusIcons.constBegin(); it != mStatusIcons.constEnd(); ++it) + for (TQStringList::ConstIterator it = mStatusIcons.constBegin(); it != mStatusIcons.constEnd(); ++it) { index++; @@ -253,8 +253,8 @@ void ThemeMoodin::initEffectWidgets() continue; // TODO: use cache in iconset mode - QPixmap* px = new QPixmap(DesktopIcon(*it, mIconSetSize)); - image = new QImage(px->convertToImage()); + TQPixmap* px = new TQPixmap(DesktopIcon(*it, mIconSetSize)); + image = new TQImage(px->convertToImage()); // JRiddell don't scale icons if (!mKubuntuStyle) { mScaler->scaleSize(image); @@ -262,7 +262,7 @@ void ThemeMoodin::initEffectWidgets() } else { - QString name = mTheme->locateThemeData(*it); + TQString name = mTheme->locateThemeData(*it); if (name.isEmpty()) continue; @@ -287,9 +287,9 @@ void ThemeMoodin::initEffectWidgets() } -void ThemeMoodin::arrangeWidget(QWidget* w, const int index) +void ThemeMoodin::arrangeWidget(TQWidget* w, const int index) { - QPoint current(mStatusIconCoords[index]); + TQPoint current(mStatusIconCoords[index]); if (mLineUpImages) { @@ -316,12 +316,12 @@ void ThemeMoodin::arrangeWidget(QWidget* w, const int index) int x = mAppendX ? mIconSetSize * 2 : 0; int y = mAppendX ? 0 : mIconSetSize * 2; - current = mStatusIconCoords[index - 1] + QPoint(x, y); + current = mStatusIconCoords[index - 1] + TQPoint(x, y); } } else { - mScaler->autoCoords(¤t, QSize(mIconSetSize, mIconSetSize)); + mScaler->autoCoords(¤t, TQSize(mIconSetSize, mIconSetSize)); current += mStatusImageOffsets[index]; } @@ -330,12 +330,12 @@ void ThemeMoodin::arrangeWidget(QWidget* w, const int index) } -EffectWidget* ThemeMoodin::createEffectWidget(QWidget* parent, QImage* image) +EffectWidget* ThemeMoodin::createEffectWidget(TQWidget* tqparent, TQImage* image) { - EffectWidget *fw = new EffectWidget(parent); + EffectWidget *fw = new EffectWidget(tqparent); fw->hide(); - fw->setBackgroundOrigin(QWidget::WindowOrigin); + fw->setBackgroundOrigin(TQWidget::WindowOrigin); fw->setDelay(mAnimationDelay); fw->setSteps(mAnimationLength); fw->setFixedSize(image->size()); @@ -347,7 +347,7 @@ EffectWidget* ThemeMoodin::createEffectWidget(QWidget* parent, QImage* image) } -void ThemeMoodin::slotSetText(const QString& s) +void ThemeMoodin::slotSetText(const TQString& s) { if (mShowStatusText) { @@ -359,12 +359,12 @@ void ThemeMoodin::slotSetText(const QString& s) } -void ThemeMoodin::slotSetPixmap(const QString& s) +void ThemeMoodin::slotSetPixmap(const TQString& s) { if (!mEffectWidgets.count() > 0) return; - int n = statusPixmaps().findIndex(s); + int n = statusPixmaps().tqfindIndex(s); if (n == -1) return; @@ -376,19 +376,19 @@ void ThemeMoodin::slotSetPixmap(const QString& s) if (fw) fw->start(); - repaint(false); + tqrepaint(false); } -void ThemeMoodin::updateStatus() +void ThemeMoodin::updatetqStatus() { - QPainter p; + TQPainter p; p.begin(mContainer); // use a copy, otherwise status messages move around - QPoint pt = mStatusCoords; - QFontMetrics fm(mStatusFont); - QSize fmSize(fm.size(0L, mCurrentAction)); + TQPoint pt = mStatusCoords; + TQFontMetrics fm(mStatusFont); + TQSize fmSize(fm.size(0L, mCurrentAction)); mScaler->autoCoords(&pt, fmSize); @@ -406,14 +406,14 @@ void ThemeMoodin::updateStatus() } -void ThemeMoodin::paintEvent(QPaintEvent* pe) +void ThemeMoodin::paintEvent(TQPaintEvent* pe) { - QRect r = pe->rect(); + TQRect r = pe->rect(); bitBlt(mContainer, r.x(), r.y(), mBG, r.x(), r.y(), r.width(), r.height()); if (mShowStatusText) - updateStatus(); + updatetqStatus(); } #include "thememoodin.moc" -- cgit v1.2.1