Rename KDE_MAKE_VERSION and update TDE version string

kghostview/kgv_miniwidget.cpp

@@ -29,7 +29,7 @@
 #include <kmessagebox.h>
 
 // KLineEditDlg is depricated as of 3.2. use KInputDialog instead
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
   #include <kinputdialog.h>
 #else
   #include <tqvalidator.h>
@@ -115,7 +115,7 @@ void KGVMiniWidget::setPSWidget( KPSWidget* psWidget )
 
 void KGVMiniWidget::goToPage()
 {
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
 	int num;
 	bool ok = false;
 	num = KInputDialog::getInteger(i18n("Go to Page"), i18n("Page:"), 1,

kghostview/kgvshell.cpp

@@ -85,12 +85,12 @@ KGVShell::KGVShell() :
     _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() );
 
     /*---- Settings -------------------------------------------------------*/
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
     createStandardStatusBarAction();
 #endif
     setAutoSaveSettings();
     setStandardToolBarMenuEnabled(true);
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
     m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
 #else
     m_fullScreenAction = new KToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
@@ -338,7 +338,7 @@ void KGVShell::slotUpdateFullScreen()
 	kapp->removeEventFilter( m_fsFilter );
 	m_gvpart->updateFullScreen( false );
 	menuBar()->show();
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
 	KToggleAction *statusbarAction = dynamic_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
 	assert( statusbarAction );
 	if (statusbarAction->isChecked()) statusBar()->show();

kuickshow/src/kuickfile.cpp

@@ -160,7 +160,7 @@ void KuickFile::slotResult( KIO::Job *job )
 
 	    if ( m_progress ) {
 	        m_progress->setProgress( 100 );
-#define BUGGY_VERSION KDE_MAKE_VERSION(3,5,2)
+#define BUGGY_VERSION TDE_MAKE_VERSION(3,5,2)
 	        if ( KDE::version() <= BUGGY_VERSION ) {
 	            m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog
 	        }