summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-15 18:49:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-15 18:49:13 -0600
commit633d1c5794363097654d9aaa6cfe27a78c4c27f1 (patch)
treede012ad38998b3e46f3ca6bfae85178ecca9fe49
parentb1db717c8a60207c8870e8d358bc6678c8810590 (diff)
downloadrosegarden-633d1c57.tar.gz
rosegarden-633d1c57.zip
Rename KDE_VERSION to TDE_VERSION
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.cpp2
-rw-r--r--src/gui/kdeext/klearlook.cpp24
-rw-r--r--src/gui/kdeext/klearlook.h2
-rw-r--r--src/misc/Debug.cpp4
-rw-r--r--src/misc/Debug.h2
5 files changed, 17 insertions, 17 deletions
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 7d38151..75216b8 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -89,7 +89,7 @@ protected:
CompositionView::CompositionView(RosegardenGUIDoc* doc,
CompositionModel* model,
TQWidget * parent, const char * name, WFlags f)
-#if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
+#if TDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
: RosegardenScrollView(parent, name, f | WNoAutoErase | WStaticContents),
#else
:
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index adfe33e..279cc9b 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -74,7 +74,7 @@ DEALINGS IN THE SOFTWARE.
#include "klearlook.h"
#include <tqsettings.h>
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
#include <tqfile.h>
#include <tqdir.h>
#endif
@@ -102,7 +102,7 @@ static const int itemFrame = 2;
static const int arrowHMargin = 6;
static const int rightBorder = 12;
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
// Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent...
static TQString readEnvPath( const char *env ) {
@@ -445,7 +445,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 KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
isTransKicker( false ),
#endif
hover( HOVER_NONE ),
@@ -521,14 +521,14 @@ hoverSect( TQTC_NO_SECT ) {
void KlearlookStyle::polish( TQApplication *app ) {
if ( !qstrcmp( app->argv() [ 0 ], "kicker" ) || !qstrcmp( app->argv() [ 0 ], "appletproxy" ) ) {
themedApp = APP_KICKER;
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
isTransKicker = rounded && kickerIsTrans();
#endif
} else if ( !qstrcmp( app->argv() [ 0 ], "korn" ) ) {
themedApp = APP_KORN;
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
isTransKicker = rounded && kickerIsTrans();
#endif
@@ -1334,8 +1334,8 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
if ( flags & Style_Down )
flags = ( ( flags | Style_Down ) ^ Style_Down ) | Style_Sunken;
flags |= Style_Enabled;
-#if KDE_VERSION >= 0x30200
-#if KDE_VERSION >= 0x30400
+#if TDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30400
if ( HOVER_KICKER == hover && hoverWidget ) // && hoverWidget==p->device())
flags |= Style_MouseOver;
@@ -1346,7 +1346,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
drawLightBevelButton( p, r, cg, flags | Style_Horizontal,
true, ROUNDED_ALL, getFill( flags, use ), use );
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
formMode = false;
#endif
@@ -1379,7 +1379,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
drawLightBevelButton( p, r, cg, flags | Style_Horizontal, true,
r.width() < 16 || r.height() < 16
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
|| ( APP_KORN == themedApp && isTransKicker && PE_ButtonTool == pe )
#endif
? ROUNDED_NONE : ROUNDED_ALL,
@@ -3106,7 +3106,7 @@ void KlearlookStyle::tqdrawComplexControl(
if ( controls & SC_ToolButton ) {
// If we're pressed, on, or raised...
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
if ( bflags & ( Style_Down | Style_On | Style_Raised ) || onControlButtons )
#else
// CPD: Style_MouseOver obove is *needed* for KDE's KToggleActions...
@@ -3944,7 +3944,7 @@ bool KlearlookStyle::redrawHoverWidget() {
( HOVER_SB_ADD == hover && !addline.contains( oldCursor ) ) ||
( HOVER_SB_ADD != hover && addline.contains( oldCursor ) );
} else {
-#if KDE_VERSION >= 0x30400
+#if TDE_VERSION >= 0x30400
TQToolButton *tb = dynamic_cast<TQToolButton *>( hoverWidget );
if ( tb ) {
@@ -3992,7 +3992,7 @@ bool KlearlookStyle::redrawHoverWidget() {
return redraw;
} else
return oldCursor == TQPoint( -1, -1 );
-#if KDE_VERSION >= 0x30400
+#if TDE_VERSION >= 0x30400
}
#endif
diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h
index fc666f3..908539c 100644
--- a/src/gui/kdeext/klearlook.h
+++ b/src/gui/kdeext/klearlook.h
@@ -329,7 +329,7 @@ class KlearlookStyle : public KStyle {
ELvLines lvLines;
EProfile pmProfile;
EAppearance appearance;
-#if KDE_VERSION >= 0x30200
+#if TDE_VERSION >= 0x30200
bool isTransKicker;
#endif
diff --git a/src/misc/Debug.cpp b/src/misc/Debug.cpp
index 5f23613..502b68d 100644
--- a/src/misc/Debug.cpp
+++ b/src/misc/Debug.cpp
@@ -23,7 +23,7 @@
#include "misc/Debug.h"
#include "Debug.h"
-#if KDE_VERSION < KDE_MAKE_VERSION(3,2,0)
+#if TDE_VERSION < KDE_MAKE_VERSION(3,2,0)
#include <tqdatetime.h>
#include <tqpoint.h>
#include <tqrect.h>
@@ -256,7 +256,7 @@ kdbgostreamAdapter::operator<<(double d)
// }
// }
-#if KDE_VERSION < KDE_MAKE_VERSION(3,2,0)
+#if TDE_VERSION < KDE_MAKE_VERSION(3,2,0)
kdbgstream&
operator<<(kdbgstream &dbg, const TQDateTime& time)
{
diff --git a/src/misc/Debug.h b/src/misc/Debug.h
index ca245bc..5a4e94e 100644
--- a/src/misc/Debug.h
+++ b/src/misc/Debug.h
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <kdeversion.h>
-#if KDE_VERSION < KDE_MAKE_VERSION(3,2,0)
+#if TDE_VERSION < KDE_MAKE_VERSION(3,2,0)
class TQDateTime;
class TQDate;
class TQTime;