From 2f0d499e563eefeaa8c603eb114640333e2377b0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 26 Dec 2011 20:05:35 -0600
Subject: [PATCH] Rename KDE_MAKE_VERSION and update TDE version string

---
 src/kile/kileconfigdialog.cpp | 6 +++---
 src/kile/kilegrepdialog.cpp   | 2 +-
 src/kile/kilelistselector.cpp | 2 +-
 src/kile/kilesidebar.cpp      | 2 +-
 src/kile/kilestatsdlg.cpp     | 2 +-
 src/kile/kileviewmanager.cpp  | 2 +-
 src/kile/texdocdialog.cpp     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/kile/kileconfigdialog.cpp b/src/kile/kileconfigdialog.cpp
index adae9a4..bb9342a 100644
--- a/src/kile/kileconfigdialog.cpp
+++ b/src/kile/kileconfigdialog.cpp
@@ -121,7 +121,7 @@ namespace KileDialog
 		TQStringList path;
 		path << section;
 
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 		setFolderIcon(path, SmallIcon(icon, KIcon::SizeSmallMedium));
 #else
                 setFolderIcon(path, SmallIcon(icon));
@@ -142,7 +142,7 @@ namespace KileDialog
 		path << sectionName << itemName;
 	
 		TQVBox *vbox = addVBoxPage(path, header,
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
                 SmallIcon(pixmapName,KIcon::SizeSmallMedium)
 #else
                 SmallIcon(pixmapName)
@@ -277,7 +277,7 @@ namespace KileDialog
 			path << i18n("Editor") << iface->configPageName(i);
 
 			// create a new vbox page and add the config page
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 			TQVBox *page = addVBoxPage(path,iface->configPageFullName(i), iface->configPagePixmap(i,KIcon::SizeSmallMedium) );
 #else
 			TQVBox *page = addVBoxPage(path,iface->configPageFullName(i), iface->configPagePixmap(i) );
diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp
index 9ecef3c..b9f37aa 100644
--- a/src/kile/kilegrepdialog.cpp
+++ b/src/kile/kilegrepdialog.cpp
@@ -210,7 +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 >= KDE_MAKE_VERSION(3,3,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 	close_button = actionbox->addButton(KStdGuiItem::close());
 #else
         close_button = actionbox->addButton(i18n("Cl&ose"));
diff --git a/src/kile/kilelistselector.cpp b/src/kile/kilelistselector.cpp
index 39a931d..43c0bd1 100644
--- a/src/kile/kilelistselector.cpp
+++ b/src/kile/kilelistselector.cpp
@@ -47,7 +47,7 @@ KileListSelectorBase::KileListSelectorBase(const TQStringList &list, const TQStr
 	//setShadeSortColumn(true);                         // default: true
 	m_listview->header()->setMovingEnabled(false);      // default: true
 
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 	m_listview->setShadeSortColumn(false);
 #endif
 	layout->addWidget(m_listview);
diff --git a/src/kile/kilesidebar.cpp b/src/kile/kilesidebar.cpp
index 54be30d..10fd2a8 100644
--- a/src/kile/kilesidebar.cpp
+++ b/src/kile/kilesidebar.cpp
@@ -61,7 +61,7 @@ KileSideBar::KileSideBar(int size, TQWidget *parent, const char *name, Qt::Orien
 	m_tabBar = new KileMultiTabBar(tabbarori, this);
 	m_tabBar->setPosition(tabbarpos);
 
-	#if TDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
+	#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 		m_tabBar->setStyle(KileMultiTabBar::KDEV3ICON);
  	#else
  		m_tabBar->setStyle(KileMultiTabBar::KDEV3);
diff --git a/src/kile/kilestatsdlg.cpp b/src/kile/kilestatsdlg.cpp
index 3649dd6..8374ac0 100644
--- a/src/kile/kilestatsdlg.cpp
+++ b/src/kile/kilestatsdlg.cpp
@@ -98,7 +98,7 @@ 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 >= KDE_MAKE_VERSION(3,3,0)
+#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
diff --git a/src/kile/kileviewmanager.cpp b/src/kile/kileviewmanager.cpp
index 72467f5..5220201 100644
--- a/src/kile/kileviewmanager.cpp
+++ b/src/kile/kileviewmanager.cpp
@@ -133,7 +133,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 >= KDE_MAKE_VERSION(3,4,0)
+	#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 		m_tabs->setTabToolTip(view, doc->url().pathOrURL() );
 	#else
 		m_tabs->setTabToolTip(view, doc->url().prettyURL() );
diff --git a/src/kile/texdocdialog.cpp b/src/kile/texdocdialog.cpp
index 7d6e353..5783142 100644
--- a/src/kile/texdocdialog.cpp
+++ b/src/kile/texdocdialog.cpp
@@ -49,7 +49,7 @@ namespace KileDialog
 
 TexDocDialog::TexDocDialog(TQWidget *parent, const char *name) 
    : KDialogBase( parent,name, true, i18n("Documentation Browser"), Close | Help, 
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
      NoDefault
 #else
      Close