From f537c21b68e08f649b1b297bce8f3904603137e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:11:21 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- konqueror/keditbookmarks/TODO | 6 +-- konqueror/keditbookmarks/actionsimpl.cpp | 72 +++++++++++++++--------------- konqueror/keditbookmarks/commands.h | 2 +- konqueror/keditbookmarks/kebsearchline.cpp | 14 +++--- konqueror/keditbookmarks/kebsearchline.h | 4 +- konqueror/keditbookmarks/listview.cpp | 12 ++--- konqueror/keditbookmarks/listview.h | 14 +++--- konqueror/keditbookmarks/toplevel.cpp | 16 +++---- konqueror/keditbookmarks/toplevel.h | 8 ++-- 9 files changed, 74 insertions(+), 74 deletions(-) (limited to 'konqueror/keditbookmarks') diff --git a/konqueror/keditbookmarks/TODO b/konqueror/keditbookmarks/TODO index 875dea715..98e379560 100644 --- a/konqueror/keditbookmarks/TODO +++ b/konqueror/keditbookmarks/TODO @@ -64,19 +64,19 @@ on startup: ==31246== at 0x4026A4DF: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: KListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) ==31246== ==31246== Conditional jump or move depends on uninitialised value(s) ==31246== at 0x4026A4E4: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: KListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) ==31246== ==31246== Conditional jump or move depends on uninitialised value(s) ==31246== at 0x4026A4E8: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: KListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) ==31246== lots of crap when using file->open diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 23e6fe16d..81d47f07e 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -98,116 +98,116 @@ void KEBApp::createActions() { (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection()); // settings menu - (void) new KToggleAction( + (void) new TDEToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions - (void) new KAction( + (void) new TDEAction( i18n("&Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete"); - (void) new KAction( + (void) new TDEAction( i18n("Rename"), "text", Key_F2, TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename"); - (void) new KAction( + (void) new TDEAction( i18n("C&hange URL"), "text", Key_F3, TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); - (void) new KAction( + (void) new TDEAction( i18n("C&hange Comment"), "text", Key_F4, TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); - (void) new KAction( + (void) new TDEAction( i18n("Chan&ge Icon..."), "icons", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); - (void) new KAction( + (void) new TDEAction( i18n("Update Favicon"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); - (void) new KAction( + (void) new TDEAction( i18n("Recursive Sort"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); - (void) new KAction( + (void) new TDEAction( i18n("&New Folder..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); - (void) new KAction( + (void) new TDEAction( i18n("&New Bookmark"), "www", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); - (void) new KAction( + (void) new TDEAction( i18n("&Insert Separator"), CTRL+Key_I, TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); - (void) new KAction( + (void) new TDEAction( i18n("&Sort Alphabetically"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort"); - (void) new KAction( + (void) new TDEAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); - (void) new KAction( + (void) new TDEAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); - (void) new KAction( + (void) new TDEAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); - (void) new KAction( + (void) new TDEAction( i18n("&Expand All Folders"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); - (void) new KAction( + (void) new TDEAction( i18n("Collapse &All Folders"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); - (void) new KAction( + (void) new TDEAction( i18n("&Open in Konqueror"), "fileopen", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); - (void) new KAction( + (void) new TDEAction( i18n("Check &Status"), "bookmark", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); - (void) new KAction( + (void) new TDEAction( i18n("Check Status: &All"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); - (void) new KAction( + (void) new TDEAction( i18n("Update All &Favicons"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); - (void) new KAction( + (void) new TDEAction( i18n("Cancel &Checks"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); - (void) new KAction( + (void) new TDEAction( i18n("Cancel &Favicon Updates"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); - (void) new KAction( + (void) new TDEAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS"); - (void) new KAction( + (void) new TDEAction( i18n("Import &Opera Bookmarks..."), "opera", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); - (void) new KAction( + (void) new TDEAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); - (void) new KAction( + (void) new TDEAction( i18n("Import &Galeon Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); - (void) new KAction( + (void) new TDEAction( i18n("Import &KDE2/KDE3 Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); - (void) new KAction( + (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE"); - (void) new KAction( + (void) new TDEAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &HTML Bookmarks..."), "html", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &IE Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } @@ -272,7 +272,7 @@ void CurrentMgr::doExport(ExportType type, const TQString & _path) { } void KEBApp::setActionsEnabled(SelcAbilities sa) { - KActionCollection * coll = actionCollection(); + TDEActionCollection * coll = actionCollection(); TQStringList toEnable; diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h index 3df5d3acf..84268a698 100644 --- a/konqueror/keditbookmarks/commands.h +++ b/konqueror/keditbookmarks/commands.h @@ -204,7 +204,7 @@ class MoveCommand : public KCommand, public IKEBCommand { public: // "Create it with itemsAlreadyMoved=true since - // "KListView moves the item before telling us about it." + // "TDEListView moves the item before telling us about it." MoveCommand(const TQString &from, const TQString &to, const TQString &name = TQString::null) : KCommand(), m_from(from), m_to(to), m_mytext(name) { ; } diff --git a/konqueror/keditbookmarks/kebsearchline.cpp b/konqueror/keditbookmarks/kebsearchline.cpp index 973f737b5..2e2a2f2c9 100644 --- a/konqueror/keditbookmarks/kebsearchline.cpp +++ b/konqueror/keditbookmarks/kebsearchline.cpp @@ -19,21 +19,21 @@ #include "kebsearchline.h" #include "kebsearchline.moc" -KEBSearchLine::KEBSearchLine(TQWidget *parent, KListView *listView, const char *name) - : KListViewSearchLine(parent, listView, name) +KEBSearchLine::KEBSearchLine(TQWidget *parent, TDEListView *listView, const char *name) + : TDEListViewSearchLine(parent, listView, name) { mmode = AND; } KEBSearchLine::KEBSearchLine(TQWidget *parent, const char *name) - :KListViewSearchLine(parent, name) + :TDEListViewSearchLine(parent, name) { mmode = AND; } void KEBSearchLine::updateSearch(const TQString &s) { - KListViewSearchLine::updateSearch(s); + TDEListViewSearchLine::updateSearch(s); emit searchUpdated(); } @@ -44,7 +44,7 @@ KEBSearchLine::~KEBSearchLine() bool KEBSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) const { if(mmode == EXACTLY) - return KListViewSearchLine::itemMatches(item, s); + return TDEListViewSearchLine::itemMatches(item, s); if(lastpattern != s) { @@ -60,12 +60,12 @@ bool KEBSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) c if(it == end) //Nothing to match return true; for( ; it != end; ++it) - if(KListViewSearchLine::itemMatches(item, *it)) + if(TDEListViewSearchLine::itemMatches(item, *it)) return true; } else if(mmode == AND) for( ; it != end; ++it) - if(! KListViewSearchLine::itemMatches(item, *it)) + if(! TDEListViewSearchLine::itemMatches(item, *it)) return false; return (mmode == AND); diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h index cfaee61c5..b2cdfce60 100644 --- a/konqueror/keditbookmarks/kebsearchline.h +++ b/konqueror/keditbookmarks/kebsearchline.h @@ -22,11 +22,11 @@ #include #include -class KEBSearchLine : public KListViewSearchLine +class KEBSearchLine : public TDEListViewSearchLine { Q_OBJECT public: - KEBSearchLine(TQWidget *parent = 0, KListView *listView = 0, const char *name = 0); + KEBSearchLine(TQWidget *parent = 0, TDEListView *listView = 0, const char *name = 0); KEBSearchLine(TQWidget *parent, const char *name); diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 3a2b14d5e..55f28b90a 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -546,7 +546,7 @@ void ListView::slotBkInfoUpdateListViewItem() { i->setText(KEBListView::CommentColumn, commentStr); } -void ListView::handleContextMenu(KEBListView *, KListView *, TQListViewItem *qitem, const TQPoint &p) { +void ListView::handleContextMenu(KEBListView *, TDEListView *, TQListViewItem *qitem, const TQPoint &p) { KEBListViewItem *item = static_cast(qitem); const char *type = ( !item || (item == m_listView->rootItem()) @@ -716,7 +716,7 @@ void KEBListView::init() { setTabOrderedRenaming(false); setSorting(-1, false); setDragEnabled(true); - setSelectionModeExt((!m_folderList) ? KListView::Extended: KListView::Single); + setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single); setAllColumnsShowFocus(true); connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); @@ -725,8 +725,8 @@ void KEBListView::init() { void KEBListView::makeConnections() { connect(this, TQT_SIGNAL( moved() ), TQT_SLOT( slotMoved() )); - connect(this, TQT_SIGNAL( contextMenu(KListView *, TQListViewItem*, const TQPoint &) ), - TQT_SLOT( slotContextMenu(KListView *, TQListViewItem *, const TQPoint &) )); + connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), + TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), @@ -744,7 +744,7 @@ void KEBListView::readonlyFlagInit(bool readonly) { void KEBListView::slotMoved() { ListView::self()->handleMoved(this); } -void KEBListView::slotContextMenu(KListView *a, TQListViewItem *b, const TQPoint &c) +void KEBListView::slotContextMenu(TDEListView *a, TQListViewItem *b, const TQPoint &c) { ListView::self()->handleContextMenu(this, a,b,c); } void KEBListView::slotItemRenamed(TQListViewItem *a, const TQString &b, int c) { ListView::self()->handleItemRenamed(this, a,b,c); } @@ -768,7 +768,7 @@ void KEBListView::rename(TQListViewItem *qitem, int column) { ListView::startRename(column, item); KeyPressEater *keyPressEater = new KeyPressEater(this); renameLineEdit()->installEventFilter(keyPressEater); - KListView::rename(item, column); + TDEListView::rename(item, column); } KEBListViewItem* KEBListView::rootItem() const { diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index 7ffe76c37..1ada9506c 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -34,7 +34,7 @@ #include "toplevel.h" class TQSplitter; -class KListViewSearchLine; +class TDEListViewSearchLine; class KEBListViewItem : public TQListViewItem { @@ -80,7 +80,7 @@ private: void boldStyle(TQPainter *); }; -class KEBListView : public KListView +class KEBListView : public TDEListView { Q_OBJECT public: @@ -92,7 +92,7 @@ public: AddressColumn = 4 }; KEBListView(TQWidget *parent, bool folderList) - : KListView(parent), m_folderList(folderList) {} + : TDEListView(parent), m_folderList(folderList) {} virtual ~KEBListView() {} void init(); @@ -111,7 +111,7 @@ public: public slots: virtual void rename(TQListViewItem *item, int c); void slotMoved(); - void slotContextMenu(KListView *, TQListViewItem *, const TQPoint &); + void slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &); void slotItemRenamed(TQListViewItem *, const TQString &, int); void slotDoubleClicked(TQListViewItem *, const TQPoint &, int); void slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*); @@ -135,7 +135,7 @@ public: void initListViews(); void updateListViewSetup(bool readOnly); void connectSignals(); - void setSearchLine(KListViewSearchLine * searchline) { m_searchline = searchline; }; + void setSearchLine(TDEListViewSearchLine * searchline) { m_searchline = searchline; }; // selected item stuff void selected(KEBListViewItem * item, bool s); @@ -179,7 +179,7 @@ public: void handleMoved(KEBListView *); void handleDropped(KEBListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *); - void handleContextMenu(KEBListView *, KListView *, TQListViewItem *, const TQPoint &); + void handleContextMenu(KEBListView *, TDEListView *, TQListViewItem *, const TQPoint &); void handleDoubleClicked(KEBListView *, TQListViewItem *, const TQPoint &, int); void handleItemRenamed(KEBListView *, TQListViewItem *, const TQString &, int); @@ -200,7 +200,7 @@ private: ListView(); KEBListView *m_listView; - KListViewSearchLine * m_searchline; + TDEListViewSearchLine * m_searchline; // Actually this is a std:set, the bool is ignored TQMap mSelectedItems; diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index eea4d8c58..24ab4fbbb 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -58,7 +58,7 @@ CmdHistory* CmdHistory::s_self = 0; -CmdHistory::CmdHistory(KActionCollection *collection) +CmdHistory::CmdHistory(TDEActionCollection *collection) : m_commandHistory(collection) { connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ), TQT_SLOT( slotCommandExecuted(KCommand *) )); @@ -196,7 +196,7 @@ KEBApp *KEBApp::s_topLevel = 0; KEBApp::KEBApp( const TQString &bookmarksFile, bool readonly, const TQString &address, bool browser, const TQString &caption -) : KMainWindow(), m_dcopIface(0), m_bookmarksFilename(bookmarksFile), +) : TDEMainWindow(), m_dcopIface(0), m_bookmarksFilename(bookmarksFile), m_caption(caption), m_readOnly(readonly), m_browser(browser) { m_cmdHistory = new CmdHistory(actionCollection()); @@ -207,9 +207,9 @@ KEBApp::KEBApp( TQSplitter *vsplitter = new TQSplitter(this); - KToolBar *quicksearch = new KToolBar(vsplitter, "search toolbar"); + TDEToolBar *quicksearch = new TDEToolBar(vsplitter, "search toolbar"); - KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), + TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, actionCollection(), "reset_quicksearch" ); resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search
" @@ -218,7 +218,7 @@ KEBApp::KEBApp( TQLabel *lbl = new TQLabel(i18n("Se&arch:"), quicksearch, "kde toolbar widget"); - KListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "KListViewSearchLine"); + TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine"); quicksearch->setStretchableWidget(searchLineEdit); lbl->setBuddy(searchLineEdit); connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear())); @@ -226,7 +226,7 @@ KEBApp::KEBApp( ListView::createListViews(vsplitter); ListView::self()->initListViews(); - searchLineEdit->setListView(static_cast(ListView::self()->widget())); + searchLineEdit->setListView(static_cast(ListView::self()->widget())); ListView::self()->setSearchLine(searchLineEdit); m_bkinfo = new BookmarkInfoWidget(vsplitter); @@ -290,8 +290,8 @@ KEBApp::~KEBApp() { delete ListView::self(); } -KToggleAction* KEBApp::getToggleAction(const char *action) const { - return static_cast(actionCollection()->action(action)); +TDEToggleAction* KEBApp::getToggleAction(const char *action) const { + return static_cast(actionCollection()->action(action)); } void KEBApp::resetActions() { diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h index 7b1ec5f81..31f10a01a 100644 --- a/konqueror/keditbookmarks/toplevel.h +++ b/konqueror/keditbookmarks/toplevel.h @@ -27,7 +27,7 @@ #include class KBookmarkManager; -class KToggleAction; +class TDEToggleAction; class KBookmarkEditorIface; class ImportCommand; class BookmarkInfoWidget; @@ -48,7 +48,7 @@ struct SelcAbilities { class CmdHistory : public TQObject { Q_OBJECT public: - CmdHistory(KActionCollection *collection); + CmdHistory(TDEActionCollection *collection); virtual ~CmdHistory() { ; } void notifyDocSaved(); @@ -108,7 +108,7 @@ private: uint ignorenext; }; -class KEBApp : public KMainWindow { +class KEBApp : public TDEMainWindow { Q_OBJECT public: static KEBApp* self() { return s_topLevel; } @@ -129,7 +129,7 @@ public: return factory()->container(type, this); } - KToggleAction* getToggleAction(const char *) const; + TDEToggleAction* getToggleAction(const char *) const; TQString caption() const { return m_caption; } bool readonly() const { return m_readOnly; } -- cgit v1.2.1