diff options
Diffstat (limited to 'styles')
| -rw-r--r-- | styles/CMakeL10n.txt | 6 | ||||
| -rw-r--r-- | styles/dotnet/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | styles/dotnet/dotnet.cpp | 48 | ||||
| -rw-r--r-- | styles/dotnet/dotnet.h | 12 | ||||
| -rw-r--r-- | styles/dotnet/dotnet.themerc | 114 | ||||
| -rw-r--r-- | styles/phase/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | styles/phase/config/phasestyleconfig.cpp | 10 | ||||
| -rw-r--r-- | styles/phase/config/phasestyleconfig.h | 2 | ||||
| -rw-r--r-- | styles/phase/phase.themerc | 81 | ||||
| -rw-r--r-- | styles/phase/phasestyle.cpp | 142 | ||||
| -rw-r--r-- | styles/phase/phasestyle.h | 16 |
11 files changed, 131 insertions, 312 deletions
diff --git a/styles/CMakeL10n.txt b/styles/CMakeL10n.txt index b585ce4a..13d78f90 100644 --- a/styles/CMakeL10n.txt +++ b/styles/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/style-themes/" + SOURCES *.themerc + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/styles/dotnet/CMakeLists.txt b/styles/dotnet/CMakeLists.txt index 15a2ef0f..e3c00aca 100644 --- a/styles/dotnet/CMakeLists.txt +++ b/styles/dotnet/CMakeLists.txt @@ -25,7 +25,11 @@ link_directories( ##### other data ################################ -install( FILES dotnet.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes ) +tde_create_translated_desktop( + SOURCE dotnet.themerc + DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes + PO_DIR style-themes +) ##### dotnet ##################################### diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 00add309..e939cfc2 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -85,7 +85,7 @@ dotNETstyle::dotNETstyle() : TDEStyle( AllowMenuTransparency ), kickerMode(false } if (tqApp->inherits("TDEApplication")) { - connect( tqApp, TQT_SIGNAL( tdedisplayPaletteChanged() ), TQT_SLOT( paletteChanged() )); + connect( tqApp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( paletteChanged() )); } TQSettings settings; @@ -111,7 +111,7 @@ bool dotNETstyle::inheritsTDEHTML(const TQWidget* w) const void dotNETstyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); if (!qstrcmp(tqApp->argv()[0], "kicker") || ceData.widgetObjectTypes.contains("Kicker")) @@ -124,7 +124,7 @@ void dotNETstyle::polish(const TQStyleControlElementData &ceData, ControlElement // to update the palette again. // bool extraPalette = false; - if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsTDEHTML(widget)) { + if (ceData.widgetObjectTypes.contains("TQComboBox") && !inheritsTDEHTML(widget)) { installObjectEventHandler(ceData, elementFlags, ptr, this); updatePalette( (TQComboBox*) widget ); // extraPalette = true; @@ -137,10 +137,10 @@ void dotNETstyle::polish(const TQStyleControlElementData &ceData, ControlElement // other bad things (see bug #54569) /* if (!widget->ownPalette()) { - if (ceData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQToolBar")) { updatePalette( (TQToolBar*) widget ); extraPalette = true; - } else if (ceData.widgetObjectTypes.contains(TQMENUBAR_OBJECT_NAME_STRING)) { + } else if (ceData.widgetObjectTypes.contains("TQMenuBar")) { updatePalette( (TQMenuBar*) widget ); extraPalette = true; } @@ -153,10 +153,10 @@ void dotNETstyle::unPolish(const TQStyleControlElementData &ceData, ControlEleme { winstyle->unPolish(ceData, elementFlags, ptr); - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsTDEHTML(widget)) { + if (ceData.widgetObjectTypes.contains("TQComboBox") && !inheritsTDEHTML(widget)) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } } @@ -425,7 +425,7 @@ void dotNETstyle::drawTDEStylePrimitive(TDEStylePrimitive kpe, // This function draws primitive elements as well as their masks. -void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe, +void dotNETstyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -765,21 +765,21 @@ void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe, if (flags & Style_Enabled) { a.translate((r.x() + r.width()/2), (r.y() + r.height()/2)); - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(cg.buttonText()); } p->drawLineSegments(a, 0, 3); p->drawPoint(a[6]); } else { a.translate((r.x() + r.width()/2)+1, (r.y() + r.height()/2)+1); - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(cg.highlightedText()); } p->drawLineSegments(a, 0, 3); p->drawPoint(a[6]); a.translate(-1,-1); - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(cg.mid()); } p->drawLineSegments(a, 0, 3); @@ -797,7 +797,7 @@ void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe, } -void dotNETstyle::drawControl(TQ_ControlElement element, +void dotNETstyle::drawControl(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1357,11 +1357,11 @@ void dotNETstyle::drawControl(TQ_ControlElement element, } else if (mi->pixmap()) { TQPixmap *pixmap = mi->pixmap(); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); } p->drawPixmap(xpos, y, *pixmap); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } } } @@ -1403,7 +1403,7 @@ void dotNETstyle::drawControl(TQ_ControlElement element, } } -void dotNETstyle::drawControlMask(TQ_ControlElement element, +void dotNETstyle::drawControlMask(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1625,7 +1625,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, case CC_SpinWidget: { const TQSpinWidget *sw = (const TQSpinWidget *) widget; SFlags flags; - TQ_PrimitiveElement pe; + PrimitiveElement pe; TQRect swf = querySubControlMetrics(control, ceData, elementFlags, SC_SpinWidgetFrame, TQStyleOption::Default, sw); swf = visualRect( swf, ceData, elementFlags ); @@ -1871,10 +1871,10 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceD if (!pseudo3D) { return 1; } else { - if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING) || - ceData.widgetObjectTypes.contains(TQMENUBAR_OBJECT_NAME_STRING) || - ceData.widgetObjectTypes.contains(TQRANGECONTROL_OBJECT_NAME_STRING) || - ceData.widgetObjectTypes.contains(TQSCROLLVIEW_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQPopupMenu") || + ceData.widgetObjectTypes.contains("TQMenuBar") || + ceData.widgetObjectTypes.contains("TQRangeControl") || + ceData.widgetObjectTypes.contains("TQScrollView")) { return 1; } else { return 2; @@ -2067,10 +2067,10 @@ void dotNETstyle::slotDestroyed() bool dotNETstyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags, void* source, TQEvent *ev ) { - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* obj = reinterpret_cast<TQObject*>(source); - if (obj->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) { + if (obj->inherits("TQComboBox")) { if (ev->type() == TQEvent::Enter) { TQWidget *btn = (TQWidget *)obj; if (btn->isEnabled()) { @@ -2090,7 +2090,7 @@ bool dotNETstyle::objectEventHandler( const TQStyleControlElementData &ceData, C pal.active().color(TQColorGroup::Background)); btn->setPalette(pal); } - } else if (obj->inherits(TQBUTTON_OBJECT_NAME_STRING)) { + } else if (obj->inherits("TQButton")) { TQWidget *btn = (TQWidget *)obj; TQPalette pal = btn->palette(); pal.setColor(TQColorGroup::Button, @@ -2119,5 +2119,3 @@ int dotNETstyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData return ret; } - -// vim: noet ts=4 sw=4 diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h index eb32a35e..0123811d 100644 --- a/styles/dotnet/dotnet.h +++ b/styles/dotnet/dotnet.h @@ -34,7 +34,7 @@ class dotNETstyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: @@ -57,7 +57,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -66,7 +66,7 @@ public: SFlags flags = Style_Default, const TQStyleOption &opt = TQStyleOption::Default ) const; - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -76,7 +76,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawControlMask( TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; + void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; void drawComplexControl( ComplexControl control, TQPainter *p, @@ -118,7 +118,7 @@ public: const TQStyleOption &o, const TQWidget *w = 0) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; @@ -161,5 +161,3 @@ private: }; #endif - -// vim: set noet ts=4 sw=4: diff --git a/styles/dotnet/dotnet.themerc b/styles/dotnet/dotnet.themerc index b7e5fde8..54bdf504 100644 --- a/styles/dotnet/dotnet.themerc +++ b/styles/dotnet/dotnet.themerc @@ -1,118 +1,6 @@ [Misc] Name=.NET style -Name[af]=.Net styl -Name[br]=Giz .NET -Name[bs]=.NET stil -Name[ca]=Estil .NET -Name[cs]=Styl .NET -Name[cy]=Arddull .NET -Name[da]=.NET-stil -Name[de]=.NET-Stil -Name[el]=Στυλ .NET -Name[eo]=.NET-stilo -Name[es]=Estilo .NET -Name[et]=.NET stiil -Name[eu]=.NET estiloa -Name[fa]=سبک .NET -Name[fi]=.NET-tyyli -Name[fo]=.NET-snið -Name[fr]=Style .NET -Name[fy]=.NET-styl -Name[ga]=Stíl .NET -Name[gl]=Estilo .NET -Name[he]=סגנון .NET -Name[hi]=.NET शैली -Name[hu]=.NET-stílus -Name[is]=.NET stíll -Name[it]=Stile .NET -Name[ja]=.NET スタイル -Name[ka]=.NET სტილი -Name[lt]=.NET stilius -Name[lv]=.NET stils -Name[mk]=Стил .NET -Name[mt]=Stil .NET -Name[nb]=.NET-stil -Name[nds]=.NET-Stil -Name[ne]=.NET शैली -Name[nl]=.NET-stijl -Name[nn]=.NET-stil -Name[pa]=.NET ਸ਼ੈਲੀ -Name[pl]=Styl .NET -Name[pt]=Estilo .NET -Name[pt_BR]=Estilos Web -Name[ro]=Stil .NET -Name[ru]=Стиль .NET -Name[sk]=Štýl .NET -Name[sl]=Slog .NET -Name[sr]=.NET стил -Name[sr@Latn]=.NET stil -Name[sv]=.NET-stil -Name[ta]=.NET வித -Name[tg]=Намуди .NET -Name[th]=รูปแบบ .NET -Name[tr]=.NET stili -Name[uk]=Стиль ".NET" -Name[ven]=Tshitaela tsha .NET -Name[vi]=Kiểu .NET -Name[xh]=Uhlobo lo Mnatha -Name[zh_CN]=.NET 风格 -Name[zh_TW]=.NET 風格 -Name[zu]=.NET uhlobo Comment=Fast, clean, and minimalistic. -Comment[af]=Vinnige, maak skoon, en minimalisties. -Comment[bg]=Семпъл и изчистен стил, изискващ малко ресурси -Comment[bs]=Brz, čist i minimalističan. -Comment[ca]=Ràpid, net i minimalista. -Comment[cs]=Rychlé, úhledné a minimalistické -Comment[cy]=Cyflym, glan a lleiafsymiol. -Comment[da]=Hurtig, ren og minimalistisk. -Comment[de]=Schnell, sauber, minimalistisch -Comment[el]=Γρήγορο, καθαρό, και μινιμαλιστικό. -Comment[es]=Rápido, limpio y minimalista. -Comment[et]=Kiire, lihtne ja minimalistlik -Comment[eu]=Azkarra, garbia, eta minimalista. -Comment[fa]=سریع، تمییز، و حداقل. -Comment[fi]=Pieni, puhdas ja minimalistinen -Comment[fo]=Skjótt og smátt. -Comment[fr]=Rapide et dépouillé -Comment[fy]=Fluch,skjin en minimalistysk -Comment[gl]=Rápido, limpo e minimalista. -Comment[he]=מהיר, נקי, ומינימליסטי. -Comment[hi]=तेज, साफ तथा कम-से-कम -Comment[hu]=Gyors, jól átlátható, egyszerű stílus -Comment[is]=Hratt, einfalt, og naumhyggja. -Comment[it]=Veloce, semplice e minimalistico -Comment[ja]=速い, クリーン, ミニマリズム -Comment[ka]=სწრაფი, სუფთა და სადა -Comment[lt]=Greitas, švarus ir minimalistinis -Comment[lv]=Ātrs, tīrs un minimāls. -Comment[mk]=Брз, чист и минималистички. -Comment[ms]=Cepat, bersih, dan minimalistik. -Comment[mt]=Jgħaġġel, nadif u minimalist -Comment[nb]=Rask, ren og minimal. -Comment[nds]=Gau, oprüümt, minimaal. -Comment[ne]=छिटो, सफा,र गौण -Comment[nl]=Snel,schoon en minimalistisch -Comment[nn]=Rask, enkel og minimalistisk. -Comment[pl]=Szybki, bez przepychu wręcz minimalistyczny -Comment[pt]=Rápido, limpo e minimalista. -Comment[pt_BR]=Rápido, limpo, e minimalista. -Comment[ro]=Rapid, clar şi minimal. -Comment[ru]=Быстрая, простая и лёгкая -Comment[sk]=Rýchly, jednoduchý a minimalistický. -Comment[sl]=Hiter, čist in minimalističen slog -Comment[sr]=Брз, чисти и минималистички -Comment[sr@Latn]=Brz, čisti i minimalistički -Comment[sv]=Snabb, ren och minimal -Comment[ta]= வேகமான, சுத்தமான, குறைச்சலாக -Comment[tg]=Тез, тоза ва сабук. -Comment[th]=เร็ว, สะอาด และดูเรียบง่าย -Comment[tr]=Hızlı ve küçük. -Comment[uk]=Швидка, акуратна і без надміру. -Comment[ven]=U tavhanya, u kulumaga, nau fhungudzanyana -Comment[vi]=Nhanh, sạch, và gọn nhẹ -Comment[zh_CN]=快速、整洁而且极简化。 -Comment[zh_TW]=快速，清楚和極簡化 -Comment[zu]=Okusheshayo,okuhlanzekile kanye nokuyingcosana. + [KDE] WidgetStyle=dotNET diff --git a/styles/phase/CMakeLists.txt b/styles/phase/CMakeLists.txt index 314548f0..f1a32611 100644 --- a/styles/phase/CMakeLists.txt +++ b/styles/phase/CMakeLists.txt @@ -28,7 +28,11 @@ add_subdirectory( config ) ##### other data ################################ -install( FILES phase.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes ) +tde_create_translated_desktop( + SOURCE phase.themerc + DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes + PO_DIR style-themes +) ##### phasestyle ################################# diff --git a/styles/phase/config/phasestyleconfig.cpp b/styles/phase/config/phasestyleconfig.cpp index d3695b83..4a3b7bcd 100644 --- a/styles/phase/config/phasestyleconfig.cpp +++ b/styles/phase/config/phasestyleconfig.cpp @@ -39,10 +39,10 @@ PhaseStyleConfig::PhaseStyleConfig(TQWidget* parent) : StyleDialog(parent) highlights->setChecked(oldhighlights); // connections - connect(gradients, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(updateChanged())); - connect(highlights, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(updateChanged())); + connect(gradients, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(updateChanged())); + connect(highlights, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(updateChanged())); } ////////////////////////////////////////////////////////////////////////////// @@ -104,7 +104,7 @@ void PhaseStyleConfig::defaults() extern "C" { KDE_EXPORT TQObject* allocate_tdestyle_config(TQWidget* parent) { - return(TQT_TQOBJECT(new PhaseStyleConfig(parent))); + return(new PhaseStyleConfig(parent)); } } diff --git a/styles/phase/config/phasestyleconfig.h b/styles/phase/config/phasestyleconfig.h index 0c29a52c..6a77c670 100644 --- a/styles/phase/config/phasestyleconfig.h +++ b/styles/phase/config/phasestyleconfig.h @@ -33,7 +33,7 @@ class TDEConfig; class PhaseStyleConfig : public StyleDialog { - Q_OBJECT + TQ_OBJECT public: PhaseStyleConfig(TQWidget* parent); diff --git a/styles/phase/phase.themerc b/styles/phase/phase.themerc index 53ec5c54..078dc93e 100644 --- a/styles/phase/phase.themerc +++ b/styles/phase/phase.themerc @@ -1,86 +1,7 @@ [Misc] Name=Phase -Name[br]=Prantadoù -Name[ca]=Fase -Name[el]=Φάση -Name[eo]=Fazo -Name[es]=Fase -Name[et]=Faas -Name[eu]=Fasea -Name[fa]=گام -Name[fi]=Vaihe -Name[fy]=Faze -Name[ga]=Pas -Name[he]=קרני לייזר -Name[hi]=फेज़ -Name[is]=Fasi -Name[it]=Fase -Name[ja]=位相 -Name[ka]=ფაზა -Name[mk]=Фаза -Name[ms]=Fasa -Name[nb]=Fase -Name[nds]=Phaas -Name[ne]=चरण -Name[nn]=Fase -Name[pa]=ਪੜਾਅ -Name[pl]=Faza -Name[ru]=Фаза -Name[sl]=Faza -Name[sr]=Фаза -Name[sr@Latn]=Faza -Name[sv]=Fas -Name[ta]=பகுதி -Name[tr]=Faz -Name[uk]=Фаза -Name[vi]=Pha -Name[zh_TW]=相 ConfigPage=tdestyle_phase_config Comment=Clean classical look -Comment[bg]=Семпъл и изчистен стил -Comment[bs]=Jednostavan klasični stil -Comment[ca]=Un estil clàssic i net -Comment[cs]=Klasický čistý vzhled -Comment[da]=Rent klassisk udseende -Comment[de]=Ein einfaches und klares Aussehen -Comment[el]=Ένα απλό και κλασσικό στυλ -Comment[es]=Un estilo clásico y claro -Comment[et]=Lihtne klassikaline välimus -Comment[eu]=Itxura garbi klasikoa -Comment[fa]=ظاهر کلاسیک واضح -Comment[fi]=Puhdas perinteinen tyyli -Comment[fr]=Un style simple et propre -Comment[fy]=In klassyk en moai uterlik -Comment[gl]=Apariencia sinxela e clásica -Comment[he]=סגנון פשוט ונקי -Comment[hi]=साफ शास्त्रीय रूप -Comment[hu]=Tiszta, egyszerű stílus -Comment[is]=Einfaldur og hreinlegur stíll -Comment[it]=Orologio classico -Comment[ja]=単純で清潔なスタイル -Comment[ka]=სადა და კლასიკური სტილი -Comment[mk]=Чист класичен изглед -Comment[ms]=Rupa klasik bersih -Comment[nb]=Enkelt klassisk utseende -Comment[nds]=Oprüümt klass'sch Utsehn -Comment[ne]=सफा उत्कृष्ट ढाँचा -Comment[nl]=Een klassiek en schoon uiterlijk -Comment[nn]=Enkel og klassisk utsjånad -Comment[pa]=ਸਾਫ਼ ਟਕਸਾਲੀ ਦਿੱਖ -Comment[pl]=Czysty, klasyczny wygląd -Comment[pt]=Um estilo clássico limpo -Comment[pt_BR]=Uma aprência clássica limpa -Comment[ru]=Простой классический стиль -Comment[sk]=Jednoduchý klasický vzhľad -Comment[sl]=Čist klasičen izgled -Comment[sr]=Чист класичан изглед -Comment[sr@Latn]=Čist klasičan izgled -Comment[sv]=Ren och klassisk stil -Comment[ta]=விசேஷ பார்வையைத் துடை -Comment[tr]=Temiz ve klasik bir görünüm -Comment[uk]=Акуратний, класичний стиль -Comment[vi]=Sạch, kiểu dáng truyền thống -Comment[zh_CN]=简洁经典的外观 -Comment[zh_TW]=乾淨的傳統外觀 + [KDE] WidgetStyle=Phase diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index 782116a6..69a90749 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -54,7 +54,7 @@ #include "phasestyle.h" #include "bitmaps.h" -static const char* TQSPLITTERHANDLE = TQSPLITTERHANDLE_OBJECT_NAME_STRING; +static const char* TQSPLITTERHANDLE = "TQSplitterHandle"; static const char* TQTOOLBAREXTENSION = "TQToolBarExtensionWidget"; static const char* KTOOLBARWIDGET = "tde toolbar widget"; @@ -138,7 +138,7 @@ PhaseStyle::~PhaseStyle() void PhaseStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); if (!qstrcmp(app->argv()[0], "kicker")) kicker_ = true; } @@ -151,29 +151,29 @@ void PhaseStyle::applicationPolish(const TQStyleControlElementData &ceData, Cont void PhaseStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if (::tqqt_cast<TQMenuBar*>(widget) || - ::tqqt_cast<TQPopupMenu*>(widget)) { + if (::tqt_cast<TQMenuBar*>(widget) || + ::tqt_cast<TQPopupMenu*>(widget)) { // anti-flicker optimization widget->setBackgroundMode(NoBackground); - } else if (::tqqt_cast<TQFrame*>(widget) || + } else if (::tqt_cast<TQFrame*>(widget) || widget->inherits(TQTOOLBAREXTENSION) || (!qstrcmp(widget->name(), KTOOLBARWIDGET))) { // needs special handling on paint events installObjectEventHandler(ceData, elementFlags, ptr, this); } else if (highlights_ && - (::tqqt_cast<TQPushButton*>(widget) || - ::tqqt_cast<TQComboBox*>(widget) || - ::tqqt_cast<TQSpinWidget*>(widget) || - ::tqqt_cast<TQCheckBox*>(widget) || - ::tqqt_cast<TQRadioButton*>(widget) || - ::tqqt_cast<TQSlider*>(widget) || + (::tqt_cast<TQPushButton*>(widget) || + ::tqt_cast<TQComboBox*>(widget) || + ::tqt_cast<TQSpinWidget*>(widget) || + ::tqt_cast<TQCheckBox*>(widget) || + ::tqt_cast<TQRadioButton*>(widget) || + ::tqt_cast<TQSlider*>(widget) || widget->inherits(TQSPLITTERHANDLE))) { // mouseover highlighting installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (highlights_ && ::tqqt_cast<TQTabBar*>(widget)) { + } else if (highlights_ && ::tqt_cast<TQTabBar*>(widget)) { // highlighting needing mouse tracking widget->setMouseTracking(true); installObjectEventHandler(ceData, elementFlags, ptr, this); @@ -213,26 +213,26 @@ void PhaseStyle::polish(TQPalette &pal) void PhaseStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if (::tqqt_cast<TQMenuBar*>(widget) || - ::tqqt_cast<TQPopupMenu*>(widget)) { + if (::tqt_cast<TQMenuBar*>(widget) || + ::tqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode(PaletteBackground); - } else if (::tqqt_cast<TQFrame*>(widget) || + } else if (::tqt_cast<TQFrame*>(widget) || widget->inherits(TQTOOLBAREXTENSION) || (!qstrcmp(widget->name(), KTOOLBARWIDGET))) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } else if (highlights_ && // highlighting - (::tqqt_cast<TQPushButton*>(widget) || - ::tqqt_cast<TQComboBox*>(widget) || - ::tqqt_cast<TQSpinWidget*>(widget) || - ::tqqt_cast<TQCheckBox*>(widget) || - ::tqqt_cast<TQRadioButton*>(widget) || - ::tqqt_cast<TQSlider*>(widget) || + (::tqt_cast<TQPushButton*>(widget) || + ::tqt_cast<TQComboBox*>(widget) || + ::tqt_cast<TQSpinWidget*>(widget) || + ::tqt_cast<TQCheckBox*>(widget) || + ::tqt_cast<TQRadioButton*>(widget) || + ::tqt_cast<TQSlider*>(widget) || widget->inherits(TQSPLITTERHANDLE))) { removeObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (highlights_ && ::tqqt_cast<TQTabBar*>(widget)) { + } else if (highlights_ && ::tqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(false); removeObjectEventHandler(ceData, elementFlags, ptr, this); } @@ -576,7 +576,7 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter, // --------------- // Draw the primitive element -void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element, +void PhaseStyle::drawPrimitive(PrimitiveElement element, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -633,12 +633,12 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element, widget =dynamic_cast<TQWidget*>(painter->device()); if (header) { - horiz = (header->orientation() ==Qt::Horizontal); + horiz = (header->orientation() ==TQt::Horizontal); } else { horiz = true; } - if ((ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) || + if ((ceData.widgetObjectTypes.contains("TQPopupMenu")) || (ceData.widgetObjectTypes.contains("TDEPopupTitle"))) { // kicker/kdesktop menu titles drawPhaseBevel(painter, x,y,w,h, @@ -696,7 +696,7 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element, drawPhaseBevel(painter, x, y, w, h, group, group.button(), down, !horiz, true); - TQ_PrimitiveElement arrow = ((horiz) ? + PrimitiveElement arrow = ((horiz) ? ((element == PE_ScrollBarAddLine) ? PE_ArrowRight : PE_ArrowLeft) : ((element == PE_ScrollBarAddLine) ? @@ -894,8 +894,8 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element, widget = dynamic_cast<TQWidget*>(painter->device()); bool flat = true; - if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) { - TQToolBar *toolbar = ::tqqt_cast<TQToolBar*>(widget->parent()); + if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) { + TQToolBar *toolbar = ::tqt_cast<TQToolBar*>(widget->parent()); if (toolbar) { // toolbar not floating or in a TQMainWindow flat = flatToolbar(ceData, elementFlags, toolbar); @@ -1153,7 +1153,7 @@ void PhaseStyle::drawTDEStylePrimitive(TDEStylePrimitive element, // ------------- // Draw the control -void PhaseStyle::drawControl(TQ_ControlElement element, +void PhaseStyle::drawControl(ControlElement element, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1203,7 +1203,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } case CE_PushButtonLabel: { - const TQPushButton* button = ::tqqt_cast<const TQPushButton*>(widget); + const TQPushButton* button = ::tqt_cast<const TQPushButton*>(widget); if (!button) { TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); @@ -1280,7 +1280,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, case CE_CheckBoxLabel: case CE_RadioButtonLabel: { - const TQButton *b = ::tqqt_cast<const TQButton*>(widget); + const TQButton *b = ::tqt_cast<const TQButton*>(widget); if (!b) return; int alignment = reverse_ ? AlignRight : AlignLeft; @@ -1298,7 +1298,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } case CE_DockWindowEmptyArea: { - const TQToolBar *tb = ::tqqt_cast<const TQToolBar*>(widget); + const TQToolBar *tb = ::tqt_cast<const TQToolBar*>(widget); if (tb) { // toolbar not floating or in a TQMainWindow if (flatToolbar(ceData, elementFlags, tb)) { @@ -1318,7 +1318,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, break; case CE_MenuBarItem: { - const TQMenuBar *mbar = ::tqqt_cast<const TQMenuBar*>(widget); + const TQMenuBar *mbar = ::tqt_cast<const TQMenuBar*>(widget); if (!mbar) { TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); @@ -1349,7 +1349,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } case CE_PopupMenuItem: { - if (!ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQPopupMenu")) { TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; @@ -1481,18 +1481,18 @@ void PhaseStyle::drawControl(TQ_ControlElement element, else if (mi->pixmap()) { // pixmap as label pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - painter->setBackgroundMode(Qt::OpaqueMode); + painter->setBackgroundMode(TQt::OpaqueMode); dx = ((w - pixmap.width()) / 2) + ((w - pixmap.width()) % 2); painter->drawPixmap(x+dx, y+ITEMFRAME, pixmap); if (pixmap.depth() == 1) - painter->setBackgroundMode(Qt::TransparentMode); + painter->setBackgroundMode(TQt::TransparentMode); } } if (mi->popup()) { // draw submenu arrow - TQ_PrimitiveElement arrow = reverse_ ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse_ ? PE_ArrowLeft : PE_ArrowRight; int dim = (h-2*ITEMFRAME) / 2; vrect = visualRect(TQRect(x + w - ARROWMARGIN - ITEMFRAME - dim, y + h / 2 - dim / 2, dim, dim), rect); @@ -1503,7 +1503,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } case CE_TabBarTab: { - if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQTabBar")) { // this guy can get complicated, we we do it elsewhere drawPhaseTab(painter, x, y, w, h, group, ceData, elementFlags, option, flags); @@ -1522,7 +1522,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } case CE_ProgressBarContents: { - if (!ceData.widgetObjectTypes.contains(TQPROGRESSBAR_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQProgressBar")) { TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; @@ -1550,7 +1550,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } case CE_ToolBoxTab: { - const TQToolBox *box = ::tqqt_cast<const TQToolBox*>(widget); + const TQToolBox *box = ::tqt_cast<const TQToolBox*>(widget); if (!box) { TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); @@ -1597,7 +1597,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, // ----------------- // Draw a bitmask for the element -void PhaseStyle::drawControlMask(TQ_ControlElement element, +void PhaseStyle::drawControlMask(ControlElement element, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1621,7 +1621,7 @@ void PhaseStyle::drawControlMask(TQ_ControlElement element, // -------------------- // Draw a complex control -void PhaseStyle::drawComplexControl(TQ_ComplexControl control, +void PhaseStyle::drawComplexControl(ComplexControl control, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1777,14 +1777,14 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, } case CC_SpinWidget: { - const TQSpinWidget *spin = ::tqqt_cast<const TQSpinWidget*>(widget); + const TQSpinWidget *spin = ::tqt_cast<const TQSpinWidget*>(widget); if (!spin) { TDEStyle::drawComplexControl(control, painter, ceData, elementFlags, rect, group, flags, controls, active, option, widget); return; } - TQ_PrimitiveElement element; + PrimitiveElement element; // draw frame if (controls & SC_SpinWidgetFrame) { @@ -1837,7 +1837,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, } case CC_ToolButton: { - const TQToolButton *btn = ::tqqt_cast<const TQToolButton*>(widget); + const TQToolButton *btn = ::tqt_cast<const TQToolButton*>(widget); TQToolBar *toolbar; bool horiz = true; @@ -1847,8 +1847,8 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, y2 = rect.bottom(); // check for TQToolBar parent - if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) { - toolbar = (btn)?::tqqt_cast<TQToolBar*>(btn->parent()):NULL; + if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) { + toolbar = (btn)?::tqt_cast<TQToolBar*>(btn->parent()):NULL; horiz = (ceData.toolBarData.orientation == TQt::Horizontal); if (normal) { // draw background if (toolbar && flatToolbar(ceData, elementFlags, toolbar)) { @@ -1871,10 +1871,10 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, // check for TQToolBarExtensionWidget parent else if (btn && ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAREXTENSION)) { TQWidget *extension; - if ((extension = ::tqqt_cast<TQWidget*>(btn->parent()))) { - toolbar = ::tqqt_cast<TQToolBar*>(extension->parent()); + if ((extension = ::tqt_cast<TQWidget*>(btn->parent()))) { + toolbar = ::tqt_cast<TQToolBar*>(extension->parent()); if (toolbar) { - horiz = (toolbar->orientation() == Qt::Horizontal); + horiz = (toolbar->orientation() == TQt::Horizontal); if (normal) { // draw background drawPhaseGradient(painter, rect, group.background(), !horiz, 0, 0, toolbar->width()-3, @@ -1919,7 +1919,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, // ------------------------ // Draw a bitmask for the control -void PhaseStyle::drawComplexControlMask(TQ_ComplexControl control, +void PhaseStyle::drawComplexControlMask(ComplexControl control, TQPainter *painter, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -1967,7 +1967,7 @@ int PhaseStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementData return 24; case PM_TabBarTabVSpace: - if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQTabBar")) { if (ceData.tabBarData.shape == TQTabBar::RoundedAbove) { return 10; } else { @@ -2030,7 +2030,7 @@ TQRect PhaseStyle::subRect(SubRect rect, const TQStyleControlElementData &ceData // ------------------------ // Get metrics for subcontrols of complex controls -TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control, +TQRect PhaseStyle::querySubControlMetrics(ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -2140,7 +2140,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, switch (contents) { case CT_PushButton: { - const TQPushButton* button = ::tqqt_cast<const TQPushButton*>(widget); + const TQPushButton* button = ::tqt_cast<const TQPushButton*>(widget); if (!button) { return TDEStyle::sizeFromContents(contents, ceData, elementFlags, contentsize, option, widget); @@ -2161,7 +2161,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, case CT_PopupMenuItem: { if (!widget || option.isDefault()) return contentsize; - if (!ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQPopupMenu")) { return TDEStyle::sizeFromContents(contents, ceData, elementFlags, contentsize, option, widget); } @@ -2261,7 +2261,7 @@ int PhaseStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); if (TDEStyle::objectEventHandler(ceData, elementFlags, source, event)) return true; @@ -2280,22 +2280,22 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co // TDE Toolbar Widget // patch by Daniel Brownlees <dbrownlees@paradise.net.nz> if (object->parent() && !qstrcmp(object->name(), KTOOLBARWIDGET)) { - if (0 == (widget = ::tqqt_cast<TQWidget*>(object))) return false; - TQWidget *parent = ::tqqt_cast<TQWidget*>(object->parent()); + if (0 == (widget = ::tqt_cast<TQWidget*>(object))) return false; + TQWidget *parent = ::tqt_cast<TQWidget*>(object->parent()); int px = ceData.rect.x(), py = ceData.rect.y(); // find the toolbar while (parent && parent->parent() - && !::tqqt_cast<TQToolBar*>(parent)) { + && !::tqt_cast<TQToolBar*>(parent)) { px += parent->x(); py += parent->y(); - parent = ::tqqt_cast<TQWidget*>(parent->parent()); + parent = ::tqt_cast<TQWidget*>(parent->parent()); } if (!parent) return false; - TQT_TQRECT_OBJECT(ceData.rect).rect(&x, &y, &w, &h); + ceData.rect.rect(&x, &y, &w, &h); TQRect prect = parent->rect(); - toolbar = ::tqqt_cast<TQToolBar*>(parent); - horiz = (toolbar) ? (toolbar->orientation() == Qt::Horizontal) + toolbar = ::tqt_cast<TQToolBar*>(parent); + horiz = (toolbar) ? (toolbar->orientation() == TQt::Horizontal) : (prect.height() < prect.width()); TQPainter painter(widget); if (flatToolbar(ceData, elementFlags, toolbar)) { @@ -2318,11 +2318,11 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co // TQToolBarExtensionWidget else if (object && object->isWidgetType() && object->parent() && - (toolbar = ::tqqt_cast<TQToolBar*>(object->parent()))) { - if (0 == (widget = ::tqqt_cast<TQWidget*>(object))) return false; - horiz = (toolbar->orientation() == Qt::Horizontal); + (toolbar = ::tqt_cast<TQToolBar*>(object->parent()))) { + if (0 == (widget = ::tqt_cast<TQWidget*>(object))) return false; + horiz = (toolbar->orientation() == TQt::Horizontal); TQPainter painter(widget); - TQT_TQRECT_OBJECT(ceData.rect).rect(&x, &y, &w, &h); + ceData.rect.rect(&x, &y, &w, &h); // draw the extension drawPhaseGradient(&painter, ceData.rect, toolbar->colorGroup().background(), @@ -2349,14 +2349,14 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co } // TQFrame lines (do this guy last) - else if (0 != (frame = ::tqqt_cast<TQFrame*>(object))) { + else if (0 != (frame = ::tqt_cast<TQFrame*>(object))) { TQFrame::Shape shape = frame->frameShape(); switch (shape) { case TQFrame::HLine: case TQFrame::VLine: { // NOTE: assuming lines have no content TQPainter painter(frame); - TQT_TQRECT_OBJECT(frame->rect()).rect(&x, &y, &w, &h); + frame->rect().rect(&x, &y, &w, &h); painter.setPen(frame->colorGroup().dark()); if (shape == TQFrame::HLine) { painter.drawLine(0, h/2, w, h/2); diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h index 2d2273cc..bba45997 100644 --- a/styles/phase/phasestyle.h +++ b/styles/phase/phasestyle.h @@ -56,7 +56,7 @@ class GradientSet class PhaseStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: PhaseStyle(); @@ -67,7 +67,7 @@ class PhaseStyle : public TDEStyle void polish(TQPalette &pal); void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); - void drawPrimitive(TQ_PrimitiveElement element, + void drawPrimitive(PrimitiveElement element, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -86,7 +86,7 @@ class PhaseStyle : public TDEStyle const TQStyleOption &option = TQStyleOption::Default, const TQWidget *widget = 0) const; - void drawControl(TQ_ControlElement element, + void drawControl(ControlElement element, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -96,7 +96,7 @@ class PhaseStyle : public TDEStyle const TQStyleOption &option = TQStyleOption::Default, const TQWidget *widget = 0) const; - void drawControlMask(TQ_ControlElement element, + void drawControlMask(ControlElement element, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -104,7 +104,7 @@ class PhaseStyle : public TDEStyle const TQStyleOption &option = TQStyleOption::Default, const TQWidget *widget = 0) const; - void drawComplexControl(TQ_ComplexControl control, + void drawComplexControl(ComplexControl control, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -116,7 +116,7 @@ class PhaseStyle : public TDEStyle const TQStyleOption &option = TQStyleOption::Default, const TQWidget *widget = 0) const; - void drawComplexControlMask(TQ_ComplexControl control, + void drawComplexControlMask(ComplexControl control, TQPainter *painter, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -129,7 +129,7 @@ class PhaseStyle : public TDEStyle TQRect subRect(SubRect rect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0) const; - TQRect querySubControlMetrics(TQ_ComplexControl control, + TQRect querySubControlMetrics(ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -143,7 +143,7 @@ class PhaseStyle : public TDEStyle const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; |