Remove use of TDE_VERSION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

10 files changed, 3 insertions, 47 deletions

diff --git a/src/kile/configcodecompletion.h b/src/kile/configcodecompletion.h
index ccaf28d..c218460 100644
--- a/src/kile/configcodecompletion.h
+++ b/src/kile/configcodecompletion.h
@@ -24,7 +24,6 @@
 #include <tqspinbox.h>
 #include <tqstring.h>
 
-#include <tdeversion.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
diff --git a/src/kile/kile.h b/src/kile/kile.h
index 3f64976..1f647d9 100644
--- a/src/kile/kile.h
+++ b/src/kile/kile.h
@@ -16,7 +16,6 @@
 #ifndef KILE_H
 #define KILE_H
 
-#include <tdeversion.h>
 #include <kate/view.h>
 #include <kate/document.h>
 #include <dcopobject.h>
diff --git a/src/kile/kileconfigdialog.cpp b/src/kile/kileconfigdialog.cpp
index 2f61b99..43554e0 100644
--- a/src/kile/kileconfigdialog.cpp
+++ b/src/kile/kileconfigdialog.cpp
@@ -33,7 +33,6 @@
 #include <tqlayout.h>
 #include <tqtextcodec.h>
 
-#include <tdeversion.h>
 #include <tdelocale.h>
 #include <ksconfig.h>
 #include <kiconloader.h>
@@ -120,12 +119,7 @@ namespace KileDialog
 	{
 		TQStringList path;
 		path << section;
-
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 		setFolderIcon(path, SmallIcon(icon, TDEIcon::SizeSmallMedium));
-#else
-                setFolderIcon(path, SmallIcon(icon));
-#endif
 	}
 
 	//////////////////// add a new page ////////////////////
@@ -142,11 +136,7 @@ namespace KileDialog
 		path << sectionName << itemName;
 	
 		TQVBox *vbox = addVBoxPage(path, header,
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
                 SmallIcon(pixmapName,TDEIcon::SizeSmallMedium)
-#else
-                SmallIcon(pixmapName)
-#endif
                 );
 		vbox->setSpacing(0); 
 		vbox->setMargin(0);
@@ -277,11 +267,7 @@ namespace KileDialog
 			path << i18n("Editor") << iface->configPageName(i);
 
 			// create a new vbox page and add the config page
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 			TQVBox *page = addVBoxPage(path,iface->configPageFullName(i), iface->configPagePixmap(i,TDEIcon::SizeSmallMedium) );
-#else
-			TQVBox *page = addVBoxPage(path,iface->configPageFullName(i), iface->configPagePixmap(i) );
-#endif
 			KTextEditor::ConfigPage *configPage = iface->configPage(i,page);
 			connect( configPage, TQ_SIGNAL(changed()), this, TQ_SLOT(slotChanged()) );
 			editorPages.append(configPage);
diff --git a/src/kile/kileconfigdialog.h b/src/kile/kileconfigdialog.h
index f314fae..5f38d93 100644
--- a/src/kile/kileconfigdialog.h
+++ b/src/kile/kileconfigdialog.h
@@ -17,7 +17,6 @@
 #define TOOLSOPTIONSDIALOG_H
 
 #include <kdialogbase.h>
-#include <tdeversion.h>
 
 #include <tdetexteditor/configinterfaceextension.h>
 #include <tdeconfigdialogmanager.h>
diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp
index e78e9e6..112405a 100644
--- a/src/kile/kilegrepdialog.cpp
+++ b/src/kile/kilegrepdialog.cpp
@@ -210,11 +210,7 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
 	clear_button = actionbox->addButton(i18n("&Clear"));
 	clear_button->setEnabled(false);
 	actionbox->addStretch();
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 	close_button = actionbox->addButton(KStdGuiItem::close());
-#else
-        close_button = actionbox->addButton(i18n("Cl&ose"));
-#endif
 	actionbox->layout();
 
 	// adjust labels
