4 files changed, 0 insertions, 27 deletions
diff --git a/src/kstreamripper.cpp b/src/kstreamripper.cpp
index e8b59d6..7451ce5 100644
--- a/src/kstreamripper.cpp
+++ b/src/kstreamripper.cpp
@@ -52,9 +52,7 @@
 
 KStreamRipper::KStreamRipper( TQWidget* parent, const char* name )
     : KStreamRipperBase( parent,name )
-#if KDE_IS_VERSION(3,3,90)
 	, m_browser("_shoutcast._tcp",0,true)
-#endif
 {
     m_destEdit->setText( TQDir::homeDirPath() );
 
@@ -125,13 +123,11 @@ KStreamRipper::KStreamRipper( TQWidget* parent, const char* name )
     connect( m_streamsListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT( selectedNewListItem()) );
 
     // zeroconf
-#if KDE_IS_VERSION(3,3,90)
     connect(&m_browser, TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), this,
             TQ_SLOT(serviceAdded(DNSSD::RemoteService::Ptr)));
     connect(&m_browser, TQ_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)), this,
             TQ_SLOT(serviceRemoved(DNSSD::RemoteService::Ptr)));
     m_browser.startBrowse();
-#endif
 }
 
 
@@ -239,7 +235,6 @@ void KStreamRipper::tuneInButtonClicked()
     else ;
 }
 
-#if KDE_IS_VERSION(3,3,90)
 void KStreamRipper::serviceAdded(DNSSD::RemoteService::Ptr srv)
 {
     ProcessListViewItem * proc = new ProcessListViewItem( m_streamsListView, srv->serviceName(), "", "");
@@ -264,7 +259,6 @@ void KStreamRipper::serviceRemoved(DNSSD::RemoteService::Ptr srv)
     }
 
 }
-#endif
 
 void KStreamRipper::ripButtonClicked()
 {
diff --git a/src/kstreamripper.h b/src/kstreamripper.h
index 6752625..9d57d41 100644
--- a/src/kstreamripper.h
+++ b/src/kstreamripper.h
@@ -26,14 +26,8 @@
 #include "kstreamripperbase.h"
 #include "processcontroller.h"
 
-#if KDE_IS_VERSION(3,3,90)
 #include <dnssd/servicebrowser.h>
 #include <dnssd/remoteservice.h>
-#else
-// damned moc will create slots regardless of #if macro
-// this is hack to avoid undefined type
-namespace  DNSSD { namespace RemoteService { typedef int Ptr; } } 
-#endif
 
 
 class TQPopupMenu;
@@ -51,9 +45,7 @@ public:
     ~KStreamRipper();
 
     virtual void closeEvent( TQCloseEvent* );
-#if KDE_IS_VERSION(3,3,90)
     DNSSD::ServiceBrowser m_browser;	
-#endif
 
 protected slots:
 
@@ -75,13 +67,8 @@ protected slots:
     void addStreamFinished( StreamPropertiesDlg* );
     void editStreamFinished( StreamPropertiesDlg* );
 
-#if KDE_IS_VERSION(3,3,90)
     void serviceAdded(DNSSD::RemoteService::Ptr srv);
     void serviceRemoved(DNSSD::RemoteService::Ptr srv);
-#else
-    void serviceAdded(DNSSD::RemoteService::Ptr) {};
-    void serviceRemoved(DNSSD::RemoteService::Ptr) {};
-#endif
 private:
 
     TQPopupMenu* contextMenu;
diff --git a/src/processcontroller.cpp b/src/processcontroller.cpp
index 4e470d0..e32939e 100644
--- a/src/processcontroller.cpp
+++ b/src/processcontroller.cpp
@@ -143,7 +143,6 @@ bool ProcessController::getAutomatic()
 {
 	return myAutomatic;
 }
-#if KDE_IS_VERSION(3,3,90)
 void ProcessController::setService(DNSSD::RemoteService::Ptr service)
 {
 	myService = service;
@@ -153,7 +152,6 @@ DNSSD::RemoteService::Ptr ProcessController::getService()
 {
 	return myService;
 }
-#endif
 
 TQString ProcessController::getDescription()
 {
diff --git a/src/processcontroller.h b/src/processcontroller.h
index 16b3358..327319f 100644
--- a/src/processcontroller.h
+++ b/src/processcontroller.h
@@ -26,9 +26,7 @@
 #include <tqtimer.h>
 #include <tqobject.h>
 #include <tdeversion.h>
-#if KDE_IS_VERSION(3,3,90)
 #include <dnssd/remoteservice.h>
-#endif
 
 class ProcessListViewItem;
 
@@ -43,10 +41,8 @@ public:
 	bool getStatus();
 	bool getAutomatic();
 	void setAutomatic(bool a);
-#if KDE_IS_VERSION(3,3,90)
 	DNSSD::RemoteService::Ptr getService();
 	void setService(DNSSD::RemoteService::Ptr service);
-#endif
 	void setUrl(TQString Url);
 	void setDescription(TQString Description);
 	TQString getUrl();
@@ -66,9 +62,7 @@ private:
 	bool myStatus;
 	bool myAutomatic;
 	bool myUnicodeEnabled;
-#if KDE_IS_VERSION(3,3,90)
 	DNSSD::RemoteService::Ptr myService;
-#endif	
 	TQProcess * myProcess;
 	TQString myUrl;
 	TQString myDescription;