Remove use of TDE_VERSIONremove/tde-version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 0 insertions, 209 deletions

diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 3bad3ca..7b1c5e2 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -87,12 +87,7 @@ protected:
 CompositionView::CompositionView(RosegardenGUIDoc* doc,
                                  CompositionModel* model,
                                  TQWidget * parent, const char * name, WFlags f)
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,2,0)
         : RosegardenScrollView(parent, name, f | WNoAutoErase | WStaticContents),
-#else
-        :
-        RosegardenScrollView(parent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents),
-#endif
         m_model(model),
         m_currentItem(0),
         m_tool(0),
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index 9b57bb4..5b18d75 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -35,7 +35,6 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-#include <tdeversion.h>
 #include <tqmenubar.h>
 #include <tqapplication.h>
 #include <tqpainter.h>
@@ -73,11 +72,8 @@ DEALINGS IN THE SOFTWARE.
 #include <sys/types.h>
 #include "klearlook.h"
 #include <tqsettings.h>
-
-#if TDE_VERSION >= 0x30200
 #include <tqfile.h>
 #include <tqdir.h>
-#endif
 
 // Uncomment the following to enable gradients in toolbars and menubars
 // NOTE: Not yet complete!!!
@@ -102,7 +98,6 @@ static const int itemFrame = 2;
 static const int arrowHMargin = 6;
 static const int rightBorder = 12;
 