diff --git a/src/kile/kilelistselector.cpp b/src/kile/kilelistselector.cpp
index b8263de..9b30eb9 100644
--- a/src/kile/kilelistselector.cpp
+++ b/src/kile/kilelistselector.cpp
@@ -46,10 +46,7 @@ KileListSelectorBase::KileListSelectorBase(const TQStringList &list, const TQStr
 	//setDragEnabled(false);                            // default: false
 	//setShadeSortColumn(true);                         // default: true
 	m_listview->header()->setMovingEnabled(false);      // default: true
-
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 	m_listview->setShadeSortColumn(false);
-#endif
 	layout->addWidget(m_listview);
 
 	insertStringList(list);
diff --git a/src/kile/kilesidebar.cpp b/src/kile/kilesidebar.cpp
index e0567a1..1cfe84b 100644
--- a/src/kile/kilesidebar.cpp
+++ b/src/kile/kilesidebar.cpp
@@ -20,7 +20,6 @@
 #include <tqwidgetstack.h>
 #include <tqlayout.h>
 
-#include <tdeversion.h>
 #include "kiledebug.h"
 #include "kilemultitabbar.h"
 
@@ -60,12 +59,7 @@ KileSideBar::KileSideBar(int size, TQWidget *parent, const char *name, TQt::Orie
 
 	m_tabBar = new KileMultiTabBar(tabbarori, this);
 	m_tabBar->setPosition(tabbarpos);
-
-	#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
-		m_tabBar->setStyle(KileMultiTabBar::KDEV3ICON);
- 	#else
- 		m_tabBar->setStyle(KileMultiTabBar::KDEV3);
- 	#endif
+	m_tabBar->setStyle(KileMultiTabBar::KDEV3ICON);
 
 	if ( orientation == TQt::Horizontal )
 	{
diff --git a/src/kile/kilestatsdlg.cpp b/src/kile/kilestatsdlg.cpp
index e7b708b..27cea55 100644
--- a/src/kile/kilestatsdlg.cpp
+++ b/src/kile/kilestatsdlg.cpp
@@ -98,10 +98,8 @@ KileStatsDlg::KileStatsDlg(KileProject *project, KileDocument::TextInfo* docinfo
 			if(m_notAllFilesOpenWarning)
 				summary->m_warning->setText(i18n("To get statistics for all project files, you have to open them all."));
 
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 			KILE_DEBUG() << "All keys in name " << m_pagetoname.keys() << " Nr. of keys " << m_pagetowidget.count() << endl;
 			KILE_DEBUG() << "All keys in widget " << m_pagetowidget.keys() << " Nr. of keys " << m_pagetowidget.count() << endl;
-#endif
 		}
 	}
 // 	setInitialSize( TQSize(550,560), true);
diff --git a/src/kile/kileviewmanager.cpp b/src/kile/kileviewmanager.cpp
index 0acfc73..90d4928 100644
--- a/src/kile/kileviewmanager.cpp
+++ b/src/kile/kileviewmanager.cpp
@@ -23,7 +23,6 @@
 #include <tqpixmap.h>
 #include <tqclipboard.h>
 
-#include <tdeversion.h>
 #include <tdeglobal.h>
 #include <kate/view.h>
 #include <kate/document.h>
@@ -133,11 +132,7 @@ Kate::View* Manager::createTextView(KileDocument::TextInfo *info, int index)
 
 	//insert the view in the tab widget
 	m_tabs->insertTab( view, m_ki->getShortName(doc), index );
-	#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
-		m_tabs->setTabToolTip(view, doc->url().pathOrURL() );
-	#else
-		m_tabs->setTabToolTip(view, doc->url().prettyURL() );
-	#endif
+	m_tabs->setTabToolTip(view, doc->url().pathOrURL() );
 	
 	m_tabs->showPage( view );
 	m_textViewList.insert((index < 0 || (uint)index >= m_textViewList.count()) ? m_textViewList.count() : index, view);
diff --git a/src/kile/texdocdialog.cpp b/src/kile/texdocdialog.cpp
index b90b552..f841f64 100644
--- a/src/kile/texdocdialog.cpp
+++ b/src/kile/texdocdialog.cpp
@@ -36,7 +36,6 @@
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include "kiledebug.h"
-#include <tdeversion.h>
 
 #include <ktrader.h>
 #include <kservice.h>
@@ -48,13 +47,7 @@ namespace KileDialog
 //BEGIN TexDocDialog
 
 TexDocDialog::TexDocDialog(TQWidget *parent, const char *name) 
-   : KDialogBase( parent,name, true, i18n("Documentation Browser"), Close | Help, 
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
-     NoDefault
-#else
-     Close
-#endif
-     , true ),
+   : KDialogBase(parent,name, true, i18n("Documentation Browser"), Close | Help, NoDefault, true),
      m_tempfile(0), m_proc(0)
 {
 	TQWidget *page = new TQWidget( this );