Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 6 deletions

diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index b5c4c0ac7..d65498430 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -43,7 +43,7 @@
 #include "positiontab_impl.moc"
 
 
-// magic numbers for the preview widget tqlayout
+// magic numbers for the preview widget layout
 extern const int offsetX = 23;
 extern const int offsetY = 14;
 extern const int maxX = 150;
@@ -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->tqsizeHint());
+    m_monitorImage->setFixedSize(m_monitorImage->sizeHint());
 
     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->_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
@@ -696,14 +696,14 @@ void PositionTab::showIdentify()
         screenLabel->setFrameStyle(TQFrame::Panel);
         screenLabel->setFrameShadow(TQFrame::Plain);
 
-        screenLabel->tqsetAlignment(Qt::AlignCenter);
+        screenLabel->setAlignment(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->tqsizeHint());
+        TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
         targetGeometry.moveCenter(screenCenter);
 
         screenLabel->setGeometry(targetGeometry);