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

Remove use of TDE_VERSION

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit b200dc191e)
r14.1.x
Michele Calgaro 5 days ago
parent 5cac7bf90b
commit 1cd3a7d43c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
15 changed files with 6 additions and 84 deletions
Show Stats Download Patch File Download Diff File

18
kghostview/kgv_miniwidget.cpp
Unescape Escape View File

@ -24,18 +24,9 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeinstance.h>
#include <tdeversion.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
// KLineEditDlg is depricated as of 3.2. use KInputDialog instead
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
#include <kinputdialog.h>
#else
#include <tqvalidator.h>
#include <tqwidget.h>
#include <klineeditdlg.h>
#endif
#include <kinputdialog.h>
#include <config.h>
#include <stdlib.h>
@ -115,18 +106,11 @@ void KGVMiniWidget::setPSWidget( KPSWidget* psWidget )
void KGVMiniWidget::goToPage()
{
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
int num;
bool ok = false;
num = KInputDialog::getInteger(i18n("Go to Page"), i18n("Page:"), 1,
1, dsc()->page_count(), 1, 10, &ok, _part->widget());
if (ok) goToPage( num-1 );
#else
TQString num;
bool b = false;
num = KLineEditDlg::getText(i18n("Go to Page"), i18n("Page:"), TQString(), &b, _part->widget(), new TQIntValidator(1, dsc()->page_count(), this));
if (b) goToPage( num.toInt() - 1 );
#endif
}
void KGVMiniWidget::info()

8
kghostview/kgvshell.cpp
Unescape Escape View File

@ -85,16 +85,10 @@ KGVShell::KGVShell() :
_showMenuBarAction = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenubar() ), actionCollection() );
/*---- Settings -------------------------------------------------------*/
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
createStandardStatusBarAction();
#endif
setAutoSaveSettings();
setStandardToolBarMenuEnabled(true);
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
m_fullScreenAction = KStdAction::fullScreen( this, TQ_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
#else
m_fullScreenAction = new TDEToggleAction( this, TQ_SLOT( slotUpdateFullScreen() ) );
#endif
KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() );
KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()),
actionCollection());
@ -338,11 +332,9 @@ void KGVShell::slotUpdateFullScreen()
kapp->removeEventFilter( m_fsFilter );
m_gvpart->updateFullScreen( false );
menuBar()->show();
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
TDEToggleAction *statusbarAction = dynamic_cast<TDEToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
assert( statusbarAction );
if (statusbarAction->isChecked()) statusBar()->show();
#endif
toolBar()->show();
showNormal();
}

6
kolourpaint/kpdefs.h
Unescape Escape View File

@ -37,12 +37,6 @@
#include <tqsize.h>
#include <tqstring.h>
#include <tdeversion.h>
#define KP_IS_TQT_3_3 ([[[TQT_VERSION IS DEPRECATED]]] >= 0x030300 && 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
#define KP_BIG_IMAGE_SIZE (32 * 1048576)

1
kpdf/part.cpp
Unescape Escape View File

@ -41,7 +41,6 @@
#include <kprinter.h>
#include <tdeprint/kprintdialogpage.h>
#include <kstdaction.h>
#include <tdeversion.h>
#include <tdeparts/genericfactory.h>
#include <kurldrag.h>
#include <tdefiledialog.h>

1
kpdf/ui/minibar.cpp
Unescape Escape View File

@ -18,7 +18,6 @@
#include <tqpainter.h>
#include <kiconloader.h>
#include <tdeaccelmanager.h>
#include <tdeversion.h>
// local includes
#include "core/document.h"

12
kpovmodeler/pmpovrayrenderwidget.cpp
Unescape Escape View File

