summaryrefslogtreecommitdiffstats
path: root/kicker/extensions/dockbar
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/extensions/dockbar
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/extensions/dockbar')
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp24
-rw-r--r--kicker/extensions/dockbar/dockbarextension.h2
-rw-r--r--kicker/extensions/dockbar/dockcontainer.cpp4
-rw-r--r--kicker/extensions/dockbar/dockcontainer.h2
4 files changed, 16 insertions, 16 deletions
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index d3b625f80..95dcccbc9 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -57,10 +57,10 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type,
: KPanelExtension(configFile, type, actions, parent, name)
{
dragging_container = 0;
- kwin_module = new KWinModule(this);
+ kwin_module = new KWinModule(TQT_TQOBJECT(this));
connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) );
setMinimumSize(DockContainer::sz(), DockContainer::sz());
- setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
loadContainerConfig();
}
@@ -77,7 +77,7 @@ DockBarExtension::~DockBarExtension()
if (dragging_container) delete dragging_container;
}
-TQSize DockBarExtension::sizeHint(Position p, TQSize) const
+TQSize DockBarExtension::tqsizeHint(Position p, TQSize) const
{
if (p == Left || p == Right)
return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count());
@@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers()
it != containers.constEnd();
++it)
{
- if (orientation() == Horizontal)
+ if (orientation() == Qt::Horizontal)
(*it)->move(DockContainer::sz() * i, 0);
else
(*it)->move(0, DockContainer::sz() * i);
@@ -246,7 +246,7 @@ void DockBarExtension::addContainer(DockContainer* c, int pos)
void DockBarExtension::removeContainer(DockContainer* c)
{
- DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), c);
+ DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), c);
if (it == containers.end())
{
@@ -335,7 +335,7 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p)
it != containers.constEnd();
++it, ++i)
{
- if ((*it)->geometry().contains(p))
+ if ((*it)->tqgeometry().tqcontains(p))
{
return i;
}
@@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p)
}
void DockBarExtension::mousePressEvent(TQMouseEvent *e ) {
- if (e->button() == LeftButton) {
+ if (e->button() == Qt::LeftButton) {
// Store the position of the mouse clic.
mclic_pos = e->pos();
- } else if (e->button() == RightButton) {
+ } else if (e->button() == Qt::RightButton) {
int pos = findContainerAtPoint(e->pos());
if (pos != -1) containers.at(pos)->popupMenu(e->globalPos());
}
}
void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
- if (e->button() != LeftButton) return;
+ if (e->button() != Qt::LeftButton) return;
if (dragging_container) {
releaseMouse();
original_container->embed(dragging_container->embeddedWinId());
@@ -366,7 +366,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
}
void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
- if (! (e->state() & LeftButton) ) return;
+ if (! (e->state() & Qt::LeftButton) ) return;
if (dragging_container == 0) {
// Check whether the user has moved far enough.
int delay = TQApplication::startDragDistance();
@@ -393,7 +393,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
int pdrag1,pdrag2,psz;
pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2;
pdrag2 = dragpos.y() - barpos.y() + DockContainer::sz()/2;
- if (orientation() == Vertical) {
+ if (orientation() == Qt::Vertical) {
int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp;
psz = height();
} else psz = width();
@@ -403,7 +403,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
pdrag1 = dragged_container_original_pos;
- DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), original_container);
+ DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), original_container);
if (it == containers.end())
{
diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h
index e735ec708..eada2583b 100644
--- a/kicker/extensions/dockbar/dockbarextension.h
+++ b/kicker/extensions/dockbar/dockbarextension.h
@@ -40,7 +40,7 @@ public:
virtual ~DockBarExtension();
- TQSize sizeHint(Position, TQSize maxSize) const;
+ TQSize tqsizeHint(Position, TQSize maxSize) const;
Position preferedPosition() const { return Right; }
protected slots:
diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp
index d363b6b30..1d281619a 100644
--- a/kicker/extensions/dockbar/dockcontainer.cpp
+++ b/kicker/extensions/dockbar/dockcontainer.cpp
@@ -41,9 +41,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
DockContainer::DockContainer( TQString command, TQWidget *parent,
TQString resname, TQString resclass, bool undocked_style )
: TQFrame( parent, resname.ascii(),
- undocked_style ? WStyle_Customize |
+ undocked_style ? (WFlags)(WStyle_Customize |
WStyle_StaysOnTop | WStyle_Tool |
- WStyle_NoBorder | WX11BypassWM : 0 ),
+ WStyle_NoBorder | WX11BypassWM) : (WFlags)0 ),
_embeddedWinId(0),
_command(command),
_resName(resname),
diff --git a/kicker/extensions/dockbar/dockcontainer.h b/kicker/extensions/dockbar/dockcontainer.h
index d1968fa28..278b8e450 100644
--- a/kicker/extensions/dockbar/dockcontainer.h
+++ b/kicker/extensions/dockbar/dockcontainer.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqframe.h>
#include <tqvaluevector.h>
-class DockContainer : public QFrame
+class DockContainer : public TQFrame
{
Q_OBJECT