diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-23 19:24:48 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-23 19:29:39 +0900 |
commit | c6f6aa86d3d66887d4a8384b87dca8f8b26e65b6 (patch) | |
tree | 7951e5f49ed2f312a319be1e958cc33820f97488 | |
parent | de8e1271d0c794acd900e7c230775cf65cb110af (diff) | |
download | krecipes-c6f6aa86d3d66887d4a8384b87dca8f8b26e65b6.tar.gz krecipes-c6f6aa86d3d66887d4a8384b87dca8f8b26e65b6.zip |
Remove unused files/code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r-- | acinclude.m4 | 163 | ||||
-rw-r--r-- | krecipes/krecipes.tdevelop | 182 | ||||
-rw-r--r-- | krecipes/src/dialogs/dietwizarddialog.cpp | 83 | ||||
-rw-r--r-- | krecipes/src/widgets/kremenu.cpp | 8 | ||||
-rw-r--r-- | krecipes/src/widgets/paneldeco.cpp | 8 | ||||
-rw-r--r-- | krecipes/templates/cpp | 9 | ||||
-rw-r--r-- | krecipes/templates/h | 9 | ||||
-rw-r--r-- | stamp-h.in | 0 |
8 files changed, 29 insertions, 433 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7e75fe1..acc1c4b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -476,11 +476,7 @@ if test "$1" = "default"; then kde_servicetypesdir='\${datadir}/servicetypes' fi if test -z "$kde_moduledir"; then - if test "$kde_qtver" = "2"; then - kde_moduledir='\${libdir}/kde2' - else - kde_moduledir='\${libdir}/kde3' - fi + kde_moduledir='\${libdir}/kde3' fi if test -z "$kde_styledir"; then kde_styledir='\${libdir}/kde3/plugins/styles' @@ -499,16 +495,6 @@ if test "$1" = "default"; then fi KDE_SET_PATHS(defaults) - -else - - if test $kde_qtver = 1; then - AC_MSG_RESULT([compiling]) - KDE_1_CHECK_PATHS - else - AC_MSG_ERROR([path checking not yet supported for KDE 2]) - fi - fi ]) @@ -713,13 +699,7 @@ AC_SUBST(kde_moduledir) AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) -if test "$kde_qtver" = 1; then - kde_minidir="$kde_icondir/mini" -else -# for KDE 1 - this breaks KDE2 apps using minidir, but -# that's the plan ;-/ - kde_minidir="/dev/null" -fi +kde_minidir="/dev/null" dnl AC_SUBST(kde_minidir) dnl AC_SUBST(kde_cgidir) dnl AC_SUBST(kde_toolbardir) @@ -1095,22 +1075,6 @@ cat > conftest.$ac_ext <<EOF #include <ntqglobal.h> #include <ntqapplication.h> EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext <<EOF -#include <ntqevent.h> -#include <ntqstring.h> -#include <ntqstyle.h> -EOF - -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <<EOF -#if TQT_VERSION < 210 -#error 1 -#endif -EOF -fi -fi - if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF #include <ntqcursor.h> @@ -1126,18 +1090,6 @@ cat >> conftest.$ac_ext <<EOF int main() { EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext <<EOF - QStringList *t = new QStringList(); - Q_UNUSED(t); -EOF -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <<EOF - TQString s; - s.setLatin1("Elvis is alive", 14); -EOF -fi -fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF (void)QStyleFactory::create(TQString::null); @@ -1163,77 +1115,25 @@ else kde_qtsubver=1 fi kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'` - if test "$kde_qtver" = "1"; then - kde_qtsubver=42 - fi fi if test -z "$2"; then - if test "$kde_qtver" = "2"; then - if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 2.2.2" - else - kde_qt_minversion=">= Qt 2.0.2" - fi - fi - if test "$kde_qtver" = "3"; then - if test $kde_qtsubver -gt 0; then - if test $kde_qtsubver -gt 1; then - if test $kde_qtsubver -gt 2; then - kde_qt_minversion=">= Qt 3.3 and < 4.0" - else - kde_qt_minversion=">= Qt 3.2 and < 4.0" - fi - else - kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0" - fi - else - kde_qt_minversion=">= Qt 3.0 and < 4.0" - fi - fi - if test "$kde_qtver" = "1"; then - kde_qt_minversion=">= 1.42 and < 2.0" - fi + kde_qt_minversion=">= Qt 3.3 and < 4.0" else kde_qt_minversion="$2" fi if test -z "$3"; then - if test $kde_qtver = 3; then - if test $kde_qtsubver -gt 0; then - kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000" - qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` - kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` - else - kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000" - fi - fi - if test $kde_qtver = 2; then - if test $kde_qtsubver -gt 0; then - kde_qt_verstring="TQT_VERSION >= 222" - else - kde_qt_verstring="TQT_VERSION >= 200" - fi - fi - if test $kde_qtver = 1; then - kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" - fi + kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000" + qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` + kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` else kde_qt_verstring="$3" fi -if test $kde_qtver = 4; then - kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" -fi if test $kde_qtver = 3; then kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" fi -if test $kde_qtver = 2; then - kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt" -fi -if test $kde_qtver = 1; then - kde_qt_dirs="$TQTDIR /usr/lib/qt" -fi ]) AC_DEFUN([KDE_CHECK_QT_DIRECT], @@ -1395,12 +1295,9 @@ else LIBTQT="-l$tqtlib" fi -if test $kde_qtver != 1; then - - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JPEG]) - LIBTQT="$LIBTQT $LIBPNG $LIBJPEG" -fi +AC_REQUIRE([AC_FIND_PNG]) +AC_REQUIRE([AC_FIND_JPEG]) +LIBTQT="$LIBTQT $LIBPNG $LIBJPEG" if test $kde_qtver = 3; then AC_REQUIRE([KDE_CHECK_LIBDL]) @@ -1448,11 +1345,7 @@ if test ! "$ac_tqt_includes" = "NO"; then qt_incdirs="$ac_tqt_includes $qt_incdirs" fi -if test "$kde_qtver" != "1"; then - kde_qt_header=ntqstyle.h -else - kde_qt_header=ntqglobal.h -fi +kde_qt_header=ntqstyle.h AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) ac_tqt_includes="$qt_incdir" @@ -1783,13 +1676,8 @@ fi AC_CACHE_VAL(ac_cv_have_kde, [#try to guess kde locations -if test "$kde_qtver" = 1; then - kde_check_header="ksock.h" - kde_check_lib="libtdecore.la" -else - kde_check_header="ksharedptr.h" - kde_check_lib="libtdeio.la" -fi +kde_check_header="ksharedptr.h" +kde_check_lib="libtdeio.la" if test -z "$1"; then @@ -2088,24 +1976,6 @@ if test $kde_qtver = 3; then # these are for backward compatibility AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_KFILE, "-ltdeio") -elif test $kde_qtver = 2; then - AC_SUBST(LIB_TDECORE, "-ltdecore") - AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_TDEIO, "-ltdeio") - AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") - AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") - AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_TDESPELL, "-ltdespell") - AC_SUBST(LIB_TDEPARTS, "-ltdeparts") - AC_SUBST(LIB_TDEPRINT, "-ltdeprint") -else - AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)") - AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2118,14 +1988,7 @@ AC_DEFUN([AC_PATH_KDE], then ac_use_path_checking="default" else ac_use_path_checking="" fi - ], - [ - if test "$kde_qtver" = 1; - then ac_use_path_checking="" - else ac_use_path_checking="default" - fi - ] - ) + ]) AC_CREATE_KFSSTND($ac_use_path_checking) diff --git a/krecipes/krecipes.tdevelop b/krecipes/krecipes.tdevelop deleted file mode 100644 index c7edf87..0000000 --- a/krecipes/krecipes.tdevelop +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Unai Garro</author> - <email>ugarro@users.sourceforge.net</email> - <version>0.8</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>TDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - <secondaryLanguages/> - <versioncontrol>kdevsubversion</versioncontrol> - </general> - <kdevautoproject> - <general> - <activetarget>src/krecipes</activetarget> - <useconfiguration>default</useconfiguration> - </general> - <run> - <mainprogram>src/krecipes</mainprogram> - <programargs/> - <terminal>false</terminal> - <envvars/> - <directoryradio>executable</directoryradio> - <customdirectory>/</customdirectory> - <autocompile>true</autocompile> - </run> - <make> - <envvars> - <envvar value="$TDEDIR/unsermake/unsermake" name="UNSERMAKE" /> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_7" /> - </envvars> - <abortonerror>false</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - </make> - <configurations> - <default> - <envvars/> - </default> - </configurations> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns></hidepatterns> - <showvcsfields>true</showvcsfields> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>gtk</toc> - <toc>gnustep</toc> - <toc>python</toc> - <toc>php</toc> - <toc>perl</toc> - </ignoretocs> - <projectdoc> - <userdocDir>/home/uga/krecipes/html/</userdocDir> - <apidocDir>/home/uga/krecipes/html/</apidocDir> - </projectdoc> - <ignoreqt_xml/> - <ignoredoxygen/> - <ignorekdocs/> - <ignoredevhelp/> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>/home/fungmeista/src/svn/kde/trunk/extragear/utils/libtool</dbgshell> - <programargs/> - <gdbpath/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - <runappinappdirectory>true</runappinappdirectory> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions/> - <updateoptions>-dP</updateoptions> - <addoptions/> - <removeoptions>-f</removeoptions> - <diffoptions>-u3 -p</diffoptions> - <logoptions/> - <rshoptions/> - <revertoptions>-C -d -P</revertoptions> - </kdevcvs> - <cppsupportpart> - <codecompletion/> - <filetemplates> - <choosefiles>false</choosefiles> - <interfaceURL/> - <implementationURL/> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - <lowercasefilenames>true</lowercasefilenames> - </filetemplates> - </cppsupportpart> - <kdevclassview> - <folderhierarchy>true</folderhierarchy> - <depthoffolders>2</depthoffolders> - </kdevclassview> - <kdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <references/> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - </kdevcppsupport> - <kdevcvsservice> - <recursivewhenupdate>true</recursivewhenupdate> - <prunedirswhenupdate>true</prunedirswhenupdate> - <createdirswhenupdate>true</createdirswhenupdate> - <recursivewhencommitremove>true</recursivewhencommitremove> - <revertoptions>-C</revertoptions> - <location>ERROR-LOCATION-IS-NOT-SET-IN-PROJECT</location> - </kdevcvsservice> - <kdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl>/home/fungmeista/src/svn/kde/trunk/extragear/utils/doc/krecipes/index.docbook</usermanualurl> - </projectdoc> - </kdevdocumentation> - <ctagspart> - <customArguments/> - <customTagfilePath/> - </ctagspart> -</tdevelop> diff --git a/krecipes/src/dialogs/dietwizarddialog.cpp b/krecipes/src/dialogs/dietwizarddialog.cpp index 6c66921..15b9e18 100644 --- a/krecipes/src/dialogs/dietwizarddialog.cpp +++ b/krecipes/src/dialogs/dietwizarddialog.cpp @@ -623,78 +623,27 @@ DishTitle::~DishTitle() void DishTitle::paintEvent( TQPaintEvent * ) { - - - // Now draw the text + TQPainter painter( this ); - if ( TQT_VERSION >= 0x030200 ) { - // Case 1: TQt 3.2+ - - TQPainter painter( this ); - - // First draw the decoration - painter.setPen( TDEGlobalSettings::activeTitleColor() ); - painter.setBrush( TQBrush( TDEGlobalSettings::activeTitleColor() ) ); - painter.drawRoundRect( 0, 20, 30, height() - 40, 50, ( int ) ( 50.0 / ( height() - 40 ) * 35.0 ) ); - - // Now draw the text + // First draw the decoration + painter.setPen( TDEGlobalSettings::activeTitleColor() ); + painter.setBrush( TQBrush( TDEGlobalSettings::activeTitleColor() ) ); + painter.drawRoundRect( 0, 20, 30, height() - 40, 50, ( int ) ( 50.0 / ( height() - 40 ) * 35.0 ) ); - TQFont titleFont = TDEGlobalSettings::windowTitleFont (); - titleFont.setPointSize( 15 ); - painter.setFont( titleFont ); - painter.rotate( -90 ); - painter.setPen( TQColor( 0x00, 0x00, 0x00 ) ); - painter.drawText( 0, 0, -height(), 30, AlignCenter, titleText ); - painter.setPen( TQColor( 0xFF, 0xFF, 0xFF ) ); - painter.drawText( -1, -1, -height() - 1, 29, AlignCenter, titleText ); - painter.end(); - } - else { - // Case 2: TQt 3.1 - - // Use a pixmap - - TQSize pmSize( height(), width() ); //inverted size so we can rotate later - TQPixmap pm( pmSize ); - pm.fill( TQColor( 0xFF, 0xFF, 0xFF ) ); - TQPainter painter( &pm ); - - // First draw the decoration - painter.setPen( TDEGlobalSettings::activeTitleColor() ); - painter.setBrush( TQBrush( TDEGlobalSettings::activeTitleColor() ) ); - painter.drawRoundRect( 20, 0, height() - 40, 30, ( int ) ( 50.0 / ( height() - 40 ) * 35.0 ), 50 ); - - // Now draw the text - TQFont titleFont = TDEGlobalSettings::windowTitleFont (); - titleFont.setPointSize( 15 ); - painter.setFont( titleFont ); - painter.setPen( TQColor( 0x00, 0x00, 0x00 ) ); - painter.drawText( 0, 0, height(), 30, AlignCenter, titleText ); - painter.setPen( TQColor( 0xFF, 0xFF, 0xFF ) ); - painter.drawText( -1, -1, height() - 1, 29, AlignCenter, titleText ); - painter.end(); - - //Set the border transparent using a mask - TQBitmap mask( pm.size() ); - mask.fill( TQt::color0 ); - painter.begin( &mask ); - painter.setPen( TQt::color1 ); - painter.setBrush( TQt::color1 ); - painter.drawRoundRect( 20, 0, height() - 40, 30, ( int ) ( 50.0 / ( height() - 40 ) * 35.0 ), 50 ); - - painter.end(); - pm.setMask( mask ); - - //And Rotate - TQWMatrix m ; - m.rotate( -90 ); - pm = pm.xForm( m ); - - bitBlt( this, 0, 0, &pm ); - } + // Now draw the text + TQFont titleFont = TDEGlobalSettings::windowTitleFont (); + titleFont.setPointSize( 15 ); + painter.setFont( titleFont ); + painter.rotate( -90 ); + painter.setPen( TQColor( 0x00, 0x00, 0x00 ) ); + painter.drawText( 0, 0, -height(), 30, AlignCenter, titleText ); + painter.setPen( TQColor( 0xFF, 0xFF, 0xFF ) ); + painter.drawText( -1, -1, -height() - 1, 29, AlignCenter, titleText ); + painter.end(); } + TQSize DishTitle::sizeHint () const { return ( TQSize( 40, 200 ) ); diff --git a/krecipes/src/widgets/kremenu.cpp b/krecipes/src/widgets/kremenu.cpp index 85581b9..f252bcc 100644 --- a/krecipes/src/widgets/kremenu.cpp +++ b/krecipes/src/widgets/kremenu.cpp @@ -31,11 +31,7 @@ #include <kpixmapeffect.h> KreMenu::KreMenu( TQWidget *parent, const char *name ) : -#if TQT_VERSION >= 0x030200 TQWidget( parent, name, TQt::WNoAutoErase ) -#else - TQWidget( parent, name ) -#endif { Menu newMenu; @@ -325,11 +321,7 @@ void KreMenu::showMenu( MenuId id ) KreMenuButton::KreMenuButton( KreMenu *parent, KrePanel _panel, MenuId id, const char *name ) : -#if TQT_VERSION >= 0x030200 TQWidget( parent, name, TQt::WNoAutoErase ), -#else - TQWidget( parent, name ), -#endif panel( _panel ) { icon = 0; diff --git a/krecipes/src/widgets/paneldeco.cpp b/krecipes/src/widgets/paneldeco.cpp index 3307fc9..a2ae935 100644 --- a/krecipes/src/widgets/paneldeco.cpp +++ b/krecipes/src/widgets/paneldeco.cpp @@ -82,11 +82,7 @@ void PanelDeco::setHeader( const TQString &title, const TQString &icon ) // Left part of the decoration LeftDeco::LeftDeco( TQWidget *parent, const char *name ) : -#if TQT_VERSION >= 0x030200 TQWidget( parent, name, TQt::WNoAutoErase ) -#else - TQWidget( parent, name ) -#endif {} LeftDeco::~LeftDeco() @@ -95,11 +91,7 @@ LeftDeco::~LeftDeco() // Top part of the decoration TopDeco::TopDeco( TQWidget *parent, const char *name, const TQString &title, const TQString &iconName ) : -#if TQT_VERSION >= 0x030200 TQWidget( parent, name, TQt::WNoAutoErase ) -#else - TQWidget( parent, name ) -#endif { setMinimumHeight( 30 ); icon = 0; diff --git a/krecipes/templates/cpp b/krecipes/templates/cpp deleted file mode 100644 index 0683d11..0000000 --- a/krecipes/templates/cpp +++ /dev/null @@ -1,9 +0,0 @@ -/*************************************************************************** -* Copyright (C) 2003 by krecipes.sourceforge.net authors * -* * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -***************************************************************************/ diff --git a/krecipes/templates/h b/krecipes/templates/h deleted file mode 100644 index 0683d11..0000000 --- a/krecipes/templates/h +++ /dev/null @@ -1,9 +0,0 @@ -/*************************************************************************** -* Copyright (C) 2003 by krecipes.sourceforge.net authors * -* * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -***************************************************************************/ diff --git a/stamp-h.in b/stamp-h.in deleted file mode 100644 index e69de29..0000000 --- a/stamp-h.in +++ /dev/null |