TDE
/
rosegarden
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/rosegarden
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 b1db717c8a
commit 633d1c5794
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
src/gui/editors/segment/segmentcanvas/CompositionView.cpp
Unescape View File

@ -89,7 +89,7 @@ protected:
CompositionView::CompositionView(RosegardenGUIDoc* doc, CompositionView::CompositionView(RosegardenGUIDoc* doc,
CompositionModel* model, CompositionModel* model,
TQWidget * parent, const char * name, WFlags f) 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), : RosegardenScrollView(parent, name, f | WNoAutoErase | WStaticContents),
#else #else
: :

24
src/gui/kdeext/klearlook.cpp
Unescape View File

@ -74,7 +74,7 @@ DEALINGS IN THE SOFTWARE.
#include "klearlook.h" #include "klearlook.h"
#include <tqsettings.h> #include <tqsettings.h>
#if KDE_VERSION >= 0x30200 #if TDE_VERSION >= 0x30200
#include <tqfile.h> #include <tqfile.h>
#include <tqdir.h> #include <tqdir.h>
#endif #endif
@ -102,7 +102,7 @@ static const int itemFrame = 2;
static const int arrowHMargin = 6; static const int arrowHMargin = 6;
static const int rightBorder = 12; 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... // Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent...
static TQString readEnvPath( const char *env ) { 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 ), 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) defBtnIndicator( dbi ), sliderThumbs( st ), handles( h ), toolbarBorders( tbb ), lvExpander( lve ), lvLines( lvl ), menuIcons( ico ), borderSplitter( true ), popupmenuHighlightLevel(popuplvl)
#endif #endif
#if KDE_VERSION >= 0x30200 #if TDE_VERSION >= 0x30200
isTransKicker( false ), isTransKicker( false ),
#endif #endif
hover( HOVER_NONE ), hover( HOVER_NONE ),
@ -521,14 +521,14 @@ hoverSect( TQTC_NO_SECT ) {
void KlearlookStyle::polish( TQApplication *app ) { void KlearlookStyle::polish( TQApplication *app ) {
if ( !qstrcmp( app->argv() [ 0 ], "kicker" ) || !qstrcmp( app->argv() [ 0 ], "appletproxy" ) ) { if ( !qstrcmp( app->argv() [ 0 ], "kicker" ) || !qstrcmp( app->argv() [ 0 ], "appletproxy" ) ) {
themedApp = APP_KICKER; themedApp = APP_KICKER;
#if KDE_VERSION >= 0x30200 #if TDE_VERSION >= 0x30200
isTransKicker = rounded && kickerIsTrans(); isTransKicker = rounded && kickerIsTrans();
#endif #endif
} else if ( !qstrcmp( app->argv() [ 0 ], "korn" ) ) { } else if ( !qstrcmp( app->argv() [ 0 ], "korn" ) ) {
themedApp = APP_KORN; themedApp = APP_KORN;
#if KDE_VERSION >= 0x30200 #if TDE_VERSION >= 0x30200
isTransKicker = rounded && kickerIsTrans(); isTransKicker = rounded && kickerIsTrans();
#endif #endif
@ -1334,8 +1334,8 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
if ( flags & Style_Down ) if ( flags & Style_Down )
flags = ( ( flags | Style_Down ) ^ Style_Down ) | Style_Sunken; flags = ( ( flags | Style_Down ) ^ Style_Down ) | Style_Sunken;
flags |= Style_Enabled; flags |= Style_Enabled;
#if KDE_VERSION >= 0x30200 #if TDE_VERSION >= 0x30200
#if KDE_VERSION >= 0x30400 #if TDE_VERSION >= 0x30400
if ( HOVER_KICKER == hover && hoverWidget ) // && hoverWidget==p->device()) if ( HOVER_KICKER == hover && hoverWidget ) // && hoverWidget==p->device())
flags |= Style_MouseOver; flags |= Style_MouseOver;
@ -1346,7 +1346,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
drawLightBevelButton( p, r, cg, flags | Style_Horizontal, drawLightBevelButton( p, r, cg, flags | Style_Horizontal,
true, ROUNDED_ALL, getFill( flags, use ), use ); true, ROUNDED_ALL, getFill( flags, use ), use );
#if KDE_VERSION >= 0x30200 #if TDE_VERSION >= 0x30200
formMode = false; formMode = false;
#endif #endif
@ -1379,7 +1379,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
drawLightBevelButton( p, r, cg, flags | Style_Horizontal, true, drawLightBevelButton( p, r, cg, flags | Style_Horizontal, true,
r.width() < 16 || r.height() < 16 r.width() < 16 || r.height() < 16
#if KDE_VERSION >= 0x30200 #if TDE_VERSION >= 0x30200
|| ( APP_KORN == themedApp && isTransKicker && PE_ButtonTool == pe ) || ( APP_KORN == themedApp && isTransKicker && PE_ButtonTool == pe )
#endif #endif
? ROUNDED_NONE : ROUNDED_ALL, ? ROUNDED_NONE : ROUNDED_ALL,
@ -3106,7 +3106,7 @@ void KlearlookStyle::tqdrawComplexControl(
if ( controls & SC_ToolButton ) { if ( controls & SC_ToolButton ) {
// If we're pressed, on, or raised... // If we're pressed, on, or raised...
#if KDE_VERSION >= 0x30200 #if TDE_VERSION >= 0x30200
if ( bflags & ( Style_Down | Style_On | Style_Raised ) || onControlButtons ) if ( bflags & ( Style_Down | Style_On | Style_Raised ) || onControlButtons )
#else #else
// CPD: Style_MouseOver obove is *needed* for KDE's KToggleActions... // 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 ) ) ||
( HOVER_SB_ADD != hover && addline.contains( oldCursor ) ); ( HOVER_SB_ADD != hover && addline.contains( oldCursor ) );
} else { } else {
#if KDE_VERSION >= 0x30400 #if TDE_VERSION >= 0x30400
TQToolButton *tb = dynamic_cast<TQToolButton *>( hoverWidget ); TQToolButton *tb = dynamic_cast<TQToolButton *>( hoverWidget );
if ( tb ) { if ( tb ) {
@ -3992,7 +3992,7 @@ bool KlearlookStyle::redrawHoverWidget() {
return redraw; return redraw;
} else } else
return oldCursor == TQPoint( -1, -1 ); return oldCursor == TQPoint( -1, -1 );
#if KDE_VERSION >= 0x30400 #if TDE_VERSION >= 0x30400
} }
#endif #endif

2
src/gui/kdeext/klearlook.h
Unescape View File

@ -329,7 +329,7 @@ class KlearlookStyle : public KStyle {
ELvLines lvLines; ELvLines lvLines;
EProfile pmProfile; EProfile pmProfile;
EAppearance appearance; EAppearance appearance;
#if KDE_VERSION >= 0x30200 #if TDE_VERSION >= 0x30200
bool isTransKicker; bool isTransKicker;
#endif #endif

4
src/misc/Debug.cpp
Unescape View File

@ -23,7 +23,7 @@
#include "misc/Debug.h" #include "misc/Debug.h"
#include "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 <tqdatetime.h>
#include <tqpoint.h> #include <tqpoint.h>
#include <tqrect.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& kdbgstream&
operator<<(kdbgstream &dbg, const TQDateTime& time) operator<<(kdbgstream &dbg, const TQDateTime& time)
{ {

2
src/misc/Debug.h
Unescape View File

@ -27,7 +27,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kdeversion.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 TQDateTime;
class TQDate; class TQDate;
class TQTime; class TQTime;

Write Preview
Loading…
Cancel
Save