5 files changed, 3 insertions, 23 deletions
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index 3fad8256..3d9e668f 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -111,11 +111,7 @@ void %{APPNAME}::saveProperties(TDEConfig *config)
     // later when this app is restored
 
     if (!m_view->currentURL().isEmpty()) {
-#if KDE_IS_VERSION(3,1,3)
         config->writePathEntry("lastURL", m_view->currentURL());
-#else
-        config->writeEntry("lastURL", m_view->currentURL());
-#endif
     }
 }
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 51639f36..bd10e65d 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -56,10 +56,8 @@
 	connect(m_manager, TQ_SIGNAL(activePartChanged(KParts::Part*)),
 			this, TQ_SLOT(createGUI(KParts::Part*)) );
 
-#if KDE_IS_VERSION(3, 3, 0)
 	setToolviewStyle( KMdi::TextAndIcon );
 	tabWidget()->setHoverCloseButton( false );
-#endif
 
 	setMenuForSDIModeSysButtons( menuBar() );
 	setManagedDockPositionModeEnabled(true); 
@@ -85,7 +83,6 @@
 	addToolWindow( m_console, KDockWidget::DockBottom, getMainDockWidget(), 20 );
 
 
-#if KDE_IS_VERSION(3, 3, 0)
 	if (Settings::showCloseTabsButton())
 	{
 		TQToolButton *but = new TQToolButton(tabWidget());
@@ -95,7 +92,6 @@
 		connect(but, TQ_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQ_SIGNAL(activated()));
 		tabWidget()->setCornerWidget(but, TopRight);
 	}
-#endif
 
 	// apply the saved mainwindow settings, if any, and ask the mainwindow
 	// to automatically save settings if changed: window size, toolbar
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index bf503bad..de3ccafa 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -270,7 +270,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
       docker_(0),
       dockWindow_(new KSystemTray(parent))
 {
-    winModule_  = new KWinModule(this);
+    winModule_  = new TWinModule(this);
     docker_ = new DbgDocker(parent, this, BarIcon("dbgnext"));
     connect(docker_, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver()));
 
diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h
index 717643b4..b23e3e47 100644
--- a/languages/cpp/debugger/dbgtoolbar.h
+++ b/languages/cpp/debugger/dbgtoolbar.h
@@ -16,7 +16,7 @@
 #ifndef _DBGTOOLBAR_H_
 #define _DBGTOOLBAR_H_
 
-class KWinModule;
+class TWinModule;
 
 #include <ksystemtray.h>
 #include <twin.h>         // needed for WId :(
@@ -72,7 +72,7 @@ private:
 
     DebuggerPart*   part_;
     WId             activeWindow_;
-    KWinModule*     winModule_;
+    TWinModule*     winModule_;
     DbgButton*      bKDevFocus_;
     DbgButton*      bPrevFocus_;
     bool            appIsActive_;
diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp
index e806b31b..49bf2c0e 100644
--- a/languages/cpp/debugger/stty.cpp
+++ b/languages/cpp/debugger/stty.cpp
@@ -149,18 +149,6 @@ int STTY::findTTY()
 
     // Find a master pty that we can open ////////////////////////////////
 
-#ifdef __sgi__
-    ptyfd = open("/dev/ptmx",O_RDWR);
-    if (ptyfd < 0) {
-        perror("Can't open a pseudo teletype");
-        return(-1);
-    }
-    strncpy(tty_slave, ptsname(ptyfd), 50);
-    grantpt(ptyfd);
-    unlockpt(ptyfd);
-    needGrantPty = false;
-#endif
-
     // first we try UNIX PTY's
 #ifdef TIOCGPTN
     strcpy(pty_master,"/dev/ptmx");