From 5920e96087707ba892650898521dac63152274f9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 14:59:02 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- src/app/bookmarkviewcontroller.cpp | 28 ++++++------- src/app/bookmarkviewcontroller.h | 2 +- src/app/dirviewcontroller.cpp | 6 +-- src/app/dirviewcontroller.h | 4 +- src/app/history.cpp | 10 ++--- src/app/history.h | 10 ++--- src/app/mainwindow.cpp | 86 +++++++++++++++++++------------------- src/app/mainwindow.h | 62 +++++++++++++-------------- 8 files changed, 104 insertions(+), 104 deletions(-) (limited to 'src/app') diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp index fe0d032..e7fb24f 100644 --- a/src/app/bookmarkviewcontroller.cpp +++ b/src/app/bookmarkviewcontroller.cpp @@ -53,7 +53,7 @@ namespace Gwenview { // URLDropListView URLDropListView::URLDropListView(TQWidget* parent) -: KListView(parent) { +: TDEListView(parent) { setAcceptDrops(true); } @@ -69,10 +69,10 @@ void URLDropListView::contentsDragMoveEvent(TQDragMoveEvent* event) { -struct BookmarkItem : public KListViewItem { +struct BookmarkItem : public TDEListViewItem { template BookmarkItem(ItemParent* parent, const KBookmark& bookmark) - : KListViewItem(parent) + : TDEListViewItem(parent) , mBookmark(bookmark) { refresh(); @@ -89,7 +89,7 @@ struct BookmarkItem : public KListViewItem { class BookmarkToolTip : public TQToolTip { public: - BookmarkToolTip(KListView* lv) + BookmarkToolTip(TDEListView* lv) : TQToolTip(lv->viewport()) , mListView(lv) {} @@ -102,17 +102,17 @@ public: tip(rect, item->mBookmark.url().prettyURL()); }; - KListView* mListView; + TDEListView* mListView; }; struct BookmarkViewController::Private { TQVBox* mBox; - KListView* mListView; + TDEListView* mListView; KBookmarkManager* mManager; KURL mCurrentURL; std::auto_ptr mToolTip; - KActionCollection* mActionCollection; + TDEActionCollection* mActionCollection; KURL mDroppedURL; template @@ -184,7 +184,7 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent) // Init listview d->mListView=new URLDropListView(d->mBox); d->mToolTip.reset(new BookmarkToolTip(d->mListView) ); - d->mActionCollection=new KActionCollection(d->mListView); + d->mActionCollection=new TDEActionCollection(d->mListView); d->mListView->header()->hide(); d->mListView->setRootIsDecorated(true); @@ -203,13 +203,13 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent) this, TQT_SLOT(slotURLDropped(TQDropEvent*, const KURL::List&)) ); // Init toolbar - KToolBar* toolbar=new KToolBar(d->mBox, "", true); - KAction* action; - toolbar->setIconText(KToolBar::IconTextRight); - action=new KAction(i18n("Add a bookmark (keep it short)", "Add"), "bookmark_add", 0, + TDEToolBar* toolbar=new TDEToolBar(d->mBox, "", true); + TDEAction* action; + toolbar->setIconText(TDEToolBar::IconTextRight); + action=new TDEAction(i18n("Add a bookmark (keep it short)", "Add"), "bookmark_add", 0, this, TQT_SLOT(bookmarkCurrentURL()), d->mActionCollection); action->plug(toolbar); - action=new KAction(i18n("Remove a bookmark (keep it short)", "Remove"), "editdelete", 0, + action=new TDEAction(i18n("Remove a bookmark (keep it short)", "Remove"), "editdelete", 0, this, TQT_SLOT(deleteCurrentBookmark()), d->mActionCollection); action->plug(toolbar); } @@ -252,7 +252,7 @@ void BookmarkViewController::fill() { void BookmarkViewController::slotURLDropped(TQDropEvent* event, const KURL::List& urls) { // Get a pointer to the drop item TQPoint point(0,event->pos().y()); - KListView* lst=d->mListView; + TDEListView* lst=d->mListView; BookmarkItem* item=static_cast( lst->itemAt(lst->contentsToViewport(point)) ); TQPopupMenu menu(lst); diff --git a/src/app/bookmarkviewcontroller.h b/src/app/bookmarkviewcontroller.h index e29d64d..e7780e7 100644 --- a/src/app/bookmarkviewcontroller.h +++ b/src/app/bookmarkviewcontroller.h @@ -41,7 +41,7 @@ namespace Gwenview { /** * A listview on which the user can drop urls */ -class URLDropListView : public KListView { +class URLDropListView : public TDEListView { Q_OBJECT public: diff --git a/src/app/dirviewcontroller.cpp b/src/app/dirviewcontroller.cpp index 15e480b..0775279 100644 --- a/src/app/dirviewcontroller.cpp +++ b/src/app/dirviewcontroller.cpp @@ -63,8 +63,8 @@ DirViewController::DirViewController(TQWidget* parent) connect(d->mTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotTreeViewSelectionChanged(TQListViewItem*)) ); - connect(d->mTreeView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotTreeViewContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect(d->mTreeView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } @@ -90,7 +90,7 @@ void DirViewController::slotTreeViewSelectionChanged(TQListViewItem* item) { } -void DirViewController::slotTreeViewContextMenu(KListView*, TQListViewItem*, const TQPoint& pos) { +void DirViewController::slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint& pos) { TQPopupMenu menu(d->mTreeView); menu.insertItem(SmallIcon("folder_new"),i18n("New Folder..."),this,TQT_SLOT(makeDir())); menu.insertSeparator(); diff --git a/src/app/dirviewcontroller.h b/src/app/dirviewcontroller.h index 1327b69..2f2bf59 100644 --- a/src/app/dirviewcontroller.h +++ b/src/app/dirviewcontroller.h @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class TQListViewItem; class TQPoint; class TQWidget; -class KListView; +class TDEListView; class KURL; namespace TDEIO { @@ -58,7 +58,7 @@ private: private slots: void slotTreeViewSelectionChanged(TQListViewItem*); - void slotTreeViewContextMenu(KListView*, TQListViewItem*, const TQPoint&); + void slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&); void makeDir(); void slotDirMade(); diff --git a/src/app/history.cpp b/src/app/history.cpp index 74a2a3a..4105856 100644 --- a/src/app/history.cpp +++ b/src/app/history.cpp @@ -35,17 +35,17 @@ namespace Gwenview { const unsigned int MAX_HISTORY_SIZE=12; -History::History(KActionCollection* actionCollection) { +History::History(TDEActionCollection* actionCollection) { mPosition=mHistoryList.end(); mMovingInHistory=false; // Actions TQPair backForward = KStdGuiItem::backAndForward(); - mGoBack=new KToolBarPopupAction(backForward.first, - KStdAccel::shortcut(KStdAccel::Back), + mGoBack=new TDEToolBarPopupAction(backForward.first, + TDEStdAccel::shortcut(TDEStdAccel::Back), this, TQT_SLOT(goBack()), actionCollection, "go_back"); - mGoForward=new KToolBarPopupAction(backForward.second, - KStdAccel::shortcut(KStdAccel::Forward), + mGoForward=new TDEToolBarPopupAction(backForward.second, + TDEStdAccel::shortcut(TDEStdAccel::Forward), this, TQT_SLOT(goForward()), actionCollection, "go_forward"); // Connections diff --git a/src/app/history.h b/src/app/history.h index 006faa5..b812824 100644 --- a/src/app/history.h +++ b/src/app/history.h @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // KDE #include -class KToolBarPopupAction; -class KActionCollection; +class TDEToolBarPopupAction; +class TDEActionCollection; typedef TQValueList HistoryList; @@ -40,7 +40,7 @@ Q_OBJECT public: - History(KActionCollection*); + History(TDEActionCollection*); ~History(); signals: @@ -50,8 +50,8 @@ public slots: void addURLToHistory(const KURL&); private: - KToolBarPopupAction* mGoBack; - KToolBarPopupAction* mGoForward; + TDEToolBarPopupAction* mGoBack; + TDEToolBarPopupAction* mGoForward; HistoryList mHistoryList; HistoryList::Iterator mPosition; bool mMovingInHistory; diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index c159dd2..0ce4417 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -163,7 +163,7 @@ static bool urlIsDirectory(TQWidget* parent, const KURL& url) { MainWindow::MainWindow() -: KMainWindow() +: TDEMainWindow() #ifdef GV_HAVE_KIPI , mPluginLoader(0) #endif @@ -183,7 +183,7 @@ MainWindow::MainWindow() createConnections(); mWindowListActions.setAutoDelete(true); updateWindowActions(); - KMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); + TDEMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); } @@ -312,7 +312,7 @@ void MainWindow::updateFullScreenLabel() { } void MainWindow::goUpTo(int id) { - KPopupMenu* menu=mGoUp->popupMenu(); + TDEPopupMenu* menu=mGoUp->popupMenu(); KURL url(menu->text(id)); KURL childURL; int index=menu->indexOf(id); @@ -538,8 +538,8 @@ void MainWindow::slotImageLoaded() { void MainWindow::hideToolBars() { - TQPtrListIterator it=toolBarIterator(); - KToolBar* bar; + TQPtrListIterator it=toolBarIterator(); + TDEToolBar* bar; for(;it.current()!=0L; ++it) { bar=it.current(); @@ -553,9 +553,9 @@ void MainWindow::hideToolBars() { void MainWindow::showToolBars() { - TQPtrListIterator it=toolBarIterator(); + TQPtrListIterator it=toolBarIterator(); - KToolBar* bar; + TDEToolBar* bar; for(;it.current()!=0L; ++it) { bar=it.current(); @@ -698,7 +698,7 @@ void MainWindow::showToolBarDialog() { void MainWindow::applyMainWindowSettings() { createGUI(); - KMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); + TDEMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); } @@ -757,7 +757,7 @@ void MainWindow::slotToggleCentralStack() { // Make sure the window list actions are disabled if we are in view mode, // otherwise weird things happens when we go back to browse mode - TQPtrListIterator it(mWindowListActions); + TQPtrListIterator it(mWindowListActions); for (;it.current(); ++it) { it.current()->setEnabled(mSwitchToBrowseMode->isChecked()); } @@ -964,10 +964,10 @@ void MainWindow::createWidgets() { */ void MainWindow::createActions() { // Stack - mSwitchToBrowseMode=new KRadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode"); + mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode"); mSwitchToBrowseMode->setExclusiveGroup("centralStackMode"); mSwitchToBrowseMode->setChecked(true); - mSwitchToViewMode=new KRadioAction(i18n("View Image"), "image", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode"); + mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode"); mSwitchToViewMode->setExclusiveGroup("centralStackMode"); // File @@ -975,41 +975,41 @@ void MainWindow::createActions() { mSaveFile=KStdAction::save(mDocument,TQT_SLOT(save()),actionCollection() ); mSaveFileAs=KStdAction::saveAs(mDocument,TQT_SLOT(saveAs()),actionCollection() ); mFilePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printFile()), actionCollection()); - mRenameFile=new KAction(i18n("&Rename..."),Key_F2,TQT_TQOBJECT(this),TQT_SLOT(renameFile()),actionCollection(),"file_rename"); - mCopyFiles=new KAction(i18n("&Copy To..."),Key_F7,TQT_TQOBJECT(this),TQT_SLOT(copyFiles()),actionCollection(),"file_copy"); - mMoveFiles=new KAction(i18n("&Move To..."),Key_F8,TQT_TQOBJECT(this),TQT_SLOT(moveFiles()),actionCollection(),"file_move"); - mLinkFiles=new KAction(i18n("&Link To..."),Key_F9,TQT_TQOBJECT(this),TQT_SLOT(linkFiles()),actionCollection(),"file_link"); - mDeleteFiles=new KAction(i18n("&Delete"),"editdelete",Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(deleteFiles()),actionCollection(),"file_delete"); - mShowFileProperties=new KAction(i18n("Properties"),0,TQT_TQOBJECT(this),TQT_SLOT(showFileProperties()),actionCollection(),"file_properties"); + mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,TQT_TQOBJECT(this),TQT_SLOT(renameFile()),actionCollection(),"file_rename"); + mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,TQT_TQOBJECT(this),TQT_SLOT(copyFiles()),actionCollection(),"file_copy"); + mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,TQT_TQOBJECT(this),TQT_SLOT(moveFiles()),actionCollection(),"file_move"); + mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,TQT_TQOBJECT(this),TQT_SLOT(linkFiles()),actionCollection(),"file_link"); + mDeleteFiles=new TDEAction(i18n("&Delete"),"editdelete",Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(deleteFiles()),actionCollection(),"file_delete"); + mShowFileProperties=new TDEAction(i18n("Properties"),0,TQT_TQOBJECT(this),TQT_SLOT(showFileProperties()),actionCollection(),"file_properties"); KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection() ); // Edit - mRotateLeft=new KAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left"); - mRotateRight=new KAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(rotateRight()),actionCollection(),"rotate_right"); - mMirror=new KAction(i18n("&Mirror"),"mirror",0, TQT_TQOBJECT(this), TQT_SLOT(mirror()),actionCollection(),"mirror"); - mFlip=new KAction(i18n("&Flip"),"flip",0, TQT_TQOBJECT(this), TQT_SLOT(flip()),actionCollection(),"flip"); + mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left"); + mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(rotateRight()),actionCollection(),"rotate_right"); + mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, TQT_TQOBJECT(this), TQT_SLOT(mirror()),actionCollection(),"mirror"); + mFlip=new TDEAction(i18n("&Flip"),"flip",0, TQT_TQOBJECT(this), TQT_SLOT(flip()),actionCollection(),"flip"); // View - mReload=new KAction(i18n("Reload"), "reload", Key_F5, mDocument, TQT_SLOT(reload()), actionCollection(), "reload"); + mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQT_SLOT(reload()), actionCollection(), "reload"); mReload->setEnabled(false); mToggleFullScreen= KStdAction::fullScreen(TQT_TQOBJECT(this),TQT_SLOT(toggleFullScreen()),actionCollection(),0); - mToggleSlideShow=new KAction(i18n("Slide Show"),"slideshow_play",0,TQT_TQOBJECT(this),TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow"); - mFullScreenLabelAction=new KToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label"); + mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,TQT_TQOBJECT(this),TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow"); + mFullScreenLabelAction=new TDEToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label"); // Go - mGoUp=new KToolBarPopupAction(i18n("Up"), "up", ALT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "go_up"); - new KAction( i18n( "Home" ), "gohome", KStdAccel::shortcut(KStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection(), "go_home"); + mGoUp=new TDEToolBarPopupAction(i18n("Up"), "up", ALT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "go_up"); + new TDEAction( i18n( "Home" ), "gohome", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection(), "go_home"); // Window - mResetDockWidgets = new KAction(i18n("Reset"), 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets"); + mResetDockWidgets = new TDEAction(i18n("Reset"), 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets"); // Settings mShowConfigDialog= KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfigDialog()), actionCollection() ); mShowKeyDialog= KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showKeyDialog()), actionCollection() ); - (void)new KAction(i18n("Configure External Tools..."), "configure", 0, + (void)new TDEAction(i18n("Configure External Tools..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools"); (void)KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(showToolBarDialog()), actionCollection() ); @@ -1025,7 +1025,7 @@ void MainWindow::createActions() { void MainWindow::createObjectInteractions() { // Actions in image view { - KActionPtrList actions; + TDEActionPtrList actions; actions << mToggleFullScreen << mToggleSlideShow @@ -1039,7 +1039,7 @@ void MainWindow::createObjectInteractions() { } { - KActionPtrList actions; + TDEActionPtrList actions; actions << mFileViewController->selectPrevious() << mFileViewController->selectNext() @@ -1049,7 +1049,7 @@ void MainWindow::createObjectInteractions() { } { - KActionPtrList actions; + TDEActionPtrList actions; actions << actionCollection()->action("view_zoom_in") << actionCollection()->action("view_zoom_to") @@ -1080,7 +1080,7 @@ void MainWindow::createObjectInteractions() { BookmarkOwner* bookmarkOwner=new BookmarkOwner(this); - KActionMenu* bookmark=new KActionMenu(i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); + TDEActionMenu* bookmark=new TDEActionMenu(i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); new KBookmarkMenu(manager, bookmarkOwner, bookmark->popupMenu(), 0, true); connect(bookmarkOwner,TQT_SIGNAL(openURL(const KURL&)), @@ -1099,7 +1099,7 @@ void MainWindow::createHideShowAction(KDockWidget* dock) { caption=i18n("Show %1").arg(dock->caption()); } - KAction* action=new KAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 ); + TDEAction* action=new TDEAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 ); if (dock->icon()) { action->setIconSet( TQIconSet(*dock->icon()) ); } @@ -1232,17 +1232,17 @@ void MainWindow::createLocationToolBar() { comboAction->setAutoSized(true); // Clear button - (void)new KAction( i18n("Clear Location Bar"), + (void)new TDEAction( i18n("Clear Location Bar"), TQApplication::reverseLayout()?"clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT(clearLocationLabel()), actionCollection(), "clear_location"); // URL Label - KToolBarLabelAction* locationAction = new KToolBarLabelAction(i18n("L&ocation:"), + TDEToolBarLabelAction* locationAction = new TDEToolBarLabelAction(i18n("L&ocation:"), Key_F6, TQT_TQOBJECT(this), TQT_SLOT( activateLocationLabel()), actionCollection(), "location_label"); locationAction->setBuddy(mURLEdit); // Go button - (void)new KAction(i18n("Go"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGo()), actionCollection(), "location_go"); + (void)new TDEAction(i18n("Go"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGo()), actionCollection(), "location_go"); } @@ -1277,7 +1277,7 @@ void MainWindow::loadPlugins() { // with local classes, so this is declared outside of slotReplug() struct MenuInfo { TQString mName; - TQPtrList mActions; + TQPtrList mActions; MenuInfo() {} MenuInfo(const TQString& name) : mName(name) {} }; @@ -1304,8 +1304,8 @@ void MainWindow::slotReplug() { if (!plugin) continue; plugin->setup(this); - KActionPtrList actions = plugin->actions(); - KActionPtrList::ConstIterator actionIt=actions.begin(), end=actions.end(); + TDEActionPtrList actions = plugin->actions(); + TDEActionPtrList::ConstIterator actionIt=actions.begin(), end=actions.end(); for (; actionIt!=end; ++actionIt) { KIPI::Category category = plugin->category(*actionIt); @@ -1320,10 +1320,10 @@ void MainWindow::slotReplug() { } // Create a dummy "no plugin" action list - KAction* noPlugin=new KAction(i18n("No Plugin"), 0, 0, 0, actionCollection(), "no_plugin"); + TDEAction* noPlugin=new TDEAction(i18n("No Plugin"), 0, 0, 0, actionCollection(), "no_plugin"); noPlugin->setShortcutConfigurable(false); noPlugin->setEnabled(false); - TQPtrList noPluginList; + TQPtrList noPluginList; noPluginList.append(noPlugin); // Fill the menu @@ -1341,10 +1341,10 @@ void MainWindow::slotReplug() { #else void MainWindow::loadPlugins() { // Create a dummy "no KIPI" action list - KAction* noPlugin=new KAction(i18n("No KIPI support"), 0, 0, 0, actionCollection(), "no_plugin"); + TDEAction* noPlugin=new TDEAction(i18n("No KIPI support"), 0, 0, 0, actionCollection(), "no_plugin"); noPlugin->setShortcutConfigurable(false); noPlugin->setEnabled(false); - TQPtrList noPluginList; + TQPtrList noPluginList; noPluginList.append(noPlugin); TQStringList lst; diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index a2dc4a0..2bda2e2 100644 --- a/src/app/mainwindow.h +++ b/src/app/mainwindow.h @@ -39,16 +39,16 @@ class TQLabel; class TQTimer; class TQWidgetStack; -class KAction; +class TDEAction; class KDockArea; class KDockWidget; class KFileItem; class KHistoryCombo; -class KListView; -class KRadioAction; -class KToggleAction; -class KToolBarLabelAction; -class KToolBarPopupAction; +class TDEListView; +class TDERadioAction; +class TDEToggleAction; +class TDEToolBarLabelAction; +class TDEToolBarPopupAction; class KURLCompletion; namespace Gwenview { @@ -62,7 +62,7 @@ class ImageViewController; class SlideShow; -class MainWindow : public KMainWindow { +class MainWindow : public TDEMainWindow { Q_OBJECT public: @@ -100,33 +100,33 @@ private: History* mHistory; SlideShow* mSlideShow; - KRadioAction* mSwitchToBrowseMode; - KRadioAction* mSwitchToViewMode; - KToggleAction* mToggleFullScreen; - KToolBarLabelAction* mFullScreenLabelAction; - KAction* mRenameFile; - KAction* mCopyFiles; - KAction* mMoveFiles; - KAction* mLinkFiles; - KAction* mDeleteFiles; - KAction* mShowConfigDialog; - KAction* mShowKeyDialog; - KAction* mReload; - KToolBarPopupAction* mGoUp; - KAction* mShowFileProperties; - KAction* mToggleSlideShow; - KAction* mRotateLeft; - KAction* mRotateRight; - KAction* mMirror; - KAction* mFlip; - KAction* mSaveFile; - KAction* mSaveFileAs; - KAction* mFilePrint; - KAction* mResetDockWidgets; + TDERadioAction* mSwitchToBrowseMode; + TDERadioAction* mSwitchToViewMode; + TDEToggleAction* mToggleFullScreen; + TDEToolBarLabelAction* mFullScreenLabelAction; + TDEAction* mRenameFile; + TDEAction* mCopyFiles; + TDEAction* mMoveFiles; + TDEAction* mLinkFiles; + TDEAction* mDeleteFiles; + TDEAction* mShowConfigDialog; + TDEAction* mShowKeyDialog; + TDEAction* mReload; + TDEToolBarPopupAction* mGoUp; + TDEAction* mShowFileProperties; + TDEAction* mToggleSlideShow; + TDEAction* mRotateLeft; + TDEAction* mRotateRight; + TDEAction* mMirror; + TDEAction* mFlip; + TDEAction* mSaveFile; + TDEAction* mSaveFileAs; + TDEAction* mFilePrint; + TDEAction* mResetDockWidgets; KHistoryCombo* mURLEdit; KURLCompletion* mURLEditCompletion; - TQPtrList mWindowListActions; + TQPtrList mWindowListActions; #ifdef GV_HAVE_KIPI KIPI::PluginLoader* mPluginLoader; -- cgit v1.2.1