TDE
/
kbookreader
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kbookreader
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/9/head
Michele Calgaro 5 months ago
parent e32bbc6e4a
commit fc1564c30b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

48
src/bookreader.cpp
Unescape View File

@ -102,16 +102,16 @@ BookReader::BookReader()
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled( true ); setStandardToolBarMenuEnabled( true );
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars() ), actionCollection());
createGUI(TQString(), false); createGUI(TQString(), false);
initialGeometrySet(); initialGeometrySet();
setAutoSaveSettings(); setAutoSaveSettings();
// allow the view to change the statusbar and caption // allow the view to change the statusbar and caption
connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), 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&)), connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(changeCaption(const TQString&))); this, TQT_SLOT(changeCaption(const TQString&)));
readSettings(); readSettings();
m_splash->finish(m_view); m_splash->finish(m_view);
@ -141,29 +141,29 @@ void BookReader::load(const KURL& url)
void BookReader::setupActions() void BookReader::setupActions()
{ {
// KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); // KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
recentFilesAction = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotURLSelected(const KURL &)), recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(slotURLSelected(const KURL &)),
actionCollection()); actionCollection());
KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection()); KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection());
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
KStdAction::firstPage(TQT_TQOBJECT(this), TQT_SLOT(gotoFirstPage()), actionCollection()); KStdAction::firstPage(this, TQT_SLOT(gotoFirstPage()), actionCollection());
KStdAction::prior(TQT_TQOBJECT(this), TQT_SLOT(prevPage()), actionCollection()); KStdAction::prior(this, TQT_SLOT(prevPage()), actionCollection());
KStdAction::next(TQT_TQOBJECT(this), TQT_SLOT(nextPage()), actionCollection()); KStdAction::next(this, TQT_SLOT(nextPage()), actionCollection());
KStdAction::lastPage(TQT_TQOBJECT(this), TQT_SLOT(gotoLastPage()), actionCollection()); KStdAction::lastPage(this, TQT_SLOT(gotoLastPage()), actionCollection());
KStdAction::addBookmark(TQT_TQOBJECT(this), TQT_SLOT(addBookmark()), actionCollection()); KStdAction::addBookmark(this, TQT_SLOT(addBookmark()), actionCollection());
KStdAction::editBookmarks(TQT_TQOBJECT(this), TQT_SLOT(editBookmarks()), 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); actionCollection(), this);
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
TDEConfig *config = kapp->config(); TDEConfig *config = kapp->config();
recentFilesAction->loadEntries(config); recentFilesAction->loadEntries(config);
@ -172,7 +172,7 @@ void BookReader::setupActions()
// how to insert a custom menu and menu item // how to insert a custom menu and menu item
/* /*
TDEAction *custom = new TDEAction( i18n( "Cus&tom Menuitem" ), 0, TDEAction *custom = new TDEAction( i18n( "Cus&tom Menuitem" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( optionsPreferences() ), this, TQT_SLOT( optionsPreferences() ),
actionCollection(), "custom_action" );*/ actionCollection(), "custom_action" );*/
} }
@ -313,7 +313,7 @@ void BookReader::optionsPreferences()
general->kcfg_DefaultEncoding->setCurrentItem(i); general->kcfg_DefaultEncoding->setCurrentItem(i);
dialog->addPage(general, i18n("General"), "settings"); 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(); dialog->show();
} }
@ -390,7 +390,7 @@ void BookReader::loadLastUrl()
TDEConfig * config = kapp->config(); TDEConfig * config = kapp->config();
TQSize size = config->readSizeEntry("size"); TQSize size = config->readSizeEntry("size");
lastURL = config->readEntry("lastURL"); 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()) if (!lastURL.isEmpty())
{ {
// kdDebug() << "loadLastUrl: initial size = " << m_view->size() << endl; // kdDebug() << "loadLastUrl: initial size = " << m_view->size() << endl;
@ -465,8 +465,8 @@ void BookReader::updateBookmarks()
m_bookmarkActions.setAutoDelete(true); m_bookmarkActions.setAutoDelete(true);
const Bookmarks & bms = m_view->bookmarks(); const Bookmarks & bms = m_view->bookmarks();
TQSignalMapper *bookmarkMapper = new TQSignalMapper(TQT_TQOBJECT(this)); TQSignalMapper *bookmarkMapper = new TQSignalMapper(this);
connect(bookmarkMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(gotoBookmark(int))); connect(bookmarkMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(gotoBookmark(int)));
for (Bookmarks::size_type i = 0; i < 9 && i < bms.size(); ++i) for (Bookmarks::size_type i = 0; i < 9 && i < bms.size(); ++i)
{ {
const Bookmark & bm = bms[i]; const Bookmark & bm = bms[i];

2
src/bookwidget.cpp
Unescape View File

@ -378,7 +378,7 @@ void BookWidget::cancelLoading()
{ {
m_timer.stop(); m_timer.stop();
if (parentWidget()) if (parentWidget())
TQT_TQWIDGET(parentWidget())->setCaption(""); parentWidget()->setCaption("");
//clean up //clean up
m_progressDlg->hide(); m_progressDlg->hide();
m_stream.reset(0); m_stream.reset(0);

Write Preview
Loading…
Cancel
Save