1 files changed, 14 insertions, 14 deletions

diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp
index d5f59939..9ca78aec 100644
--- a/ksirc/chanButtons.cpp
+++ b/ksirc/chanButtons.cpp
@@ -9,7 +9,7 @@
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqlineedit.h>
 
@@ -17,7 +17,7 @@
 
 static void makeSquare(TQWidget *w)
 {
-   TQSize sh = w->tqsizeHint();
+   TQSize sh = w->sizeHint();
    int s = sh.height();
    w->setFixedSize(s,s);
 }
@@ -38,37 +38,37 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name)
   toggleMenu[5] = Popupmenu->insertItem(i18n("w (receive wallops)"), this, TQT_SLOT(wallops()));
   toggleMenu[6] = Popupmenu->insertItem(i18n("s (get server notices)"), this, TQT_SLOT(serverNotices()));
 
-  tqlayout = new TQHBoxLayout(this);
-  tqlayout->setSpacing(0);
-  tqlayout->setMargin(0);
+  layout = new TQHBoxLayout(this);
+  layout->setSpacing(0);
+  layout->setMargin(0);
 
   protectButton = new TQPushButton(i18n("T"), this);
   protectButton->setToggleButton(true);
   makeSquare(protectButton);
   TQToolTip::add(protectButton, i18n("Only op'ed users can change the topic"));
   connect(protectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(protectMode()));
-  tqlayout->addWidget(protectButton);
+  layout->addWidget(protectButton);
 
   outsideButton = new TQPushButton(i18n("N"), this);
   outsideButton->setToggleButton(true);
   makeSquare(outsideButton);
   TQToolTip::add(outsideButton, i18n("No outside messages"));
   connect(outsideButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(outsideMode()));
-  tqlayout->addWidget(outsideButton);
+  layout->addWidget(outsideButton);
 
   moderateButton = new TQPushButton(i18n("M"), this);
   moderateButton->setToggleButton(true);
   makeSquare(moderateButton);
   TQToolTip::add(moderateButton, i18n("Only op'ed users and voiced users (+v) can speak"));
   connect(moderateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(moderateMode()));
-  tqlayout->addWidget(moderateButton);
+  layout->addWidget(moderateButton);
 
   menuButton = new TQPushButton(i18n("..."), this);
   makeSquare(menuButton);
   menuButton->setFixedWidth(menuButton->width()*2);
   menuButton->setPopup(Popupmenu);
   TQToolTip::add(menuButton, i18n("More mode commands"));
-  tqlayout->addWidget(menuButton);
+  layout->addWidget(menuButton);
 }
 
 void chanButtons::invite()
@@ -93,7 +93,7 @@ void chanButtons::limited()
   }
   else {
     Popupmenu->setItemChecked(toggleMenu[1], true);
-    emit mode(TQString("+l %1").tqarg(chanDialog->sendLimitedUsers()), 0);
+    emit mode(TQString("+l %1").arg(chanDialog->sendLimitedUsers()), 0);
   }
   delete chanDialog;
 }
@@ -104,12 +104,12 @@ void chanButtons::key()
   if (Popupmenu->isItemChecked(toggleMenu[2])) {
     chanDialog->exec();
     Popupmenu->setItemChecked(toggleMenu[2], false);
-    emit mode(TQString("-k %1").tqarg(chanDialog->sendKey()), 0);
+    emit mode(TQString("-k %1").arg(chanDialog->sendKey()), 0);
   }
   else {
     chanDialog->exec();
     Popupmenu->setItemChecked(toggleMenu[2], true);
-    emit mode(TQString("+k %1").tqarg(chanDialog->sendKey()), 0);
+    emit mode(TQString("+k %1").arg(chanDialog->sendKey()), 0);
   }
   delete chanDialog;
 }
@@ -230,7 +230,7 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent,
   Layout->setMargin(0);
 
   okButton = new KPushButton(KStdGuiItem::ok(), this);
-  okButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1,
+  okButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1,
                                       okButton->sizePolicy().hasHeightForWidth()));
   Layout->addWidget(okButton);
   switch (modeType) {
@@ -245,7 +245,7 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent,
   Layout->addWidget(okButton);
 
   cancelButton = new KPushButton(KStdGuiItem::cancel(), this);
-  cancelButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1,
+  cancelButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1,
                                       cancelButton->sizePolicy().hasHeightForWidth()));
   Layout->addWidget(cancelButton);
   connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));