summaryrefslogtreecommitdiffstats
path: root/src/sources
diff options
context:
space:
mode:
Diffstat (limited to 'src/sources')
-rw-r--r--src/sources/acpithermalsrc.cpp2
-rw-r--r--src/sources/cpuinfofreqsrc.cpp2
-rw-r--r--src/sources/hddtempsrc.cpp2
-rw-r--r--src/sources/hwmonfansrc.cpp4
-rw-r--r--src/sources/hwmonthermalsrc.cpp4
-rw-r--r--src/sources/i8ksrc.cpp2
-rw-r--r--src/sources/ibmacpifansrc.cpp2
-rw-r--r--src/sources/ibmacpithermalsrc.cpp2
-rw-r--r--src/sources/ibmhdaps.cpp2
-rw-r--r--src/sources/ibookg4thermalsrc.cpp2
-rw-r--r--src/sources/labelsource.cpp8
-rw-r--r--src/sources/labelsourcePrefs.cpp32
-rw-r--r--src/sources/labelsourcePrefs.ui10
-rw-r--r--src/sources/omnibookthermalsrc.cpp2
-rw-r--r--src/sources/source.cpp6
-rw-r--r--src/sources/source.h10
-rw-r--r--src/sources/sourceprefs.cpp4
-rw-r--r--src/sources/sourceprefs.ui4
-rw-r--r--src/sources/sysfreqsrc.cpp2
-rw-r--r--src/sources/uptimesrc.cpp6
20 files changed, 54 insertions, 54 deletions
diff --git a/src/sources/acpithermalsrc.cpp b/src/sources/acpithermalsrc.cpp
index f762d00..054c0e0 100644
--- a/src/sources/acpithermalsrc.cpp
+++ b/src/sources/acpithermalsrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "acpithermalsrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdir.h>
#include <klocale.h>
diff --git a/src/sources/cpuinfofreqsrc.cpp b/src/sources/cpuinfofreqsrc.cpp
index 6b1b55d..c7b863f 100644
--- a/src/sources/cpuinfofreqsrc.cpp
+++ b/src/sources/cpuinfofreqsrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "cpuinfofreqsrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <klocale.h>
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..6674111 100644
--- a/src/sources/hwmonfansrc.cpp
+++ b/src/sources/hwmonfansrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "hwmonfansrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdir.h>
#include <klocale.h>
@@ -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..d244d88 100644
--- a/src/sources/hwmonthermalsrc.cpp
+++ b/src/sources/hwmonthermalsrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "hwmonthermalsrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdir.h>
#include <klocale.h>
@@ -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/i8ksrc.cpp b/src/sources/i8ksrc.cpp
index 50c1bf5..235c665 100644
--- a/src/sources/i8ksrc.cpp
+++ b/src/sources/i8ksrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "i8ksrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdir.h>
#include <klocale.h>
diff --git a/src/sources/ibmacpifansrc.cpp b/src/sources/ibmacpifansrc.cpp
index a311bda..8b517a8 100644
--- a/src/sources/ibmacpifansrc.cpp
+++ b/src/sources/ibmacpifansrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "ibmacpifansrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <klocale.h>
diff --git a/src/sources/ibmacpithermalsrc.cpp b/src/sources/ibmacpithermalsrc.cpp
index 770c885..ba18019 100644
--- a/src/sources/ibmacpithermalsrc.cpp
+++ b/src/sources/ibmacpithermalsrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "ibmacpithermalsrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <klocale.h>
//#include "hal/libhal.h"
diff --git a/src/sources/ibmhdaps.cpp b/src/sources/ibmhdaps.cpp
index 64d3d9a..a748c61 100644
--- a/src/sources/ibmhdaps.cpp
+++ b/src/sources/ibmhdaps.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "ibmhdaps.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdir.h>
#include <klocale.h>
diff --git a/src/sources/ibookg4thermalsrc.cpp b/src/sources/ibookg4thermalsrc.cpp
index 54f5a91..f9bbdaa 100644
--- a/src/sources/ibookg4thermalsrc.cpp
+++ b/src/sources/ibookg4thermalsrc.cpp
@@ -20,7 +20,7 @@
***************************************************************************/
#include "ibookg4thermalsrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <klocale.h>
IbookG4ThermalSrc::IbookG4ThermalSrc(TQWidget* inParent, const TQFile& inSourceFile, const TQString& inName):
diff --git a/src/sources/labelsource.cpp b/src/sources/labelsource.cpp
index d4d2182..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;
@@ -95,7 +95,7 @@ void LabelSource::applyPrefs(){
}else if(alignID == 2){
align = TQt::AlignRight;
}
- mLabel->tqsetAlignment(align);
+ mLabel->setAlignment(align);
updateLabel(mValue);
}
@@ -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){
@@ -113,7 +113,7 @@ void LabelSource::loadPrefs(KConfig* inKConfig){
color.setRgb(0,0,0);
mLabel->setPaletteForegroundColor(color);
mLabel->setFont(inKConfig->readFontEntry(mID + "_font"));
- mLabel->tqsetAlignment(inKConfig->readNumEntry(mID + "_align"));
+ mLabel->setAlignment(inKConfig->readNumEntry(mID + "_align"));
}
void LabelSource::updateLabel(const TQString& inValue){
diff --git a/src/sources/labelsourcePrefs.cpp b/src/sources/labelsourcePrefs.cpp
index db9b675..99a8470 100644
--- a/src/sources/labelsourcePrefs.cpp
+++ b/src/sources/labelsourcePrefs.cpp
@@ -18,7 +18,7 @@
#include <kcolorbutton.h>
#include <kfontrequester.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -44,39 +44,39 @@ LabelSourcePrefs::LabelSourcePrefs( TQWidget* parent, const char* name, WFlags f
taskbartitleLabel->setFont( taskbartitleLabel_font );
defaultSourcePrefsFrameLayout->addWidget( taskbartitleLabel );
- tqlayout13 = new TQHBoxLayout( 0, 0, 6, "tqlayout13");
+ layout13 = new TQHBoxLayout( 0, 0, 6, "layout13");
colorLabel = new TQLabel( defaultSourcePrefsFrame, "colorLabel" );
- tqlayout13->addWidget( colorLabel );
+ layout13->addWidget( colorLabel );
colorButton = new KColorButton( defaultSourcePrefsFrame, "colorButton" );
- tqlayout13->addWidget( colorButton );
+ layout13->addWidget( colorButton );
spacer1 = new TQSpacerItem( 350, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- tqlayout13->addItem( spacer1 );
- defaultSourcePrefsFrameLayout->addLayout( tqlayout13 );
+ layout13->addItem( spacer1 );
+ defaultSourcePrefsFrameLayout->addLayout( layout13 );
- tqlayout17 = new TQHBoxLayout( 0, 0, 6, "tqlayout17");
+ layout17 = new TQHBoxLayout( 0, 0, 6, "layout17");
fontLabel = new TQLabel( defaultSourcePrefsFrame, "fontLabel" );
- tqlayout17->addWidget( fontLabel );
+ layout17->addWidget( fontLabel );
fontRequester = new KFontRequester( defaultSourcePrefsFrame, "fontRequester" );
- tqlayout17->addWidget( fontRequester );
- defaultSourcePrefsFrameLayout->addLayout( tqlayout17 );
+ layout17->addWidget( fontRequester );
+ defaultSourcePrefsFrameLayout->addLayout( layout17 );
- tqlayout18 = new TQHBoxLayout( 0, 0, 6, "tqlayout18");
+ layout18 = new TQHBoxLayout( 0, 0, 6, "layout18");
alignmentLabel = new TQLabel( defaultSourcePrefsFrame, "alignmentLabel" );
- tqlayout18->addWidget( alignmentLabel );
+ layout18->addWidget( alignmentLabel );
alignmentComboBox = new TQComboBox( FALSE, defaultSourcePrefsFrame, "alignmentComboBox" );
- tqlayout18->addWidget( alignmentComboBox );
+ layout18->addWidget( alignmentComboBox );
spacer2 = new TQSpacerItem( 350, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- tqlayout18->addItem( spacer2 );
- defaultSourcePrefsFrameLayout->addLayout( tqlayout18 );
+ layout18->addItem( spacer2 );
+ defaultSourcePrefsFrameLayout->addLayout( layout18 );
LabelSourcePrefsLayout->addWidget( defaultSourcePrefsFrame );
languageChange();
- resize( TQSize(299, 135).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(299, 135).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
}
diff --git a/src/sources/labelsourcePrefs.ui b/src/sources/labelsourcePrefs.ui
index a7f49db..2458413 100644
--- a/src/sources/labelsourcePrefs.ui
+++ b/src/sources/labelsourcePrefs.ui
@@ -55,7 +55,7 @@ Taskbar visual settings</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -87,7 +87,7 @@ Taskbar visual settings</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>350</width>
<height>20</height>
@@ -98,7 +98,7 @@ Taskbar visual settings</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -121,7 +121,7 @@ Taskbar visual settings</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -165,7 +165,7 @@ Taskbar visual settings</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>350</width>
<height>20</height>
diff --git a/src/sources/omnibookthermalsrc.cpp b/src/sources/omnibookthermalsrc.cpp
index 11f8cd9..ea91f95 100644
--- a/src/sources/omnibookthermalsrc.cpp
+++ b/src/sources/omnibookthermalsrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "omnibookthermalsrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <klocale.h>
diff --git a/src/sources/source.cpp b/src/sources/source.cpp
index 20885b0..8ba4376 100644
--- a/src/sources/source.cpp
+++ b/src/sources/source.cpp
@@ -20,7 +20,7 @@
#include "source.h"
#include <math.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
@@ -107,7 +107,7 @@ TQWidget* Source::createPrefs(TQWidget* inParent){
createSubPrefs(mSourcePrefs);
// add bottom vspacer
- mSourcePrefs->tqlayout()->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding) );
+ mSourcePrefs->layout()->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding) );
updatePrefsGUI(); // fill the prefs gui
}
@@ -140,7 +140,7 @@ void Source::setPrefsWidgetsEnabled(bool isEnabled, bool isShownOnApplet){
void Source::addPrefs(TQWidget* inParent){
if(inParent != NULL)
- mSourcePrefs->tqlayout()->add(inParent);
+ mSourcePrefs->layout()->add(inParent);
}
void Source::applyPrefs(){
diff --git a/src/sources/source.h b/src/sources/source.h
index 6ae53c5..ff01049 100644
--- a/src/sources/source.h
+++ b/src/sources/source.h
@@ -48,12 +48,12 @@ public:
const TQString& getID() const;
/**
- * Returns the position of this source in the tqlayout
+ * Returns the position of this source in the layout
*/
int getPosition() const;
/**
- * Sets the position of this source in the tqlayout
+ * Sets the position of this source in the layout
*/
void setPosition(int inPosition, KConfig* inKConfig);
@@ -145,9 +145,9 @@ signals:
/**
* This signal is emitted whenever the enabled flag (mEnabled) of this source has changed
*/
- void enabledChanged(bool inEnabled, Source* inSource); // needed by kima.cpp to add sources to its tqlayout
+ void enabledChanged(bool inEnabled, Source* inSource); // needed by kima.cpp to add sources to its layout
/**
- * This signal is emitted whenever this Source should be added or removed from the display (tqlayout) of the kicker applet
+ * This signal is emitted whenever this Source should be added or removed from the display (layout) of the kicker applet
*/
void displaySource(bool inDisplay, Source* inSource);
@@ -179,7 +179,7 @@ protected:
*/
TQString mID;
/**
- * The Position of the source in the tqlayout
+ * The Position of the source in the layout
*/
int mPosition;
/**
diff --git a/src/sources/sourceprefs.cpp b/src/sources/sourceprefs.cpp
index 160cfd0..4fbd5a7 100644
--- a/src/sources/sourceprefs.cpp
+++ b/src/sources/sourceprefs.cpp
@@ -16,7 +16,7 @@
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -59,7 +59,7 @@ SourcePrefs::SourcePrefs( TQWidget* parent, const char* name, WFlags fl )
tooltipCheckBox = new TQCheckBox( this, "tooltipCheckBox" );
SourcePrefsLayout->addWidget( tooltipCheckBox );
languageChange();
- resize( TQSize(203, 127).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(203, 127).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
}
diff --git a/src/sources/sourceprefs.ui b/src/sources/sourceprefs.ui
index e063d39..46c3b8e 100644
--- a/src/sources/sourceprefs.ui
+++ b/src/sources/sourceprefs.ui
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/src/sources/sysfreqsrc.cpp b/src/sources/sysfreqsrc.cpp
index a90c127..26e57c5 100644
--- a/src/sources/sysfreqsrc.cpp
+++ b/src/sources/sysfreqsrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "sysfreqsrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <tqdir.h>
#include <klocale.h>
diff --git a/src/sources/uptimesrc.cpp b/src/sources/uptimesrc.cpp
index cc9d0b5..a43ce92 100644
--- a/src/sources/uptimesrc.cpp
+++ b/src/sources/uptimesrc.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "uptimesrc.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <klocale.h>
UptimeSrc::UptimeSrc(TQWidget* inParent, const TQFile& inSourceFile):
@@ -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;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 03:58:46 +0000