Remove additional unneeded tq method conversions

7 files changed, 18 insertions, 18 deletions

diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui
index 5053d6bac..5ba10dd75 100644
--- a/kcontrol/kicker/advancedOptions.ui
+++ b/kcontrol/kicker/advancedOptions.ui
@@ -208,7 +208,7 @@
                     <property name="text">
                         <string>Min</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="whatsThis" stdset="0">
@@ -250,7 +250,7 @@
                     <property name="text">
                         <string>Max</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="whatsThis" stdset="0">
diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp
index 89f000410..d1a0b2766 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);
-    _tqalignment      = c.readNumEntry ("Alignment",           _tqalignment);
+    _alignment      = c.readNumEntry ("Alignment",           _alignment);
     _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_tqalignment = _tqalignment;
+    _orig_alignment = _alignment;
     _orig_size = _size;
     _orig_customSize = _customSize;
 
@@ -170,10 +170,10 @@ void ExtensionInfo::configChanged()
         _orig_position = _position = position;
     }
 
-    int tqalignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
-    if (tqalignment != _tqalignment && tqalignment != _orig_tqalignment)
+    int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
+    if (alignment != _alignment && alignment != _orig_alignment)
     {
-        _orig_tqalignment = _tqalignment = tqalignment;
+        _orig_alignment = _alignment = alignment;
     }
 
     if (_resizeable)
@@ -197,7 +197,7 @@ void ExtensionInfo::setDefaults()
 {
     // defaults
     _position       = 3;
-    _tqalignment      = TQApplication::reverseLayout() ? 2 : 0;
+    _alignment      = 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",           _tqalignment);
+    c.writeEntry("Alignment",           _alignment);
     c.writeEntry("XineramaScreen",      _xineramaScreen);
     c.writeEntry("ShowLeftHideButton",  _showLeftHB);
     c.writeEntry("ShowRightHideButton", _showRightHB);
@@ -251,7 +251,7 @@ void ExtensionInfo::save()
     }
 
     _orig_position = _position;
-    _orig_tqalignment = _tqalignment;
+    _orig_alignment = _alignment;
     _orig_size = _size;
     _orig_customSize = _customSize;
 
diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h
index 5b890d324..169322aa4 100644
--- a/kcontrol/kicker/extensionInfo.h
+++ b/kcontrol/kicker/extensionInfo.h
@@ -47,7 +47,7 @@ class ExtensionInfo
         // Configuration settings
         TQString  _name;
         int      _position;
-        int      _tqalignment;
+        int      _alignment;
         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_tqalignment;
+        int      _orig_alignment;
         int      _orig_size;
         int      _orig_customSize;
 
diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui
index 6aca01f9c..d6b85c046 100644
--- a/kcontrol/kicker/hidingtab.ui
+++ b/kcontrol/kicker/hidingtab.ui
@@ -557,7 +557,7 @@
                             <property name="text">
                                 <string>Fast</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="hAlign" stdset="0">
@@ -598,7 +598,7 @@
                             <property name="text">
                                 <string>Medium</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                             <property name="hAlign" stdset="0">
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index c78c5d4f9..48461ac03 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -449,7 +449,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui
index fa145433a..ac367a15f 100644
--- a/kcontrol/kicker/positiontab.ui
+++ b/kcontrol/kicker/positiontab.ui
@@ -132,7 +132,7 @@
                             <property name="scaledContents">
                                 <bool>true</bool>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                             <property name="whatsThis" stdset="0">
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 220344f98..5e90a9c54 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -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->_tqalignment;
+    m_panelAlign = m_panelInfo->_alignment;
     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->_tqalignment = m_panelAlign;
+    m_panelInfo->_alignment = m_panelAlign;
     if(m_xineramaScreenComboBox->currentItem() == m_xineramaScreenComboBox->count()-1)
         m_panelInfo->_xineramaScreen = -2; /* all screens */
     else