summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/core/container_extension.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kicker/kicker/core/container_extension.h
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/kicker/core/container_extension.h')
-rw-r--r--kicker/kicker/core/container_extension.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h
index 8eedd4e6f..fdb3be989 100644
--- a/kicker/kicker/core/container_extension.h
+++ b/kicker/kicker/core/container_extension.h
@@ -49,7 +49,7 @@ class PopupWidgetFilter;
class PanelExtensionOpMenu;
class TQColor;
-class ExtensionContainer : public QFrame
+class ExtensionContainer : public TQFrame
{
Q_OBJECT
@@ -66,7 +66,7 @@ public:
TQWidget *parent = 0);
virtual ~ExtensionContainer();
- virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const;
+ virtual TQSize tqsizeHint(KPanelExtension::Position, const TQSize &maxSize) const;
const AppletInfo& info() const { return _info; }
@@ -86,7 +86,7 @@ public:
KPanelExtension::Orientation orientation() const;
KPanelExtension::Position position() const;
- void setPosition(KPanelExtension::Position p) { arrange( p, alignment(), xineramaScreen() ); }
+ void setPosition(KPanelExtension::Position p) { arrange( p, tqalignment(), xineramaScreen() ); }
int xineramaScreen() const;
void setXineramaScreen(int screen);
@@ -100,8 +100,8 @@ public:
void unhideIfHidden(int showForHowManyMS = 0);
bool reserveStrut() const;
- KPanelExtension::Alignment alignment() const;
- void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); }
+ KPanelExtension::Alignment tqalignment() const;
+ void tqsetAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); }
TQRect currentGeometry() const;
TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a,
@@ -159,7 +159,7 @@ private:
int XineramaScreen, const TQSize &s, TQRect workArea,
bool autohidden = false, UserHidden userHidden = Unhidden) const;
void positionChange(KPanelExtension::Position p);
- void alignmentChange(KPanelExtension::Alignment a);
+ void tqalignmentChange(KPanelExtension::Alignment a);
void xineramaScreenChange(int /*XineramaScreen*/) {}
int arrangeHideButtons();
int setupBorderSpace();
@@ -198,7 +198,7 @@ private:
TQColor m_highlightColor;
};
-class PopupWidgetFilter : public QObject
+class PopupWidgetFilter : public TQObject
{
Q_OBJECT