1 files changed, 8 insertions, 8 deletions
diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp
index 015ce4cf..9dd42a38 100644
--- a/klinkstatus/src/ui/tabwidgetsession.cpp
+++ b/klinkstatus/src/ui/tabwidgetsession.cpp
@@ -33,7 +33,7 @@
 #include <tqstringlist.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kstringhandler.h> 
 #include <kcharsets.h>
@@ -45,7 +45,7 @@
 TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f)
         : KTabWidget(parent, name, f) // tabs_ is initialized with size 17
 {
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
     setMargin(0);
     setTabReorderingEnabled(true);
     setHoverCloseButton(true);
@@ -55,7 +55,7 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f)
     
     TQToolButton* tabs_new = new TQToolButton(this);
     tabs_new->setAccel(TQKeySequence("Ctrl+N"));
-    connect(tabs_new, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewSession()));
+    connect(tabs_new, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewSession()));
     tabs_new->setIconSet(SmallIconSet("tab_new_raised"));
     tabs_new->adjustSize();
     TQToolTip::add(tabs_new, i18n("Open new tab"));
@@ -63,13 +63,13 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f)
 
     tabs_close_ = new TQToolButton(this);
     tabs_close_->setAccel(TQKeySequence("Ctrl+W"));
-    connect(tabs_close_, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeSession()));
+    connect(tabs_close_, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeSession()));
     tabs_close_->setIconSet(SmallIconSet("tab_remove"));
     tabs_close_->adjustSize();
     TQToolTip::add(tabs_close_, i18n("Close the current tab"));
     setCornerWidget(tabs_close_, TopRight);
 
-    connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*)));
+    connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentChanged(TQWidget*)));
 }
 
 TabWidgetSession::~TabWidgetSession()
@@ -117,8 +117,8 @@ SessionWidget* TabWidgetSession::newSession()
 {
     // TODO: settings: number of connections, timeout
     SessionWidget* session_widget = newSessionWidget();
-    connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)),
-            this, TQT_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*)));
+    connect(session_widget, TQ_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)),
+            this, TQ_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*)));
 
     insertTab(session_widget, i18n("Session") + i18n(TQString::number(count() + 1).ascii()));
     
@@ -149,7 +149,7 @@ void TabWidgetSession::closeSession()
 SessionWidget* TabWidgetSession::newSessionWidget()
 {
     SessionWidget* session_widget = new SessionWidget(KLSConfig::maxConnectionsNumber(), 
-            KLSConfig::timeOut(), this, TQString("session_widget-" + count()));
+            KLSConfig::timeOut(), this, TQString("session_widget-" + count()).utf8());
 
     TQStringList columns;