diff --git a/src/kstreamripper.cpp b/src/kstreamripper.cpp
index d386097..4c43d1e 100644
--- a/src/kstreamripper.cpp
+++ b/src/kstreamripper.cpp
@@ -34,7 +34,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqprocess.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqframe.h>
 #include <tqtimer.h>
 #include <kmessagebox.h>
@@ -191,7 +191,7 @@ void KStreamRipper::tuneInButtonClicked()
 void KStreamRipper::serviceAdded(DNSSD::RemoteService::Ptr srv)
 {
     ProcessListViewItem * proc = new ProcessListViewItem( m_streamsListView, srv->serviceName(), "", "");
-    proc->getProcessController()->setUrl( TQString("http://%1:%2%3").tqarg(srv->hostName()).tqarg(srv->port()).tqarg(srv->textData()["path"]) );
+    proc->getProcessController()->setUrl( TQString("http://%1:%2%3").arg(srv->hostName()).arg(srv->port()).arg(srv->textData()["path"]) );
     proc->getProcessController()->setDescription( i18n("found by Zeroconf") );
     proc->getProcessController()->setAutomatic(true);
     proc->getProcessController()->setService(srv);
@@ -269,8 +269,8 @@ void KStreamRipper::selectedNewListItem()
     ProcessController * ProcCtl = ((ProcessListViewItem*)m_streamsListView->currentItem())->getProcessController();
 
     // reconfigure what the user is allowed to do based on if this process is ripping	
-    m_ripButton->setEnabled( !ProcCtl->gettqStatus() );
-    m_stopRipButton->setEnabled( ProcCtl->gettqStatus() );
+    m_ripButton->setEnabled( !ProcCtl->getStatus() );
+    m_stopRipButton->setEnabled( ProcCtl->getStatus() );
     m_tuneInButton->setEnabled( true );
     m_deleteStreamButton->setEnabled( !ProcCtl->getAutomatic() );
 	
diff --git a/src/kstreamripperbase.ui b/src/kstreamripperbase.ui
index ea70001..5079c5e 100644
--- a/src/kstreamripperbase.ui
+++ b/src/kstreamripperbase.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>20</height>
@@ -46,7 +46,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="6" column="1">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>421</width>
                     <height>21</height>
diff --git a/src/processcontroller.cpp b/src/processcontroller.cpp
index d025a67..336ce85 100644
--- a/src/processcontroller.cpp
+++ b/src/processcontroller.cpp
@@ -23,7 +23,7 @@
 #include "processlistviewitem.h"
 
 ProcessController::ProcessController(ProcessListViewItem * parent)
-  : TQObject((TQObject *)parent), myParent(parent), mytqStatus(false), myAutomatic(false), myProcess(new TQProcess(this))
+  : TQObject((TQObject *)parent), myParent(parent), myStatus(false), myAutomatic(false), myProcess(new TQProcess(this))
 {
 	connect (myProcess, TQT_SIGNAL( readyReadStdout() ), (ProcessController *) this, TQT_SLOT( readStdout()) );
 	// connect (myProcess, TQT_SIGNAL( destroyed() ), myProcess, TQT_SLOT( kill()) );
@@ -71,7 +71,7 @@ void ProcessController::readStdout()
 
 void ProcessController::startRip(TQString destination, TQString time)
 {
-	mytqStatus = true;
+	myStatus = true;
 	myParent->setText( 1, "Ripping" );
 	
 	myProcess->clearArguments();
@@ -92,7 +92,7 @@ void ProcessController::startRip(TQString destination, TQString time)
 
 void ProcessController::stopRip()
 {
-	mytqStatus = false;
+	myStatus = false;
 	myParent->setText( 1, "" );
 	myParent->setText( 2, "" );
 
@@ -101,9 +101,9 @@ void ProcessController::stopRip()
 }
 
 
-bool ProcessController::gettqStatus()
+bool ProcessController::getStatus()
 {
-	return mytqStatus;
+	return myStatus;
 }
 
 TQString ProcessController::getUrl()
diff --git a/src/processcontroller.h b/src/processcontroller.h
index df58ceb..4695d7a 100644
--- a/src/processcontroller.h
+++ b/src/processcontroller.h
@@ -40,7 +40,7 @@ public:
 	ProcessController(ProcessListViewItem * parent);
 	~ProcessController();
 	
-	bool gettqStatus();
+	bool getStatus();
 	bool getAutomatic();
 	void setAutomatic(bool a);
 #if KDE_IS_VERSION(3,3,90)
@@ -59,7 +59,7 @@ protected slots:
 	
 private:
 	ProcessListViewItem * myParent;
-	bool mytqStatus;
+	bool myStatus;
 	bool myAutomatic;
 #if KDE_IS_VERSION(3,3,90)
 	DNSSD::RemoteService::Ptr myService;