Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 891a52019a
commit 8d2687a8b6

@ -72,7 +72,7 @@ TQStringList listEncodings()
BookReader::BookReader()
: KMainWindow(0, "BookReader"),
: TDEMainWindow(0, "BookReader"),
m_view(new BookWidget(this)),
m_fullScreenAction(0),
m_splash(0),
@ -86,7 +86,7 @@ BookReader::BookReader()
// accept dnd
setAcceptDrops(true);
// tell the KMainWindow that this is indeed the main widget
// tell the TDEMainWindow that this is indeed the main widget
setCentralWidget(m_view);
// then, setup our actions
@ -171,7 +171,7 @@ void BookReader::setupActions()
// this doesn't do anything useful. it's just here to illustrate
// how to insert a custom menu and menu item
/*
KAction *custom = new KAction( i18n( "Cus&tom Menuitem" ), 0,
TDEAction *custom = new TDEAction( i18n( "Cus&tom Menuitem" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( optionsPreferences() ),
actionCollection(), "custom_action" );*/
}
@ -470,7 +470,7 @@ void BookReader::updateBookmarks()
for (Bookmarks::size_type i = 0; i < 9 && i < bms.size(); ++i)
{
const Bookmark & bm = bms[i];
KAction * action = new KAction(bm.name(), ALT+Key_1 + i);
TDEAction * action = new TDEAction(bm.name(), ALT+Key_1 + i);
connect(action, TQT_SIGNAL(activated()), bookmarkMapper, TQT_SLOT(map()));
m_bookmarkActions.append(action);
bookmarkMapper->setMapping(action, i);

@ -31,8 +31,8 @@
class KPrinter;
class KURL;
class KRecentFilesAction;
class KToggleFullScreenAction;
class TDERecentFilesAction;
class TDEToggleFullScreenAction;
class KSplashScreen;
/**
@ -42,7 +42,7 @@ class KSplashScreen;
* @short Main window class
* @author Alexandr Nemish <atlanter@gmail.com>
*/
class BookReader : public KMainWindow
class BookReader : public TDEMainWindow
{
Q_OBJECT
@ -116,9 +116,9 @@ private:
private:
BookWidget * m_view;
//Actions
KRecentFilesAction * recentFilesAction;
KToggleFullScreenAction * m_fullScreenAction;
TQPtrList<KAction> m_bookmarkActions;
TDERecentFilesAction * recentFilesAction;
TDEToggleFullScreenAction * m_fullScreenAction;
TQPtrList<TDEAction> m_bookmarkActions;
KURL lastURL;
KSplashScreen * m_splash;
KPrinter * m_printer;

@ -416,7 +416,7 @@ void BookWidget::addBookmark(const TQString& name)
m_bookmarks.push_back(Bookmark(currentPage(), name));
std::sort(m_bookmarks.begin(), m_bookmarks.end());
// KAction menu = new KAction()
// TDEAction menu = new TDEAction()
saveBookmarks();
}

@ -58,7 +58,7 @@
<cstring>kFontRequester1</cstring>
</property>
</widget>
<widget class="KFontRequester">
<widget class="TDEFontRequester">
<property name="name">
<cstring>kcfg_Font</cstring>
</property>

Loading…
Cancel
Save