Remove additional unneeded tq method conversions

7 files changed, 12 insertions, 12 deletions

diff --git a/src/flowlayout.cpp b/src/flowlayout.cpp
index 813ae5c..96756fa 100644
--- a/src/flowlayout.cpp
+++ b/src/flowlayout.cpp
@@ -275,7 +275,7 @@ int FlowLayout::doLayoutHorizontal( const TQRect& rect, bool testOnly ){
 				int space = (rect.height() - height) / (column.count() + 1);
 				int i = 0; // counts the items of this column
 				for(TQLayoutItem* item = column.first(); item; item = column.next()){
-					TQRect r = item->tqgeometry();
+					TQRect r = item->geometry();
 					item->setGeometry( TQRect(r.left(), r.top() + ((++i) * space), rWidth, r.height()) );
 				}
 				column.clear(); // remove the items of the former column
@@ -328,7 +328,7 @@ int FlowLayout::count() const {
     \reimp
 */
 TQLayoutItem* FlowLayout::itemAt(int index) const {
-        return index >= 0 && index < mLayoutItems.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(mLayoutItems).tqat(index)) : 0;
+        return index >= 0 && index < mLayoutItems.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(mLayoutItems).at(index)) : 0;
 }
 
 /*!
@@ -337,8 +337,8 @@ TQLayoutItem* FlowLayout::itemAt(int index) const {
 TQLayoutItem* FlowLayout::takeAt(int index) {
         if (index < 0 || index >= mLayoutItems.count())
                 return 0;
-        TQLayoutItem *item = mLayoutItems.tqat(index);
-        mLayoutItems.remove(mLayoutItems.tqat(index));
+        TQLayoutItem *item = mLayoutItems.at(index);
+        mLayoutItems.remove(mLayoutItems.at(index));
         delete item;
 
         invalidate();
diff --git a/src/kima.cpp b/src/kima.cpp
index b8d3228..bb63a69 100644
--- a/src/kima.cpp
+++ b/src/kima.cpp
@@ -389,7 +389,7 @@ void Kima::paintEvent(TQPaintEvent* inEvent){
 }
 
 void Kima::updateSourceWidgets(){
-	// tqrepaint the source widgets
+	// repaint the source widgets
 	for(Source* source = mSources.first(); source; source = mSources.next())
 		if(source->showOnApplet())
 			source->getWidget()->update();
diff --git a/src/sources/hddtempsrc.cpp b/src/sources/hddtempsrc.cpp
index b22a6c8..34995d5 100644
--- a/src/sources/hddtempsrc.cpp
+++ b/src/sources/hddtempsrc.cpp
@@ -38,7 +38,7 @@ HDDTempSrc::HDDTempSrc(TQWidget* inParent, uint inIndex, const TQString& inDevic
 		mTrigger(this){
 	mID = "HDDTemp" + TQString().setNum(inIndex);
 	mName = mID;
-	mDescription = i18n("This source is provided by hddtemp. (%1, %2)").tqarg(inDevice).tqarg(inModelName);
+	mDescription = i18n("This source is provided by hddtemp. (%1, %2)").arg(inDevice).arg(inModelName);
 }
 
 HDDTempSrc::~HDDTempSrc(){
diff --git a/src/sources/hwmonfansrc.cpp b/src/sources/hwmonfansrc.cpp
index 17f57ae..abd428f 100644
--- a/src/sources/hwmonfansrc.cpp
+++ b/src/sources/hwmonfansrc.cpp
@@ -30,7 +30,7 @@ HwMonFanSrc::HwMonFanSrc(TQWidget* inParent, const TQFile& inSourceFile, unsigne
 	//mName = "HwMon " + inSourceFile.name()[inSourceFile.name().length() - 7];
 	mID = "hwmonFan" + TQString::number(inIndex);
 	mName = mID;
-	mDescription = i18n("This fan source is provided by hwmon. (%1)").tqarg(inSourceFile.name());
+	mDescription = i18n("This fan source is provided by hwmon. (%1)").arg(inSourceFile.name());
 }
 
 HwMonFanSrc::~HwMonFanSrc(){
diff --git a/src/sources/hwmonthermalsrc.cpp b/src/sources/hwmonthermalsrc.cpp
index 96af141..24aa3f0 100644
--- a/src/sources/hwmonthermalsrc.cpp
+++ b/src/sources/hwmonthermalsrc.cpp
@@ -30,7 +30,7 @@ HwMonThermalSrc::HwMonThermalSrc(TQWidget* inParent, const TQFile& inSourceFile,
 	//mName = "HwMon " + inSourceFile.name()[inSourceFile.name().length() - 7];
 	mID = "hwmon" + TQString::number(inIndex);
 	mName = mID;
-	mDescription = i18n("This thermal source is provided by hwmon. (%1)").tqarg(inSourceFile.name());
+	mDescription = i18n("This thermal source is provided by hwmon. (%1)").arg(inSourceFile.name());
 }
 
 HwMonThermalSrc::~HwMonThermalSrc(){
diff --git a/src/sources/labelsource.cpp b/src/sources/labelsource.cpp
index 4262c82..ef98492 100644
--- a/src/sources/labelsource.cpp
+++ b/src/sources/labelsource.cpp
@@ -60,7 +60,7 @@ void LabelSource::updatePrefsGUI(){
 	TriggeredSource::updatePrefsGUI(); // update prefs of the super class
 	mLabelSourcePrefs->colorButton->setColor(mLabel->paletteForegroundColor());
 	mLabelSourcePrefs->fontRequester->setFont(mLabel->font());
-	switch (mLabel->tqalignment()) {
+	switch (mLabel->alignment()) {
 		case TQt::AlignCenter:
 			mLabelSourcePrefs->alignmentComboBox->setCurrentItem(1);
 			break;
@@ -103,7 +103,7 @@ void LabelSource::savePrefs(KConfig* inKConfig){
 	TriggeredSource::savePrefs(inKConfig);
 	inKConfig->writeEntry(mID + "_color", mLabelSourcePrefs->colorButton->color());
 	inKConfig->writeEntry(mID + "_font", mLabelSourcePrefs->fontRequester->font());
-	inKConfig->writeEntry(mID + "_align", mLabel->tqalignment());
+	inKConfig->writeEntry(mID + "_align", mLabel->alignment());
 }
 
 void LabelSource::loadPrefs(KConfig* inKConfig){
diff --git a/src/sources/uptimesrc.cpp b/src/sources/uptimesrc.cpp
index cc9d0b5..2daca75 100644
--- a/src/sources/uptimesrc.cpp
+++ b/src/sources/uptimesrc.cpp
@@ -55,9 +55,9 @@ TQString UptimeSrc::fetchValue(){
 		TQString hours = TQString::number(secs / 3600 % 24).rightJustify(2, '0');
 		TQString days = TQString::number(secs / 86400);
 		if(days != "0")
-			s = mTimeFormatLong.tqarg(days).tqarg(hours).tqarg(minutes);
+			s = mTimeFormatLong.arg(days).arg(hours).arg(minutes);
 		else
-			s = mTimeFormatShort.tqarg(hours).tqarg(minutes);
+			s = mTimeFormatShort.arg(hours).arg(minutes);
         mSourceFile.close();
 	}
 	return s;