diff --git a/src/magiclabel.cpp b/src/magiclabel.cpp index 6c7aac4..57d50c7 100644 --- a/src/magiclabel.cpp +++ b/src/magiclabel.cpp @@ -73,7 +73,7 @@ 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)); } diff --git a/src/thememoodin.cpp b/src/thememoodin.cpp index f623979..d3d1a2f 100644 --- a/src/thememoodin.cpp +++ b/src/thememoodin.cpp @@ -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,7 +376,7 @@ void ThemeMoodin::slotSetPixmap(const TQString& s) if (fw) fw->start(); - tqrepaint(false); + repaint(false); }