diff options
| -rw-r--r-- | src/bookreader.cpp | 48 | ||||
| -rw-r--r-- | src/bookwidget.cpp | 2 |
2 files changed, 25 insertions, 25 deletions
diff --git a/src/bookreader.cpp b/src/bookreader.cpp index bff3e4d..d98ddeb 100644 --- a/src/bookreader.cpp +++ b/src/bookreader.cpp @@ -102,16 +102,16 @@ BookReader::BookReader() KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled( true ); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars() ), actionCollection()); createGUI(TQString(), false); initialGeometrySet(); setAutoSaveSettings(); // allow the view to change the statusbar and caption connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(changeStatusbar(const TQString&))); + this, TQT_SLOT(changeStatusbar(const TQString&))); connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(changeCaption(const TQString&))); + this, TQT_SLOT(changeCaption(const TQString&))); readSettings(); m_splash->finish(m_view); @@ -141,29 +141,29 @@ void BookReader::load(const KURL& url) void BookReader::setupActions() { -// KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - recentFilesAction = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotURLSelected(const KURL &)), +// KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(slotURLSelected(const KURL &)), actionCollection()); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - KStdAction::firstPage(TQT_TQOBJECT(this), TQT_SLOT(gotoFirstPage()), actionCollection()); - KStdAction::prior(TQT_TQOBJECT(this), TQT_SLOT(prevPage()), actionCollection()); - KStdAction::next(TQT_TQOBJECT(this), TQT_SLOT(nextPage()), actionCollection()); - KStdAction::lastPage(TQT_TQOBJECT(this), TQT_SLOT(gotoLastPage()), actionCollection()); + KStdAction::firstPage(this, TQT_SLOT(gotoFirstPage()), actionCollection()); + KStdAction::prior(this, TQT_SLOT(prevPage()), actionCollection()); + KStdAction::next(this, TQT_SLOT(nextPage()), actionCollection()); + KStdAction::lastPage(this, TQT_SLOT(gotoLastPage()), actionCollection()); - KStdAction::addBookmark(TQT_TQOBJECT(this), TQT_SLOT(addBookmark()), actionCollection()); - KStdAction::editBookmarks(TQT_TQOBJECT(this), TQT_SLOT(editBookmarks()), actionCollection()); + KStdAction::addBookmark(this, TQT_SLOT(addBookmark()), actionCollection()); + KStdAction::editBookmarks(this, TQT_SLOT(editBookmarks()), actionCollection()); - KStdAction::gotoPage(TQT_TQOBJECT(this), TQT_SLOT(gotoPage()), actionCollection()); + KStdAction::gotoPage(this, TQT_SLOT(gotoPage()), actionCollection()); - m_fullScreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(fullScreen()), + m_fullScreenAction = KStdAction::fullScreen(this, TQT_SLOT(fullScreen()), actionCollection(), this); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); TDEConfig *config = kapp->config(); recentFilesAction->loadEntries(config); @@ -172,7 +172,7 @@ void BookReader::setupActions() // how to insert a custom menu and menu item /* TDEAction *custom = new TDEAction( i18n( "Cus&tom Menuitem" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( optionsPreferences() ), + this, TQT_SLOT( optionsPreferences() ), actionCollection(), "custom_action" );*/ } @@ -313,7 +313,7 @@ void BookReader::optionsPreferences() general->kcfg_DefaultEncoding->setCurrentItem(i); dialog->addPage(general, i18n("General"), "settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadSettings())); + connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); dialog->show(); } @@ -390,7 +390,7 @@ void BookReader::loadLastUrl() TDEConfig * config = kapp->config(); TQSize size = config->readSizeEntry("size"); lastURL = config->readEntry("lastURL"); - connect(m_view, TQT_SIGNAL(loadingFinished()), TQT_TQOBJECT(this), TQT_SLOT(loadLastURLSetPage())); + connect(m_view, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(loadLastURLSetPage())); if (!lastURL.isEmpty()) { // kdDebug() << "loadLastUrl: initial size = " << m_view->size() << endl; @@ -465,8 +465,8 @@ void BookReader::updateBookmarks() m_bookmarkActions.setAutoDelete(true); const Bookmarks & bms = m_view->bookmarks(); - TQSignalMapper *bookmarkMapper = new TQSignalMapper(TQT_TQOBJECT(this)); - connect(bookmarkMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(gotoBookmark(int))); + TQSignalMapper *bookmarkMapper = new TQSignalMapper(this); + connect(bookmarkMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(gotoBookmark(int))); for (Bookmarks::size_type i = 0; i < 9 && i < bms.size(); ++i) { const Bookmark & bm = bms[i]; diff --git a/src/bookwidget.cpp b/src/bookwidget.cpp index 348a0eb..a90e273 100644 --- a/src/bookwidget.cpp +++ b/src/bookwidget.cpp @@ -378,7 +378,7 @@ void BookWidget::cancelLoading() { m_timer.stop(); if (parentWidget()) - TQT_TQWIDGET(parentWidget())->setCaption(""); + parentWidget()->setCaption(""); //clean up m_progressDlg->hide(); m_stream.reset(0); |