@ -113,10 +113,8 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene,
<< "+K0.0" << "+KFI1" << "+KFF1" << "+KI0.0" << "+KF0.0"
<< "+SF1" << "+EF1" << "-KC" << "-D";
#if ( ( TDE_VERSION_MAJOR == 2 ) && ( TDE_VERSION_MINOR >= 9 ) ) || ( TDE_VERSION_MAJOR == 3 )
if( !documentURL.isEmpty( ) && documentURL.isLocalFile( ) )
m_pProcess->setWorkingDirectory( documentURL.directory( ) );
#endif
m_rcvHeader = true;
m_rcvHeaderBytes = 0;
@ -407,25 +405,15 @@ TQSize PMPovrayRenderWidget::sizeHint( ) const
void PMPovrayRenderWidget::saveConfig( TDEConfig* cfg )
{
cfg->setGroup( "Povray" );
#if ( ( TDE_VERSION_MAJOR == 3 ) && ( TDE_VERSION_MINOR <= 1 ) )
cfg->writeEntry( "PovrayCommand", s_povrayCommand );
cfg->writeEntry( "LibraryPaths", s_libraryPaths );
#else
cfg->writePathEntry( "PovrayCommand", s_povrayCommand );
cfg->writePathEntry( "LibraryPaths", s_libraryPaths );
#endif
}
void PMPovrayRenderWidget::restoreConfig( TDEConfig* cfg )
{
cfg->setGroup( "Povray" );
#if ( ( TDE_VERSION_MAJOR == 3 ) && ( TDE_VERSION_MINOR <= 1 ) )
s_povrayCommand = cfg->readEntry( "PovrayCommand", s_povrayCommand );
s_libraryPaths = cfg->readListEntry( "LibraryPaths" );
#else
s_povrayCommand = cfg->readPathEntry( "PovrayCommand", s_povrayCommand );
s_libraryPaths = cfg->readPathListEntry( "LibraryPaths" );
#endif
}
void PMPovrayRenderWidget::startDrag( )

8
kpovmodeler/pmpovraywidget.cpp
Unescape Escape View File

@ -151,19 +151,11 @@ bool PMPovrayWidget::render( const TQByteArray& scene, const PMRenderMode& m,
w += 16;
h += 16;
#if ( ( TDE_VERSION_MAJOR == 3 ) && ( TDE_VERSION_MINOR <= 1 ) )
TQWidget* dw = TQApplication::desktop( );
if( w > dw->width( ) )
w = dw->width( );
if( h > dw->height( ) )
h = dw->height( );
#else
TQRect dw = TDEGlobalSettings::desktopGeometry(this);
if( w > dw.width() )
w = dw.width();
if( h > dw.height() )
h = dw.height();
#endif
resize( w, h );
}

3
kuickshow/src/filewidget.cpp
Unescape Escape View File

@ -18,7 +18,6 @@
#include <tqkeycode.h>
#include <tdeversion.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <tdelocale.h>
@ -42,9 +41,7 @@ FileWidget::FileWidget( const KURL& url, TQWidget *parent, const char *name )
{
setEnableDirHighlighting( true );
#if TDE_VERSION >= 310
setViewConfig( TDEGlobal::config(), "Filebrowser" );
#endif
readConfig( TDEGlobal::config(), "Filebrowser" );
setView( KFile::Default );

11
kuickshow/src/imagewindow.cpp
Unescape Escape View File

@ -40,7 +40,6 @@
#include <tdeconfig.h>
#include <kcursor.h>
#include <kdebug.h>
#include <tdeversion.h>
#ifdef KDE_USE_FINAL
#undef Unsorted
#endif
@ -924,11 +923,7 @@ void ImageWindow::saveImage()
KuickData tmp;
TQCheckBox *keepSize = new TQCheckBox( i18n("Keep original image size"), 0L);
keepSize->setChecked( true );
KFileDialog dlg( m_saveDirectory, tmp.fileFilter, this, "filedialog", true
#if TDE_VERSION >= 310
,keepSize
#endif
);
KFileDialog dlg( m_saveDirectory, tmp.fileFilter, this, "filedialog", true ,keepSize);
TQString selection = m_saveDirectory.isEmpty() ?
m_kuim->url().url() :
@ -961,10 +956,6 @@ void ImageWindow::saveImage()
TQString lastDir = dlg.baseURL().path(+1);
if ( lastDir != m_saveDirectory )
m_saveDirectory = lastDir;
#if TDE_VERSION < 310
delete keepSize;
#endif
}
bool ImageWindow::saveImage( const KURL& dest, bool keepOriginalSize )