-#if TDE_VERSION >= 0x30200 
 // Try to read $TDEHOME/share/config/kickerrc to find out if kicker is transparent...
 
 static TQString readEnvPath( const char *env ) {
@@ -150,7 +145,6 @@ static bool kickerIsTrans() {
 
     return trans;
 }
-#endif
 
 inline int limit( double c ) {
     return c < 0.0
@@ -445,9 +439,7 @@ borderButton( bb ), borderFrame( bf ), rounded( round ), etchedSlider( etched ),
 pmProfile( PROFILE_SUNKEN ), vArrow( va ), boldDefText( bdt ), crLabelHighlight( crlh ), lvDark( lvd ),
 defBtnIndicator( dbi ), sliderThumbs( st ), handles( h ), toolbarBorders( tbb ), lvExpander( lve ), lvLines( lvl ), menuIcons( ico ), borderSplitter( true ), popupmenuHighlightLevel(popuplvl)
 #endif
-#if TDE_VERSION >= 0x30200
 isTransKicker( false ),
-#endif
 hover( HOVER_NONE ),
 oldCursor( -1, -1 ),
 formMode( false ),
@@ -524,18 +516,10 @@ void KlearlookStyle::applicationPolish( const TQStyleControlElementData &ceData,
 
 	if ( !qstrcmp( app->argv() [ 0 ], "kicker" ) || !qstrcmp( app->argv() [ 0 ], "appletproxy" ) ) {
 		themedApp = APP_KICKER;
-	#if TDE_VERSION >= 0x30200
-	
 		isTransKicker = rounded && kickerIsTrans();
-	#endif
-	
 	} else if ( !qstrcmp( app->argv() [ 0 ], "korn" ) ) {
 		themedApp = APP_KORN;
-	#if TDE_VERSION >= 0x30200
-	
 		isTransKicker = rounded && kickerIsTrans();
-	#endif
-	
 	} else
 		themedApp = qstrcmp( tqApp->argv() [ 0 ], "soffice.bin" ) ? APP_OTHER : APP_OPENOFFICE;
     }
@@ -1350,22 +1334,16 @@ void KlearlookStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQS
                     if ( flags & Style_Down )
                         flags = ( ( flags | Style_Down ) ^ Style_Down ) | Style_Sunken;
                     flags |= Style_Enabled;
-#if TDE_VERSION >= 0x30200
-#if TDE_VERSION >= 0x30400
 
                     if ( HOVER_KICKER == hover && hoverWidget )   //  && hoverWidget==p->device())
                         flags |= Style_MouseOver;
-#endif
 
                     formMode = isTransKicker;
-#endif
 
                     drawLightBevelButton( p, r, cg, flags | Style_Horizontal,
                         true, ROUNDED_ALL, getFill( flags, use ), use );
-#if TDE_VERSION >= 0x30200
 
                     formMode = false;
-#endif
 
                 } else {
                     flags = ( ( flags | Style_Sunken ) ^ Style_Sunken ) | Style_Raised;
@@ -1395,9 +1373,7 @@ void KlearlookStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQS
 
                 drawLightBevelButton( p, r, cg, flags | Style_Horizontal, true,
                                       r.width() < 16 || r.height() < 16
-#if TDE_VERSION >= 0x30200
                                       || ( APP_KORN == themedApp && isTransKicker && PE_ButtonTool == pe )
-#endif
                                       ? ROUNDED_NONE : ROUNDED_ALL,
                                       getFill( flags, use ), use );
                 break;
@@ -3125,12 +3101,7 @@ void KlearlookStyle::drawComplexControl(
 
                 if ( controls & SC_ToolButton ) {
                     // If we're pressed, on, or raised...
-#if TDE_VERSION >= 0x30200
                     if ( bflags & ( Style_Down | Style_On | Style_Raised ) || onControlButtons )
-#else
-                    // CPD: Style_MouseOver obove is *needed* for KDE's TDEToggleActions...
-                    if ( bflags & ( Style_Down | Style_On | Style_Raised | Style_MouseOver ) || onControlButtons )
-#endif
 
                     {
                         //Make sure the standalone toolbuttons have a gradient in the right direction
@@ -3970,14 +3941,12 @@ bool KlearlookStyle::redrawHoverWidget() {
                        ( HOVER_SB_ADD == hover && !addline.contains( oldCursor ) ) ||
                        ( HOVER_SB_ADD != hover && addline.contains( oldCursor ) );
             } else {
-#if TDE_VERSION >= 0x30400
                 TQToolButton *tb = dynamic_cast<TQToolButton *>( hoverWidget );
 
                 if ( tb ) {
                     hover = APP_KICKER == themedApp ? HOVER_KICKER : HOVER_NONE;
                     return HOVER_KICKER == hover;
                 } else {
-#endif
                     TQHeader *hd = dynamic_cast<TQHeader *>( hoverWidget );
 
                     if ( hd ) {
@@ -4018,11 +3987,7 @@ bool KlearlookStyle::redrawHoverWidget() {
                         return redraw;
                     } else
                         return oldCursor == TQPoint( -1, -1 );
-#if TDE_VERSION >= 0x30400
-
                 }
-#endif
-
             }
         }
     }
diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h
index ff55f19..a780567 100644
--- a/src/gui/kdeext/klearlook.h
+++ b/src/gui/kdeext/klearlook.h
@@ -38,7 +38,6 @@
 
 #define USE_SINGLE_STYLE 1
 
-#include <tdeversion.h>
 #include <tdestyle.h>
 #include <tqcolor.h>
 #include <tqpoint.h>
@@ -329,10 +328,7 @@ class KlearlookStyle : public TDEStyle {
         ELvLines lvLines;
         EProfile pmProfile;
         EAppearance appearance;
-#if TDE_VERSION >= 0x30200
-
         bool isTransKicker;
-#endif
 
         EHover hover;
         int contrast;
diff --git a/src/misc/Debug.cpp b/src/misc/Debug.cpp
index dbbc389..dd9daf8 100644
--- a/src/misc/Debug.cpp
+++ b/src/misc/Debug.cpp
@@ -21,18 +21,6 @@
 #include "misc/Debug.h"
 #include "Debug.h"
 
-#if TDE_VERSION < TDE_MAKE_VERSION(3,2,0)
-#include <tqdatetime.h>
-#include <tqpoint.h>
-#include <tqrect.h>
-#include <tqregion.h>
-#include <tqstringlist.h>
-#include <tqpen.h>
-#include <tqbrush.h>
-#include <tqsize.h>
-#include <kurl.h>
-#endif
-
 #include "base/Event.h"
 #include "base/Segment.h"
 #include "base/RealTime.h"
@@ -254,141 +242,5 @@ kdbgostreamAdapter::operator<<(double d)
 //     }
 // }
 
-#if TDE_VERSION < TDE_MAKE_VERSION(3,2,0)
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQDateTime& time)
-{
-    dbg << time.toString();
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQDate& date)
-{
-    dbg << date.toString();
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQTime& time )
-{
-    dbg << time.toString();
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQPoint& p )
-{
-    dbg << "(" << p.x() << ", " << p.y() << ")";
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQSize& s )
-{
-    dbg << "[" << s.width() << "x" << s.height() << "]";
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQRect& r )
-{
-    dbg << "[" << r.x() << "," << r.y() << " - "
-    << r.width() << "x" << r.height() << "]";
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQRegion& reg )
-{
-    dbg << "[ ";
-
-    TQMemArray<TQRect>rs = reg.rects();
-    for (uint i = 0;i < rs.size();++i)
-        dbg << TQString("[%1,%2 - %3x%4] ").arg(rs[i].x()).arg(rs[i].y())
-        .arg(rs[i].width()).arg(rs[i].height() ) ;
-
-    dbg << "]";
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const KURL& u )
-{
-    dbg << u.prettyURL();
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQStringList& l )
-{
-    dbg << "(";
-    dbg << l.join(",");
-    dbg << ")";
-
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQColor& c )
-{
-    if ( c.isValid() )
-        dbg << c.name();
-    else
-        dbg << "(invalid/default)";
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQPen& p )
-{
-    static const char* const s_penStyles[] = {
-                "NoPen", "SolidLine", "DashLine", "DotLine", "DashDotLine",
-                "DashDotDotLine"
-            };
-    static const char* const s_capStyles[] = {
-                "FlatCap", "SquareCap", "RoundCap"
-            };
-    dbg << "[ style:";
-    dbg << s_penStyles[ p.style() ];
-    dbg << " width:";
-    dbg << p.width();
-    dbg << " color:";
-    if ( p.color().isValid() )
-        dbg << p.color().name();
-    else
-        dbg << "(invalid/default)";
-    if ( p.width() > 0 ) {
-        dbg << " capstyle:";
-        dbg << s_capStyles[ p.capStyle() >> 4 ];
-    }
-    dbg << " ]";
-    return dbg;
-}
-
-kdbgstream&
-operator<<(kdbgstream &dbg, const TQBrush& b)
-{
-    static const char* const s_brushStyles[] = {
-                "NoBrush", "SolidPattern", "Dense1Pattern", "Dense2Pattern", "Dense3Pattern",
-                "Dense4Pattern", "Dense5Pattern", "Dense6Pattern", "Dense7Pattern",
-                "HorPattern", "VerPattern", "CrossPattern", "BDiagPattern", "FDiagPattern",
-                "DiagCrossPattern"
-            };
-
-    dbg << "[ style: ";
-    dbg << s_brushStyles[ b.style() ];
-    dbg << " color: ";
-    if ( b.color().isValid() )
-        dbg << b.color().name() ;
-    else
-        dbg << "(invalid/default)";
-    if ( b.pixmap() )
-        dbg << " has a pixmap";
-    dbg << " ]";
-    return dbg;
-}
-#endif
-
 #endif
 
diff --git a/src/misc/Debug.h b/src/misc/Debug.h
index 83d4acf..b9141d6 100644
--- a/src/misc/Debug.h
+++ b/src/misc/Debug.h
@@ -23,22 +23,6 @@
 #include <string>
 #include <iostream>
 #include <kdebug.h>
-#include <tdeversion.h>
-
-#if TDE_VERSION < TDE_MAKE_VERSION(3,2,0)
-class TQDateTime;
-class TQDate;
-class TQTime;
-class TQPoint;
-class TQSize;
-class TQRect;
-class TQRegion;
-class KURL;
-class TQStringList;
-class TQColor;
-class TQPen;
-class TQBrush;
-#endif
 
 namespace Rosegarden { class Event; class Segment; class RealTime; class Colour; namespace Guitar { class Chord; } }
 
diff --git a/src/misc/stableheaders.h b/src/misc/stableheaders.h
index 619d77e..fe73085 100644
--- a/src/misc/stableheaders.h
+++ b/src/misc/stableheaders.h
@@ -155,7 +155,6 @@
 #include <kcursor.h>
 #include <kdcopactionproxy.h>
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <kdialogbase.h>
 #include <kdialog.h>
 #include <kdiskfreesp.h>