diff options
Diffstat (limited to 'twin/lib')
| -rw-r--r-- | twin/lib/kcommondecoration.cpp | 6 | ||||
| -rw-r--r-- | twin/lib/kcommondecoration.h | 6 | ||||
| -rw-r--r-- | twin/lib/kdecoration.cpp | 4 | ||||
| -rw-r--r-- | twin/lib/kdecoration.h | 10 | ||||
| -rw-r--r-- | twin/lib/kdecoration_p.cpp | 2 | ||||
| -rw-r--r-- | twin/lib/kdecorationfactory.h | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index bd33e979f..4a667c7b4 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -522,7 +522,7 @@ void KCommonDecoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize KCommonDecoration::minimumSize() const +TQSize KCommonDecoration::tqminimumSize() const { const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft)) +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight)) @@ -684,7 +684,7 @@ void KCommonDecoration::resizeEvent(TQResizeEvent */*e*/) updateWindowShape(); // FIXME: don't update() here! this would result in two paintEvent()s - // because there is already "something" else triggering the repaint... + // because there is already "something" else triggering the tqrepaint... // widget()->update(); } @@ -946,7 +946,7 @@ void KCommonDecorationButton::setSize(const TQSize &s) } } -TQSize KCommonDecorationButton::sizeHint() const +TQSize KCommonDecorationButton::tqsizeHint() const { return m_size; } diff --git a/twin/lib/kcommondecoration.h b/twin/lib/kcommondecoration.h index bd55ffa0a..93427b248 100644 --- a/twin/lib/kcommondecoration.h +++ b/twin/lib/kcommondecoration.h @@ -178,7 +178,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration /** * This updates the window mask using the information provided by * cornerShape(). Edges which are aligned to screen corners are not - * shaped for better usability (remember to paint these areas in paintEvent(), too). + * tqshaped for better usability (remember to paint these areas in paintEvent(), too). * You normally don't want/need to reimplement updateWindowShape(). * @see cornerShape() */ @@ -234,7 +234,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void show(); virtual void resize(const TQSize& s); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; virtual void maximizeChange(); virtual void desktopChange(); virtual void shadeChange(); @@ -348,7 +348,7 @@ class KWIN_EXPORT KCommonDecorationButton : public TQButton */ ButtonState lastMousePress() const { return m_lastMouse; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void setToggleButton(bool toggle); diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp index c9888ff96..ee8eb866d 100644 --- a/twin/lib/kdecoration.cpp +++ b/twin/lib/kdecoration.cpp @@ -388,14 +388,14 @@ const TQFont& KDecorationOptions::font(bool active, bool small) const return(active ? d->activeFont : d->inactiveFont); } -const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const +const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const { int idx = type + (active ? 0 : NUM_COLORS); if(d->cg[idx]) return(*d->cg[idx]); d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150), d->colors[idx].dark(), d->colors[idx].dark(120), - Qt::black, TQApplication::palette().active(). + Qt::black, TQApplication::tqpalette().active(). base()); return(*d->cg[idx]); } diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h index 19fe494ed..30da5bc5c 100644 --- a/twin/lib/kdecoration.h +++ b/twin/lib/kdecoration.h @@ -205,7 +205,7 @@ public: * @param type The requested color type. * @param active Whether to return the color for active or inactive windows. */ - const TQColorGroup& colorGroup(ColorType type, bool active=true) const; + const TQColorGroup& tqcolorGroup(ColorType type, bool active=true) const; /** * Returns the active or inactive decoration font. * The changed flags for this setting is SettingFont. @@ -481,15 +481,15 @@ class KWIN_EXPORT KDecoration void performWindowOperation( WindowOperation op ); /** * If the decoration is non-rectangular, this function needs to be called - * to set the shape of the decoration. + * to set the tqshape of the decoration. * - * @param reg The shape of the decoration. + * @param reg The tqshape of the decoration. * @param mode The X11 values Unsorted, YSorted, YXSorted and YXBanded that specify * the sorting of the rectangles, default value is Unsorted. */ void setMask( const TQRegion& reg, int mode = 0 ); /** - * This convenience function resets the shape mask. + * This convenience function resets the tqshape mask. */ void clearMask(); // convenience /** @@ -594,7 +594,7 @@ class KWIN_EXPORT KDecoration * Note that the returned size shouldn't be too large, because it will be * used to keep the decorated window at least as large. */ - virtual TQSize minimumSize() const = 0; + virtual TQSize tqminimumSize() const = 0; /** * This function is called whenever the window either becomes or stops being active. * Use isActive() to find out the current state. diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp index 3561d63e0..1e063d099 100644 --- a/twin/lib/kdecoration_p.cpp +++ b/twin/lib/kdecoration_p.cpp @@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE. #include <kconfig.h> #include <kglobalsettings.h> -#include <palette.h> +#include <tqpalette.h> #include <tqapplication.h> #include <assert.h> diff --git a/twin/lib/kdecorationfactory.h b/twin/lib/kdecorationfactory.h index 7396ad987..fb560c492 100644 --- a/twin/lib/kdecorationfactory.h +++ b/twin/lib/kdecorationfactory.h @@ -56,7 +56,7 @@ class KWIN_EXPORT KDecorationFactory * The argument specifies what has changed, using the SettingXXX masks. * It should be determined whether the decorations need to be completely * remade, in which case true should be returned, or whether only e.g. - * a repaint will be sufficient, in which case false should be returned, + * a tqrepaint will be sufficient, in which case false should be returned, * and resetDecorations() can be called to reset all decoration objects. * Note that true should be returned only when really necessary. */ |