TDE
/
tde-style-qtcurve
6
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Rename a number of old tq methods that are no longer tq specific

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent dd3d53e709
commit b98d1ff3de
7 changed files with 220 additions and 220 deletions
Show Stats Download Patch File Download Diff File

2
common/config_file.c
Unescape View File

@ -53,7 +53,7 @@
#include <tqmap.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#endif
#endif // __cplusplus

2
common/config_file.c-orig
Unescape View File

@ -391,7 +391,7 @@ static void checkColor(EShade *s, color *c)
#include <tqmap.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#endif
class TQtCConfig

28
style/qtc_fixx11h.h
Unescape View File

@ -168,25 +168,25 @@ const int GrayScale = XGrayScale;
#endif
// Affects: Should be without side effects.
#ifdef tqStatus
#ifndef FIXX11H_tqStatus
#define FIXX11H_tqStatus
typedef tqStatus XtqStatus;
#undef tqStatus
typedef XtqStatus tqStatus;
#ifdef Status
#ifndef FIXX11H_Status
#define FIXX11H_Status
typedef Status XStatus;
#undef Status
typedef XStatus Status;
#endif
#undef tqStatus
#undef Status
#endif
// Affects: Should be without side effects.
#ifdef tqCursorShape
#ifndef FIXX11H_tqCursorShape
#define FIXX11H_tqCursorShape
const int XtqCursorShape = tqCursorShape;
#undef tqCursorShape
const int tqCursorShape = tqCursorShape;
#ifdef CursorShape
#ifndef FIXX11H_CursorShape
#define FIXX11H_CursorShape
const int XCursorShape = CursorShape;
#undef CursorShape
const int CursorShape = CursorShape;
#endif
#undef tqCursorShape
#undef CursorShape
#endif
// template --->

48
style/qtc_kstyle.cpp
Unescape View File

