summaryrefslogtreecommitdiffstats
path: root/kcontrol/kicker
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
commit2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (patch)
tree65f4f4370cf4269757d7fa4d0f4d15996a1bf68f /kcontrol/kicker
parent73c08b592db45af554b9f21029bc549d70f683ab (diff)
downloadtdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.tar.gz
tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
Diffstat (limited to 'kcontrol/kicker')
-rw-r--r--kcontrol/kicker/advancedDialog.cpp6
-rw-r--r--kcontrol/kicker/advancedOptions.ui12
-rw-r--r--kcontrol/kicker/applettab.ui10
-rw-r--r--kcontrol/kicker/applettab_impl.cpp2
-rw-r--r--kcontrol/kicker/extensionInfo.cpp16
-rw-r--r--kcontrol/kicker/extensionInfo.h4
-rw-r--r--kcontrol/kicker/hidingconfig.cpp2
-rw-r--r--kcontrol/kicker/hidingtab.ui26
-rw-r--r--kcontrol/kicker/lookandfeelconfig.cpp2
-rw-r--r--kcontrol/kicker/lookandfeeltab.ui14
-rw-r--r--kcontrol/kicker/lookandfeeltab_kcm.cpp2
-rw-r--r--kcontrol/kicker/menuconfig.cpp2
-rw-r--r--kcontrol/kicker/menutab.ui22
-rw-r--r--kcontrol/kicker/menutab_impl.cpp12
-rw-r--r--kcontrol/kicker/positionconfig.cpp2
-rw-r--r--kcontrol/kicker/positiontab.ui70
-rw-r--r--kcontrol/kicker/positiontab_impl.cpp10
17 files changed, 107 insertions, 107 deletions
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index 86f33a07f..d2a87be69 100644
--- a/kcontrol/kicker/advancedDialog.cpp
+++ b/kcontrol/kicker/advancedDialog.cpp
@@ -19,7 +19,7 @@
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqslider.h>
@@ -51,7 +51,7 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name)
layout->addWidget(m_advancedWidget);
layout->addStretch();
- setMinimumSize( sizeHint() );
+ setMinimumSize( tqsizeHint() );
connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)),
this, TQT_SLOT(changed()));
@@ -92,7 +92,7 @@ void advancedDialog::load()
int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14);
m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize);
- TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() );
+ TQColor color = c.readColorEntry( "TintColor", &tqcolorGroup().mid() );
m_advancedWidget->tintColorB->setColor( color );
int tintValue = c.readNumEntry( "TintValue", 33 );
m_advancedWidget->tintSlider->setValue( tintValue );
diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui
index 5ba10dd75..c49cf45b2 100644
--- a/kcontrol/kicker/advancedOptions.ui
+++ b/kcontrol/kicker/advancedOptions.ui
@@ -71,7 +71,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>101</width>
<height>20</height>
@@ -145,7 +145,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -208,7 +208,7 @@
<property name="text">
<string>Min</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="whatsThis" stdset="0">
@@ -225,7 +225,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -250,7 +250,7 @@
<property name="text">
<string>Max</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="whatsThis" stdset="0">
diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui
index bcdfef2f8..8b0aeb223 100644
--- a/kcontrol/kicker/applettab.ui
+++ b/kcontrol/kicker/applettab.ui
@@ -112,7 +112,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -123,7 +123,7 @@
<property name="name">
<cstring>pb_add</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -162,7 +162,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -182,7 +182,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index 4462b3be0..a8b7cdb20 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqvbuttongroup.h>
#include <tqwhatsthis.h>
diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp
index d1a0b2766..89f000410 100644
--- a/kcontrol/kicker/extensionInfo.cpp
+++ b/kcontrol/kicker/extensionInfo.cpp
@@ -125,7 +125,7 @@ void ExtensionInfo::load()
c.setGroup("General");
_position = c.readNumEntry ("Position", _position);
- _alignment = c.readNumEntry ("Alignment", _alignment);
+ _tqalignment = c.readNumEntry ("Alignment", _tqalignment);
_xineramaScreen = c.readNumEntry ("XineramaScreen", _xineramaScreen);
_showLeftHB = c.readBoolEntry("ShowLeftHideButton", _showLeftHB);
_showRightHB = c.readBoolEntry("ShowRightHideButton", _showRightHB);
@@ -147,7 +147,7 @@ void ExtensionInfo::load()
}
_orig_position = _position;
- _orig_alignment = _alignment;
+ _orig_tqalignment = _tqalignment;
_orig_size = _size;
_orig_customSize = _customSize;
@@ -170,10 +170,10 @@ void ExtensionInfo::configChanged()
_orig_position = _position = position;
}
- int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
- if (alignment != _alignment && alignment != _orig_alignment)
+ int tqalignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
+ if (tqalignment != _tqalignment && tqalignment != _orig_tqalignment)
{
- _orig_alignment = _alignment = alignment;
+ _orig_tqalignment = _tqalignment = tqalignment;
}
if (_resizeable)
@@ -197,7 +197,7 @@ void ExtensionInfo::setDefaults()
{
// defaults
_position = 3;
- _alignment = TQApplication::reverseLayout() ? 2 : 0;
+ _tqalignment = TQApplication::reverseLayout() ? 2 : 0;
_xineramaScreen = TQApplication::desktop()->primaryScreen();
_size = 2;
_showLeftHB = false;
@@ -225,7 +225,7 @@ void ExtensionInfo::save()
c.setGroup("General");
c.writeEntry("Position", _position);
- c.writeEntry("Alignment", _alignment);
+ c.writeEntry("Alignment", _tqalignment);
c.writeEntry("XineramaScreen", _xineramaScreen);
c.writeEntry("ShowLeftHideButton", _showLeftHB);
c.writeEntry("ShowRightHideButton", _showRightHB);
@@ -251,7 +251,7 @@ void ExtensionInfo::save()
}
_orig_position = _position;
- _orig_alignment = _alignment;
+ _orig_tqalignment = _tqalignment;
_orig_size = _size;
_orig_customSize = _customSize;
diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h
index 169322aa4..5b890d324 100644
--- a/kcontrol/kicker/extensionInfo.h
+++ b/kcontrol/kicker/extensionInfo.h
@@ -47,7 +47,7 @@ class ExtensionInfo
// Configuration settings
TQString _name;
int _position;
- int _alignment;
+ int _tqalignment;
int _xineramaScreen;
int _size;
int _customSize;
@@ -67,7 +67,7 @@ class ExtensionInfo
// Original settings to ensure that we can figure out
// what has changed externally to the panel vs within the panel
int _orig_position;
- int _orig_alignment;
+ int _orig_tqalignment;
int _orig_size;
int _orig_customSize;
diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp
index bbda99f33..935fa5902 100644
--- a/kcontrol/kicker/hidingconfig.cpp
+++ b/kcontrol/kicker/hidingconfig.cpp
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <klocale.h>
diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui
index d6b85c046..20db3beba 100644
--- a/kcontrol/kicker/hidingtab.ui
+++ b/kcontrol/kicker/hidingtab.ui
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>342</width>
<height>20</height>
@@ -92,7 +92,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -332,7 +332,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>50</width>
<height>10</height>
@@ -401,7 +401,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -439,7 +439,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -467,7 +467,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -532,7 +532,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -557,7 +557,7 @@
<property name="text">
<string>Fast</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@@ -573,7 +573,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -598,7 +598,7 @@
<property name="text">
<string>Medium</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@@ -637,7 +637,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp
index d87b0b7e0..7475ad7b0 100644
--- a/kcontrol/kicker/lookandfeelconfig.cpp
+++ b/kcontrol/kicker/lookandfeelconfig.cpp
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <klocale.h>
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 48461ac03..3684ff599 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -359,7 +359,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>66</width>
<height>130</height>
@@ -389,7 +389,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -428,13 +428,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>50</width>
<height>50</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>50</width>
<height>50</height>
@@ -449,7 +449,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@@ -527,7 +527,7 @@ This option is only active if 'Enable background image' is selected.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>289</width>
<height>20</height>
@@ -546,7 +546,7 @@ This option is only active if 'Enable background image' is selected.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp
index 8cf13201a..bfdb3a491 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.cpp
+++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <dcopclient.h>
diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp
index 7eb938597..03ca57582 100644
--- a/kcontrol/kicker/menuconfig.cpp
+++ b/kcontrol/kicker/menuconfig.cpp
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <klocale.h>
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index 2ded51364..fad4f859a 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -197,7 +197,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -261,13 +261,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>26</width>
<height>26</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>26</width>
<height>26</height>
@@ -327,7 +327,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -345,7 +345,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -389,7 +389,7 @@
<verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -487,7 +487,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -558,7 +558,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -654,7 +654,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -698,7 +698,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index a7cd7f596..cd1d27fa9 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -19,7 +19,7 @@
#include <tqgroupbox.h>
#include <tqdir.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqcombobox.h>
@@ -93,9 +93,9 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
btnCustomKMenuIcon->setPixmap(kmenu_icon);
KConfig *config;
- config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
- config->setGroup(TQString::fromLatin1("RecentDocuments"));
- maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10));
+ config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false);
+ config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
+ maxrecentdocs->setValue(config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10));
m_browserGroupLayout->setColStretch( 1, 1 );
m_pRecentOrderGroupLayout->setColStretch( 1, 1 );
@@ -247,8 +247,8 @@ void MenuTab::save()
// Save recent documents
KConfig *config;
- config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
- config->setGroup(TQString::fromLatin1("RecentDocuments"));
+ config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false);
+ config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
config->writeEntry("MaxEntries", maxrecentdocs->value());
config->sync();
diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp
index fb93f4abb..6e5dcdeb2 100644
--- a/kcontrol/kicker/positionconfig.cpp
+++ b/kcontrol/kicker/positionconfig.cpp
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <klocale.h>
diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui
index ac367a15f..e7ea78bb3 100644
--- a/kcontrol/kicker/positiontab.ui
+++ b/kcontrol/kicker/positiontab.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>342</width>
<height>20</height>
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -123,7 +123,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>151</width>
<height>115</height>
@@ -132,7 +132,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
<property name="whatsThis" stdset="0">
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -235,7 +235,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>101</height>
@@ -357,7 +357,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>16</height>
@@ -426,7 +426,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>40</height>
@@ -538,7 +538,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -555,7 +555,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>0</height>
@@ -590,13 +590,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32</width>
<height>16</height>
@@ -624,13 +624,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32</width>
<height>16</height>
@@ -658,13 +658,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32</width>
<height>16</height>
@@ -702,13 +702,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>16</width>
<height>24</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>16</width>
<height>24</height>
@@ -736,13 +736,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>16</width>
<height>24</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>16</width>
<height>24</height>
@@ -770,13 +770,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>16</width>
<height>24</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>16</width>
<height>24</height>
@@ -814,13 +814,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32</width>
<height>16</height>
@@ -848,13 +848,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32</width>
<height>16</height>
@@ -882,13 +882,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32</width>
<height>16</height>
@@ -926,13 +926,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>16</width>
<height>24</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>16</width>
<height>24</height>
@@ -960,13 +960,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>16</width>
<height>24</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>16</width>
<height>24</height>
@@ -994,13 +994,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>16</width>
<height>24</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>16</width>
<height>24</height>
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 5e90a9c54..d7202726a 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -60,7 +60,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
{
TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png"));
m_monitorImage->setPixmap(monitor);
- m_monitorImage->setFixedSize(m_monitorImage->sizeHint());
+ m_monitorImage->setFixedSize(m_monitorImage->tqsizeHint());
m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG");
m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY);
@@ -558,7 +558,7 @@ void PositionTab::switchPanel(int panelItem)
m_customSpinbox->setValue(m_panelInfo->_customSize);
m_sizeGroup->setEnabled(m_panelInfo->_resizeable);
m_panelPos = m_panelInfo->_position;
- m_panelAlign = m_panelInfo->_alignment;
+ m_panelAlign = m_panelInfo->_tqalignment;
if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens())
m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen);
else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */
@@ -672,7 +672,7 @@ void PositionTab::storeInfo()
}
m_panelInfo->_position = m_panelPos;
- m_panelInfo->_alignment = m_panelAlign;
+ m_panelInfo->_tqalignment = m_panelAlign;
if(m_xineramaScreenComboBox->currentItem() == m_xineramaScreenComboBox->count()-1)
m_panelInfo->_xineramaScreen = -2; /* all screens */
else
@@ -696,14 +696,14 @@ void PositionTab::showIdentify()
screenLabel->setFrameStyle(TQFrame::Panel);
screenLabel->setFrameShadow(TQFrame::Plain);
- screenLabel->setAlignment(Qt::AlignCenter);
+ screenLabel->tqsetAlignment(Qt::AlignCenter);
screenLabel->setNum(s + 1);
// BUGLET: we should not allow the identification to be entered again
// until the timer fires.
TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
- TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
+ TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint());
targetGeometry.moveCenter(screenCenter);
screenLabel->setGeometry(targetGeometry);