1 files changed, 18 insertions, 19 deletions

diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp
index 8c9a1746..0fe1e7db 100644
--- a/knode/kngroupdialog.cpp
+++ b/knode/kngroupdialog.cpp
@@ -51,17 +51,17 @@ KNGroupDialog::KNGroupDialog(TQWidget *parent, KNNntpAccount *a) :
   dir1=right;
   dir2=left;
 
-  connect(groupView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-    this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
-  connect(groupView, TQT_SIGNAL(selectionChanged()),
-    this, TQT_SLOT(slotSelectionChanged()));
-  connect(subView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-    this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
-  connect(unsubView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-    this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
-
-  connect(arrowBtn1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn1()));
-  connect(arrowBtn2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn2()));
+  connect(groupView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+    this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+  connect(groupView, TQ_SIGNAL(selectionChanged()),
+    this, TQ_SLOT(slotSelectionChanged()));
+  connect(subView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+    this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+  connect(unsubView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+    this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+
+  connect(arrowBtn1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn1()));
+  connect(arrowBtn2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn2()));
 
   KNHelper::restoreWindowSize("groupDlg", this, TQSize(662,393));  // optimized for 800x600
 
@@ -121,18 +121,17 @@ void KNGroupDialog::updateItemState(CheckItem *it)
 
 
 
-void KNGroupDialog::toSubscribe(TQSortedList<KNGroupInfo> *l)
+void KNGroupDialog::toSubscribe(std::list<KNGroupInfo*> *l)
 {
   KNGroupInfo *info;
   l->clear();
-  l->setAutoDelete(true);
 
   bool moderated=false;
   TQListViewItemIterator it(subView);
   for(; it.current(); ++it) {
     info = new KNGroupInfo();
     *info = ((static_cast<GroupItem*>(it.current()))->info);
-    l->append(info);
+    l->push_back(info);
     if (info->status==KNGroup::moderated)
       moderated=true;
   }
@@ -177,17 +176,17 @@ void KNGroupDialog::setButtonDirection(arrowButton b, arrowDirection d)
 
 void KNGroupDialog::slotItemSelected(TQListViewItem *it)
 {
-  const TQObject *s=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
+  const TQObject *s=sender();
 
 
-  if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(subView)) {
+  if(s==subView) {
     unsubView->clearSelection();
     groupView->clearSelection();
     arrowBtn2->setEnabled(false);
     arrowBtn1->setEnabled(true);
     setButtonDirection(btn1, left);
   }
-  else if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(unsubView)) {
+  else if(s==unsubView) {
     subView->clearSelection();
     groupView->clearSelection();
     arrowBtn1->setEnabled(false);
@@ -294,7 +293,7 @@ void KNGroupDialog::slotUser2()
   TQLabel *l = new TQLabel(TDEGlobal::locale()->formatDate(lastDate, false),btnGrp);
   topL->addWidget(l, 1, 1, TQt::AlignLeft);
 
-  connect(takeLast, TQT_SIGNAL(toggled(bool)), l, TQT_SLOT(setEnabled(bool)));
+  connect(takeLast, TQ_SIGNAL(toggled(bool)), l, TQ_SLOT(setEnabled(bool)));
 
   TQRadioButton *takeCustom = new TQRadioButton( i18n("Created since this date:"), btnGrp );
   topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1);
@@ -303,7 +302,7 @@ void KNGroupDialog::slotUser2()
   dateSel->setMinimumSize(dateSel->sizeHint());
   topL->addWidget(dateSel, 3, 1, TQt::AlignLeft);
 
-  connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool)));
+  connect(takeCustom, TQ_SIGNAL(toggled(bool)), dateSel, TQ_SLOT(setEnabled(bool)));
 
   takeLast->setChecked(true);
   dateSel->setEnabled(false);