@ -124,8 +124,8 @@ void TQtCKStyle::polish( TQWidget* widget )
if ( d->useFilledFrameWorkaround )
{
if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) {
TQFrame::Shape tqshape = frame->frameShape();
if (tqshape == TQFrame::ToolBarPanel || tqshape == TQFrame::MenuBarPanel)
TQFrame::Shape shape = frame->frameShape();
if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel)
widget->installEventFilter(this);
}
}
@ -137,8 +137,8 @@ void TQtCKStyle::unPolish( TQWidget* widget )
if ( d->useFilledFrameWorkaround )
{
if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) {
TQFrame::Shape tqshape = frame->frameShape();
if (tqshape == TQFrame::ToolBarPanel || tqshape == TQFrame::MenuBarPanel)
TQFrame::Shape shape = frame->frameShape();
if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel)
widget->removeEventFilter(this);
}
}
@ -423,7 +423,7 @@ void TQtCKStyle::drawPrimitive( PrimitiveElement pe,
void TQtCKStyle::tqdrawControl( ControlElement element,
void TQtCKStyle::drawControl( ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@ -437,7 +437,7 @@ void TQtCKStyle::tqdrawControl( ControlElement element,
// ------------------------------------------------------------------------
case CE_TabBarTab: {
const TQTabBar* tb = (const TQTabBar*) widget;
TQTabBar::Shape tbs = tb->tqshape();
TQTabBar::Shape tbs = tb->shape();
bool selected = flags & Style_Selected;
int x = r.x(), y=r.y(), bottom=r.bottom(), right=r.right();
@ -721,7 +721,7 @@ void TQtCKStyle::tqdrawControl( ControlElement element,
}
default:
TQCommonStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
TQCommonStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
}
@ -748,7 +748,7 @@ TQRect TQtCKStyle::subRect(SubRect r, const TQWidget* widget) const
}
int TQtCKStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
int TQtCKStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const
{
switch(m)
{
@ -769,7 +769,7 @@ int TQtCKStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
&& widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
return widget->fontMetrics().lineSpacing();
else
return TQCommonStyle::tqpixelMetric(m, widget);
return TQCommonStyle::pixelMetric(m, widget);
}
// TABS
@ -779,8 +779,8 @@ int TQtCKStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
case PM_TabBarTabVSpace: {
const TQTabBar * tb = (const TQTabBar *) widget;
if ( tb->tqshape() == TQTabBar::RoundedAbove ||
tb->tqshape() == TQTabBar::RoundedBelow )
if ( tb->shape() == TQTabBar::RoundedAbove ||
tb->shape() == TQTabBar::RoundedBelow )
return 10;
else
return 4;
@ -788,7 +788,7 @@ int TQtCKStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
case PM_TabBarTabOverlap: {
const TQTabBar* tb = (const TQTabBar*)widget;
TQTabBar::Shape tbs = tb->tqshape();
TQTabBar::Shape tbs = tb->shape();
if ( (tbs == TQTabBar::RoundedAbove) ||
(tbs == TQTabBar::RoundedBelow) )
@ -853,10 +853,10 @@ int TQtCKStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
return 0;
case PM_PopupMenuScrollerHeight:
return tqpixelMetric( PM_ScrollBarExtent, 0);
return pixelMetric( PM_ScrollBarExtent, 0);
default:
return TQCommonStyle::tqpixelMetric( m, widget );
return TQCommonStyle::pixelMetric( m, widget );
}
}
@ -873,7 +873,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling;
}
void TQtCKStyle::tqdrawComplexControl( ComplexControl control,
void TQtCKStyle::drawComplexControl( ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@ -996,7 +996,7 @@ void TQtCKStyle::tqdrawComplexControl( ComplexControl control,
// Draw the tickmarks
if (controls & SC_SliderTickmarks)
TQCommonStyle::tqdrawComplexControl(control, &p2, widget,
TQCommonStyle::drawComplexControl(control, &p2, widget,
r, cg, flags, SC_SliderTickmarks, active, opt);
// Draw the slider handle
@ -1022,7 +1022,7 @@ void TQtCKStyle::tqdrawComplexControl( ComplexControl control,
// Paint the icon and text.
if ( controls & SC_ListView )
TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
// If we're have a branch or are expanded...
if ( controls & (SC_ListViewBranch | SC_ListViewExpand) )
@ -1162,7 +1162,7 @@ void TQtCKStyle::tqdrawComplexControl( ComplexControl control,
}
default:
TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg,
TQCommonStyle::drawComplexControl( control, p, widget, r, cg,
flags, controls, active, opt );
break;
}
@ -1201,7 +1201,7 @@ TQRect TQtCKStyle::querySubControlMetrics( ComplexControl control,
const TQScrollBar *sb = (const TQScrollBar*)widget;
bool horizontal = sb->orientation() == Qt::Horizontal;
int sliderstart = sb->sliderStart();
int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget);
int sbextent = pixelMetric(PM_ScrollBarExtent, widget);
int maxlen = (horizontal ? sb->width() : sb->height())
- (sbextent * (threeButtonScrollBar ? 3 : 2));
int sliderlen;
@ -1212,7 +1212,7 @@ TQRect TQtCKStyle::querySubControlMetrics( ComplexControl control,
uint range = sb->maxValue() - sb->minValue();
sliderlen = (sb->pageStep() * maxlen) / (range + sb->pageStep());
int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget );
int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget );
if ( sliderlen < slidermin || range > INT_MAX / 2 )
sliderlen = slidermin;
if ( sliderlen > maxlen )
@ -1602,7 +1602,7 @@ TQPixmap TQtCKStyle::stylePixmap( StylePixmap stylepixmap,
}
int TQtCKStyle::tqstyleHint( StyleHint sh, const TQWidget* w,
int TQtCKStyle::styleHint( StyleHint sh, const TQWidget* w,
const TQStyleOption &opt, TQStyleHintReturn* shr) const
{
switch (sh)
@ -1617,7 +1617,7 @@ int TQtCKStyle::tqstyleHint( StyleHint sh, const TQWidget* w,
return d->menuAltKeyNavigation ? 1 : 0;
case SH_PopupMenu_SubMenuPopupDelay:
if ( tqstyleHint( SH_PopupMenu_SloppySubMenus, w ) )
if ( styleHint( SH_PopupMenu_SloppySubMenus, w ) )
return TQMIN( 100, d->popupMenuDelay );
else
return d->popupMenuDelay;
@ -1653,7 +1653,7 @@ int TQtCKStyle::tqstyleHint( StyleHint sh, const TQWidget* w,
}
default:
return TQCommonStyle::tqstyleHint(sh, w, opt, shr);
return TQCommonStyle::styleHint(sh, w, opt, shr);
}
}
@ -1666,7 +1666,7 @@ bool TQtCKStyle::eventFilter( TQObject* object, TQEvent* event )
// ensure that the filled frame contents are properly painted.
// We essentially modify the paintEvent's rect to include the
// panel border, which also paints the widget's interior.
// This is nasty, but I see no other way to properly tqrepaint
// This is nasty, but I see no other way to properly repaint
// filled frames in all TQMenuBars and TQToolBars.
// -- Karol.
TQFrame *frame = 0;

10
style/qtc_kstyle.h
Unescape View File

@ -224,7 +224,7 @@ class TQtCKStyle: public TQCommonStyle
*
* @see KStyle::KStylePrimitive
* @see TQStyle::drawPrimitive
* @see TQStyle::tqdrawComplexControl
* @see TQStyle::drawComplexControl
*/
virtual void drawKStylePrimitive( KStylePrimitive kpe,
TQPainter* p,
@ -262,7 +262,7 @@ class TQtCKStyle: public TQCommonStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
void tqdrawControl( ControlElement element,
void drawControl( ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@ -270,7 +270,7 @@ class TQtCKStyle: public TQCommonStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
void tqdrawComplexControl( ComplexControl control,
void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQWidget* widget,
const TQRect &r,
@ -290,7 +290,7 @@ class TQtCKStyle: public TQCommonStyle
SubControl sc,
const TQStyleOption& = TQStyleOption::Default ) const;
int tqpixelMetric( PixelMetric m,
int pixelMetric( PixelMetric m,
const TQWidget* widget = 0 ) const;
TQRect subRect( SubRect r,
@ -300,7 +300,7 @@ class TQtCKStyle: public TQCommonStyle
const TQWidget* widget = 0,
const TQStyleOption& = TQStyleOption::Default ) const;
int tqstyleHint( StyleHint sh,
int styleHint( StyleHint sh,
const TQWidget* w = 0,
const TQStyleOption &opt = TQStyleOption::Default,
TQStyleHintReturn* shr = 0 ) const;

336
style/qtcurve.cpp
View File

File diff suppressed because it is too large Load Diff

14
style/qtcurve.h
Unescape View File

@ -59,7 +59,7 @@
#endif
#include <tqcolor.h>
#include <tqpoint.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqpixmap.h>
#include <tqcache.h>
#include <tqvaluelist.h>
@ -162,23 +162,23 @@ class TQtCurveStyle : public BASE_STYLE
SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default) const;
void drawKStylePrimitive(KStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r,
const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt ) const;
void tqdrawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
void drawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default) const;
void tqdrawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
void drawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQStyleOption & = TQStyleOption::Default) const;
void tqdrawComplexControlMask(ComplexControl control, TQPainter *p, const TQWidget *widget,
void drawComplexControlMask(ComplexControl control, TQPainter *p, const TQWidget *widget,
const TQRect &r, const TQStyleOption &data) const;
TQRect subRect(SubRect, const TQWidget *) const;
void tqdrawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
void drawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All,
SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default) const;
TQRect querySubControlMetrics(TQ_ComplexControl, const TQWidget *, SubControl,
const TQStyleOption & = TQStyleOption::Default) const;
int tqpixelMetric(PixelMetric, const TQWidget *widget= 0) const;
int pixelMetric(PixelMetric, const TQWidget *widget= 0) const;
int kPixelMetric(KStylePixelMetric kpm, const TQWidget *widget) const;
TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &,
const TQStyleOption & = TQStyleOption::Default) const;
int tqstyleHint(StyleHint, const TQWidget *widget= 0, const TQStyleOption & = TQStyleOption::Default,
int styleHint(StyleHint, const TQWidget *widget= 0, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn *returnData= 0) const;
void drawItem(TQPainter *p, const TQRect &r, int flags, const TQColorGroup &cg, bool enabled,
const TQPixmap *pixmap, const TQString &text, int len=-1, const TQColor *penColor=0) const;

Write Preview
Loading…
Cancel
Save