5
kuickshow/src/kuickfile.cpp
Unescape Escape View File

@ -1,7 +1,6 @@
#include <tqfile.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <tdeinstance.h>
#include <tdelocale.h>
#include <kprogress.h>
@ -160,10 +159,6 @@ void KuickFile::slotResult( TDEIO::Job *job )
if ( m_progress ) {
m_progress->setProgress( 100 );
#define BUGGY_VERSION TDE_MAKE_VERSION(3,5,2)
if ( KDE::version() <= BUGGY_VERSION ) {
m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog
}
}
}
}

5
kuickshow/src/kuickshow.cpp
Unescape Escape View File

@ -35,7 +35,6 @@
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kcursor.h>
#include <tdeversion.h>
#include <tdefiledialog.h>
#include <tdefilemetainfo.h>
#include <tdeglobal.h>
@ -1125,9 +1124,6 @@ void KuickShow::about()
aboutWidget->adjustSize();
#if TDE_VERSION >= 310
KDialog::centerOnScreen( aboutWidget );
#else
// Not fixed because it must be dead code now.
TQDesktopWidget *desktop = TQApplication::desktop();
int screen = desktop->screenNumber( aboutWidget );
@ -1137,7 +1133,6 @@ void KuickShow::about()
TQRect r = desktop->screenGeometry( screen );
aboutWidget->move( r.center().x() - aboutWidget->width()/2,
r.center().y() - aboutWidget->height()/2 );
#endif
aboutWidget->show();
}

1
kview/kviewcanvas/kimagecanvas.cpp
Unescape Escape View File

@ -18,7 +18,6 @@
#include "kimagecanvas.h"
#include "kimageholder.h"
#include "version.h"
#include "config/defaults.h"
#include <tqcolor.h>

4
kview/kviewviewer/kviewviewer.cpp
Unescape Escape View File

@ -21,7 +21,6 @@
#include "kviewviewer.h"
#include "kimageviewer/canvas.h"
#include "version.h"
#include <ksettings/dispatcher.h>
@ -34,6 +33,7 @@
#include <tqlabel.h>
#include <tqregexp.h>
#include <tdeversion.h>
#include <kpushbutton.h>
#include <kpassivepopup.h>
#include <kdebug.h>
@ -170,7 +170,7 @@ KViewViewer::~KViewViewer()
TDEAboutData * KViewViewer::createAboutData()
{
TDEAboutData * aboutData = new TDEAboutData( "kviewviewer", I18N_NOOP( "KView" ),
KVIEW_VERSION, I18N_NOOP( "TDE Image Viewer Part" ),
TDE_VERSION_STRING, I18N_NOOP( "TDE Image Viewer Part" ),
TDEAboutData::License_GPL,
I18N_NOOP("(c) 1997-2002, The KView Developers") );
aboutData->addAuthor( "Matthias Kretz", I18N_NOOP( "Maintainer" ), "kretz@kde.org" );

4
kview/main.cpp
Unescape Escape View File

@ -17,7 +17,7 @@
*/
#include "kview.h"
#include "version.h"
#include <tdeversion.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
@ -34,7 +34,7 @@ static TDECmdLineOptions options[] =
extern "C" TDE_EXPORT int kdemain( int argc, char ** argv )
{
TDEAboutData about( "kview", I18N_NOOP( "KView" ),
KVIEW_VERSION, description,
TDE_VERSION_STRING, description,
TDEAboutData::License_GPL,
I18N_NOOP( "(c) 1997-2002, The KView Developers" ) );
about.addAuthor( "Matthias Kretz", I18N_NOOP( "Maintainer" ), "kretz@kde.org" );

3
kview/version.h
Unescape Escape View File

@ -1,3 +0,0 @@
#ifndef KVIEW_VERSION
#define KVIEW_VERSION TDE_VERSION_STRING
#endif
Write Preview
Loading…
Cancel
Save