summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:37 -0600
commit3227a6694d1fa7e0a6e290d5b65c96428eca39d1 (patch)
tree59ff331c2387ab2c52e0f54eb663ed6f50d61079
parenta6617dd36aadab336910eed6fb4ad609507297db (diff)
downloadksplash-engine-moodin-3227a6694d1fa7e0a6e290d5b65c96428eca39d1.tar.gz
ksplash-engine-moodin-3227a6694d1fa7e0a6e290d5b65c96428eca39d1.zip
Rename a number of old tq methods that are no longer tq specific
-rw-r--r--src/magiclabel.cpp4
-rw-r--r--src/thememoodin.cpp32
-rw-r--r--src/thememoodin.h2
3 files changed, 19 insertions, 19 deletions
diff --git a/src/magiclabel.cpp b/src/magiclabel.cpp
index 5b30252..57d50c7 100644
--- a/src/magiclabel.cpp
+++ b/src/magiclabel.cpp
@@ -73,13 +73,13 @@ void MagicLabel::getCommandOutput()
mValue = "";
if (!proc->start(KProcess::Block, KProcess::Stdout))
- KMessageBox::information(0, TQString("Could not start process: %1").tqarg(cmd));
+ KMessageBox::information(0, TQString("Could not start process: %1").arg(cmd));
}
void MagicLabel::receivedStdout(KProcess *proc, char *buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
mValue += buf.replace("\n", "");
}
diff --git a/src/thememoodin.cpp b/src/thememoodin.cpp
index 9c8f7ec..976b3b1 100644
--- a/src/thememoodin.cpp
+++ b/src/thememoodin.cpp
@@ -26,7 +26,7 @@
#include <tqpainter.h>
#include <tqstringlist.h>
#include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "magiclabel.h"
#include "thememoodin.h"
@@ -54,7 +54,7 @@ void ThemeMoodin::readSettings()
if (!cfg)
return;
- cfg->setGroup(TQString("KSplash Theme: %1").tqarg(mTheme->theme()));
+ cfg->setGroup(TQString("KSplash Theme: %1").arg(mTheme->theme()));
TQFont defaultFont("Trebuchet MS", 10);
TQFont defaultStatusFont("Trebuchet MS", 12, TQFont::Bold);
@@ -106,26 +106,26 @@ void ThemeMoodin::readSettings()
if (mUseIconSet)
defaultIcon = statusPixmaps()[i];
else
- defaultIcon = TQString("%1.png").tqarg(i + 1);
+ defaultIcon = TQString("%1.png").arg(i + 1);
- mStatusIcons.append(cfg->readEntry(TQString("Image%1").tqarg(i + 1), defaultIcon));
+ mStatusIcons.append(cfg->readEntry(TQString("Image%1").arg(i + 1), defaultIcon));
if (mKubuntuStyle) {
TQPoint *mypoint;
mypoint = new TQPoint((int)(iconX + (i * (mIconSetSize+mImageSpacer) * scaleRatioWidth)), iconY);
mStatusIconCoords.append( *mypoint );
} else {
- mStatusIconCoords.append(cfg->readPointEntry(TQString("ImageCoords%1").tqarg(i + 1), &defaultPoint));
+ mStatusIconCoords.append(cfg->readPointEntry(TQString("ImageCoords%1").arg(i + 1), &defaultPoint));
}
- mStatusImageOffsets.append(cfg->readPointEntry(TQString("ImageOffset%1").tqarg(i + 1), &defaultOffset));
- mStatusMessages.append(cfg->readEntry(TQString("StatusMessage%1").tqarg(i + 1), TQString()));
+ mStatusImageOffsets.append(cfg->readPointEntry(TQString("ImageOffset%1").arg(i + 1), &defaultOffset));
+ mStatusMessages.append(cfg->readEntry(TQString("StatusMessage%1").arg(i + 1), TQString()));
}
for (int i = 0; i < mLabelCount; i++)
{
- 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));
+ mLabels.append(cfg->readEntry(TQString("Label%1").arg(i + 1), TQString()));
+ mLabelCoords.append(cfg->readPointEntry(TQString("LabelCoords%1").arg(i + 1), &defaultPoint));
+ mLabelFonts.append(cfg->readFontEntry(TQString("LabelFont%1").arg(i + 1), &defaultFont));
+ mLabelColors.append(cfg->readColorEntry(TQString("LabelColor%1").arg(i + 1), &defaultColor));
}
}
@@ -168,7 +168,7 @@ void ThemeMoodin::initBackground(TQPainter* p)
kdesktoprc.setGroup("Background Common");
int num = kdesktoprc.readNumEntry("DeskNum", 0);
- kdesktoprc.setGroup(TQString("Desktop%1").tqarg(num));
+ kdesktoprc.setGroup(TQString("Desktop%1").arg(num));
bgImage = kdesktoprc.readPathEntry("Wallpaper", TQString());
}
else
@@ -178,7 +178,7 @@ void ThemeMoodin::initBackground(TQPainter* p)
}
if (bgImage.isEmpty())
- bgImage = mTheme->locateThemeData(TQString("Background-%1x%2.jpg").tqarg(width()).tqarg(height()));
+ bgImage = mTheme->locateThemeData(TQString("Background-%1x%2.jpg").arg(width()).arg(height()));
if (bgImage.isEmpty())
bgImage = mTheme->locateThemeData("Background.jpg");
@@ -376,11 +376,11 @@ void ThemeMoodin::slotSetPixmap(const TQString& s)
if (fw)
fw->start();
- tqrepaint(false);
+ repaint(false);
}
-void ThemeMoodin::updatetqStatus()
+void ThemeMoodin::updateStatus()
{
TQPainter p;
p.begin(mContainer);
@@ -413,7 +413,7 @@ void ThemeMoodin::paintEvent(TQPaintEvent* pe)
bitBlt(mContainer, r.x(), r.y(), mBG, r.x(), r.y(), r.width(), r.height());
if (mShowStatusText)
- updatetqStatus();
+ updateStatus();
}
#include "thememoodin.moc"
diff --git a/src/thememoodin.h b/src/thememoodin.h
index d607edf..cf7f285 100644
--- a/src/thememoodin.h
+++ b/src/thememoodin.h
@@ -122,7 +122,7 @@ private:
void paintEvent(TQPaintEvent* pe);
void readSettings();
void arrangeWidget(TQWidget* me, const int index);
- void updatetqStatus();
+ void updateStatus();
EffectWidget* createEffectWidget(TQWidget *parent, TQImage *image);
};