diff options
Diffstat (limited to 'kicker/kicker')
107 files changed, 777 insertions, 825 deletions
diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h index bb6d450e1..18d03214c 100644 --- a/kicker/kicker/buttons/bookmarksbutton.h +++ b/kicker/kicker/buttons/bookmarksbutton.h @@ -36,7 +36,7 @@ class KBookmarkOwner; */ class BookmarksButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: BookmarksButton(TQWidget* parent); diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 71f2d0504..7ab5de6de 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -66,7 +66,7 @@ void BrowserButton::initialize( const TQString& icon, const TQString& path ) setPopup(topMenu); _menuTimer = new TQTimer( this, "_menuTimer" ); - connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) ); + connect( _menuTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDelayedPopup()) ); TQToolTip::add(this, i18n("Browse: %1").arg(path)); setTitle( path ); diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h index 507a764ed..627368472 100644 --- a/kicker/kicker/buttons/browserbutton.h +++ b/kicker/kicker/buttons/browserbutton.h @@ -33,7 +33,7 @@ class PanelBrowserMenu; */ class BrowserButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent ); diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index fe70954f9..b548579f6 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -45,8 +45,8 @@ DesktopButton::DesktopButton( TQWidget* parent ) setTitle(i18n("Desktop Access")); setIcon("desktop"); - connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) ); - connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); + connect( this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showDesktop(bool)) ); + connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) ); setOn( ShowDesktop::the()->desktopShowing() ); } diff --git a/kicker/kicker/buttons/desktopbutton.h b/kicker/kicker/buttons/desktopbutton.h index c896bdf92..3ea98a49e 100644 --- a/kicker/kicker/buttons/desktopbutton.h +++ b/kicker/kicker/buttons/desktopbutton.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class DesktopButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: DesktopButton( TQWidget* parent ); diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h index 2d2d2d1f2..3c9932655 100644 --- a/kicker/kicker/buttons/extensionbutton.h +++ b/kicker/kicker/buttons/extensionbutton.h @@ -31,7 +31,7 @@ class KPanelMenu; class ExtensionButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: ExtensionButton( const TQString& desktopFile, TQWidget* parent ); diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h index 896bf56c2..fd34e5104 100644 --- a/kicker/kicker/buttons/kbutton.h +++ b/kicker/kicker/buttons/kbutton.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class KButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: KButton( TQWidget *parent ); diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index ee5fa9c1f..1e5c2a7f8 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -29,11 +29,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <tqpainter.h> #include <tqcursor.h> -#include <tqeffects_p.h> +#include <private/tqeffects_p.h> #include <tdelocale.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kdebug.h> @@ -100,7 +100,7 @@ void KNewButton::show() KButton::show(); if (KickerSettings::firstRun()) { - TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu())); + TQTimer::singleShot(0,this,TQ_SLOT(slotExecMenu())); KickerSettings::setFirstRun(false); KickerSettings::writeConfig(); } @@ -112,11 +112,11 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup && m_openTimer != -1 - && (me->button() & Qt::LeftButton) ) + && (me->button() & TQt::LeftButton) ) return true; } } diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h index 1bdbbafbd..d38df07c6 100644 --- a/kicker/kicker/buttons/knewbutton.h +++ b/kicker/kicker/buttons/knewbutton.h @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class KNewButton : public KButton { - Q_OBJECT + TQ_OBJECT public: KNewButton( TQWidget *parent ); diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp index 4f88f2d37..eb4d1396d 100644 --- a/kicker/kicker/buttons/nontdeappbutton.cpp +++ b/kicker/kicker/buttons/nontdeappbutton.cpp @@ -25,11 +25,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> #include <tdeconfig.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeapplication.h> #include <tdeglobal.h> #include <krun.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <kiconeffect.h> @@ -61,7 +61,7 @@ NonKDEAppButton::NonKDEAppButton(const TQString& name, // to the slotExec() slot // we do this here instead of in initialize(...) since initialize(...) may // get called later, e.g after reconfiguring it - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } // this constructor is used when restoring a button, usually at startup @@ -77,7 +77,7 @@ NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent config.readBoolEntry("RunInTerminal")); // see comment on connect in above constructor - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } void NonKDEAppButton::initialize(const TQString& name, @@ -174,11 +174,11 @@ void NonKDEAppButton::dropEvent(TQDropEvent *ev) ++it) { const KURL &url(*it); - if (KDesktopFile::isDesktopFile(url.path())) + if (TDEDesktopFile::isDesktopFile(url.path())) { // this URL is actually a .desktop file, so let's grab // the URL it actually points to ... - KDesktopFile deskFile(url.path()); + TDEDesktopFile deskFile(url.path()); deskFile.setDesktopGroup(); // ... and add it to the exec string @@ -216,7 +216,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr) // since kicker doesn't listen to or use the session manager, we have // to make sure that our environment is set up correctly. this is // accomlplished by doing: - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); if (term) { @@ -278,8 +278,8 @@ void NonKDEAppButton::properties() // ... connect the signal it emits when it has data for us to save // to our updateSettings slot (see above) ... - connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this, - TQT_SLOT(updateSettings(PanelExeDialog*))); + connect(dlg, TQ_SIGNAL(updateSettings(PanelExeDialog*)), this, + TQ_SLOT(updateSettings(PanelExeDialog*))); // ... and then show it to the user dlg->show(); diff --git a/kicker/kicker/buttons/nontdeappbutton.h b/kicker/kicker/buttons/nontdeappbutton.h index 94c7cb59d..eac6ce412 100644 --- a/kicker/kicker/buttons/nontdeappbutton.h +++ b/kicker/kicker/buttons/nontdeappbutton.h @@ -37,8 +37,8 @@ class PanelExeDialog; */ class NonKDEAppButton : public PanelButton { - // the Q_OBJECT macro provides the magic glue for signals 'n slots - Q_OBJECT + // the TQ_OBJECT macro provides the magic glue for signals 'n slots + TQ_OBJECT public: // define our two constructors, one used for creating new buttons... diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index 716a750ed..2c392d29e 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -24,13 +24,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> #include <tqtooltip.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdelocale.h> #include <kiconeffect.h> #include <kicontheme.h> #include <kpropertiesdialog.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include "global.h" @@ -92,7 +92,7 @@ void ServiceButton::loadServiceFromId(const TQString &id) _id = locate("appdata", id.mid(1)); if (!_id.isEmpty()) { - KDesktopFile df(_id, true); + TDEDesktopFile df(_id, true); _service = new KService(&df); } } @@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const TQString &id) void ServiceButton::initialize() { readDesktopFile(); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } void ServiceButton::readDesktopFile() @@ -169,7 +169,7 @@ void ServiceButton::dropEvent( TQDropEvent* ev ) { KURL::List uriList; if( KURLDrag::decode( ev, uriList ) && _service ) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KRun::run( *_service, uriList ); } PanelButton::dropEvent(ev); @@ -192,7 +192,7 @@ void ServiceButton::slotExec() { // this allows the button to return to a non-pressed state // before launching - TQTimer::singleShot(0, this, TQT_SLOT(performExec())); + TQTimer::singleShot(0, this, TQ_SLOT(performExec())); } void ServiceButton::performExec() @@ -200,7 +200,7 @@ void ServiceButton::performExec() if (!_service) return; KURL::List uriList; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KRun::run( *_service, uriList ); } @@ -223,10 +223,10 @@ void ServiceButton::properties() KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0, false, false); dialog->setFileNameReadOnly(true); - connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)), - this, TQT_SLOT(slotSaveAs(const KURL &, KURL &))); - connect(dialog, TQT_SIGNAL(propertiesClosed()), - this, TQT_SLOT(slotUpdate())); + connect(dialog, TQ_SIGNAL(saveAs(const KURL &, KURL &)), + this, TQ_SLOT(slotSaveAs(const KURL &, KURL &))); + connect(dialog, TQ_SIGNAL(propertiesClosed()), + this, TQ_SLOT(slotUpdate())); dialog->show(); } diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h index ac551adb5..a2d7939e8 100644 --- a/kicker/kicker/buttons/servicebutton.h +++ b/kicker/kicker/buttons/servicebutton.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ServiceButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: ServiceButton( const TQString& desktopFile, TQWidget* parent ); diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h index da512105d..bef038859 100644 --- a/kicker/kicker/buttons/servicemenubutton.h +++ b/kicker/kicker/buttons/servicemenubutton.h @@ -33,7 +33,7 @@ class PanelServiceMenu; */ class ServiceMenuButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: ServiceMenuButton( const TQString& relPath, TQWidget* parent ); diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index 13ff95323..afdf90fa9 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <tqfile.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdefileitem.h> #include <konq_operations.h> #include <kicontheme.h> @@ -71,7 +71,7 @@ void URLButton::initialize( const TQString& _url ) if (!url.isLocalFile() || !url.path().endsWith(".desktop")) { TQString file = KickerLib::newDesktopFile(url); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", url.prettyURL()); @@ -90,7 +90,7 @@ void URLButton::initialize( const TQString& _url ) } fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url ); setIcon( fileItem->iconName() ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) ); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()) ); setToolTip(); if (url.isLocalFile()) @@ -107,9 +107,9 @@ void URLButton::saveConfig( TDEConfigGroup& config ) const void URLButton::setToolTip() { if (fileItem->isLocalFile() - && KDesktopFile::isDesktopFile(fileItem->url().path())) + && TDEDesktopFile::isDesktopFile(fileItem->url().path())) { - KDesktopFile df(fileItem->url().path()); + TDEDesktopFile df(fileItem->url().path()); if (df.readComment().isEmpty()) { @@ -140,12 +140,12 @@ void URLButton::dragEnterEvent(TQDragEnterEvent *ev) void URLButton::dropEvent(TQDropEvent *ev) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KURL::List execList; if(KURLDrag::decode(ev, execList)){ KURL url( fileItem->url() ); if(!execList.isEmpty()) { - if (KDesktopFile::isDesktopFile(url.path())){ + if (TDEDesktopFile::isDesktopFile(url.path())){ TDEApplication::startServiceByDesktopPath(url.path(), execList.toStringList(), 0, 0, 0, "", true); } @@ -165,7 +165,7 @@ void URLButton::startDrag() void URLButton::slotExec() { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); fileItem->run(); } @@ -196,6 +196,6 @@ void URLButton::properties() pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself pDlg->setFileNameReadOnly(true); - connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL())); + connect(pDlg, TQ_SIGNAL(applied()), TQ_SLOT(updateURL())); pDlg->show(); } diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h index ba4a1b43d..dd55d78b4 100644 --- a/kicker/kicker/buttons/urlbutton.h +++ b/kicker/kicker/buttons/urlbutton.h @@ -34,7 +34,7 @@ class KPropertiesDialog; */ class URLButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: URLButton( const TQString& url, TQWidget* parent ); diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h index d8b57c62e..d9b67fb67 100644 --- a/kicker/kicker/buttons/windowlistbutton.h +++ b/kicker/kicker/buttons/windowlistbutton.h @@ -33,7 +33,7 @@ class KWindowListMenu; */ class WindowListButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: WindowListButton( TQWidget* parent ); diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 1806fedbb..6299a6650 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -58,14 +58,14 @@ AppletHandle::AppletHandle(AppletContainer* parent) m_dragBar->installEventFilter(this); m_layout->addWidget(m_dragBar); - if (kapp->authorizeTDEAction("kicker_rmb")) + if (tdeApp->authorizeTDEAction("kicker_rmb")) { m_menuButton = new AppletHandleButton( this ); m_menuButton->installEventFilter(this); m_layout->addWidget(m_menuButton); - connect(m_menuButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(menuButtonPressed())); + connect(m_menuButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(menuButtonPressed())); TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); } @@ -89,7 +89,7 @@ int AppletHandle::widthForHeight( int /* h */ ) const void AppletHandle::setPopupDirection(KPanelApplet::Direction d) { - Qt::ArrowType a = Qt::UpArrow; + TQt::ArrowType a = TQt::UpArrow; if (d == m_popupDirection || !m_menuButton) { @@ -102,19 +102,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d) { case KPanelApplet::Up: m_layout->setDirection(TQBoxLayout::BottomToTop); - a = Qt::UpArrow; + a = TQt::UpArrow; break; case KPanelApplet::Down: m_layout->setDirection(TQBoxLayout::TopToBottom); - a = Qt::DownArrow; + a = TQt::DownArrow; break; case KPanelApplet::Left: m_layout->setDirection(TQBoxLayout::RightToLeft); - a = Qt::LeftArrow; + a = TQt::LeftArrow; break; case KPanelApplet::Right: m_layout->setDirection(TQBoxLayout::LeftToRight); - a = Qt::RightArrow; + a = TQt::RightArrow; break; } @@ -151,8 +151,8 @@ void AppletHandle::setFadeOutHandle(bool fadeOut) if (!m_handleHoverTimer) { m_handleHoverTimer = new TQTimer(this, "m_handleHoverTimer"); - connect(m_handleHoverTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkHandleHover())); + connect(m_handleHoverTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkHandleHover())); m_applet->installEventFilter(this); } } @@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) // a hack for applets that have out-of-process // elements (e.g the systray) so that the handle // doesn't flicker when moving over those elements - if (TQT_TQRECT_OBJECT(w->rect()).contains(w->mapFromGlobal(TQCursor::pos()))) + if (w->rect().contains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -220,12 +220,12 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) return TQWidget::eventFilter( o, e ); } - else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar)) + else if (o == m_dragBar) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); - if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton) + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); + if (ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton) { emit moveApplet(m_applet->mapFromGlobal(ev->globalPos())); } @@ -234,8 +234,8 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) if (m_menuButton && e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); - if (ev->button() == Qt::RightButton) + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); + if (ev->button() == TQt::RightButton) { if (!m_menuButton->isDown()) { @@ -252,7 +252,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) void AppletHandle::menuButtonPressed() { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) { return; } @@ -312,7 +312,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const { int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSize(wh, 0); } @@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const TQSizePolicy AppletHandleDrag::sizePolicy() const { - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); } @@ -360,14 +360,14 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQStyle::SFlags flags = TQStyle::Style_Default; flags |= TQStyle::Style_Enabled; - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { flags |= TQStyle::Style_Horizontal; } TQRect r = rect(); - style().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, + style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, colorGroup(), flags); } else @@ -387,7 +387,7 @@ TQSize AppletHandleButton::minimumSizeHint() const int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSize(width, height); } diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index 34e8e3576..578bc1dc3 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -37,7 +37,7 @@ class AppletHandleButton; class AppletHandle : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AppletHandle(AppletContainer* parent); @@ -87,7 +87,7 @@ class AppletHandle : public TQWidget class AppletHandleDrag : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AppletHandleDrag(AppletHandle* parent); @@ -109,7 +109,7 @@ class AppletHandleDrag : public TQWidget class AppletHandleButton : public SimpleArrowButton { - Q_OBJECT + TQ_OBJECT public: AppletHandleButton(AppletHandle *parent); diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index d710a1ade..5ba59dfbc 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -39,8 +39,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdemessagebox.h> #include <kpanelapplet.h> #include <tdepopupmenu.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include "applethandle.h" #include "appletinfo.h" @@ -79,7 +79,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _appletframe->setFrameStyle(TQFrame::NoFrame); _appletframe->installEventFilter(this); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); } @@ -92,10 +92,10 @@ AppletContainer::AppletContainer(const AppletInfo& info, _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); - _layout->addWidget(TQT_TQWIDGET(_handle), 0); - connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), - this, TQT_SLOT(moveApplet(const TQPoint&))); - connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); + _layout->addWidget(_handle, 0); + connect(_handle, TQ_SIGNAL(moveApplet(const TQPoint&)), + this, TQ_SLOT(moveApplet(const TQPoint&))); + connect(_handle, TQ_SIGNAL(showAppletMenu()), this, TQ_SLOT(showAppletMenu())); _layout->addWidget(_appletframe, 1); _layout->activate(); @@ -124,12 +124,12 @@ AppletContainer::AppletContainer(const AppletInfo& info, setImmutable(immutable); - connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); - connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(activateWindow())); - connect(_applet, TQT_SIGNAL(requestFocus(bool)), TQT_SLOT(focusRequested(bool))); + connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); + connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(activateWindow())); + connect(_applet, TQ_SIGNAL(requestFocus(bool)), TQ_SLOT(focusRequested(bool))); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(slotReconfigure())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(slotReconfigure())); } void AppletContainer::configure() @@ -139,7 +139,7 @@ void AppletContainer::configure() if (isImmutable() || KickerSettings::hideAppletHandles() || - !kapp->authorizeTDEAction("kicker_rmb")) + !tdeApp->authorizeTDEAction("kicker_rmb")) { if (_handle->isVisibleTo(this)) { @@ -191,7 +191,7 @@ void AppletContainer::resetLayout() { _handle->resetLayout(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { _layout->setDirection( TQBoxLayout::LeftToRight ); } @@ -216,7 +216,7 @@ void AppletContainer::signalToBeRemoved() void AppletContainer::showAppletMenu() { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) { return; } @@ -225,7 +225,7 @@ void AppletContainer::showAppletMenu() Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center())); - switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(_handle)))) + switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, _handle))) { case PanelAppletOpMenu::Move: moveApplet(_handle->mapToParent(_handle->rect().center())); @@ -298,7 +298,7 @@ void AppletContainer::doSaveConfiguration( TDEConfigGroup& config, bool layoutOnly ) const { // immutability is checked by ContainerBase - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { config.writeEntry( "WidthForHeightHint", widthForHeight(height()) ); } @@ -321,8 +321,8 @@ TQPopupMenu* AppletContainer::createOpMenu() _info.name(), _info.icon(), this); - connect(opMenu, TQT_SIGNAL(escapePressed()), - _handle, TQT_SLOT(toggleMenuButtonOff())); + connect(opMenu, TQ_SIGNAL(escapePressed()), + _handle, TQ_SLOT(toggleMenuButtonOff())); return opMenu; } @@ -461,7 +461,7 @@ void AppletContainer::setImmutable(bool immutable) BaseContainer::setImmutable(immutable); if (isImmutable() || KickerSettings::hideAppletHandles() || - !kapp->authorizeTDEAction("kicker_rmb")) + !tdeApp->authorizeTDEAction("kicker_rmb")) { if (_handle->isVisibleTo(this)) { @@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable) } else if (!_handle->isVisibleTo(this)) { - TQToolTip::add(TQT_TQWIDGET(_handle), _info.name()); + TQToolTip::add(_handle, _info.name()); _handle->show(); setBackground(); } diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 458f18fe0..d5b80930e 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -40,7 +40,7 @@ class AppletHandle; class AppletContainer : public BaseContainer { - Q_OBJECT + TQ_OBJECT public: AppletContainer(const AppletInfo& info, TQPopupMenu* opMenu, bool isImmutable = false, TQWidget* parent = 0); diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index e3131b2ed..64886f436 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name ) : TQWidget( parent, name ) , _dir(KPanelApplet::Up) - , _orient(Qt::Horizontal) + , _orient(TQt::Horizontal) , _alignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) @@ -47,7 +47,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const , _opMnu(0) , _appletOpMnu(appletOpMenu) { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } BaseContainer::~BaseContainer() diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index 88e06e715..6cf61bec6 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -36,7 +36,7 @@ class TQPopupMenu; class BaseContainer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<BaseContainer*> List; diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 40f479308..c35f54606 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -161,13 +161,13 @@ void ButtonContainer::embedButton(PanelButton* b) } _layout = vbox; - connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave())); - connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool))); - connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested())); - connect(_button, TQT_SIGNAL(dragme(const TQPixmap)), - TQT_SLOT(dragButton(const TQPixmap))); - connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)), - TQT_SLOT(dragButton(const KURL::List, const TQPixmap))); + connect(_button, TQ_SIGNAL(requestSave()), TQ_SIGNAL(requestSave())); + connect(_button, TQ_SIGNAL(hideme(bool)), TQ_SLOT(hideRequested(bool))); + connect(_button, TQ_SIGNAL(removeme()), TQ_SLOT(removeRequested())); + connect(_button, TQ_SIGNAL(dragme(const TQPixmap)), + TQ_SLOT(dragButton(const TQPixmap))); + connect(_button, TQ_SIGNAL(dragme(const KURL::List, const TQPixmap)), + TQ_SLOT(dragButton(const KURL::List, const TQPixmap))); } TQPopupMenu* ButtonContainer::createOpMenu() @@ -225,7 +225,7 @@ void ButtonContainer::dragButton(const TQPixmap icon) bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress) + if (o == _button && e->type() == TQEvent::MouseButtonPress) { static bool sentinal = false; @@ -235,10 +235,10 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } sentinal = true; - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); switch (me->button()) { - case Qt::MidButton: + case TQt::MidButton: { if (isImmutable()) { @@ -252,18 +252,18 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) return true; } - case Qt::RightButton: + case TQt::RightButton: { - if (!kapp->authorizeTDEAction("kicker_rmb") || + if (!tdeApp->authorizeTDEAction("kicker_rmb") || isImmutable()) { break; } TQPopupMenu* menu = opMenu(); - connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); - TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this), - (orientation() == Qt::Horizontal) ? + connect( menu, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotMenuClosed() ) ); + TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, + (orientation() == TQt::Horizontal) ? TQPoint(0, 0) : me->pos()); Kicker::the()->setInsertionPoint(me->globalPos()); diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index 1e48989c1..d564354b0 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -36,7 +36,7 @@ class TDEConfigGroup; class ButtonContainer : public BaseContainer { - Q_OBJECT + TQ_OBJECT public: ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 721df418e..a58b006ee 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -40,10 +40,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobal.h> #include <kicker.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <tdelocale.h> #include <tdeglobalsettings.h> @@ -137,20 +137,20 @@ void ExtensionContainer::init() KWin::setState(winId(), NET::Sticky); KWin::setOnAllDesktops(winId(), true); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged())); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT( currentDesktopChanged(int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(strutChanged()), this, TQ_SLOT(strutChanged())); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT( currentDesktopChanged(int))); setBackgroundOrigin(AncestorOrigin); setFrameStyle(NoFrame); setLineWidth(0); setMargin(0); - connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), - this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); + connect(UnhideTrigger::the(), TQ_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), + this, TQ_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); - _popupWidgetFilter = new PopupWidgetFilter( TQT_TQOBJECT(this) ); - connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); + _popupWidgetFilter = new PopupWidgetFilter( this ); + connect(_popupWidgetFilter, TQ_SIGNAL(popupWidgetHiding()), TQ_SLOT(maybeStartAutoHideTimer())); // layout _layout = new TQGridLayout(this, 3, 3, 0, 0); @@ -160,15 +160,15 @@ void ExtensionContainer::init() // instantiate the autohide timer _autohideTimer = new TQTimer(this, "_autohideTimer"); - connect(_autohideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoHideTimeout())); + connect(_autohideTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoHideTimeout())); // instantiate the updateLayout event compressor timer _updateLayoutTimer = new TQTimer(this, "_updateLayoutTimer"); - connect(_updateLayoutTimer, TQT_SIGNAL(timeout()), TQT_SLOT(actuallyUpdateLayout())); + connect(_updateLayoutTimer, TQ_SIGNAL(timeout()), TQ_SLOT(actuallyUpdateLayout())); installEventFilter(this); // for mouse event handling - connect(Kicker::the(), TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); + connect(Kicker::the(), TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(updateHighlightColor())); updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! @@ -207,9 +207,9 @@ void ExtensionContainer::init() item->setDefaultValue(m_extension->customSize()); } - connect(m_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(updateLayout())); - connect(m_extension, TQT_SIGNAL(maintainFocus(bool)), - TQT_SLOT(maintainFocus(bool))); + connect(m_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(updateLayout())); + connect(m_extension, TQ_SIGNAL(maintainFocus(bool)), + TQ_SLOT(maintainFocus(bool))); _layout->addWidget(m_extension, 1, 1); } @@ -371,7 +371,7 @@ void ExtensionContainer::writeConfig() void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) { return; } @@ -387,7 +387,7 @@ void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) if (!_opMnu) { - KDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile())); + TDEDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile())); _opMnu = new PanelExtensionOpMenu(f.readName(), m_extension ? m_extension->actions() : 0, this); @@ -484,7 +484,7 @@ void ExtensionContainer::moveMe() if (screen < 0) { - screen = kapp->desktop()->screenNumber(this); + screen = tdeApp->desktop()->screenNumber(this); } if (screen < 0) @@ -733,7 +733,7 @@ void ExtensionContainer::autoHideTimeout() { // kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl; // Hack: If there is a popup open, don't autohide until it closes. - TQWidget* popup = TQT_TQWIDGET(TQApplication::activePopupWidget()); + TQWidget* popup = TQApplication::activePopupWidget(); if (popup) { @@ -885,7 +885,7 @@ void ExtensionContainer::autoHide(bool hide) _in_autohide = false; - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); } void ExtensionContainer::animatedHide(bool left) @@ -925,7 +925,7 @@ void ExtensionContainer::animatedHide(bool left) !TQApplication::desktop()->screenGeometry(s).intersects(geometry())) { blockUserInput(false); - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); return; } } @@ -988,7 +988,7 @@ void ExtensionContainer::animatedHide(bool left) config->setGroup(extensionId()); config->writeEntry("UserHidden", userHidden()); - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); } bool ExtensionContainer::reserveStrut() const @@ -1208,7 +1208,7 @@ int ExtensionContainer::arrangeHideButtons() _layout->setEnabled(false); } - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { int maxWidth = width(); @@ -1227,7 +1227,7 @@ int ExtensionContainer::arrangeHideButtons() _ltHB->setMaximumWidth(maxWidth); _ltHB->setMaximumHeight(14); _layout->remove(_ltHB); - _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft); + _layout->addWidget(_ltHB, 0, 1, TQt::AlignBottom | TQt::AlignLeft); } if (_rbHB) @@ -1252,21 +1252,21 @@ int ExtensionContainer::arrangeHideButtons() maxHeight = maxHeight - (PANEL_RESIZE_HANDLE_WIDTH + PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE); } - int vertAlignment = (position() == KPanelExtension::Top) ? Qt::AlignTop : 0; - int leftAlignment = Qt::AlignRight; + int vertAlignment = (position() == KPanelExtension::Top) ? TQt::AlignTop : 0; + int leftAlignment = TQt::AlignRight; if (_ltHB) { _ltHB->setMaximumHeight(maxHeight); _ltHB->setMaximumWidth(14); _layout->remove(_ltHB); - if (kapp->reverseLayout()) + if (tdeApp->reverseLayout()) { - _layout->addWidget(_ltHB, 1, 2, (TQ_Alignment)vertAlignment); + _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment); } else { - _layout->addWidget(_ltHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); + _layout->addWidget(_ltHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment)); } } @@ -1275,13 +1275,13 @@ int ExtensionContainer::arrangeHideButtons() _rbHB->setMaximumHeight(maxHeight); _rbHB->setMaximumWidth(14); _layout->remove(_rbHB); - if (kapp->reverseLayout()) + if (tdeApp->reverseLayout()) { - _layout->addWidget(_rbHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); + _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment)); } else { - _layout->addWidget(_rbHB, 1, 2, (TQ_Alignment)vertAlignment); + _layout->addWidget(_rbHB, 1, 2, (TQt::AlignmentFlags)vertAlignment); } } } @@ -1315,7 +1315,7 @@ int ExtensionContainer::setupBorderSpace() TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen()); TQRect h = geometry(); - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { if (h.top() > 0) { @@ -1417,26 +1417,26 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e) // KPanelExtension::Left/Right don't seem to draw the separators at all! if (position() == KPanelExtension::Left) { rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); + style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Right) { rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); + style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Top) { // Nastiness to both vertically flip the PE_Separator // and make sure it pops out of, not sinks into, the screen TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH); - TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm)); + TQPainter myp(&inv_pm); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); TQColorGroup darkcg = colorGroup(); darkcg.setColor(TQColorGroup::Light, colorGroup().dark()); - style().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); + style().drawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); p.drawPixmap(0,height()-2,inv_pm); } else { rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); - style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); + style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); } } } @@ -1486,7 +1486,7 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS) { autoHide(false); TQTimer::singleShot(showForAtLeastHowManyMS, - this, TQT_SLOT(maybeStartAutoHideTimer())); + this, TQ_SLOT(maybeStartAutoHideTimer())); return; } @@ -1582,11 +1582,11 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const { if (position() == KPanelExtension::Top || position() == KPanelExtension::Bottom) { - return Qt::Horizontal; + return TQt::Horizontal; } else { - return Qt::Vertical; + return TQt::Vertical; } } @@ -1627,18 +1627,18 @@ void ExtensionContainer::resetLayout() _ltHB = new HideButton(this); _ltHB->installEventFilter(this); _ltHB->setEnabled(true); - connect(_ltHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideLeft())); + connect(_ltHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideLeft())); haveToArrangeButtons = true; } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { - _ltHB->setArrowType(Qt::LeftArrow); + _ltHB->setArrowType(TQt::LeftArrow); _ltHB->setFixedSize(m_settings.hideButtonSize(), height()); } else { - _ltHB->setArrowType(Qt::UpArrow); + _ltHB->setArrowType(TQt::UpArrow); _ltHB->setFixedSize(width(), m_settings.hideButtonSize()); } @@ -1658,18 +1658,18 @@ void ExtensionContainer::resetLayout() _rbHB = new HideButton(this); _rbHB->installEventFilter(this); _rbHB->setEnabled(true); - connect(_rbHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideRight())); + connect(_rbHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideRight())); haveToArrangeButtons = true; } - if ( orientation() == Qt::Horizontal) + if ( orientation() == TQt::Horizontal) { - _rbHB->setArrowType(Qt::RightArrow); + _rbHB->setArrowType(TQt::RightArrow); _rbHB->setFixedSize(m_settings.hideButtonSize(), height()); } else { - _rbHB->setArrowType(Qt::DownArrow); + _rbHB->setArrowType(TQt::DownArrow); _rbHB->setFixedSize(width(), m_settings.hideButtonSize()); } @@ -1709,7 +1709,7 @@ void ExtensionContainer::resetLayout() updateGeometry(); int endBorderWidth = haveToArrangeButtons ? arrangeHideButtons() : setupBorderSpace(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (m_extension) { @@ -2145,8 +2145,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { case TQEvent::MouseButtonPress: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if ( me->button() == Qt::LeftButton ) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if ( me->button() == TQt::LeftButton ) { if (inResizeArea(me->pos())) { @@ -2170,7 +2170,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) _is_lmb_down = true; } } - else if (me->button() == Qt::RightButton) + else if (me->button() == TQt::RightButton) { showPanelMenu(me->globalPos()); return true; // don't crash! @@ -2180,8 +2180,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseButtonRelease: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if ( me->button() == Qt::LeftButton ) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if ( me->button() == TQt::LeftButton ) { _is_lmb_down = false; } @@ -2190,7 +2190,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseMove: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if (KickerSettings::useResizeHandle()) { KPanelExtension::Position pos = position(); @@ -2202,7 +2202,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else if (pos == KPanelExtension::Right) @@ -2213,35 +2213,35 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else if (pos == KPanelExtension::Top) { if (inResizeArea(me->pos())) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else { if (inResizeArea(me->pos())) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } } if (_is_lmb_down && - ((me->state() & Qt::LeftButton) == Qt::LeftButton) && + ((me->state() & TQt::LeftButton) == TQt::LeftButton) && !Kicker::the()->isImmutable() && !m_settings.config()->isImmutable() && !ExtensionManager::the()->isMenuBar(this)) diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 8948341d1..b1db1efeb 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -51,7 +51,7 @@ class TQColor; class ExtensionContainer : public TQFrame { - Q_OBJECT + TQ_OBJECT public: enum UserHidden { Unhidden, LeftTop, RightBottom }; @@ -203,7 +203,7 @@ private: class PopupWidgetFilter : public TQObject { - Q_OBJECT + TQ_OBJECT public: PopupWidgetFilter( TQObject *parent ); diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 5b1eb5c8c..cb61b16e8 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -35,13 +35,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kiconloader.h> #include <kmimetype.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krootpixmap.h> #include <kpixmap.h> #include <tdelocale.h> @@ -103,11 +103,11 @@ ContainerArea::ContainerArea(TDEConfig* _c, setBackground(); - connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackground())); - connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), - TQT_SLOT(immutabilityChanged(bool))); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); + connect(&_autoScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoScroll())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground())); + connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)), + TQ_SLOT(immutabilityChanged(bool))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); } ContainerArea::~ContainerArea() @@ -142,7 +142,7 @@ void ContainerArea::initialize(bool useDefaultConfig) } setAcceptDrops(!isImmutable()); - TQTimer::singleShot(0, this, TQT_SLOT(resizeContents())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeContents())); } void ContainerArea::defaultContainerConfig() @@ -153,7 +153,7 @@ void ContainerArea::defaultContainerConfig() containers.append(new KMenuButtonContainer(m_opMenu, m_contents)); int dsize; - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { dsize = width(); } @@ -325,7 +325,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) a = new DesktopButtonContainer(group, m_opMenu, m_contents); else if (appletType == "WindowListButton") a = new WindowListButtonContainer(group, m_opMenu, m_contents); - else if ((appletType == "BookmarksButton") && kapp->authorizeTDEAction("bookmarks")) + else if ((appletType == "BookmarksButton") && tdeApp->authorizeTDEAction("bookmarks")) a = new BookmarksButtonContainer(group, m_opMenu, m_contents); else if (appletType == "ServiceButton") a = new ServiceButtonContainer(group, m_opMenu, m_contents); @@ -377,7 +377,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) // it gets executed too soon. we need to wait until the containers are // actually resized, but we enter the event loop prior to that happening // above. - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } void ContainerArea::saveContainerConfig(bool layoutOnly) @@ -438,7 +438,7 @@ const TQWidget* ContainerArea::addButton(const AppletInfo& info) if (buttonType == "BookmarksButton") { - if (kapp->authorizeTDEAction("bookmarks")) + if (tdeApp->authorizeTDEAction("bookmarks")) { return addBookmarksButton(); } @@ -728,20 +728,20 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) m_layout->add(a); } - connect(a, TQT_SIGNAL(moveme(BaseContainer*)), - TQT_SLOT(startContainerMove(BaseContainer*))); - connect(a, TQT_SIGNAL(removeme(BaseContainer*)), - TQT_SLOT(removeContainer(BaseContainer*))); - connect(a, TQT_SIGNAL(takeme(BaseContainer*)), - TQT_SLOT(takeContainer(BaseContainer*))); - connect(a, TQT_SIGNAL(requestSave()), - TQT_SLOT(slotSaveContainerConfig())); - connect(a, TQT_SIGNAL(maintainFocus(bool)), - this, TQT_SIGNAL(maintainFocus(bool))); + connect(a, TQ_SIGNAL(moveme(BaseContainer*)), + TQ_SLOT(startContainerMove(BaseContainer*))); + connect(a, TQ_SIGNAL(removeme(BaseContainer*)), + TQ_SLOT(removeContainer(BaseContainer*))); + connect(a, TQ_SIGNAL(takeme(BaseContainer*)), + TQ_SLOT(takeContainer(BaseContainer*))); + connect(a, TQ_SIGNAL(requestSave()), + TQ_SLOT(slotSaveContainerConfig())); + connect(a, TQ_SIGNAL(maintainFocus(bool)), + this, TQ_SIGNAL(maintainFocus(bool))); if (dynamic_cast<AppletContainer*>(a)) { - connect(a, TQT_SIGNAL(updateLayout()), TQT_SLOT(resizeContents())); + connect(a, TQ_SIGNAL(updateLayout()), TQ_SLOT(resizeContents())); } a->configure(orientation(), popupDirection()); @@ -824,16 +824,16 @@ void ContainerArea::takeContainer(BaseContainer* a) return; } - disconnect(a, TQT_SIGNAL(moveme(BaseContainer*)), - this, TQT_SLOT(startContainerMove(BaseContainer*))); - disconnect(a, TQT_SIGNAL(removeme(BaseContainer*)), - this, TQT_SLOT(removeContainer(BaseContainer*))); - disconnect(a, TQT_SIGNAL(takeme(BaseContainer*)), - this, TQT_SLOT(takeContainer(BaseContainer*))); - disconnect(a, TQT_SIGNAL(requestSave()), - this, TQT_SLOT(slotSaveContainerConfig())); - disconnect(a, TQT_SIGNAL(maintainFocus(bool)), - this, TQT_SIGNAL(maintainFocus(bool))); + disconnect(a, TQ_SIGNAL(moveme(BaseContainer*)), + this, TQ_SLOT(startContainerMove(BaseContainer*))); + disconnect(a, TQ_SIGNAL(removeme(BaseContainer*)), + this, TQ_SLOT(removeContainer(BaseContainer*))); + disconnect(a, TQ_SIGNAL(takeme(BaseContainer*)), + this, TQ_SLOT(takeContainer(BaseContainer*))); + disconnect(a, TQ_SIGNAL(requestSave()), + this, TQ_SLOT(slotSaveContainerConfig())); + disconnect(a, TQ_SIGNAL(maintainFocus(bool)), + this, TQ_SIGNAL(maintainFocus(bool))); // Just remove the group from our own config file. Leave separate config // files untouched. @@ -850,7 +850,7 @@ void ContainerArea::resizeContents() int w = width(); int h = height(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int newWidth = m_layout->widthForHeight(h); if (newWidth > w) @@ -923,7 +923,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) KickerTip::enableTipping(false); emit maintainFocus(true); setMouseTracking(true); - grabMouse(tqsizeAllCursor); + grabMouse(TQt::sizeAllCursor); m_layout->setStretchEnabled(false); a->raise(); @@ -940,7 +940,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *) // so we need to complete the move here _autoScrollTimer.stop(); releaseMouse(); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -962,12 +962,12 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).contains(ev->pos())) + if (ev->state() == TQt::LeftButton && !rect().contains(ev->pos())) { // leaveEvent() doesn't work, while grabbing the mouse _autoScrollTimer.stop(); releaseMouse(); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -979,14 +979,14 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) saveContainerConfig(true); PanelDrag *dd = new PanelDrag(_moveAC, this); - dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small)); + dd->setPixmap(tdeApp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small)); grabKeyboard(); dd->drag(); releaseKeyboard(); return; } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int oldX = _moveAC->x() + _moveAC->moveOffset().x(); int x = ev->pos().x() + contentsX(); @@ -1082,7 +1082,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) preferedHeight = draggedContainer->heightForWidth(width()); } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { _dragIndicator->setPreferredSize(TQSize(preferedWidth, height())); } @@ -1103,9 +1103,9 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) --it; BaseContainer* a = *it; - if ((orientation() == Qt::Horizontal && + if ((orientation() == TQt::Horizontal && a->x() < (ev->pos().x() + contentsX()) - _dragMoveOffset.x()) || - (orientation() == Qt::Vertical && + (orientation() == TQt::Vertical && a->y() < (ev->pos().y() + contentsY()) - _dragMoveOffset.y())) { _dragMoveAC = a; @@ -1114,7 +1114,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) } while (it != m_containers.begin()); } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1143,7 +1143,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) startContainerMove(_moveAC); // Align the container to the mouse position. - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x()); } @@ -1159,7 +1159,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) return; } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1201,7 +1201,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) } TQObject *parent = ev->source() ? ev->source()->parent() : 0; - while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this))) + while (parent && (parent != this)) { parent = parent->parent(); } @@ -1209,13 +1209,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev) if (parent) { // Move container a - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int oldX = a->x(); int x = _dragIndicator->x(); m_layout->moveContainerSwitch(a, x - oldX); } - else if (orientation() == Qt::Vertical) + else if (orientation() == TQt::Vertical) { int oldY = a->y(); int y = _dragIndicator->y(); @@ -1322,7 +1322,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { // a local desktop file being dragged from an external program. // Make a copy first. - KDesktopFile df(url.path()); + TDEDesktopFile df(url.path()); KURL newUrl; newUrl.setPath(KickerLib::copyDesktopFile(url)); if (df.readType() == "Link") @@ -1387,7 +1387,7 @@ bool ContainerArea::eventFilter(TQObject* o, TQEvent* e) // which contain a ContainerArea can react to layout changes of its // contents. For example: If an applets grows, the top level widget may // want to grow as well. - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_contents)) + if (o == m_contents) { if (e->type() == TQEvent::LayoutHint) { @@ -1408,7 +1408,7 @@ void ContainerArea::resizeEvent(TQResizeEvent *ev) void ContainerArea::viewportResizeEvent(TQResizeEvent* ev) { Panner::viewportResizeEvent(ev); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { m_contents->resize(kMax(widthForHeight(ev->size().height()), ev->size().width()), @@ -1436,8 +1436,8 @@ void ContainerArea::setBackground() { _rootPixmap = new KRootPixmap(this); _rootPixmap->setCustomPainting(true); - connect(_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), - TQT_SLOT(updateBackground(const TQPixmap&))); + connect(_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQ_SLOT(updateBackground(const TQPixmap&))); } else { @@ -1446,12 +1446,7 @@ void ContainerArea::setBackground() double tint = double(KickerSettings::tintValue()) / 100; _rootPixmap->setFadeEffect(tint, KickerSettings::tintColor()); - if (KickerSettings::menubarPanelBlurred()) { - _rootPixmap->setBlurEffect(0.0, 4.0); - } - else { - _rootPixmap->setBlurEffect(0.0, 0.0); - } + _rootPixmap->setBlurEffect(0.0, KickerSettings::blurValue()); _rootPixmap->start(); _bgSet = true; return; @@ -1487,7 +1482,7 @@ void ContainerArea::setBackground() { TQImage bgImage = srcImage; - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { if (KickerSettings::rotateBackground()) { @@ -1516,7 +1511,7 @@ void ContainerArea::setBackground() KickerLib::colorize(bgImage); } setPaletteBackgroundPixmap(TQPixmap(bgImage)); - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } } @@ -1538,7 +1533,7 @@ void ContainerArea::immutabilityChanged(bool immutable) } setAcceptDrops(!isImmutable()); - TQTimer::singleShot(0, this, TQT_SLOT(setBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(setBackground())); } TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) @@ -1565,7 +1560,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) } } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (a) { @@ -1599,7 +1594,7 @@ void ContainerArea::moveDragIndicator(int pos) // Move _dragIndicator to position pos, restricted by availableSpace. // Resize _dragIndicator if necessary. - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (availableSpace.size().width() < _dragIndicator->preferredSize().width()) @@ -1640,7 +1635,7 @@ void ContainerArea::moveDragIndicator(int pos) void ContainerArea::updateBackground( const TQPixmap& pm ) { TQBrush bgBrush(colorGroup().background(), pm); - TQPalette pal = kapp->palette(); + TQPalette pal = tdeApp->palette(); pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); @@ -1663,7 +1658,7 @@ void ContainerArea::resizeContents(int w, int h) if (!m_updateBackgroundsCalled) { m_updateBackgroundsCalled = true; - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } } @@ -1680,9 +1675,9 @@ void ContainerArea::setPosition(KPanelExtension::Position p) } _pos = p; - Qt::Orientation o = (p == KPanelExtension::Top || + TQt::Orientation o = (p == KPanelExtension::Top || p == KPanelExtension::Bottom) ? - Qt::Horizontal : Qt::Vertical; + TQt::Horizontal : TQt::Vertical; bool orientationChanged = (orientation() != o); m_layout->setEnabled(false); @@ -1696,7 +1691,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p) // when that gets called AFTER we've been moved // it's not always safe to do the resize here, as scroll buttons // from the panner may get in our way. =/ - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) { resizeContents(0, height()); } @@ -1742,7 +1737,7 @@ void ContainerArea::autoScroll() { if(!_moveAC) return; - if(orientation() == Qt::Horizontal) { + if(orientation() == TQt::Horizontal) { if(_moveAC->pos().x() <= 80) scrollBy(-10, 0); else if(_moveAC->pos().x() >= width() - _moveAC->width() - 80) @@ -1793,7 +1788,7 @@ void ContainerArea::updateContainersBackground() if( !m_cachedGeometry.contains( *it )) { m_cachedGeometry[ *it ] = TQRect(); - connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry())); + connect( *it, TQ_SIGNAL( destroyed()), TQ_SLOT( destroyCachedGeometry())); } if( m_cachedGeometry[ *it ] != (*it)->geometry()) { @@ -1910,7 +1905,7 @@ void ContainerArea::showAddAppletDialog() if (!m_addAppletDialog) { m_addAppletDialog = new AddAppletDialog(this, this, 0); - connect(m_addAppletDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(addAppletDialogDone())); + connect(m_addAppletDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(addAppletDialogDone())); } else { @@ -1958,7 +1953,7 @@ void DragIndicator::paintEvent(TQPaintEvent*) { TQPainter painter(this); TQRect rect(0, 0, width(), height()); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), + style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index f52003982..2b543e6ac 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -45,7 +45,7 @@ class AddAppletDialog; class ContainerArea : public Panner { - Q_OBJECT + TQ_OBJECT public: ContainerArea( TDEConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 ); @@ -174,7 +174,7 @@ private: class DragIndicator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DragIndicator(TQWidget* parent = 0, const char* name = 0); diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index c12778fbb..81080fe82 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -122,7 +122,7 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio) m_freeSpaceRatio = ratio; } -Qt::Orientation ContainerAreaLayoutItem::orientation() const +TQt::Orientation ContainerAreaLayoutItem::orientation() const { return m_layout->orientation(); } @@ -139,7 +139,7 @@ void ContainerAreaLayoutItem::setGeometryR(const TQRect& r) int ContainerAreaLayoutItem::widthForHeightR(int h) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return widthForHeight(h); } @@ -151,7 +151,7 @@ int ContainerAreaLayoutItem::widthForHeightR(int h) const int ContainerAreaLayoutItem::widthR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().width(); } @@ -163,7 +163,7 @@ int ContainerAreaLayoutItem::widthR() const int ContainerAreaLayoutItem::heightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().height(); } @@ -175,7 +175,7 @@ int ContainerAreaLayoutItem::heightR() const int ContainerAreaLayoutItem::leftR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().right(); @@ -190,7 +190,7 @@ int ContainerAreaLayoutItem::leftR() const int ContainerAreaLayoutItem::rightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().left(); @@ -206,46 +206,14 @@ int ContainerAreaLayoutItem::rightR() const ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent) : TQLayout(parent), - m_orientation(Qt::Horizontal), + m_orientation(TQt::Horizontal), m_stretchEnabled(true) { } -#ifdef USE_QT4 -/*! - \reimp -*/ -int ContainerAreaLayout::count() const { - return m_items.count(); -} - -/*! - \reimp -*/ -TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { - return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0; -} - -/*! - \reimp -*/ -TQLayoutItem* ContainerAreaLayout::takeAt(int index) { - if (index < 0 || index >= m_items.count()) - return 0; - ContainerAreaLayoutItem *b = *m_items.at(index); - m_items.remove(m_items.at(index)); - TQLayoutItem *item = b->item; - b->item = 0; - delete b; - - invalidate(); - return item; -} -#endif // USE_QT4 - void ContainerAreaLayout::addItem(TQLayoutItem* item) { - m_items.append(new ContainerAreaLayoutItem(static_cast<TQLayoutItem*>(item), this)); + m_items.append(new ContainerAreaLayoutItem(item, this)); } void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint) @@ -283,7 +251,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio return; } - int insPos = (orientation() == Qt::Horizontal) ? insertionPoint.x(): insertionPoint.y(); + int insPos = (orientation() == TQt::Horizontal) ? insertionPoint.x(): insertionPoint.y(); Item* current = *currentIt; Item* next = *nextIt; @@ -419,7 +387,7 @@ TQSize ContainerAreaLayout::sizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -433,7 +401,7 @@ TQSize ContainerAreaLayout::minimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -445,13 +413,7 @@ TQSize ContainerAreaLayout::minimumSize() const TQLayoutIterator ContainerAreaLayout::iterator() { - // [FIXME] -#ifdef USE_QT4 - #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4 - return TQLayoutIterator(this); // [FIXME] -#else // USE_QT4 return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items)); -#endif // USE_QT4 } void ContainerAreaLayout::setGeometry(const TQRect& rect) @@ -559,7 +521,7 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) { - const bool horizontal = orientation() == Qt::Horizontal; + const bool horizontal = orientation() == TQt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); if (horizontal && reverseLayout) @@ -696,7 +658,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance) { - const bool horizontal = orientation() == Qt::Horizontal; + const bool horizontal = orientation() == TQt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); // Get the iterator 'it' pointing to the layoutitem representing 'a'. @@ -767,7 +729,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it, TQRect ContainerAreaLayout::transform(const TQRect& r) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (TQApplication::reverseLayout()) { @@ -788,7 +750,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const int ContainerAreaLayout::widthForHeightR(int h) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return widthForHeight(h); } @@ -800,7 +762,7 @@ int ContainerAreaLayout::widthForHeightR(int h) const int ContainerAreaLayout::widthR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().width(); } @@ -812,7 +774,7 @@ int ContainerAreaLayout::widthR() const int ContainerAreaLayout::heightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().height(); } @@ -824,7 +786,7 @@ int ContainerAreaLayout::heightR() const int ContainerAreaLayout::leftR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) return geometry().left(); else return geometry().top(); @@ -832,7 +794,7 @@ int ContainerAreaLayout::leftR() const int ContainerAreaLayout::rightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) return geometry().right(); else return geometry().bottom(); diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 4edeb8be2..abb28c6f0 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -108,12 +108,6 @@ class ContainerAreaLayout : public TQLayout int leftR() const; int rightR() const; -#ifdef USE_QT4 - - QLAYOUT_REQUIRED_METHOD_DECLARATIONS - -#endif // USE_QT4 - private: int moveContainerPushRecursive(ItemList::const_iterator it, int distance); int distanceToPreviousItem(ItemList::const_iterator it) const; diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 796b98125..bf22f3b70 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdelocale.h> #include <tdemenubar.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twinmodule.h> #include <dcopref.h> @@ -111,7 +111,7 @@ void ExtensionManager::initialize() m_mainPanel = pm->createExtensionContainer( "childpanelextension.desktop", true, - TQString(kapp->aboutData()->appName()) + "rc", + TQString(tdeApp->aboutData()->appName()) + "rc", "Main Panel"); } @@ -129,7 +129,7 @@ void ExtensionManager::initialize() m_mainPanel->readConfig(); m_mainPanel->show(); - kapp->processEvents(); + tdeApp->processEvents(); // read extension list config->setGroup("General"); @@ -173,13 +173,13 @@ void ExtensionManager::initialize() addContainer(e); e->readConfig(); e->show(); - kapp->processEvents(); + tdeApp->processEvents(); } } m_loadingContainers = false; pm->clearUntrustedLists(); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), TQT_SLOT(configurationChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), TQ_SLOT(configurationChanged())); DCOPRef r( "ksmserver", "ksmserver" ); r.send( "resumeStartup", TQCString( "kicker" )); } @@ -222,7 +222,7 @@ void ExtensionManager::configureMenubar(bool duringInit) updateMenubar(); m_menubarPanel->show(); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(updateMenubar())); + connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar())); } else if (m_menubarPanel) { @@ -437,8 +437,8 @@ void ExtensionManager::addContainer(ExtensionContainer* e) _containers.append(e); - connect(e, TQT_SIGNAL(removeme(ExtensionContainer*)), - this, TQT_SLOT(removeContainer(ExtensionContainer*))); + connect(e, TQ_SIGNAL(removeme(ExtensionContainer*)), + this, TQ_SLOT(removeContainer(ExtensionContainer*))); if (!m_loadingContainers) { emit desktopIconsAreaChanged(desktopIconsArea(e->xineramaScreen()), @@ -692,7 +692,7 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* } TQRect workArea; - if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2)) + if ((XineramaScreen == XineramaAllScreens) || (tdeApp->desktop()->numScreens() < 2)) { /* special value for all screens */ workArea = Kicker::the()->twinModule()->workArea(list); diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h index b4a53ec31..1e36bca56 100644 --- a/kicker/kicker/core/extensionmanager.h +++ b/kicker/kicker/core/extensionmanager.h @@ -33,7 +33,7 @@ const int XineramaAllScreens = -2; class ExtensionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: static ExtensionManager* the(); diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 94517607e..21ff97684 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -32,16 +32,16 @@ #include <tdeconfig.h> #include <tdecmdlineargs.h> #include <kcmultidialog.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kdebug.h> #include <kdirwatch.h> #include <tdeglobal.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kiconloader.h> #include <kimageio.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <twinmodule.h> @@ -59,10 +59,10 @@ #include "kicker.moc" -Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); } +Kicker* Kicker::the() { return static_cast<Kicker*>(tdeApp); } Kicker::Kicker() - : KUniqueApplication(), + : TDEUniqueApplication(), keys(0), m_twinModule(0), m_configDialog(0), @@ -77,7 +77,7 @@ Kicker::Kicker() // this means we've most likely crashed once. so let's see if we // stay up for more than 2 minutes time, and if so reset the // crash handler since the crash isn't a frequent offender - TQTimer::singleShot(120000, this, TQT_SLOT(setCrashHandler())); + TQTimer::singleShot(120000, this, TQ_SLOT(setCrashHandler())); } else { @@ -88,7 +88,7 @@ Kicker::Kicker() } // Make kicker immutable if configuration modules have been marked immutable - if (isKioskImmutable() && kapp->authorizeControlModules(Kicker::configModules(true)).isEmpty()) + if (isKioskImmutable() && tdeApp->authorizeControlModules(Kicker::configModules(true)).isEmpty()) { config()->setReadOnly(true); config()->reparseConfiguration(); @@ -116,7 +116,7 @@ Kicker::Kicker() // initialize our keys // note that this creates the KMenu by calling MenuManager::the() - keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + keys = new TDEGlobalAccel( this ); #define KICKER_ALL_BINDINGS #include "kickerbindings.cpp" keys->readSettings(); @@ -125,19 +125,19 @@ Kicker::Kicker() // set up our global settings configure(); - connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(this, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); - connect(this, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); + connect(this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(this, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); + connect(this, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged())); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support - connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized())); + connect(desktop(), TQ_SIGNAL(resized(int)), TQ_SLOT(slotDesktopResized())); #endif // the panels, aka extensions - TQTimer::singleShot(0, ExtensionManager::the(), TQT_SLOT(initialize())); + TQTimer::singleShot(0, ExtensionManager::the(), TQ_SLOT(initialize())); - connect(ExtensionManager::the(), TQT_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), - this, TQT_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); + connect(ExtensionManager::the(), TQ_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), + this, TQ_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); } Kicker::~Kicker() @@ -258,7 +258,7 @@ void Kicker::quit() void Kicker::restart() { // do this on a timer to give us time to return true - TQTimer::singleShot(0, this, TQT_SLOT(slotRestart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestart())); } void Kicker::slotRestart() @@ -352,7 +352,7 @@ void Kicker::showConfig(const TQString& configPath, const TQString& configFile, moduleNumber++; } - connect(m_configDialog, TQT_SIGNAL(finished()), TQT_SLOT(configDialogFinished())); + connect(m_configDialog, TQ_SIGNAL(finished()), TQ_SLOT(configDialogFinished())); } if (!configPath.isEmpty()) @@ -413,7 +413,7 @@ void Kicker::configDialogFinished() if (m_reloadingConfigDialog) { TQByteArray data; m_reloadingConfigDialog = false; - kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); + tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); } } diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 6a3e02d36..5a76570a5 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqcolor.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <kicontheme.h> class KCMultiDialog; @@ -36,9 +36,9 @@ class KWinModule; class PanelKMenu; class PanelPopupButton; -class Kicker : public KUniqueApplication +class Kicker : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp index 46cfa432d..e8999a22d 100644 --- a/kicker/kicker/core/kickerbindings.cpp +++ b/kicker/kicker/core/kickerbindings.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(target), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, target, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, target, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) @@ -37,12 +37,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef LAUNCH_MENU keys->insert("Program:kicker", i18n("Panel")); - DEF(I18N_NOOP("Popup Launch Menu" ), ALT+Qt::Key_F1, WIN+Qt::Key_Menu, + DEF(I18N_NOOP("Popup Launch Menu" ), ALT+TQt::Key_F1, WIN+TQt::Key_Menu, MenuManager::the(), kmenuAccelActivated()); #endif #ifdef SHOW_DESKTOP - DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+Qt::Key_D, WIN+CTRL+Qt::Key_D, + DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+TQt::Key_D, WIN+CTRL+TQt::Key_D, this, slotToggleShowDesktop()); #endif diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 23cefb044..02941c127 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -54,7 +54,7 @@ static void sighandler(int) TQApplication::exit(); } -extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char ** argv ) { { TQCString multiHead = getenv("TDE_MULTIHEAD"); diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index a7326844e..4e4de2f56 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -70,9 +70,9 @@ MenuManager::MenuManager(TQObject *parent) else m_kmenu = new KMenuStub(new KMenu); - kapp->dcopClient()->setNotifications(true); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - this, TQT_SLOT(applicationRemoved(const TQCString&))); + tdeApp->dcopClient()->setNotifications(true); + connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + this, TQ_SLOT(applicationRemoved(const TQCString&))); } MenuManager::~MenuManager() @@ -164,7 +164,7 @@ void MenuManager::kmenuAccelActivated() // the item under the cursor gets selected. The single shot // avoids this from happening by allowing the item to be selected // when the event loop is enterred, and then resetting it. - TQTimer::singleShot(0, this, TQT_SLOT(slotSetKMenuItemActive())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSetKMenuItemActive())); } else { @@ -210,7 +210,7 @@ TQCString MenuManager::createMenu(TQPixmap icon, TQString text) p->text = text; p->icon = icon; p->idInParentMenu = m_kmenu->insertClientMenu( p ); - p->createdBy = kapp->dcopClient()->senderId(); + p->createdBy = tdeApp->dcopClient()->senderId(); m_kmenu->adjustSize(); return name; } diff --git a/kicker/kicker/core/menumanager.h b/kicker/kicker/core/menumanager.h index 1139b0b61..03e107767 100644 --- a/kicker/kicker/core/menumanager.h +++ b/kicker/kicker/core/menumanager.h @@ -40,7 +40,7 @@ typedef TQValueList<PanelPopupButton*> KButtonList; */ class MenuManager : public TQObject, DCOPObject { - Q_OBJECT + TQ_OBJECT public: static MenuManager* the(); diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 93bd2356b..b3160aed5 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -71,7 +71,7 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con // container area _containerArea = new ContainerArea( config(), this, opMenu() ); - connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool))); + connect(_containerArea, TQ_SIGNAL(maintainFocus(bool)), this, TQ_SIGNAL(maintainFocus(bool))); _layout->addWidget(_containerArea); _containerArea->viewport()->installEventFilter(this); @@ -81,15 +81,15 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con // beginning. positionChange(position()); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - TQT_SLOT(configurationChanged())); - connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), - TQT_SLOT(immutabilityChanged(bool))); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + TQ_SLOT(configurationChanged())); + connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)), + TQ_SLOT(immutabilityChanged(bool))); // we wait to get back to the event loop to start up the container area so that // the main panel in ExtensionManager will be assigned and we can tell in a // relatively non-hackish way that we are (or aren't) the "main panel" - TQTimer::singleShot(0, this, TQT_SLOT(populateContainerArea())); + TQTimer::singleShot(0, this, TQ_SLOT(populateContainerArea())); } PanelExtension::~PanelExtension() @@ -129,7 +129,7 @@ TQPopupMenu* PanelExtension::opMenu() } _opMnu = new TQPopupMenu(this); - connect(_opMnu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBuildOpMenu())); + connect(_opMnu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBuildOpMenu())); return _opMnu; } @@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e) if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*) e; - if ( me->button() == Qt::RightButton && kapp->authorize("action/kicker_rmb")) + if ( me->button() == TQt::RightButton && tdeApp->authorize("action/kicker_rmb")) { Kicker::the()->setInsertionPoint(me->globalPos()); opMenu()->exec(me->globalPos()); @@ -339,7 +339,7 @@ void PanelExtension::slotBuildOpMenu() { _opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar...") : i18n("Add &Applet to Panel..."), - _containerArea, TQT_SLOT(showAddAppletDialog())); + _containerArea, TQ_SLOT(showAddAppletDialog())); m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this); _opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar") : i18n("Add Appli&cation to Panel"), @@ -362,7 +362,7 @@ void PanelExtension::slotBuildOpMenu() } _opMnu->insertItem(SmallIconSet("system-lock-screen"), i18n("&Lock Panels"), - Kicker::the(), TQT_SLOT(toggleLock())); + Kicker::the(), TQ_SLOT(toggleLock())); } else if (!Kicker::the()->isKioskImmutable()) { @@ -370,23 +370,23 @@ void PanelExtension::slotBuildOpMenu() SmallIconSet("system-lock-screen"), kickerImmutable ? i18n("Un&lock Panels") : i18n("&Lock Panels"), - Kicker::the(), TQT_SLOT(toggleLock())); + Kicker::the(), TQ_SLOT(toggleLock())); } if (!isMenuBar && !Kicker::the()->isKioskImmutable()) { _opMnu->insertItem(SmallIconSet("configure"), i18n("&Configure Panel..."), - this, TQT_SLOT(showConfig())); + this, TQ_SLOT(showConfig())); _opMnu->insertSeparator(); } _opMnu->insertItem(SmallIconSet("fork"), i18n("&Launch Process Manager..."), - this, TQT_SLOT(showProcessManager())); + this, TQ_SLOT(showProcessManager())); _opMnu->insertSeparator(); - if (kapp->authorize("action/help")) + if (tdeApp->authorize("action/help")) { KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false); _opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu()); diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index c7882291f..02460b00b 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -40,7 +40,7 @@ class TQGridLayout; class PanelExtension : public KPanelExtension, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: @@ -109,7 +109,7 @@ private: class MenubarExtension : public PanelExtension { - Q_OBJECT + TQ_OBJECT public: MenubarExtension(const AppletInfo& info); diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index a8b79877a..bb7044aec 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klibloader.h> #include <kpanelapplet.h> #include <kpanelextension.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include "appletinfo.h" @@ -123,8 +123,8 @@ PluginManager::~PluginManager() AppletInfo::Dict::const_iterator it = _dict.constBegin(); for (; it != _dict.constEnd(); ++it) { - disconnect(it.key(), TQT_SIGNAL(destroyed( TQObject*)), - this, TQT_SLOT(slotPluginDestroyed(TQObject*))); + disconnect(it.key(), TQ_SIGNAL(destroyed( TQObject*)), + this, TQ_SLOT(slotPluginDestroyed(TQObject*))); delete it.data(); } @@ -159,9 +159,9 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { - _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) ); - connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), - TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); + _dict.insert( applet, new AppletInfo( info ) ); + connect( applet, TQ_SIGNAL( destroyed( TQObject* ) ), + TQ_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return applet; @@ -197,9 +197,9 @@ KPanelExtension* PluginManager::loadExtension( KPanelExtension* extension = init_ptr( parent, info.configFile() ); if( extension ) { - _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) ); - connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), - TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); + _dict.insert( extension, new AppletInfo( info ) ); + connect( extension, TQ_SIGNAL( destroyed( TQObject* ) ), + TQ_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return extension; @@ -360,12 +360,12 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) { // NOTE: this doesn't work on kicker shutdown because the timer never gets // fired. - TQTimer::singleShot( 0, this, TQT_SLOT( unload() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( unload() ) ); } void LibUnloader::unload( const TQString &libName ) { - (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) ); + (void)new LibUnloader( libName, tdeApp ); } void LibUnloader::unload() diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h index f67c13490..ea7730387 100644 --- a/kicker/kicker/core/pluginmanager.h +++ b/kicker/kicker/core/pluginmanager.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqmap.h> #include <tqobject.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kstaticdeleter.h> #include "appletinfo.h" @@ -38,9 +38,9 @@ class KPanelApplet; class KPanelExtension; class TQPopupMenu; -class KDE_EXPORT PluginManager : public TQObject +class TDE_EXPORT PluginManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: static PluginManager* the(); @@ -90,7 +90,7 @@ private: class LibUnloader : public TQObject { - Q_OBJECT + TQ_OBJECT public: static void unload( const TQString &libName ); diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp index 4a6639574..0a1e2907c 100644 --- a/kicker/kicker/core/showdesktop.cpp +++ b/kicker/kicker/core/showdesktop.cpp @@ -49,8 +49,8 @@ ShowDesktop::ShowDesktop() m_wmSupport = i.isSupported( NET::WM2ShowingDesktop ); if( m_wmSupport ) { - connect( Kicker::the()->twinModule(), TQT_SIGNAL( showingDesktopChanged( bool )), - TQT_SLOT( showingDesktopChanged( bool ))); + connect( Kicker::the()->twinModule(), TQ_SIGNAL( showingDesktopChanged( bool )), + TQ_SLOT( showingDesktopChanged( bool ))); showingDesktopChanged( m_showingDesktop = Kicker::the()->twinModule()->showingDesktop()); } } @@ -161,21 +161,21 @@ void ShowDesktop::showDesktop( bool b ) } // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - TQT_SLOT(slotCurrentDesktopChanged(int))); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - TQT_SLOT(slotWindowChanged(WId,unsigned int))); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), - TQT_SLOT(slotWindowAdded(WId))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + TQ_SLOT(slotCurrentDesktopChanged(int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + TQ_SLOT(slotWindowChanged(WId,unsigned int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)), + TQ_SLOT(slotWindowAdded(WId))); } else { - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(slotCurrentDesktopChanged(int))); - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - this, TQT_SLOT(slotWindowChanged(WId,unsigned int))); - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(slotWindowAdded(WId))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(slotCurrentDesktopChanged(int))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + this, TQ_SLOT(slotWindowChanged(WId,unsigned int))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(slotWindowAdded(WId))); for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); it != m_iconifiedList.end(); diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h index 88cc7d7c7..ec7119438 100644 --- a/kicker/kicker/core/showdesktop.h +++ b/kicker/kicker/core/showdesktop.h @@ -33,7 +33,7 @@ class KWinModule; */ class ShowDesktop : public TQObject { - Q_OBJECT + TQ_OBJECT public: static ShowDesktop* the(); diff --git a/kicker/kicker/core/unhidetrigger.cpp b/kicker/kicker/core/unhidetrigger.cpp index 0a5093a61..1acc182f6 100644 --- a/kicker/kicker/core/unhidetrigger.cpp +++ b/kicker/kicker/core/unhidetrigger.cpp @@ -40,7 +40,7 @@ UnhideTrigger::UnhideTrigger() , enabledCount( 0 ) { _timer = new TQTimer( this, "UnhideTrigger" ); - connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(pollMouse()) ); + connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(pollMouse()) ); } void UnhideTrigger::setEnabled( bool enable ) diff --git a/kicker/kicker/core/unhidetrigger.h b/kicker/kicker/core/unhidetrigger.h index af05a43f5..472009014 100644 --- a/kicker/kicker/core/unhidetrigger.h +++ b/kicker/kicker/core/unhidetrigger.h @@ -32,9 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqobject.h> -class UnhideTrigger : public QObject +class UnhideTrigger : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Trigger { None = 0, Top, TopRight, Right, BottomRight, Bottom, BottomLeft, Left, TopLeft }; static UnhideTrigger* the(); diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp index d48c43aad..04a2a4afd 100644 --- a/kicker/kicker/core/userrectsel.cpp +++ b/kicker/kicker/core/userrectsel.cpp @@ -46,7 +46,7 @@ UserRectSel::~UserRectSel() void UserRectSel::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { tqApp->exit_loop(); } @@ -89,7 +89,7 @@ void UserRectSel::paintCurrent() for (i = 0; i < 4; i++) { _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); - _frame[i]->setPaletteBackgroundColor(Qt::black); + _frame[i]->setPaletteBackgroundColor(TQt::black); } for (i = 4; i < 8; i++) { diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index 564a6d980..dbc4d62be 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -34,7 +34,7 @@ class ShutUpCompiler; class UserRectSel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: class PanelStrut diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp index 107a2527a..3119d8354 100644 --- a/kicker/kicker/core/usersizesel.cpp +++ b/kicker/kicker/core/usersizesel.cpp @@ -46,7 +46,7 @@ UserSizeSel::UserSizeSel(const TQRect& rect, const KPanelExtension::Position pos } if ((pos == KPanelExtension::Top) || (pos == KPanelExtension::Bottom)) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } setGeometry(-10, -10, 2, 2); @@ -69,7 +69,7 @@ UserSizeSel::~UserSizeSel() void UserSizeSel::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { tqApp->exit_loop(); } @@ -99,7 +99,7 @@ void UserSizeSel::mouseMoveEvent(TQMouseEvent * e) // int screen = xineramaScreen(); // if (screen < 0) // { -// screen = kapp->desktop()->screenNumber(this); +// screen = tdeApp->desktop()->screenNumber(this); // } // TQRect desktopGeom = TQApplication::desktop()->screenGeometry(screen); if (newSize < PANEL_MINIMUM_HEIGHT) @@ -156,7 +156,7 @@ void UserSizeSel::paintCurrent() for (i = 0; i < 4; i++) { _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); - _frame[i]->setPaletteBackgroundColor(Qt::black); + _frame[i]->setPaletteBackgroundColor(TQt::black); } for (i = 4; i < 8; i++) { diff --git a/kicker/kicker/core/usersizesel.h b/kicker/kicker/core/usersizesel.h index 64c8950bd..658baecf2 100644 --- a/kicker/kicker/core/usersizesel.h +++ b/kicker/kicker/core/usersizesel.h @@ -34,7 +34,7 @@ class ShutUpCompiler; class UserSizeSel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static TQRect select(const TQRect& rect, const KPanelExtension::Position pos, const TQColor& color); diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h index e605e27c5..441d71200 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.h +++ b/kicker/kicker/interfaces/kickoff-search-plugin.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <kurl.h> #include <kservice.h> -#include <kdemacros.h> +#include <tdemacros.h> typedef enum { ACTIONS = 0, @@ -89,9 +89,9 @@ public: namespace KickoffSearch { - class KDE_EXPORT Plugin : public TQObject + class TDE_EXPORT Plugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: Plugin(TQObject *parent, const char* name=0); diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.cpp b/kicker/kicker/interfaces/kickoffsearchinterface.cpp index 66b1add77..7c77cff0c 100644 --- a/kicker/kicker/interfaces/kickoffsearchinterface.cpp +++ b/kicker/kicker/interfaces/kickoffsearchinterface.cpp @@ -19,7 +19,7 @@ #include "kickoffsearchinterface.h" -KDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name ) +TDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name ) :TQObject( parent, name ) { } diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.h b/kicker/kicker/interfaces/kickoffsearchinterface.h index 485e9757c..89768d8ce 100644 --- a/kicker/kicker/interfaces/kickoffsearchinterface.h +++ b/kicker/kicker/interfaces/kickoffsearchinterface.h @@ -22,15 +22,15 @@ #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class HitMenuItem; namespace KickoffSearch { - class KDE_EXPORT KickoffSearchInterface :public TQObject + class TDE_EXPORT KickoffSearchInterface :public TQObject { - Q_OBJECT + TQ_OBJECT public: KickoffSearchInterface( TQObject* parent, const char* name = 0); diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index 9d530f236..d9beb5663 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -8,7 +8,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> struct AppletInfo diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 0db6bc352..f3b864ed8 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <tdeglobalsettings.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <paneldrag.h> @@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent) m_odd(odd), m_selected(false) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setSelected(m_selected); itemTitle->setText("<h3>" + info.name() + "</h3>"); @@ -84,8 +84,8 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() & Qt::LeftButton) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if (me->button() & TQt::LeftButton) { m_dragStart = me->pos(); } @@ -97,7 +97,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) if (e->type() == TQEvent::MouseMove) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if ((me->pos() - m_dragStart).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { @@ -123,21 +123,21 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) void AppletWidget::keyPressEvent(TQKeyEvent *e) { - if (e->key() == Qt::Key_Enter || - e->key() == Qt::Key_Return) + if (e->key() == TQt::Key_Enter || + e->key() == TQt::Key_Return) { emit doubleClicked(this); } - else if (e->key() == Qt::Key_Up) + else if (e->key() == TQt::Key_Up) { TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0); TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); } - else if (e->key() == Qt::Key_Down) + else if (e->key() == TQt::Key_Down) { - TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_Tab, 0, 0); TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); @@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e) void AppletWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { emit clicked(this); m_dragStart = e->pos(); @@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e) void AppletWidget::mouseMoveEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton && + if (e->button() == TQt::LeftButton && !m_dragStart.isNull() && (e->pos() - m_dragStart).manhattanLength() > TDEGlobalSettings::dndEventDelay()) @@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e) void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e) { - if (!e->button() == Qt::LeftButton) + if (!e->button() == TQt::LeftButton) { AppletItem::mouseDoubleClickEvent(e); return; @@ -254,16 +254,16 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea, m_mainWidget->appletInstall->setGuiItem(addGuiItem); m_mainWidget->closeButton->setGuiItem(KStdGuiItem::close()); - connect(m_mainWidget->appletSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(delayedSearch())); - connect(m_searchDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(search())); - connect(m_mainWidget->appletFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(filter(int))); - connect(m_mainWidget->appletInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCurrentApplet())); - connect(m_mainWidget->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + connect(m_mainWidget->appletSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(delayedSearch())); + connect(m_searchDelay, TQ_SIGNAL(timeout()), this, TQ_SLOT(search())); + connect(m_mainWidget->appletFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(filter(int))); + connect(m_mainWidget->appletInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCurrentApplet())); + connect(m_mainWidget->closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); m_selectedType = AppletInfo::Undefined; m_appletBox = 0; - TQTimer::singleShot(0, this, TQT_SLOT(populateApplets())); + TQTimer::singleShot(0, this, TQ_SLOT(populateApplets())); } void AddAppletDialog::updateInsertionPoint() @@ -303,9 +303,9 @@ void AddAppletDialog::resizeAppletView() bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::Resize) - TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView())); - return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e); + return this->TQObject::eventFilter(o, e); } void AddAppletDialog::populateApplets() @@ -372,10 +372,10 @@ void AddAppletDialog::populateApplets() setTabOrder(prevTabWidget, itemWidget); prevTabWidget = itemWidget; - connect(itemWidget, TQT_SIGNAL(clicked(AppletWidget*)), - this, TQT_SLOT(selectApplet(AppletWidget*))); - connect(itemWidget, TQT_SIGNAL(doubleClicked(AppletWidget*)), - this, TQT_SLOT(addApplet(AppletWidget*))); + connect(itemWidget, TQ_SIGNAL(clicked(AppletWidget*)), + this, TQ_SLOT(selectApplet(AppletWidget*))); + connect(itemWidget, TQ_SIGNAL(doubleClicked(AppletWidget*)), + this, TQ_SLOT(addApplet(AppletWidget*))); if (m_closing) { @@ -518,7 +518,7 @@ void AddAppletDialog::search() } } - TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView())); } void AddAppletDialog::filter(int i) diff --git a/kicker/kicker/ui/addapplet.h b/kicker/kicker/ui/addapplet.h index bc2763f0b..c62b2b2ec 100644 --- a/kicker/kicker/ui/addapplet.h +++ b/kicker/kicker/ui/addapplet.h @@ -41,7 +41,7 @@ class TQTimer; class AddAppletDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AddAppletDialog(ContainerArea* cArea, TQWidget* parent, const char* name); diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp index 6d5c4482f..f68159b98 100644 --- a/kicker/kicker/ui/addapplet_mnu.cpp +++ b/kicker/kicker/ui/addapplet_mnu.cpp @@ -33,8 +33,8 @@ PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, TQWidget *parent, c : TQPopupMenu(parent, name), containerArea(cArea) { setCheckable(true); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelAddAppletMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h index 79c539687..dfe15bbeb 100644 --- a/kicker/kicker/ui/addapplet_mnu.h +++ b/kicker/kicker/ui/addapplet_mnu.h @@ -33,7 +33,7 @@ class ContainerArea; class PanelAddAppletMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelAddAppletMenu(ContainerArea *cArea, TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index 62ff12675..dd6f04135 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -54,9 +54,9 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, m_moveTimer(0, "m_moveTimer"), m_dirty(false) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(NoBackground); - connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser())); + connect(&m_moveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(swoopCloser())); TQString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name()); @@ -109,10 +109,10 @@ void AddAppletVisualFeedback::makeMask() { TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::black); + m_mask.fill(TQt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); + maskPainter.setBrush(TQt::white); + maskPainter.setPen(TQt::white); maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); setMask(m_mask); @@ -156,7 +156,7 @@ void AddAppletVisualFeedback::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(Qt::black); + bufferPainter.setPen(TQt::black); bufferPainter.setBrush(colorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); @@ -218,7 +218,7 @@ void AddAppletVisualFeedback::swoopCloser() { m_moveTimer.stop(); displayInternal(); - TQTimer::singleShot(2000, this, TQT_SLOT(deleteLater())); + TQTimer::singleShot(2000, this, TQ_SLOT(deleteLater())); } } diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h index dc660bff1..d2e3da5e6 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.h +++ b/kicker/kicker/ui/addappletvisualfeedback.h @@ -40,7 +40,7 @@ class TQTimer; class AddAppletVisualFeedback : TQWidget { - Q_OBJECT + TQ_OBJECT public: AddAppletVisualFeedback(AppletWidget* parent, diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp index a544d0f74..a70a9cfd6 100644 --- a/kicker/kicker/ui/addbutton_mnu.cpp +++ b/kicker/kicker/ui/addbutton_mnu.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdesycocaentry.h> #include <kservice.h> #include <kservicegroup.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "addbutton_mnu.h" diff --git a/kicker/kicker/ui/addbutton_mnu.h b/kicker/kicker/ui/addbutton_mnu.h index 209e7e9a3..1a19b9480 100644 --- a/kicker/kicker/ui/addbutton_mnu.h +++ b/kicker/kicker/ui/addbutton_mnu.h @@ -30,7 +30,7 @@ class ContainerArea; class PanelAddButtonMenu : public PanelServiceMenu { - Q_OBJECT + TQ_OBJECT public: PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, const TQString & relPath, diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp index b22187443..c0eda09ab 100644 --- a/kicker/kicker/ui/addextension_mnu.cpp +++ b/kicker/kicker/ui/addextension_mnu.cpp @@ -31,8 +31,8 @@ PanelAddExtensionMenu::PanelAddExtensionMenu(TQWidget *parent, const char *name) : TQPopupMenu(parent, name) { setCheckable(true); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelAddExtensionMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h index 76163250f..f3be54c1f 100644 --- a/kicker/kicker/ui/addextension_mnu.h +++ b/kicker/kicker/ui/addextension_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelAddExtensionMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelAddExtensionMenu(TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index a037909b6..b38ca9fae 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -99,7 +99,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP insertSeparator(); } - TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon, + TQPixmap iconPix(tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true)); @@ -169,13 +169,13 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP } if (KickerSettings::legacyKMenu()) -// insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy())); - insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy())); +// insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy())); + insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy())); else - insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQT_SLOT(toggleLegacy())); + insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQ_SLOT(toggleLegacy())); } - if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit")) + if ((actions & PanelAppletOpMenu::KMenuEditor) && tdeApp->authorizeTDEAction("menuedit")) { if (needSeparator) { @@ -187,7 +187,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP } if ((actions & PanelAppletOpMenu::BookmarkEditor) && - kapp->authorizeTDEAction("edit_bookmarks")) + tdeApp->authorizeTDEAction("edit_bookmarks")) { if (needSeparator) { @@ -213,7 +213,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e) { - if (e->key() == Qt::Key_Escape) + if (e->key() == TQt::Key_Escape) { emit escapePressed(); } diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h index 35e10be3c..ae058cea1 100644 --- a/kicker/kicker/ui/appletop_mnu.h +++ b/kicker/kicker/ui/appletop_mnu.h @@ -31,7 +31,7 @@ class AppletInfo; // The button operations menu (usually right click) class PanelAppletOpMenu : public TQPopupMenu { -Q_OBJECT +TQ_OBJECT public: enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905 }; diff --git a/kicker/kicker/ui/appletwidget.h b/kicker/kicker/ui/appletwidget.h index d0bb9e885..e0a0b485c 100644 --- a/kicker/kicker/ui/appletwidget.h +++ b/kicker/kicker/ui/appletwidget.h @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class AppletWidget: public AppletItem { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<AppletWidget*> List; diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp index 0e98054d8..27eb0def5 100644 --- a/kicker/kicker/ui/browser_dlg.cpp +++ b/kicker/kicker/ui/browser_dlg.cpp @@ -55,7 +55,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic hbox1->setSpacing( KDialog::spacingHint() ); TQLabel *label2 = new TQLabel( i18n ( "Path:" ), hbox1 ); pathInput = new KLineEdit( hbox1 ); - connect( pathInput, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotPathChanged( const TQString & ))); + connect( pathInput, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotPathChanged( const TQString & ))); pathInput->setText( path ); pathInput->setFocus(); @@ -69,7 +69,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic else iconBtn->setIcon( icon ); - connect( browseBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( browse() ) ); + connect( browseBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( browse() ) ); } PanelBrowserDialog::~PanelBrowserDialog() diff --git a/kicker/kicker/ui/browser_dlg.h b/kicker/kicker/ui/browser_dlg.h index d1b3b623d..8aad531a2 100644 --- a/kicker/kicker/ui/browser_dlg.h +++ b/kicker/kicker/ui/browser_dlg.h @@ -31,7 +31,7 @@ class KLineEdit; class PanelBrowserDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PanelBrowserDialog( const TQString &path = TQString::null, const TQString &icon = TQString::null, TQWidget *parent = 0, const char *name = 0 ); diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index c5b76569c..a3dad738d 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdirwatch.h> #include <tdefileitem.h> #include <tdeglobal.h> @@ -37,9 +37,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdelocale.h> #include <kmimetype.h> #include <konq_operations.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kstringhandler.h> #include <kurldrag.h> @@ -64,12 +64,12 @@ PanelBrowserMenu::PanelBrowserMenu(TQString path, TQWidget *parent, const char * // we are not interested for dirty events on files inside the // directory (see slotClearIfNeeded) - connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotClearIfNeeded(const TQString&)) ); - connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)), - this, TQT_SLOT(slotClear()) ); - connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(slotClear()) ); + connect( &_dirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotClearIfNeeded(const TQString&)) ); + connect( &_dirWatch, TQ_SIGNAL(created(const TQString&)), + this, TQ_SLOT(slotClear()) ); + connect( &_dirWatch, TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(slotClear()) ); kdDebug() << "PanelBrowserMenu Constructor " << path << endl; } @@ -139,7 +139,7 @@ void PanelBrowserMenu::initialize() KURL url; url.setPath(path()); - if (!kapp->authorizeURLAction("list", KURL(), url)) + if (!tdeApp->authorizeURLAction("list", KURL(), url)) { insertItem(i18n("Not Authorized to Read Folder")); return; @@ -151,9 +151,9 @@ void PanelBrowserMenu::initialize() insertTitle(path()); TDEConfig *c = TDEGlobal::config(); c->setGroup("menus"); - insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager())); - if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal()) - insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal())); + insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager())); + if (tdeApp->authorize("shell_access") && KickerSettings::showOpenInTerminal()) + insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal())); insertSeparator(); } @@ -189,7 +189,7 @@ void PanelBrowserMenu::initialize() // parse .directory if it does exist if (TQFile::exists(path + "/.directory")) { - KSimpleConfig c(path + "/.directory", true); + TDESimpleConfig c(path + "/.directory", true); c.setDesktopGroup(); TQString iconPath = c.readEntry("Icon"); @@ -237,9 +237,9 @@ void PanelBrowserMenu::initialize() bool mimecheck = false; // .desktop files - if(KDesktopFile::isDesktopFile(path)) + if(TDEDesktopFile::isDesktopFile(path)) { - KSimpleConfig c(path, true); + TDESimpleConfig c(path, true); c.setDesktopGroup(); title = c.readEntry("Name", title); @@ -334,7 +334,7 @@ void PanelBrowserMenu::initialize() if(!_mimecheckTimer) _mimecheckTimer = new TQTimer(this, "_mimecheckTimer"); - connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck())); + connect(_mimecheckTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMimeCheck())); _mimecheckTimer->start(0); } } @@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) { TQPopupMenu::mouseMoveEvent(e); - if (!(e->state() & Qt::LeftButton)) return; + if (!(e->state() & TQt::LeftButton)) return; if(_lastpress == TQPoint(-1, -1)) return; // DND delay @@ -398,7 +398,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) url.setPath(path() + "/" + _filemap[id]); KURL::List files(url); KURLDrag *d = new KURLDrag(files, this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed())); d->setPixmap(iconSet(id)->pixmap()); d->drag(); } @@ -422,7 +422,7 @@ void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev ) void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev) { - TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton); + TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), TQt::NoButton, TQt::LeftButton); TQPopupMenu::mouseMoveEvent(&mev); } @@ -437,7 +437,7 @@ void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) void PanelBrowserMenu::slotExec(int id) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); if(!_filemap.contains(id)) return; @@ -449,7 +449,7 @@ void PanelBrowserMenu::slotExec(int id) void PanelBrowserMenu::slotOpenTerminal() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("General"); TQString term = config->readPathEntry("TerminalApplication", "konsole"); diff --git a/kicker/kicker/ui/browser_mnu.h b/kicker/kicker/ui/browser_mnu.h index 38f9b9690..1359e855e 100644 --- a/kicker/kicker/ui/browser_mnu.h +++ b/kicker/kicker/ui/browser_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelBrowserMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PanelBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0); diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h index 85efcada8..d6dbcc4f1 100644 --- a/kicker/kicker/ui/clicklineedit.h +++ b/kicker/kicker/ui/clicklineedit.h @@ -33,9 +33,9 @@ namespace KPIM { @short LineEdit with customizable "Click here" text @author Daniel Molkentin */ -class KDE_EXPORT ClickLineEdit : public KLineEdit +class TDE_EXPORT ClickLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: ClickLineEdit( TQWidget *parent, const TQString &msg = TQString::null, const char* name = 0 ); ~ClickLineEdit(); diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index 0ad2107d1..72cc6b279 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -46,13 +46,13 @@ void KickerClientMenu::clear() void KickerClientMenu::insertItem( TQPixmap icon, TQString text, int id ) { - int globalid = TQPopupMenu::insertItem( icon, text, this, TQT_SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( icon, text, this, TQ_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } void KickerClientMenu::insertItem( TQString text, int id ) { - int globalid = TQPopupMenu::insertItem( text, this, TQT_SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( text, this, TQ_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } @@ -134,6 +134,6 @@ void KickerClientMenu::slotActivated(int id) TQByteArray data; TQDataStream dataStream( data, IO_WriteOnly ); dataStream << id; - kapp->dcopClient()->send( app, obj, "activated(int)", data ); + tdeApp->dcopClient()->send( app, obj, "activated(int)", data ); } } diff --git a/kicker/kicker/ui/client_mnu.h b/kicker/kicker/ui/client_mnu.h index 272f6364f..c1884469d 100644 --- a/kicker/kicker/ui/client_mnu.h +++ b/kicker/kicker/ui/client_mnu.h @@ -40,7 +40,7 @@ class PanelKMenu; */ class KickerClientMenu : public TQPopupMenu, DCOPObject { - Q_OBJECT + TQ_OBJECT public: KickerClientMenu( TQWidget *parent=0, const char *name=0); ~KickerClientMenu(); diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index 07caa2b55..a0c572685 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kicondialog.h> #include <tdemessagebox.h> #include <kmimetype.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlcompletion.h> #include <kurlrequester.h> #include <kurl.h> @@ -68,14 +68,14 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio updateIcon(); - connect(ui->m_exec, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(slotSelect(const TQString &))); - connect(ui->m_exec, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotTextChanged(const TQString &))); - connect(ui->m_exec, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotReturnPressed())); - connect(ui->m_icon, TQT_SIGNAL(iconChanged(TQString)), - this, TQT_SLOT(slotIconChanged(TQString))); + connect(ui->m_exec, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(slotSelect(const TQString &))); + connect(ui->m_exec, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotTextChanged(const TQString &))); + connect(ui->m_exec, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotReturnPressed())); + connect(ui->m_icon, TQ_SIGNAL(iconChanged(TQString)), + this, TQ_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline resize(sizeHint().width() > 300 ? sizeHint().width() : 300, diff --git a/kicker/kicker/ui/exe_dlg.h b/kicker/kicker/ui/exe_dlg.h index ef96fe9d0..669e98a61 100644 --- a/kicker/kicker/ui/exe_dlg.h +++ b/kicker/kicker/ui/exe_dlg.h @@ -29,7 +29,7 @@ class NonKDEButtonSettings; class PanelExeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PanelExeDialog(const TQString& title, const TQString& description, const TQString &path, const TQString &pixmap=TQString::null, diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp index ae96ebcaa..e2e19d406 100644 --- a/kicker/kicker/ui/flipscrollview.cpp +++ b/kicker/kicker/ui/flipscrollview.cpp @@ -101,20 +101,20 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name ) addChild( mRightView ); mTimer = new TQTimer( this, "mTimer" ); - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) ); - - connect( mLeftView, TQT_SIGNAL( startService(KService::Ptr) ), - TQT_SIGNAL( startService(KService::Ptr) ) ); - connect( mLeftView, TQT_SIGNAL( startURL(const TQString& ) ), - TQT_SIGNAL( startURL(const TQString& ) ) ); - connect( mLeftView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), - TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); - connect( mRightView, TQT_SIGNAL( startService(KService::Ptr) ), - TQT_SIGNAL( startService(KService::Ptr) ) ); - connect( mRightView, TQT_SIGNAL( startURL(const TQString& ) ), - TQT_SIGNAL( startURL(const TQString& ) ) ); - connect( mRightView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), - TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) ); + + connect( mLeftView, TQ_SIGNAL( startService(KService::Ptr) ), + TQ_SIGNAL( startService(KService::Ptr) ) ); + connect( mLeftView, TQ_SIGNAL( startURL(const TQString& ) ), + TQ_SIGNAL( startURL(const TQString& ) ) ); + connect( mLeftView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), + TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); + connect( mRightView, TQ_SIGNAL( startService(KService::Ptr) ), + TQ_SIGNAL( startService(KService::Ptr) ) ); + connect( mRightView, TQ_SIGNAL( startURL(const TQString& ) ), + TQ_SIGNAL( startURL(const TQString& ) ) ); + connect( mRightView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), + TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); // wild hack to make sure it has correct width mLeftView->setVScrollBarMode( TQScrollView::AlwaysOn ); @@ -124,7 +124,7 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name ) mBackrow = new BackFrame( this ); mBackrow->resize( 24, 100 ); - connect( mBackrow, TQT_SIGNAL( clicked() ), TQT_SIGNAL( backButtonClicked() ) ); + connect( mBackrow, TQ_SIGNAL( clicked() ), TQ_SIGNAL( backButtonClicked() ) ); } ItemView* FlipScrollView::prepareRightMove() diff --git a/kicker/kicker/ui/flipscrollview.h b/kicker/kicker/ui/flipscrollview.h index d2de2ab5e..7c761b5ac 100644 --- a/kicker/kicker/ui/flipscrollview.h +++ b/kicker/kicker/ui/flipscrollview.h @@ -44,14 +44,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqframe.h> #include <tqtimer.h> #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "service_mnu.h" class ItemView; class BackFrame : public TQFrame { - Q_OBJECT + TQ_OBJECT public: BackFrame( TQWidget *parent ); @@ -71,7 +71,7 @@ private: class FlipScrollView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: enum State{ StoppedLeft, StoppedRight, ScrollingLeft, ScrollingRight }; FlipScrollView( TQWidget * parent = 0, const char * name = 0 ); diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 971679359..f7637a100 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -29,42 +29,42 @@ #include <kiconloader.h> #include <kicontheme.h> #include <kipc.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> HideButton::HideButton(TQWidget *parent, const char *name) : TQButton(parent, name), m_highlight(false), - m_arrow(Qt::LeftArrow) + m_arrow(TQt::LeftArrow) { setBackgroundOrigin(AncestorOrigin); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int))); - kapp->addKipcEventMask(KIPC::SettingsChanged); - kapp->addKipcEventMask(KIPC::IconChanged); + tdeApp->addKipcEventMask(KIPC::SettingsChanged); + tdeApp->addKipcEventMask(KIPC::IconChanged); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); } void HideButton::drawButton(TQPainter *p) { - if (m_arrow == Qt::LeftArrow) + if (m_arrow == TQt::LeftArrow) { p->setPen(colorGroup().mid()); p->drawLine(width()-1, 0, width()-1, height()); } - else if (m_arrow == Qt::RightArrow) + else if (m_arrow == TQt::RightArrow) { p->setPen(colorGroup().mid()); p->drawLine(0, 0, 0, height()); } - else if (m_arrow == Qt::UpArrow) + else if (m_arrow == TQt::UpArrow) { p->setPen(colorGroup().mid()); p->drawLine(0, height()-1, width(), height()-1); } - else if (m_arrow == Qt::DownArrow) + else if (m_arrow == TQt::DownArrow) { p->setPen(colorGroup().mid()); p->drawLine(0, 0, width(), 0); @@ -106,24 +106,24 @@ void HideButton::setPixmap(const TQPixmap &pix) generateIcons(); } -void HideButton::setArrowType(Qt::ArrowType arrow) +void HideButton::setArrowType(TQt::ArrowType arrow) { m_arrow = arrow; switch (arrow) { - case Qt::LeftArrow: + case TQt::LeftArrow: setPixmap(SmallIcon("1leftarrow")); break; - case Qt::RightArrow: + case TQt::RightArrow: setPixmap(SmallIcon("1rightarrow")); break; - case Qt::UpArrow: + case TQt::UpArrow: setPixmap(SmallIcon("1uparrow")); break; - case Qt::DownArrow: + case TQt::DownArrow: default: setPixmap(SmallIcon("1downarrow")); break; @@ -138,7 +138,7 @@ void HideButton::generateIcons() } TQImage image = pixmap()->convertToImage(); - image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin); + image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin); TDEIconEffect effect; diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h index c73c25ba7..c8c754857 100644 --- a/kicker/kicker/ui/hidebutton.h +++ b/kicker/kicker/ui/hidebutton.h @@ -25,11 +25,11 @@ class HideButton : public TQButton { - Q_OBJECT + TQ_OBJECT public: HideButton(TQWidget *parent, const char *name = 0); - void setArrowType(Qt::ArrowType arrow); + void setArrowType(TQt::ArrowType arrow); void setPixmap(const TQPixmap &pix); protected: @@ -44,7 +44,7 @@ class HideButton : public TQButton bool m_highlight; TQPixmap m_normalIcon; TQPixmap m_activeIcon; - Qt::ArrowType m_arrow; + TQt::ArrowType m_arrow; protected slots: void slotSettingsChanged( int category ); diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 4ca9acb81..873fbaa9f 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcombobox.h> #include <twin.h> #include <kdebug.h> @@ -158,12 +158,12 @@ void KMenuItem::setup() float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.); const int expected_height = 38; - description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; - title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); + description_font_size = TQMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; + title_font_size = TQMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl; TQListViewItem::setup(); - setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView())))); + setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView()))); } void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) @@ -278,7 +278,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column if ( m_description.isEmpty() ) spacing = ( height() - f1h ) / 2; - int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) ); + int right_triangle_size = pixelSize( 7, listView() ); int right_margin = listView()->verticalScrollBar()->width(); if ( m_has_children ) @@ -531,7 +531,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int int r = left_margin + margin * 2; const int min_font_size = 7; - int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) ); + int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) ); TQFont f1 = p->font(); f1.setPixelSize( title_font_pixelSize ); @@ -635,16 +635,16 @@ ItemView::ItemView(TQWidget* parent, const char* name) setItemMargin(0); setSorting(-1); setTreeStepSize(38); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); m_lastOne = 0; m_old_contentY = -1; - connect(this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )), - TQT_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int))); + connect(this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )), + TQ_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int))); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); - connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); new ItemViewTip( viewport(), this ); } @@ -837,7 +837,7 @@ KMenuItem* ItemView::insertDocumentItem(const TQString& s, int nId, int nIndex, KMenuItem* ItemView::insertRecentlyItem(const TQString& s, int nId, int nIndex) { - KDesktopFile f(s, true /* read only */); + TDEDesktopFile f(s, true /* read only */); KMenuItem* newItem = findItem(nId); @@ -944,14 +944,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) if (m_mouseMoveSelects) { if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) + (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0) TDEListView::setSelected(i, true); else if (!i && selectedItem()) TDEListView::setSelected(selectedItem(), false); } if ( link_cursor ) - setCursor( Qt::PointingHandCursor ); + setCursor( TQt::PointingHandCursor ); else unsetCursor(); @@ -999,7 +999,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e) if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) + (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0) TDEListView::setSelected(i, true); else if (!i && selectedItem()) TDEListView::setSelected(selectedItem(), false); @@ -1029,7 +1029,7 @@ TQDragObject * ItemView::dragObject() mask = *pix.mask(); else { mask.resize(pix.size()); - mask.fill(Qt::color1); + mask.fill(TQt::color1); } bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP ); @@ -1056,7 +1056,7 @@ TQDragObject * ItemView::dragObject() TQString uri = kitem->path(); if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(uri,true); + TDEDesktopFile df(uri,true); uri=df.readURL(); } @@ -1153,9 +1153,9 @@ bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) TQString url = *it; kdDebug () << "Url " << url << endl; item.m_path = KURL( url ).path(); - if ( KDesktopFile::isDesktopFile( item.m_path ) ) + if ( TDEDesktopFile::isDesktopFile( item.m_path ) ) { - KDesktopFile df( item.m_path, true ); + TDEDesktopFile df( item.m_path, true ); item.m_description = df.readGenericName(); item.m_icon = df.readIcon(); item.m_title = df.readName(); @@ -1215,13 +1215,13 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQString uri = item.m_path; if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(uri,true); + TDEDesktopFile df(uri,true); uri=df.readURL(); } for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==uri) break; } @@ -1243,7 +1243,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQStringList::Iterator it; for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==text) break; } diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h index 27807c939..bab0142c2 100644 --- a/kicker/kicker/ui/itemview.h +++ b/kicker/kicker/ui/itemview.h @@ -156,7 +156,7 @@ class ItemView : public TDEListView { friend class KMenuItem; - Q_OBJECT + TQ_OBJECT public: ItemView(TQWidget* parent, const char* name = 0); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index b99d6e3ba..189e7e03e 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetoolbarbutton.h> #include <twin.h> #include <popupmenutop.h> @@ -77,7 +77,7 @@ PanelKMenu::PanelKMenu() : PanelServiceMenu(TQString::null, TQString::null, 0, "KMenu") , bookmarkMenu(0) , bookmarkOwner(0) - , displayRepaired(FALSE) + , displayRepaired(false) { static const TQCString dcopObjId("KMenu"); DCOPObject::setObjId(dcopObjId); @@ -87,8 +87,8 @@ PanelKMenu::PanelKMenu() disableAutoClear(); actionCollection = new TDEActionCollection(this); setCaption(i18n("TDE Menu")); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(configChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(configChanged())); DCOPClient *dcopClient = TDEApplication::dcopClient(); dcopClient->connectDCOPSignal(0, "appLauncher", "serviceStartedByStorageId(TQString,TQString)", @@ -96,7 +96,7 @@ PanelKMenu::PanelKMenu() "slotServiceStartedByStorageId(TQString,TQString)", false); displayRepairTimer = new TQTimer( this ); - connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) ); + connect( displayRepairTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repairDisplay()) ); } PanelKMenu::~PanelKMenu() @@ -122,19 +122,16 @@ void PanelKMenu::hideMenu() { hide(); -#ifdef USE_QT4 - // The hacks below aren't needed any more because Qt4 supports true transparency for the fading logout screen -#else // USE_QT4 // Try to redraw the area under the menu // Qt makes this surprisingly difficult to do in a timely fashion! while (isShown() == true) - kapp->eventLoop()->processEvents(1000); + tdeApp->eventLoop()->processEvents(1000); TQTimer *windowtimer = new TQTimer( this ); - connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; - windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed + windowtimer->start( 0, true ); // Wait for all window system events to be processed while (windowTimerTimedOut == false) - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); // HACK // The TDE Menu takes an unknown amount of time to disappear, and redrawing @@ -143,12 +140,11 @@ void PanelKMenu::hideMenu() // thereby removing a bad shutdown screen artifact while still providing // a somewhat snappy user interface. TQTimer *delaytimer = new TQTimer( this ); - connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( delaytimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; - delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds + delaytimer->start( 100, true ); // Wait for 100 milliseconds while (windowTimerTimedOut == false) - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); -#endif // USE_QT4 + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); } void PanelKMenu::windowClearTimeout() @@ -251,10 +247,10 @@ void PanelKMenu::initialize() if (loadSidePixmap()) { // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); } else { @@ -287,16 +283,16 @@ void PanelKMenu::initialize() } searchEdit = new KPIM::ClickLineEdit( hbox, placeholder ); - hbox->setFocusPolicy(TQ_StrongFocus); + hbox->setFocusPolicy(TQWidget::StrongFocus); hbox->setFocusProxy(searchEdit); hbox->setSpacing( 3 ); - connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch())); - connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT( slotUpdateSearch( const TQString&))); + connect(clearButton, TQ_SIGNAL(clicked()), searchEdit, TQ_SLOT(clear())); + connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClearSearch())); + connect(searchEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT( slotUpdateSearch( const TQString&))); accel->insert("search", i18n("Search"), i18n("TDE Menu search"), TDEShortcut(KickerSettings::searchShortcut()), - this, TQT_SLOT(slotFocusSearch())); + this, TQ_SLOT(slotFocusSearch())); insertItem(hbox, searchLineID, 0); } else { @@ -321,7 +317,7 @@ void PanelKMenu::initialize() bool need_separator = false; // insert bookmarks - if (KickerSettings::useBookmarks() && kapp->authorizeTDEAction("bookmarks")) + if (KickerSettings::useBookmarks() && tdeApp->authorizeTDEAction("bookmarks")) { // Need to create a new popup each time, it's deleted by subMenus.clear() TDEPopupMenu * bookmarkParent = new TDEPopupMenu( this, "bookmarks" ); @@ -389,21 +385,21 @@ void PanelKMenu::initialize() } // run command - if (kapp->authorize("run_command")) + if (tdeApp->authorize("run_command")) { insertItem(KickerLib::menuIconSet("system-run"), i18n("Run Command..."), this, - TQT_SLOT( slotRunCommand())); + TQ_SLOT( slotRunCommand())); insertSeparator(); } - if (DM().isSwitchable() && kapp->authorize("switch_user")) + if (DM().isSwitchable() && tdeApp->authorize("switch_user")) { sessionsMenu = new TQPopupMenu( this ); insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu); - connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) ); - connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) ); + connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) ); + connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) ); } /* @@ -413,17 +409,17 @@ void PanelKMenu::initialize() ksmserver.setGroup("General"); if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession") { - insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession())); + insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQ_SLOT(slotSaveSession())); } - if (kapp->authorize("lock_screen")) + if (tdeApp->authorize("lock_screen")) { - insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQT_SLOT(slotLock())); + insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQ_SLOT(slotLock())); } - if (kapp->authorize("logout")) + if (tdeApp->authorize("logout")) { - insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQT_SLOT(slotLogout())); + insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQ_SLOT(slotLogout())); } #if 0 @@ -434,9 +430,9 @@ void PanelKMenu::initialize() insertTearOffHandle(); #endif - if (displayRepaired == FALSE) { - displayRepairTimer->start(5, FALSE); - displayRepaired = TRUE; + if (displayRepaired == false) { + displayRepairTimer->start(5, false); + displayRepaired = true; } setInitialized(true); @@ -449,7 +445,7 @@ void PanelKMenu::repairDisplay(void) { // Now do a nasty hack to prevent search bar merging into the side image // This forces a layout/repaint of the qpopupmenu repaint(); // This ensures that the side bar image was applied - styleChange(style()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. + styleChange(style()); // This forces a call to the private function updateSize(true) inside the qpopupmenu. update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above } } @@ -481,13 +477,13 @@ void PanelKMenu::slotLock() TQByteArray replyData; // Block here until lock is complete // If this is not done the desktop of the locked session will be shown after VT switch until the lock fully engages! - kapp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData); + tdeApp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData); } void PanelKMenu::slotLogout() { hide(); - kapp->requestShutDown(); + tdeApp->requestShutDown(); } void PanelKMenu::slotPopulateSessions() @@ -496,9 +492,9 @@ void PanelKMenu::slotPopulateSessions() DM dm; sessionsMenu->clear(); - if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) + if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) { - if (kapp->authorize("lock_screen")) { + if (tdeApp->authorize("lock_screen")) { sessionsMenu->insertItem(SmallIconSet("system-lock-screen"), i18n("Lock Current && Start New Session"), 100 ); } sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Start New Session"), 101 ); @@ -532,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent ) void PanelKMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), + tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -562,7 +558,7 @@ void PanelKMenu::doNewSession( bool lock ) void PanelKMenu::slotSaveSession() { TQByteArray data; - kapp->dcopClient()->send( "ksmserver", "default", + tdeApp->dcopClient()->send( "ksmserver", "default", "saveCurrentSession()", data ); } @@ -573,8 +569,8 @@ void PanelKMenu::slotRunCommand() if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send( appname, "KDesktopIface", + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "popupExecuteCommand()", data ); } @@ -659,7 +655,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e) TQPainter p(this); p.setClipRegion(e->region()); - style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); @@ -730,7 +726,7 @@ void PanelKMenu::slotUpdateSearch(const TQString& searchString) void PanelKMenu::slotClearSearch() { if (searchEdit && searchEdit->text().isEmpty() == false) { - TQTimer::singleShot(0, searchEdit, TQT_SLOT(clear())); + TQTimer::singleShot(0, searchEdit, TQ_SLOT(clear())); } } diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index cf5a1917b..bb2056590 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -45,7 +45,7 @@ class Panel; class PanelKMenu : public PanelServiceMenu, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 712868adb..324c46f0e 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -31,6 +31,11 @@ #include <dmctl.h> #include <inttypes.h> +#ifdef Q_OS_SOLARIS +#include <sys/statvfs.h> +#define statfs statvfs +#endif /* Q_OS_SOLARIS */ + #include <tqimage.h> #include <tqpainter.h> #include <tqstyle.h> @@ -63,7 +68,7 @@ #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcombobox.h> #include <twin.h> #include <kdebug.h> @@ -76,7 +81,7 @@ #include <kurifilter.h> #include <kbookmarkmanager.h> #include <kbookmark.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeio/jobclasses.h> #include <tdeio/job.h> #include <dcopref.h> @@ -201,15 +206,15 @@ KMenu::KMenu() m_iconName(TQString()), m_orientation(UnDetermined), m_search_plugin( 0 ) { setMouseTracking(true); - connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout())); + connect(&m_sloppyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotSloppyTimeout())); // set the first client id to some arbitrarily large value. client_id = 10000; // Don't automatically clear the main menu. actionCollection = new TDEActionCollection(this); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(configChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(configChanged())); KUser * user = new KUser(); @@ -223,7 +228,7 @@ KMenu::KMenu() setupUi(); m_userInfo->setBackgroundMode( PaletteBase ); - TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid ); + TQColor userInfoColor = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Mid ); if ( tqGray( userInfoColor.rgb() ) > 120 ) userInfoColor = userInfoColor.dark( 200 ); else @@ -231,7 +236,7 @@ KMenu::KMenu() m_userInfo->setPaletteForegroundColor( userInfoColor ); m_tabBar = new KickoffTabBar(this, "m_tabBar"); - connect(m_tabBar, TQT_SIGNAL(tabClicked(TQTab*)), TQT_SLOT(tabClicked(TQTab*))); + connect(m_tabBar, TQ_SIGNAL(tabClicked(TQTab*)), TQ_SLOT(tabClicked(TQTab*))); const int tab_icon_size = 32; @@ -279,8 +284,8 @@ KMenu::KMenu() m_tabs[LeaveTab]->setIconSet(BarIcon("leave", tab_icon_size)); } - connect(m_tabBar, TQT_SIGNAL(selected(int)), m_stacker, TQT_SLOT(raiseWidget(int))); - connect(m_stacker, TQT_SIGNAL(aboutToShow(int)), m_tabBar, TQT_SLOT(setCurrentTab(int))); + connect(m_tabBar, TQ_SIGNAL(selected(int)), m_stacker, TQ_SLOT(raiseWidget(int))); + connect(m_stacker, TQ_SIGNAL(aboutToShow(int)), m_tabBar, TQ_SLOT(setCurrentTab(int))); m_favoriteView = new FavoritesItemView (m_stacker, "m_favoriteView"); m_favoriteView->setAcceptDrops(true); @@ -295,11 +300,11 @@ KMenu::KMenu() m_browserView = new FlipScrollView(m_stacker, "m_browserView"); m_stacker->addWidget(m_browserView, ApplicationsTab); - connect( m_browserView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoBack() ) ); + connect( m_browserView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoBack() ) ); m_exitView = new FlipScrollView(m_stacker, "m_exitView"); m_stacker->addWidget(m_exitView, LeaveTab); - connect( m_exitView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoExitMainMenu() ) ); + connect( m_exitView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoExitMainMenu() ) ); m_searchWidget = new TQVBox (m_stacker, "m_searchWidget"); m_searchWidget->setSpacing(0); @@ -326,7 +331,7 @@ KMenu::KMenu() m_searchResultsWidget->setItemMargin(4); // m_searchResultsWidget->setIconSize(16); m_searchActions = new ItemView (m_searchWidget, "m_searchActions"); - m_searchActions->setFocusPolicy(TQ_NoFocus); + m_searchActions->setFocusPolicy(TQWidget::NoFocus); m_searchActions->setItemMargin(4); m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet")); m_searchInternet->setPixmap(0,icon); @@ -336,40 +341,40 @@ KMenu::KMenu() m_searchActions->setMaximumHeight(5+m_searchInternet->height()); - connect(m_searchActions, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchActions, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchActions, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchResultsWidget, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_searchResultsWidget, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_searchResultsWidget, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_searchResultsWidget, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_searchResultsWidget, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_searchResultsWidget, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_recentlyView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_recentlyView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_recentlyView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_recentlyView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_recentlyView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_recentlyView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_favoriteView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_favoriteView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_favoriteView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_favoriteView, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQT_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); + connect(m_favoriteView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_favoriteView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_favoriteView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_favoriteView, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQ_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); - connect(m_systemView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_systemView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_systemView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_systemView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_systemView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_systemView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_browserView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotGoSubMenu(const TQString&))); - connect(m_browserView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_browserView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_browserView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotGoSubMenu(const TQString&))); + connect(m_browserView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_browserView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_exitView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_exitView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_exitView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_exitView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); m_kcommand->setDuplicatesEnabled( false ); m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit")); m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory())); - connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept())); - connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &))); + connect(m_kcommand, TQ_SIGNAL(cleared()), TQ_SLOT(clearedHistory())); + connect(m_kcommand->lineEdit(), TQ_SIGNAL(returnPressed()), TQ_SLOT(searchAccept())); + connect(m_kcommand->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(searchChanged(const TQString &))); // URI Filter meta object... m_filterData = new KURIFilterData(); @@ -378,14 +383,14 @@ KMenu::KMenu() categorised_hit_total = new int [num_categories]; input_timer = new TQTimer (this, "input_timer"); - connect( input_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doQuery()) ); + connect( input_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doQuery()) ); init_search_timer = new TQTimer (this, "init_search_timer"); - connect( init_search_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initSearch()) ); + connect( init_search_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initSearch()) ); init_search_timer->start(2000, true); - connect( m_favoriteView, TQT_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ), - TQT_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) ); + connect( m_favoriteView, TQ_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ), + TQ_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) ); this->installEventFilter(this); m_tabBar->installEventFilter(this); @@ -445,10 +450,10 @@ void KMenu::setupUi() m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); - // m_stacker->setFocusPolicy( TQ_StrongFocus ); + // m_stacker->setFocusPolicy( TQWidget::StrongFocus ); m_stacker->setLineWidth( 0 ); - m_stacker->setFocusPolicy(TQ_NoFocus); - connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*))); + m_stacker->setFocusPolicy(TQWidget::NoFocus); + connect(m_stacker, TQ_SIGNAL(aboutToShow(TQWidget*)), TQ_SLOT(stackWidgetRaised(TQWidget*))); m_kcommand->setName("m_kcommand"); } @@ -475,16 +480,16 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) TQPoint p; if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); p = me->globalPos(); } else if (e->type() == TQEvent::Wheel) { - TQWheelEvent* we = TQT_TQWHEELEVENT(e); + TQWheelEvent* we = static_cast<TQWheelEvent*>(e); p = we->globalPos(); } while (receiver) { - if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { + if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p)); if (s && s->identifier() == ApplicationsTab) raiseWidget = m_browserView; @@ -504,8 +509,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) /* we do not want hover activation for the search line edit as this can be * pretty disturbing */ - if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) || - ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) && + if ( (receiver == m_searchPixmap || + ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) && ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel || e->type() == TQEvent::MouseButtonPress ) ) ) && !m_isShowing) { @@ -517,25 +522,25 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if(raiseWidget) break; if(receiver->isWidgetType()) - receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true)); + receiver = static_cast<TQWidget*>(receiver)->parentWidget(true); else break; } if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) { - m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus); + m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus); m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ? - TQ_StrongFocus : TQ_NoFocus); + TQWidget::StrongFocus : TQWidget::NoFocus); setTabOrder(raiseWidget, m_searchResultsWidget); if (raiseWidget != m_stacker->visibleWidget() - && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus + && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus && m_stacker->id(raiseWidget) >= 0) { m_stacker->raiseWidget(raiseWidget); return true; } - if (raiseWidget->focusPolicy() != TQ_NoFocus) + if (raiseWidget->focusPolicy() != TQWidget::NoFocus) return false; } @@ -557,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) } if(e->type() == TQEvent::Enter && receiver->isWidgetType()) { - TQT_TQWIDGET(receiver)->setMouseTracking(true); + static_cast<TQWidget*>(receiver)->setMouseTracking(true); TQToolTip::hide(); } @@ -584,7 +589,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if (view) { bool handled = true; - switch (TQT_TQKEYEVENT(e)->key()) { + switch (static_cast<TQKeyEvent*>(e)->key()) { case Key_Up: if (view->selectedItem()) { view->setSelected(view->selectedItem()->itemAbove(),true); @@ -661,7 +666,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) r = true; } - if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker)) + if (e->type() == TQEvent::Enter && receiver == m_stacker) { TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size()); r.setSize(r.size()+TQSize(16,128)); @@ -738,8 +743,8 @@ void KMenu::paintSearchTab( bool active ) m_tabBar->deactivateTabs(true); - p.setBrush( Qt::white ); - p.setPen( Qt::NoPen ); + p.setBrush( TQt::white ); + p.setPen( TQt::NoPen ); if ( m_orientation == BottomUp ) { search_tab_center.convertFromImage( search_tab_center.convertToImage().scale(search_tab_center.width(), m_searchFrame->height())); @@ -1220,18 +1225,18 @@ void KMenu::initialize() kdDebug(1210) << "KMenu::initialize()" << endl; // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); /* If the user configured ksmserver to */ TDEConfig ksmserver("ksmserverrc", false, false); ksmserver.setGroup("General"); - connect( m_branding, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenHomepage())); - m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout")); + connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage())); + m_tabBar->setTabEnabled(LeaveTab, tdeApp->authorize("logout")); // load search field history TQStringList histList = KickerSettings::history(); @@ -1279,7 +1284,7 @@ void KMenu::initialize() for (TQStringList::ConstIterator it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); TQString url = df.readURL(); if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString()))) m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++); @@ -1304,10 +1309,10 @@ void KMenu::insertStaticExitItems() int index = 1; m_exitView->leftView()->insertSeparator( nId++, i18n("Session"), index++ ); - if (kapp->authorize("logout")) + if (tdeApp->authorize("logout")) m_exitView->leftView()->insertItem( "edit-undo", i18n( "Log out" ), i18n( "End current session" ), "kicker:/logout", nId++, index++ ); - if (kapp->authorize("lock_screen")) + if (tdeApp->authorize("lock_screen")) m_exitView->leftView()->insertItem( "system-lock-screen", i18n( "Lock" ), i18n( "Lock computer screen" ), "kicker:/lock", nId++, index++ ); @@ -1319,7 +1324,7 @@ void KMenu::insertStaticExitItems() i18n("Save current Session for next login"), "kicker:/savesession", nId++, index++ ); } - if (DM().isSwitchable() && kapp->authorize("switch_user")) + if (DM().isSwitchable() && tdeApp->authorize("switch_user")) { KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ), i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ ); @@ -1381,7 +1386,7 @@ void KMenu::insertStaticItems() m_systemView->insertMenuItem(p, nId++, index++); // run command - if (kapp->authorize("run_command")) + if (tdeApp->authorize("run_command")) { m_systemView->insertItem( "system-run", i18n("Run Command..."), "", "kicker:/runusercommand", nId++, index++ ); @@ -1440,11 +1445,11 @@ void KMenu::insertStaticItems() m_systemView->insertItem( "network", i18n( "Network Folders" ), "remote:/", "remote:/", nId++, index++ ); - m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) ); - connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) ); + m_mediaWatcher = new MediaWatcher( this ); + connect( m_mediaWatcher, TQ_SIGNAL( mediumChanged() ), TQ_SLOT( updateMedia() ) ); m_media_id = 0; - connect(&m_mediaFreeTimer, TQT_SIGNAL(timeout()), TQT_SLOT( updateMedia())); + connect(&m_mediaFreeTimer, TQ_SIGNAL(timeout()), TQ_SLOT( updateMedia())); } int KMenu::insertClientMenu(KickerClientMenu *) @@ -1474,18 +1479,18 @@ void KMenu::slotLock() TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); + tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void KMenu::slotOpenHomepage() { accept(); - kapp->invokeBrowser("http://www.trinitydesktop.org"); + tdeApp->invokeBrowser("http://www.trinitydesktop.org"); } void KMenu::slotLogout() { - kapp->requestShutDown(); + tdeApp->requestShutDown(); } void KMenu::slotPopulateSessions() @@ -1494,9 +1499,9 @@ void KMenu::slotPopulateSessions() DM dm; sessionsMenu->clear(); - if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) + if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) { - if (kapp->authorize("lock_screen")) + if (tdeApp->authorize("lock_screen")) sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 ); sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 ); if (!p) { @@ -1529,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent ) void KMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), + tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -1578,8 +1583,8 @@ void KMenu::searchAccept() if ( logout ) { - kapp->propagateSessionManager(); - kapp->requestShutDown(); + tdeApp->propagateSessionManager(); + tdeApp->requestShutDown(); } if ( lock ) { @@ -1587,7 +1592,7 @@ void KMenu::searchAccept() int kicker_screen_number = tqt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); + tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } } @@ -1651,7 +1656,7 @@ bool KMenu::runCommand() // fall-through to shell case case KURIFilterData::SHELL: { - if (kapp->authorize("shell_access")) + if (tdeApp->authorize("shell_access")) { exec = cmd; @@ -1747,7 +1752,7 @@ void KMenu::setOrientation(MenuOrientation orientation) m_orientation=orientation; - m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor); + m_resizeHandle->setCursor(m_orientation == BottomUp ? TQt::sizeBDiagCursor : TQt::sizeFDiagCursor); TQPixmap pix; if ( m_orientation == BottomUp ) @@ -1969,7 +1974,7 @@ void KMenu::searchChanged(const TQString & text) if (input_timer->isActive ()) input_timer->stop (); - input_timer->start (WAIT_BEFORE_QUERYING, TRUE); + input_timer->start (WAIT_BEFORE_QUERYING, true); } bool KMenu::dontQueryNow (const TQString& str) @@ -1996,7 +2001,7 @@ void KMenu::createNewProgramList() m_seenPrograms = KickerSettings::firstSeenApps(); m_newInstalledPrograms.clear(); - m_currentDate = TQDate::currentDate().toString(Qt::ISODate); + m_currentDate = TQDate::currentDate().toString(TQt::ISODate); bool initialize = (m_seenPrograms.count() == 0); @@ -2058,7 +2063,7 @@ void KMenu::createNewProgramList(TQString relPath) else { ++it_find; if (*(it_find)!="-") { - TQDate date = TQDate::fromString(*(it_find),Qt::ISODate); + TQDate date = TQDate::fromString(*(it_find),TQt::ISODate); if (date.daysTo(TQDate::currentDate())<3) { if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); @@ -2278,7 +2283,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width, void KMenu::clearSearchResults(bool showHelp) { m_searchResultsWidget->clear(); - m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus); + m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus); setTabOrder(m_kcommand, m_searchResultsWidget); if (showHelp) { @@ -2414,7 +2419,7 @@ void KMenu::doQuery (bool return_pressed) #endif ) exe = TQString(); - else if (kapp->authorize("shell_access")) + else if (tdeApp->authorize("shell_access")) { if( filterData.hasArgsAndOptions() ) exe += filterData.argsAndOptions(); @@ -2614,7 +2619,7 @@ TQString KMenu::iconForHitMenuItem(HitMenuItem *hit_item) return (mimetype_iconstore [hit_item->mimetype]); else { KMimeType::Ptr mimetype_ptr = KMimeType::mimeType (hit_item->mimetype); - TQString mimetype_icon = mimetype_ptr->icon(TQString(), FALSE); + TQString mimetype_icon = mimetype_ptr->icon(TQString(), false); mimetype_iconstore [hit_item->mimetype] = mimetype_icon; return mimetype_icon; } @@ -2655,7 +2660,7 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream stream(params, IO_WriteOnly); stream << 0 << -1 << ""; - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } else if ( u == "kicker:/runcommand" ) { @@ -2670,14 +2675,14 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream stream(params, IO_WriteOnly); stream << 2 << -1 << ""; - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } else if ( u == "kicker:/restart" ) { TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << 1 << -1 << TQString(); - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } else if ( u == "kicker:/suspend_freeze" ) { slotSuspend( SuspendType::Freeze ); @@ -2696,7 +2701,7 @@ void KMenu::slotStartURL(const TQString& u) } else if ( u == "kicker:/savesession" ) { TQByteArray data; - kapp->dcopClient()->send( "ksmserver", "default", + tdeApp->dcopClient()->send( "ksmserver", "default", "saveCurrentSession()", data ); } else if ( u == "kicker:/switchuser" ) { @@ -2717,7 +2722,7 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream stream(params, IO_WriteOnly); stream << 1 << -1 << rebootOptions[u.mid(16).toInt()]; - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } #warning restart entry not supported #if 0 @@ -2748,19 +2753,19 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream arg(data, IO_WriteOnly); arg << u.mid(9,22); - kapp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data); + tdeApp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data); } return; } - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); (void) new KRun( u, parentWidget()); } } void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ ) { - const TQObject* source = TQT_TQOBJECT_CONST(sender()); + const TQObject* source = sender(); if (!item) return; @@ -2784,18 +2789,18 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupPath.icon = kitem->icon(); if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(m_popupPath.path,true); + TDEDesktopFile df(m_popupPath.path,true); m_popupPath.path=df.readURL(); } } m_popupMenu = new TDEPopupMenu(this); - connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); + connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int))); bool hasEntries = false; m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title()); - if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView)) + if (source==m_favoriteView) { hasEntries = true; m_popupMenu->insertItem(SmallIconSet("remove"), @@ -2817,7 +2822,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==m_popupPath.path) break; } @@ -2827,12 +2832,12 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) { + if (source!=m_exitView) { if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) { if (hasEntries) m_popupMenu->insertSeparator(); - if (kapp->authorize("editable_desktop_icons") ) + if (tdeApp->authorize("editable_desktop_icons") ) { hasEntries = true; if (m_popupPath.menuPath.endsWith("/")) @@ -2842,7 +2847,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertItem(SmallIconSet("desktop"), i18n("Add Item to Desktop"), AddItemToDesktop); } - if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; if (m_popupPath.menuPath.endsWith("/")) @@ -2852,7 +2857,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertItem(SmallIconSet("kicker"), i18n("Add Item to Main Panel"), AddItemToPanel); } - if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty()) + if (tdeApp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty()) { hasEntries = true; if (kitem->menuPath().endsWith("/")) @@ -2860,14 +2865,14 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos else m_popupMenu->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem); } - if (kapp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/")))) + if (tdeApp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/")))) { hasEntries = true; m_popupMenu->insertItem(SmallIconSet("system-run"), i18n("Put Into Run Dialog"), PutIntoRunDialog); } } - if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { + if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { TQString uri; if (m_popupService) uri = locate("apps", m_popupService->desktopEntryPath()); @@ -2904,7 +2909,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) { + if (source==m_recentlyView) { m_popupMenu->insertSeparator(); if (m_popupService) m_popupMenu->insertItem(SmallIconSet("history_clear"), @@ -2949,7 +2954,7 @@ void KMenu::slotContextMenu(int selected) job->setDefaultPermissions( true ); } else { - KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) ); + TDEDesktopFile* df = new TDEDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) ); df->writeEntry("GenericName", m_popupPath.description); df->writeEntry( "Icon", m_popupPath.icon ); df->writePathEntry( "URL", m_popupPath.path ); @@ -2964,17 +2969,17 @@ void KMenu::slotContextMenu(int selected) case AddItemToPanel: accept(); if (m_popupService) - kapp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath()); + tdeApp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath()); else #warning FIXME special RecentDocuments/foo.desktop handling - kapp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path); + tdeApp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path); accept(); break; case EditItem: case EditMenu: accept(); - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); @@ -2983,16 +2988,16 @@ void KMenu::slotContextMenu(int selected) case PutIntoRunDialog: accept(); if (m_popupService) - kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec()); + tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec()); else #warning FIXME special RecentDocuments/foo.desktop handling - kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path); + tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path); accept(); break; case AddMenuToDesktop: { accept(); - KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath())); + TDEDesktopFile *df = new TDEDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath())); df->writeEntry( "Icon", m_popupPath.icon ); df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath ); df->writeEntry( "Name", m_popupPath.title ); @@ -3005,7 +3010,7 @@ void KMenu::slotContextMenu(int selected) case AddMenuToPanel: accept(); ds << "foo" << m_popupPath.menuPath; - kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); + tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); break; case AddToFavorites: @@ -3020,14 +3025,14 @@ void KMenu::slotContextMenu(int selected) TQStringList::Iterator it; for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==m_popupPath.path) break; } } if (it==favs.end()) { TQString file = KickerLib::newDesktopFile(m_popupPath.path); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", m_popupPath.title); @@ -3062,7 +3067,7 @@ void KMenu::slotContextMenu(int selected) else { for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==m_popupPath.path) { TQFile::remove((*it)); favs.erase(it); @@ -3238,7 +3243,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service) TQDataStream stream(params, IO_WriteOnly); stream << "minicli" << service->storageId(); kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl; - TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", + tdeApp->dcopClient()->emitDCOPSignal("appLauncher", "serviceStartedByStorageId(TQString,TQString)", params); } @@ -3306,7 +3311,7 @@ void KMenu::searchActionClicked(TQListViewItem* item) list << "kurisearchfilter" << "kuriikwsfilter"; if( !KURIFilter::self()->filterURI(data, list) ) { - KDesktopFile file("searchproviders/google.desktop", true, "services"); + TDEDesktopFile file("searchproviders/google.desktop", true, "services"); data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText())); } @@ -3415,7 +3420,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==kitem->path()) { addFav = *it; @@ -3440,7 +3445,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir { if ((*it)[0]=='/' && !kafterNow->service()) { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==kafterNow->path()) { kdDebug() << "insert after " << kafterNow->path() << endl; @@ -3564,7 +3569,7 @@ bool KMenu::ensureServiceRunning(const TQString & service) TQDataStream arg(data, IO_WriteOnly); arg << service << URLs; - if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", + if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, replyData) ) { tqWarning( "call to tdelauncher failed."); return false; @@ -3610,7 +3615,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) { TQString uri = item.m_path; if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(uri,true); + TDEDesktopFile df(uri,true); uri=df.readURL(); } @@ -3619,7 +3624,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==uri) break; } @@ -3627,7 +3632,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if (it==favs.end()) { TQString file = KickerLib::newDesktopFile(uri); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item.m_title); @@ -3661,7 +3666,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==text) break; } @@ -3672,7 +3677,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) KURL kurl(text); TQString file = KickerLib::newDesktopFile(text); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item->name()); @@ -3844,7 +3849,7 @@ void KMenu::runUserCommand() if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send( appname, "KDesktopIface", + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "popupExecuteCommand()", data ); } diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index e4ffe91fc..b0e18e7cb 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -78,7 +78,7 @@ enum OverflowCategoryState { None, Filling, NotNeeded }; class KMenu : public KMenuBase { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY (bool TDEStyleMenuDropShadow READ useTDEStyleMenuDropShadow ) public: diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp index c13bffe14..977ec1089 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -199,7 +199,7 @@ void KickoffTabBar::layoutTabs() int w = TQMAX(st.width() / count(), parentWidget()->width() / count()); TQRect r = tab->rect(); - tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this, + tab->setRect(TQRect(TQPoint(x, 0), style().sizeFromContents(TQStyle::CT_TabBarTab, this, TQSize(w, h), TQStyleOption(tab)))); x += tab->rect().width() - overlap; } @@ -223,7 +223,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event) void KickoffTabBar::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() != Qt::LeftButton ) { + if ( e->button() != TQt::LeftButton ) { e->ignore(); return; } diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h index 941f1144f..d5dcb8d3c 100644 --- a/kicker/kicker/ui/kickoff_bar.h +++ b/kicker/kicker/ui/kickoff_bar.h @@ -27,7 +27,7 @@ class KickoffTabBar : public TQTabBar { - Q_OBJECT + TQ_OBJECT public: KickoffTabBar(TQWidget* parent, const char* name); diff --git a/kicker/kicker/ui/media_watcher.cpp b/kicker/kicker/ui/media_watcher.cpp index 9ff74535c..d40178dc8 100644 --- a/kicker/kicker/ui/media_watcher.cpp +++ b/kicker/kicker/ui/media_watcher.cpp @@ -43,7 +43,7 @@ MediaWatcher::MediaWatcher( TQObject *parent ) : void MediaWatcher::updateDevices() { DCOPRef nsd( "kded", "mediamanager" ); - nsd.setDCOPClient( kapp->dcopClient() ); + nsd.setDCOPClient( tdeApp->dcopClient() ); m_devices = nsd.call( "fullList" ); } diff --git a/kicker/kicker/ui/media_watcher.h b/kicker/kicker/ui/media_watcher.h index 604fcaabe..0f6cb6fae 100644 --- a/kicker/kicker/ui/media_watcher.h +++ b/kicker/kicker/ui/media_watcher.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class MediaWatcher : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP TQStringList m_devices; diff --git a/kicker/kicker/ui/mykickoffsearchinterface.h b/kicker/kicker/ui/mykickoffsearchinterface.h index b728718c4..4271766d8 100644 --- a/kicker/kicker/ui/mykickoffsearchinterface.h +++ b/kicker/kicker/ui/mykickoffsearchinterface.h @@ -28,7 +28,7 @@ using namespace KickoffSearch; class MyKickoffSearchInterface :public KickoffSearchInterface { - Q_OBJECT + TQ_OBJECT public: MyKickoffSearchInterface( KMenu*, TQObject* parent, const char* name = 0 ); diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index d839a3b84..a6f3dec5e 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -46,7 +46,7 @@ public: { p->save(); TQRect r(x, y, w, h); - kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, + tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, p, r, cg); if (!m_desktopName.isEmpty()) @@ -73,7 +73,7 @@ public: { TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); + (tdeApp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff --git a/kicker/kicker/ui/popupmenutop.cpp b/kicker/kicker/ui/popupmenutop.cpp index 571d1c7dc..c05545aae 100644 --- a/kicker/kicker/ui/popupmenutop.cpp +++ b/kicker/kicker/ui/popupmenutop.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "popupmenutop.h" #include "kickerSettings.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqimage.h> #include <kdebug.h> diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp index 9efc1ab5c..4ca117f3f 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.cpp +++ b/kicker/kicker/ui/quickbrowser_mnu.cpp @@ -44,17 +44,17 @@ void PanelQuickBrowser::initialize() KURL url; url.setPath(TQDir::homeDirPath()); - if (kapp->authorizeURLAction("list", KURL(), url)) + if (tdeApp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("kfm_home"), i18n("&Home Folder"), new PanelBrowserMenu(url.path(), this)); url.setPath(TQDir::rootDirPath()); - if (kapp->authorizeURLAction("list", KURL(), url)) + if (tdeApp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_red"), i18n("&Root Folder"), new PanelBrowserMenu(url.path(), this)); url.setPath(TQDir::rootDirPath() + "etc"); - if (kapp->authorizeURLAction("list", KURL(), url)) + if (tdeApp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_yellow"), i18n("System &Configuration"), new PanelBrowserMenu(url.path(), this)); } diff --git a/kicker/kicker/ui/quickbrowser_mnu.h b/kicker/kicker/ui/quickbrowser_mnu.h index 01b12d09d..98a3eb4c4 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.h +++ b/kicker/kicker/ui/quickbrowser_mnu.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelQuickBrowser : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PanelQuickBrowser(TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp index ef2f5c6a1..0cb81b53f 100644 --- a/kicker/kicker/ui/recentapps.cpp +++ b/kicker/kicker/ui/recentapps.cpp @@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp) TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << launchDCOPSignalSource() << strApp; - TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", + tdeApp->dcopClient()->emitDCOPSignal("appLauncher", "serviceStartedByStorageId(TQString,TQString)", params); for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index a7bc609a6..4ce3c4ea0 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -37,8 +37,8 @@ PanelRemoveAppletMenu::PanelRemoveAppletMenu(ContainerArea* cArea, const char *name) : TQPopupMenu(parent, name), m_containerArea(cArea) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelRemoveAppletMenu::slotAboutToShow() @@ -81,7 +81,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() if (m_containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h index 895ded710..17b24b496 100644 --- a/kicker/kicker/ui/removeapplet_mnu.h +++ b/kicker/kicker/ui/removeapplet_mnu.h @@ -34,7 +34,7 @@ class ContainerArea; class PanelRemoveAppletMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelRemoveAppletMenu(ContainerArea* cArea, TQWidget* parent = 0, const char* name = 0); diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 819eff533..6617975f5 100644 --- a/kicker/kicker/ui/removebutton_mnu.cpp +++ b/kicker/kicker/ui/removebutton_mnu.cpp @@ -40,8 +40,8 @@ PanelRemoveButtonMenu::PanelRemoveButtonMenu( ContainerArea* cArea, TQWidget *parent, const char *name ) : TQPopupMenu( parent, name ), containerArea( cArea ) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelRemoveButtonMenu::addToContainers(const TQString& type) @@ -89,7 +89,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() if (containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h index 211edd771..d3b5d7237 100644 --- a/kicker/kicker/ui/removebutton_mnu.h +++ b/kicker/kicker/ui/removebutton_mnu.h @@ -34,7 +34,7 @@ class ContainerArea; class PanelRemoveButtonMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelRemoveButtonMenu( ContainerArea *cArea, TQWidget *parent=0, const char *name=0 ); diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp index 1b30506cc..a447b4d66 100644 --- a/kicker/kicker/ui/removecontainer_mnu.cpp +++ b/kicker/kicker/ui/removecontainer_mnu.cpp @@ -44,7 +44,7 @@ RemoveContainerMenu::RemoveContainerMenu( ContainerArea* cArea, buttonId = insertItem(i18n("Appli&cation"), new PanelRemoveButtonMenu( containerArea, this ) ); adjustSize(); - connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); + connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); } RemoveContainerMenu::~RemoveContainerMenu() diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h index bd6d03d89..4f5546449 100644 --- a/kicker/kicker/ui/removecontainer_mnu.h +++ b/kicker/kicker/ui/removecontainer_mnu.h @@ -30,7 +30,7 @@ class ContainerArea; class RemoveContainerMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: RemoveContainerMenu(ContainerArea* cArea, TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 829dfab5c..ef345921d 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -37,8 +37,8 @@ static const int REMOVEALLID = 1000; PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( TQWidget *parent, const char *name ) : TQPopupMenu( parent, name ) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } PanelRemoveExtensionMenu::PanelRemoveExtensionMenu() diff --git a/kicker/kicker/ui/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h index e77522bc8..847179caa 100644 --- a/kicker/kicker/ui/removeextension_mnu.h +++ b/kicker/kicker/ui/removeextension_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelRemoveExtensionMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelRemoveExtensionMenu( TQWidget *parent=0, const char *name=0 ); diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index b7e069706..59d63e533 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -31,14 +31,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelocale.h> #include <kmimetype.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <kservicegroup.h> #include <tdesycoca.h> @@ -68,10 +68,10 @@ PanelServiceMenu::PanelServiceMenu(const TQString & label, const TQString & relP { excludeNoDisplay_=true; - connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), - TQT_SLOT(slotClearOnClose())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose())); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSetTooltip(int))); + connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()), + TQ_SLOT(slotClearOnClose())); + connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClose())); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSetTooltip(int))); } PanelServiceMenu::~PanelServiceMenu() @@ -378,7 +378,7 @@ void PanelServiceMenu::doInitialize() if (relPath_ == "") { insertItem(KickerLib::menuIconSet("application-x-executable"), i18n("Add Non-TDE Application"), - this, TQT_SLOT(addNonKDEApp())); + this, TQ_SLOT(addNonKDEApp())); } if (list.count() > 0) { @@ -553,7 +553,7 @@ void PanelServiceMenu::slotExec(int id) KSycocaEntry * e = entryMap_[id]; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KService::Ptr service = static_cast<KService *>(e); TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(), @@ -571,7 +571,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev) void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) { - if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable()) + if (ev->button() == TQt::RightButton && !Kicker::the()->isKioskImmutable()) { int id = idAt( ev->pos() ); @@ -590,31 +590,31 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) delete popupMenu_; popupMenu_ = new TDEPopupMenu(this); - connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); + connect(popupMenu_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int))); bool hasEntries = false; switch (contextKSycocaEntry_->sycocaType()) { case KST_KService: - if (kapp->authorize("editable_desktop_icons")) + if (tdeApp->authorize("editable_desktop_icons")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("desktop"), i18n("Add Item to Desktop"), AddItemToDesktop); } - if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kicker"), i18n("Add Item to Main Panel"), AddItemToPanel); } - if (kapp->authorizeTDEAction("menuedit")) + if (tdeApp->authorizeTDEAction("menuedit")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem); } - if (kapp->authorize("run_command")) + if (tdeApp->authorize("run_command")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("system-run"), @@ -623,19 +623,19 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) break; case KST_KServiceGroup: - if (kapp->authorize("editable_desktop_icons")) + if (tdeApp->authorize("editable_desktop_icons")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("desktop"), i18n("Add Menu to Desktop"), AddMenuToDesktop); } - if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kicker"), i18n("Add Menu to Main Panel"), AddMenuToPanel); } - if (kapp->authorizeTDEAction("menuedit")) + if (tdeApp->authorizeTDEAction("menuedit")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kmenuedit"), @@ -672,7 +672,7 @@ void PanelServiceMenu::slotContextMenu(int selected) KURL src,dest; TDEIO::CopyJob *job; - KDesktopFile *df; + TDEDesktopFile *df; switch (selected) { case AddItemToDesktop: @@ -691,12 +691,12 @@ void PanelServiceMenu::slotContextMenu(int selected) if ( kicker_screen_number ) appname.sprintf("kicker-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); - kapp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath()); + tdeApp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath()); break; } case EditItem: - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); @@ -708,8 +708,8 @@ void PanelServiceMenu::slotContextMenu(int selected) if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec()); + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec()); break; } @@ -718,7 +718,7 @@ void PanelServiceMenu::slotContextMenu(int selected) dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( g->caption() ); - df = new KDesktopFile( dest.path() ); + df = new TDEDesktopFile( dest.path() ); df->writeEntry( "Icon", g->icon() ); df->writePathEntry( "URL", "programs:/"+g->name() ); df->writeEntry( "Name", g->caption() ); @@ -735,12 +735,12 @@ void PanelServiceMenu::slotContextMenu(int selected) g = static_cast<KServiceGroup *>(contextKSycocaEntry_); ds << "foo" << g->relPath(); - kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); + tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); break; } case EditMenu: - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); @@ -758,7 +758,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) if (Kicker::the()->isKioskImmutable()) return; - if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton ) + if ( (ev->state() & TQt::LeftButton ) != TQt::LeftButton ) return; TQPoint p = ev->pos() - startPos_; @@ -814,7 +814,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); @@ -840,7 +840,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event) void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *) { // see PanelServiceMenu::dragEnterEvent why this is nescessary - if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -857,7 +857,7 @@ void PanelServiceMenu::slotDragObjectDestroyed() // the execution of any code after the original exec() statement // though the panels themselves continue on otherwise normally // (we just have some sort of nested event loop) - TQTimer::singleShot(0, this, TQT_SLOT(close())); + TQTimer::singleShot(0, this, TQ_SLOT(close())); } } @@ -898,7 +898,7 @@ void PanelServiceMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - TQTimer::singleShot(100, this, TQT_SLOT(slotClear())); + TQTimer::singleShot(100, this, TQ_SLOT(slotClear())); return; } diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h index 9cbfaa068..be4d47332 100644 --- a/kicker/kicker/ui/service_mnu.h +++ b/kicker/kicker/ui/service_mnu.h @@ -48,9 +48,9 @@ typedef TQValueVector<TQPopupMenu*> PopupMenuList; class PanelServiceMenu; typedef TQMap<PanelServiceMenu*,int> PanelServiceMenuMap; -class KDE_EXPORT PanelServiceMenu : public KPanelMenu +class TDE_EXPORT PanelServiceMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PanelServiceMenu(const TQString & label, const TQString & relPath, |