diff options
Diffstat (limited to 'kicker/extensions/dockbar/dockbarextension.cpp')
| -rw-r--r-- | kicker/extensions/dockbar/dockbarextension.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 446991109..ac35bfdbc 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -26,10 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <twinmodule.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kshell.h> #include <twin.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeapplication.h> #include <dcopclient.h> @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("dockbarextension"); return new DockBarExtension(configFile, KPanelExtension::Normal, @@ -57,8 +57,8 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - twin_module = new KWinModule(TQT_TQOBJECT(this)); - connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); + twin_module = new KWinModule(this); + connect( twin_module, TQ_SIGNAL( windowAdded(WId) ), TQ_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); @@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers() it != containers.constEnd(); ++it) { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) (*it)->move(DockContainer::sz() * i, 0); else (*it)->move(0, DockContainer::sz() * i); @@ -236,10 +236,10 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) containers.insert(it, c); } - connect(c, TQT_SIGNAL(embeddedWindowDestroyed(DockContainer*)), - TQT_SLOT(embeddedWindowDestroyed(DockContainer*))); - connect(c, TQT_SIGNAL(settingsChanged(DockContainer*)), - TQT_SLOT(settingsChanged(DockContainer*))); + connect(c, TQ_SIGNAL(embeddedWindowDestroyed(DockContainer*)), + TQ_SLOT(embeddedWindowDestroyed(DockContainer*))); + connect(c, TQ_SIGNAL(settingsChanged(DockContainer*)), + TQ_SLOT(settingsChanged(DockContainer*))); c->resize(DockContainer::sz(), DockContainer::sz()); c->show(); } @@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) } void DockBarExtension::mousePressEvent(TQMouseEvent *e ) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { // Store the position of the mouse clic. mclic_pos = e->pos(); - } else if (e->button() == Qt::RightButton) { + } else if (e->button() == TQt::RightButton) { int pos = findContainerAtPoint(e->pos()); if (pos != -1) containers.at(pos)->popupMenu(e->globalPos()); } } void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { - if (e->button() != Qt::LeftButton) return; + if (e->button() != TQt::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() & Qt::LeftButton) ) return; + if (! (e->state() & TQt::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() == Qt::Vertical) { + if (orientation() == TQt::Vertical) { int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp; psz = height(); } else psz = width(); |