diff options
Diffstat (limited to 'superkaramba/src')
-rw-r--r-- | superkaramba/src/karamba.cpp | 10 | ||||
-rw-r--r-- | superkaramba/src/karambaapp.cpp | 6 | ||||
-rw-r--r-- | superkaramba/src/menu_python.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/sklineedit.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/taskmanager.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/themefile.cpp | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index b5618a4..ebd7f2f 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -170,7 +170,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, toDesktopMenu = new TDEPopupMenu (this); toDesktopMenu -> setCheckable(true); mid = toDesktopMenu -> insertItem (i18n("&All Desktops"), - dslot = new DesktopChangeSlot(TQT_TQOBJECT(this),0), + dslot = new DesktopChangeSlot(this,0), TQT_SLOT(receive())); dslot->setMenuId(mid); @@ -181,7 +181,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, name += ('0' + ndesktop); mid = toDesktopMenu -> insertItem (name, - dslot = new DesktopChangeSlot(TQT_TQOBJECT(this), ndesktop), TQT_SLOT(receive())); + dslot = new DesktopChangeSlot(this, ndesktop), TQT_SLOT(receive())); dslot->setMenuId(mid); } @@ -196,7 +196,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, TQT_SLOT(updateSensors()), Key_F5 ); toggleLocked = new TDEToggleAction ( i18n("Toggle &Locked Position"), SmallIconSet("locked"), - CTRL+Key_L, TQT_TQOBJECT(this), + CTRL+Key_L, this, TQT_SLOT( slotToggleLocked() ), accColl, "Locked position" ); accColl->insert(toggleLocked); @@ -205,7 +205,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, toggleLocked->plug(kpop); toggleFastTransforms = new TDEToggleAction(i18n("Use &Fast Image Scaling"), - CTRL+Key_F, TQT_TQOBJECT(this), + CTRL+Key_F, this, TQT_SLOT( slotToggleFastTransforms() ), accColl, "Fast transformations"); @@ -1778,7 +1778,7 @@ void karamba::addMenuConfigOption(TQString key, TQString name) //tqDebug("karamba::addMenuConfigOption"); kpop -> setItemEnabled(THEMECONF, true); - SignalBridge* action = new SignalBridge(TQT_TQOBJECT(this), key, menuAccColl); + SignalBridge* action = new SignalBridge(this, key, menuAccColl); TDEToggleAction* confItem = new TDEToggleAction (name, TDEShortcut::null(), action, TQT_SLOT(receive()), menuAccColl, key.ascii()); diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index d567eb7..79d7d42 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -296,7 +296,7 @@ void KarambaApplication::addKaramba(karamba* k, bool reloading) karambaApp->dcopClient()->appId(), k->theme().file()); k->setInstance(instance); } - karambaList->append(TQT_TQOBJECT(k)); + karambaList->append(k); } void KarambaApplication::deleteKaramba(karamba* k, bool reloading) @@ -304,12 +304,12 @@ void KarambaApplication::deleteKaramba(karamba* k, bool reloading) if(!reloading && karambaApp->dcopStub()) karambaApp->dcopStub()->themeClosed( karambaApp->dcopClient()->appId(), k->theme().file(), k->instance()); - karambaList->removeRef(TQT_TQOBJECT(k)); + karambaList->removeRef(k); } bool KarambaApplication::hasKaramba(karamba* k) { - return karambaList->containsRef(TQT_TQOBJECT(k)) > 0; + return karambaList->containsRef(k) > 0; } // XXX: I guess this should be made with mutex/semaphores diff --git a/superkaramba/src/menu_python.cpp b/superkaramba/src/menu_python.cpp index 5d80a75..c42a009 100644 --- a/superkaramba/src/menu_python.cpp +++ b/superkaramba/src/menu_python.cpp @@ -38,7 +38,7 @@ long createMenu(long widget) karamba* currTheme = (karamba*)widget; TDEPopupMenu* tmp = new TDEPopupMenu(currTheme); - currTheme->menuList->append( TQT_TQOBJECT(tmp) ); + currTheme->menuList->append( tmp ); currTheme->connect(tmp, TQT_SIGNAL(activated(int)), currTheme, TQT_SLOT(passMenuItemClicked(int))); @@ -86,7 +86,7 @@ long deleteMenu(long widget, long menu) karamba* currTheme = (karamba*)widget; TDEPopupMenu* tmp = (TDEPopupMenu*)menu; - currTheme->menuList->removeRef(TQT_TQOBJECT(tmp)); + currTheme->menuList->removeRef(tmp); return 1; } diff --git a/superkaramba/src/sklineedit.cpp b/superkaramba/src/sklineedit.cpp index 57b9db0..86f281a 100644 --- a/superkaramba/src/sklineedit.cpp +++ b/superkaramba/src/sklineedit.cpp @@ -66,7 +66,7 @@ void SKLineEdit::keyPressEvent(TQKeyEvent* e) if(!e->text().isEmpty()) { - karamba* k = static_cast<karamba*>(TQT_TQWIDGET(parent())); + karamba* k = static_cast<karamba*>(parent()); k->keyPressed(e->text(), m_input); } } diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 48cef86..e58f9b3 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -773,7 +773,7 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop()); + TQWidget *rootWin = tqApp->desktop(); TQRect geom = _info.geometry(); _grab = TQPixmap::grabWindow( rootWin->winId(), geom.x(), geom.y(), diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp index 8cf3b92..84e1590 100644 --- a/superkaramba/src/themefile.cpp +++ b/superkaramba/src/themefile.cpp @@ -209,7 +209,7 @@ bool ThemeFile::set(const KURL &url) { if(!url.isLocalFile() && !url.protocol().isEmpty()) { - if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()), + if(KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("You are about to install and run %1 SuperKaramba theme. Since " "themes can contain executable code you should only install themes " "from sources that you trust. Continue?"), i18n("Executable Code Warning"), i18n("Install") @@ -224,7 +224,7 @@ bool ThemeFile::set(const KURL &url) if(localFile.exists()) { - if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()), + if(KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("%1 already exists. Do you want to overwrite it?") .arg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite")) == KMessageBox::Cancel) |