TDE
/
tdegraphics
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KDE_VERSION to TDE_VERSION

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 1d7bcf8647
commit 3af987b782
14 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

4
kghostview/kgv_miniwidget.cpp
Unescape View File

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

6
kghostview/kgvshell.cpp
Unescape View File

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

4
kmrml/kmrml/kcontrol/indexcleaner.cpp
Unescape View File

@ -5,7 +5,7 @@
#include "indexcleaner.h" #include "indexcleaner.h"
#include <kdeversion.h> #include <kdeversion.h>
#if KDE_VERSION < 306 #if TDE_VERSION < 306
#define TQUOTE( x ) x #define TQUOTE( x ) x
#else #else
#define TQUOTE( x ) KProcess::quote( x ) #define TQUOTE( x ) KProcess::quote( x )
@ -60,7 +60,7 @@ void IndexCleaner::startNext()
return; return;
} }
#if KDE_VERSION < 306 #if TDE_VERSION < 306
m_process = new KShellProcess(); m_process = new KShellProcess();
#else #else
m_process = new KProcess(); m_process = new KProcess();

6
kmrml/kmrml/kcontrol/indexer.cpp
Unescape View File

@ -27,7 +27,7 @@
#include "indexer.h" #include "indexer.h"
#include <kdeversion.h> #include <kdeversion.h>
#if KDE_VERSION < 306 #if TDE_VERSION < 306
#define TQUOTE( x ) x #define TQUOTE( x ) x
#else #else
#define TQUOTE( x ) KProcess::quote( x ) #define TQUOTE( x ) KProcess::quote( x )
@ -42,7 +42,7 @@ Indexer::Indexer( const KMrml::Config* config,
m_dirCount( 0 ) m_dirCount( 0 )
{ {
m_process = new KProcIO(); m_process = new KProcIO();
#if KDE_VERSION >= 306 #if TDE_VERSION >= 306
m_process->setUseShell( true ); m_process->setUseShell( true );
#endif #endif
m_process->setEnvironment( "LC_ALL", "C" ); m_process->setEnvironment( "LC_ALL", "C" );
@ -103,7 +103,7 @@ void Indexer::processNext()
cmd.replace( index, 2, TQUOTE(m_currentDir + "_thumbnails") ); cmd.replace( index, 2, TQUOTE(m_currentDir + "_thumbnails") );
// qDebug("****** command: %s", cmd.latin1()); // qDebug("****** command: %s", cmd.latin1());
#if KDE_VERSION >= 306 #if TDE_VERSION >= 306
*m_process << cmd; *m_process << cmd;
#else #else
TQStringList params = TQStringList::split( ' ', cmd ); TQStringList params = TQStringList::split( ' ', cmd );

2
kmrml/kmrml/kcontrol/mainpage.cpp
Unescape View File

@ -70,7 +70,7 @@ MainPage::MainPage( TQWidget *parent, const char *name )
m_serverWidget->m_portInput->setRange( 0, MAX_PORT_VALUE ); m_serverWidget->m_portInput->setRange( 0, MAX_PORT_VALUE );
#if KDE_VERSION >= 306 #if TDE_VERSION >= 306
KURLRequester *requester = new KURLRequester( this, "dir requester" ); KURLRequester *requester = new KURLRequester( this, "dir requester" );
requester->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); requester->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
requester->setURL( KGlobalSettings::documentPath() ); requester->setURL( KGlobalSettings::documentPath() );

2
kmrml/kmrml/lib/kmrml_config.cpp
Unescape View File

@ -29,7 +29,7 @@
#include "kmrml_config.h" #include "kmrml_config.h"
#include <kdeversion.h> #include <kdeversion.h>
#if KDE_VERSION < 307 #if TDE_VERSION < 307
#define TQUOTE( x ) x #define TQUOTE( x ) x
#else #else
#define TQUOTE( x ) KProcess::quote( x ) #define TQUOTE( x ) KProcess::quote( x )

2
kmrml/kmrml/server/watcher.cpp
Unescape View File

@ -74,7 +74,7 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
m_daemons.insert( daemonKey, daemon ); m_daemons.insert( daemonKey, daemon );
daemon->apps.append( clientAppId ); daemon->apps.append( clientAppId );
#if KDE_VERSION >= 306 #if TDE_VERSION >= 306
daemon->process = new KProcess(); daemon->process = new KProcess();
daemon->process->setUseShell( true ); daemon->process->setUseShell( true );
#else #else

2
kolourpaint/kpdefs.h
Unescape View File

@ -41,7 +41,7 @@
#define KP_IS_TQT_3_3 ([[[TQT_VERSION IS DEPRECATED]]] >= 0x030300 && 1) #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 // approx. 2896x2896x32bpp or 3344x3344x24bpp (TODO: 24==32?) or 4096*4096x16bpp

6
kpovmodeler/pmpovrayrenderwidget.cpp
Unescape View File

@ -113,7 +113,7 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene,
<< "+K0.0" << "+KFI1" << "+KFF1" << "+KI0.0" << "+KF0.0" << "+K0.0" << "+KFI1" << "+KFF1" << "+KI0.0" << "+KF0.0"
<< "+SF1" << "+EF1" << "-KC" << "-D"; << "+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( ) ) if( !documentURL.isEmpty( ) && documentURL.isLocalFile( ) )
m_pProcess->setWorkingDirectory( documentURL.directory( ) ); m_pProcess->setWorkingDirectory( documentURL.directory( ) );
#endif #endif
@ -407,7 +407,7 @@ TQSize PMPovrayRenderWidget::tqsizeHint( ) const
void PMPovrayRenderWidget::saveConfig( KConfig* cfg ) void PMPovrayRenderWidget::saveConfig( KConfig* cfg )
{ {
cfg->setGroup( "Povray" ); 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( "PovrayCommand", s_povrayCommand );
cfg->writeEntry( "LibraryPaths", s_libraryPaths ); cfg->writeEntry( "LibraryPaths", s_libraryPaths );
#else #else
@ -419,7 +419,7 @@ void PMPovrayRenderWidget::saveConfig( KConfig* cfg )
void PMPovrayRenderWidget::restoreConfig( KConfig* cfg ) void PMPovrayRenderWidget::restoreConfig( KConfig* cfg )
{ {
cfg->setGroup( "Povray" ); 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_povrayCommand = cfg->readEntry( "PovrayCommand", s_povrayCommand );
s_libraryPaths = cfg->readListEntry( "LibraryPaths" ); s_libraryPaths = cfg->readListEntry( "LibraryPaths" );
#else #else

2
kpovmodeler/pmpovraywidget.cpp
Unescape View File

@ -151,7 +151,7 @@ bool PMPovrayWidget::render( const TQByteArray& scene, const PMRenderMode& m,
w += 16; w += 16;
h += 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( ); TQWidget* dw = TQApplication::desktop( );
if( w > dw->width( ) ) if( w > dw->width( ) )
w = dw->width( ); w = dw->width( );

2
kuickshow/src/filewidget.cpp
Unescape View File

@ -42,7 +42,7 @@ FileWidget::FileWidget( const KURL& url, TQWidget *parent, const char *name )
{ {
setEnableDirHighlighting( true ); setEnableDirHighlighting( true );
#if KDE_VERSION >= 310 #if TDE_VERSION >= 310
setViewConfig( KGlobal::config(), "Filebrowser" ); setViewConfig( KGlobal::config(), "Filebrowser" );
#endif #endif
readConfig( KGlobal::config(), "Filebrowser" ); readConfig( KGlobal::config(), "Filebrowser" );

4
kuickshow/src/imagewindow.cpp
Unescape View File

@ -925,7 +925,7 @@ void ImageWindow::saveImage()
TQCheckBox *keepSize = new TQCheckBox( i18n("Keep original image size"), 0L); TQCheckBox *keepSize = new TQCheckBox( i18n("Keep original image size"), 0L);
keepSize->setChecked( true ); keepSize->setChecked( true );
KFileDialog dlg( m_saveDirectory, tmp.fileFilter, this, "filedialog", true KFileDialog dlg( m_saveDirectory, tmp.fileFilter, this, "filedialog", true
#if KDE_VERSION >= 310 #if TDE_VERSION >= 310
,keepSize ,keepSize
#endif #endif
); );
@ -962,7 +962,7 @@ void ImageWindow::saveImage()
if ( lastDir != m_saveDirectory ) if ( lastDir != m_saveDirectory )
m_saveDirectory = lastDir; m_saveDirectory = lastDir;
#if KDE_VERSION < 310 #if TDE_VERSION < 310
delete keepSize; delete keepSize;
#endif #endif
} }

2
kuickshow/src/kuickshow.cpp
Unescape View File

@ -1125,7 +1125,7 @@ void KuickShow::about()
aboutWidget->adjustSize(); aboutWidget->adjustSize();
#if KDE_VERSION >= 310 #if TDE_VERSION >= 310
KDialog::centerOnScreen( aboutWidget ); KDialog::centerOnScreen( aboutWidget );
#else #else
// Not fixed because it must be dead code now. // Not fixed because it must be dead code now.

2
kview/version.h
Unescape View File

@ -1,3 +1,3 @@
#ifndef KVIEW_VERSION #ifndef KVIEW_VERSION
#define KVIEW_VERSION KDE_VERSION_STRING #define KVIEW_VERSION TDE_VERSION_STRING
#endif #endif

Write Preview
Loading…
Cancel
Save