From 3af987b7825866d742487cb6aa5b82bf0adf7543 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Nov 2011 18:56:27 -0600 Subject: [PATCH] Rename KDE_VERSION to TDE_VERSION --- kghostview/kgv_miniwidget.cpp | 4 ++-- kghostview/kgvshell.cpp | 6 +++--- kmrml/kmrml/kcontrol/indexcleaner.cpp | 4 ++-- kmrml/kmrml/kcontrol/indexer.cpp | 6 +++--- kmrml/kmrml/kcontrol/mainpage.cpp | 2 +- kmrml/kmrml/lib/kmrml_config.cpp | 2 +- kmrml/kmrml/server/watcher.cpp | 2 +- kolourpaint/kpdefs.h | 2 +- kpovmodeler/pmpovrayrenderwidget.cpp | 6 +++--- kpovmodeler/pmpovraywidget.cpp | 2 +- kuickshow/src/filewidget.cpp | 2 +- kuickshow/src/imagewindow.cpp | 4 ++-- kuickshow/src/kuickshow.cpp | 2 +- kview/version.h | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index 5c17fc19..8d9bf827 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -29,7 +29,7 @@ #include // KLineEditDlg is depricated as of 3.2. use KInputDialog instead -#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90) #include #else #include @@ -115,7 +115,7 @@ void KGVMiniWidget::setPSWidget( KPSWidget* psWidget ) void KGVMiniWidget::goToPage() { -#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90) int num; bool ok = false; num = KInputDialog::getInteger(i18n("Go to Page"), i18n("Page:"), 1, diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 74df4cde..568b209b 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -85,12 +85,12 @@ KGVShell::KGVShell() : _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() ); /*---- Settings -------------------------------------------------------*/ -#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90) createStandardStatusBarAction(); #endif setAutoSaveSettings(); setStandardToolBarMenuEnabled(true); -#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= KDE_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 KDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90) KToggleAction *statusbarAction = dynamic_cast(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar))); assert( statusbarAction ); if (statusbarAction->isChecked()) statusBar()->show(); diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp index 3c09b7a3..77c856f3 100644 --- a/kmrml/kmrml/kcontrol/indexcleaner.cpp +++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp @@ -5,7 +5,7 @@ #include "indexcleaner.h" #include -#if KDE_VERSION < 306 +#if TDE_VERSION < 306 #define TQUOTE( x ) x #else #define TQUOTE( x ) KProcess::quote( x ) @@ -60,7 +60,7 @@ void IndexCleaner::startNext() return; } -#if KDE_VERSION < 306 +#if TDE_VERSION < 306 m_process = new KShellProcess(); #else m_process = new KProcess(); diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp index 78e83f76..ab80df04 100644 --- a/kmrml/kmrml/kcontrol/indexer.cpp +++ b/kmrml/kmrml/kcontrol/indexer.cpp @@ -27,7 +27,7 @@ #include "indexer.h" #include -#if KDE_VERSION < 306 +#if TDE_VERSION < 306 #define TQUOTE( x ) x #else #define TQUOTE( x ) KProcess::quote( x ) @@ -42,7 +42,7 @@ Indexer::Indexer( const KMrml::Config* config, m_dirCount( 0 ) { m_process = new KProcIO(); -#if KDE_VERSION >= 306 +#if TDE_VERSION >= 306 m_process->setUseShell( true ); #endif m_process->setEnvironment( "LC_ALL", "C" ); @@ -103,7 +103,7 @@ void Indexer::processNext() cmd.replace( index, 2, TQUOTE(m_currentDir + "_thumbnails") ); // qDebug("****** command: %s", cmd.latin1()); -#if KDE_VERSION >= 306 +#if TDE_VERSION >= 306 *m_process << cmd; #else TQStringList params = TQStringList::split( ' ', cmd ); diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp index c44f1b0e..a03266a5 100644 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ b/kmrml/kmrml/kcontrol/mainpage.cpp @@ -70,7 +70,7 @@ MainPage::MainPage( TQWidget *parent, const char *name ) m_serverWidget->m_portInput->setRange( 0, MAX_PORT_VALUE ); -#if KDE_VERSION >= 306 +#if TDE_VERSION >= 306 KURLRequester *requester = new KURLRequester( this, "dir requester" ); requester->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); requester->setURL( KGlobalSettings::documentPath() ); diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp index 2167448b..97172f84 100644 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ b/kmrml/kmrml/lib/kmrml_config.cpp @@ -29,7 +29,7 @@ #include "kmrml_config.h" #include -#if KDE_VERSION < 307 +#if TDE_VERSION < 307 #define TQUOTE( x ) x #else #define TQUOTE( x ) KProcess::quote( x ) diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp index 60b37c48..e9f895ad 100644 --- a/kmrml/kmrml/server/watcher.cpp +++ b/kmrml/kmrml/server/watcher.cpp @@ -74,7 +74,7 @@ bool Watcher::requireDaemon( const TQCString& clientAppId, m_daemons.insert( daemonKey, daemon ); daemon->apps.append( clientAppId ); -#if KDE_VERSION >= 306 +#if TDE_VERSION >= 306 daemon->process = new KProcess(); daemon->process->setUseShell( true ); #else diff --git a/kolourpaint/kpdefs.h b/kolourpaint/kpdefs.h index c46ccec9..d4abb622 100644 --- a/kolourpaint/kpdefs.h +++ b/kolourpaint/kpdefs.h @@ -41,7 +41,7 @@ #define KP_IS_TQT_3_3 ([[[TQT_VERSION IS DEPRECATED]]] >= 0x030300 && 1) -#define KP_IS_KDE_3_3 ((KDE_VERSION_MAJOR >= 3 && KDE_VERSION_MINOR >= 3) && 1) +#define KP_IS_KDE_3_3 ((TDE_VERSION_MAJOR >= 3 && TDE_VERSION_MINOR >= 3) && 1) // approx. 2896x2896x32bpp or 3344x3344x24bpp (TODO: 24==32?) or 4096*4096x16bpp diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp index aae9c137..ac95309c 100644 --- a/kpovmodeler/pmpovrayrenderwidget.cpp +++ b/kpovmodeler/pmpovrayrenderwidget.cpp @@ -113,7 +113,7 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene, << "+K0.0" << "+KFI1" << "+KFF1" << "+KI0.0" << "+KF0.0" << "+SF1" << "+EF1" << "-KC" << "-D"; -#if ( ( KDE_VERSION_MAJOR == 2 ) && ( KDE_VERSION_MINOR >= 9 ) ) || ( KDE_VERSION_MAJOR == 3 ) +#if ( ( TDE_VERSION_MAJOR == 2 ) && ( TDE_VERSION_MINOR >= 9 ) ) || ( TDE_VERSION_MAJOR == 3 ) if( !documentURL.isEmpty( ) && documentURL.isLocalFile( ) ) m_pProcess->setWorkingDirectory( documentURL.directory( ) ); #endif @@ -407,7 +407,7 @@ TQSize PMPovrayRenderWidget::tqsizeHint( ) const void PMPovrayRenderWidget::saveConfig( KConfig* cfg ) { cfg->setGroup( "Povray" ); -#if ( ( KDE_VERSION_MAJOR == 3 ) && ( KDE_VERSION_MINOR <= 1 ) ) +#if ( ( TDE_VERSION_MAJOR == 3 ) && ( TDE_VERSION_MINOR <= 1 ) ) cfg->writeEntry( "PovrayCommand", s_povrayCommand ); cfg->writeEntry( "LibraryPaths", s_libraryPaths ); #else @@ -419,7 +419,7 @@ void PMPovrayRenderWidget::saveConfig( KConfig* cfg ) void PMPovrayRenderWidget::restoreConfig( KConfig* cfg ) { cfg->setGroup( "Povray" ); -#if ( ( KDE_VERSION_MAJOR == 3 ) && ( KDE_VERSION_MINOR <= 1 ) ) +#if ( ( TDE_VERSION_MAJOR == 3 ) && ( TDE_VERSION_MINOR <= 1 ) ) s_povrayCommand = cfg->readEntry( "PovrayCommand", s_povrayCommand ); s_libraryPaths = cfg->readListEntry( "LibraryPaths" ); #else diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp index 086ced61..c4ce83cb 100644 --- a/kpovmodeler/pmpovraywidget.cpp +++ b/kpovmodeler/pmpovraywidget.cpp @@ -151,7 +151,7 @@ bool PMPovrayWidget::render( const TQByteArray& scene, const PMRenderMode& m, w += 16; h += 16; -#if ( ( KDE_VERSION_MAJOR == 3 ) && ( KDE_VERSION_MINOR <= 1 ) ) +#if ( ( TDE_VERSION_MAJOR == 3 ) && ( TDE_VERSION_MINOR <= 1 ) ) TQWidget* dw = TQApplication::desktop( ); if( w > dw->width( ) ) w = dw->width( ); diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 7bd52834..170b5fa5 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -42,7 +42,7 @@ FileWidget::FileWidget( const KURL& url, TQWidget *parent, const char *name ) { setEnableDirHighlighting( true ); -#if KDE_VERSION >= 310 +#if TDE_VERSION >= 310 setViewConfig( KGlobal::config(), "Filebrowser" ); #endif readConfig( KGlobal::config(), "Filebrowser" ); diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 1d11a423..8d0dd3da 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -925,7 +925,7 @@ void ImageWindow::saveImage() TQCheckBox *keepSize = new TQCheckBox( i18n("Keep original image size"), 0L); keepSize->setChecked( true ); KFileDialog dlg( m_saveDirectory, tmp.fileFilter, this, "filedialog", true -#if KDE_VERSION >= 310 +#if TDE_VERSION >= 310 ,keepSize #endif ); @@ -962,7 +962,7 @@ void ImageWindow::saveImage() if ( lastDir != m_saveDirectory ) m_saveDirectory = lastDir; -#if KDE_VERSION < 310 +#if TDE_VERSION < 310 delete keepSize; #endif } diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 0dd6d2bf..ee308444 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -1125,7 +1125,7 @@ void KuickShow::about() aboutWidget->adjustSize(); -#if KDE_VERSION >= 310 +#if TDE_VERSION >= 310 KDialog::centerOnScreen( aboutWidget ); #else // Not fixed because it must be dead code now. diff --git a/kview/version.h b/kview/version.h index e4a147a5..be12d7fe 100644 --- a/kview/version.h +++ b/kview/version.h @@ -1,3 +1,3 @@ #ifndef KVIEW_VERSION -#define KVIEW_VERSION KDE_VERSION_STRING +#define KVIEW_VERSION TDE_VERSION_STRING #endif