diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 15:12:51 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 15:12:51 -0600 |
commit | 65eca7929c22f0f0bc64135c02d85d1243df376c (patch) | |
tree | 5b47361590fb6693a0f6258d6a8d725856ef2ad9 /kviewshell | |
parent | cd6d514066c22206c388eddbb7fbec32648dbaeb (diff) | |
download | tdegraphics-65eca7929c22f0f0bc64135c02d85d1243df376c.tar.gz tdegraphics-65eca7929c22f0f0bc64135c02d85d1243df376c.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kviewshell')
-rw-r--r-- | kviewshell/kviewpart.cpp | 40 | ||||
-rw-r--r-- | kviewshell/kviewpart.h | 50 | ||||
-rw-r--r-- | kviewshell/kviewshell.cpp | 2 | ||||
-rw-r--r-- | kviewshell/kviewshell.h | 8 | ||||
-rw-r--r-- | kviewshell/marklist.cpp | 2 | ||||
-rw-r--r-- | kviewshell/marklist.h | 4 | ||||
-rw-r--r-- | kviewshell/plugins/djvu/djvumultipage.cpp | 4 | ||||
-rw-r--r-- | kviewshell/plugins/djvu/djvumultipage.h | 6 | ||||
-rw-r--r-- | kviewshell/tableOfContents.cpp | 6 | ||||
-rw-r--r-- | kviewshell/tableOfContents.h | 4 | ||||
-rw-r--r-- | kviewshell/tdemultipage.h | 2 |
11 files changed, 64 insertions, 64 deletions
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 85a27558..d165fc38 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -170,7 +170,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // Add the multipage to the GUI. partManager->addPart(multiPage); - exportTextAction = new KAction(i18n("Text..."), 0, this, TQT_SLOT(mp_exportText()), actionCollection(), "export_text"); + exportTextAction = new TDEAction(i18n("Text..."), 0, this, TQT_SLOT(mp_exportText()), actionCollection(), "export_text"); // edit menu findTextAction = KStdAction::find(this, TQT_SLOT(mp_showFindTextDialog()), actionCollection(), "find"); @@ -190,11 +190,11 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p saveAction = KStdAction::save(this, TQT_SLOT(mp_slotSave_defaultFilename()), actionCollection()); // settings menu - showSidebar = new KToggleAction (i18n("Show &Sidebar"), "show_side_panel", 0, this, + showSidebar = new TDEToggleAction (i18n("Show &Sidebar"), "show_side_panel", 0, this, TQT_SLOT(slotShowSidebar()), actionCollection(), "show_sidebar"); showSidebar->setCheckedState(i18n("Hide &Sidebar")); - watchAct = new KToggleAction(i18n("&Watch File"), 0, 0, 0, actionCollection(), "watch_file"); - scrollbarHandling = new KToggleAction (i18n("Show Scrollbars"), 0, 0, 0, actionCollection(), "scrollbarHandling"); + watchAct = new TDEToggleAction(i18n("&Watch File"), 0, 0, 0, actionCollection(), "watch_file"); + scrollbarHandling = new TDEToggleAction (i18n("Show Scrollbars"), 0, 0, 0, actionCollection(), "scrollbarHandling"); scrollbarHandling->setCheckedState(i18n("Hide Scrollbars")); // View modes @@ -203,19 +203,19 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p viewModes.append(i18n("Continuous")); viewModes.append(i18n("Continuous - Facing")); viewModes.append(i18n("Overview")); - viewModeAction = new KSelectAction (i18n("View Mode"), 0, 0, 0, actionCollection(), "viewmode"); + viewModeAction = new TDESelectAction (i18n("View Mode"), 0, 0, 0, actionCollection(), "viewmode"); viewModeAction->setItems(viewModes); // Qt::Orientation menu TQStringList orientations; orientations.append(i18n("Portrait")); orientations.append(i18n("Landscape")); - orientation = new KSelectAction (i18n("Preferred &Orientation"), 0, 0, 0, actionCollection(), "view_orientation"); + orientation = new TDESelectAction (i18n("Preferred &Orientation"), 0, 0, 0, actionCollection(), "view_orientation"); orientation->setItems(orientations); connect(orientation, TQT_SIGNAL(activated (int)), &userRequestedPaperSize, TQT_SLOT(setOrientation(int))); // Zoom Menu - zoom_action = new KSelectAction (i18n("&Zoom"), 0, 0, 0, actionCollection(), "view_zoom"); + zoom_action = new TDESelectAction (i18n("&Zoom"), 0, 0, 0, actionCollection(), "view_zoom"); zoom_action->setEditable(true); zoom_action->setItems(_zoomVal.zoomNames()); @@ -227,24 +227,24 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p emit(zoomChanged("100%")); // Paper Size Menu - media = new KSelectAction (i18n("Preferred Paper &Size"), 0, 0, 0, actionCollection(), "view_media"); + media = new TDESelectAction (i18n("Preferred Paper &Size"), 0, 0, 0, actionCollection(), "view_media"); TQStringList items = userRequestedPaperSize.pageSizeNames(); items.prepend(i18n("Custom Size...")); media->setItems(items); connect (media, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMedia(int))); - useDocumentSpecifiedSize = new KToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQT_SLOT(slotShowSidebar()), + useDocumentSpecifiedSize = new TDEToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQT_SLOT(slotShowSidebar()), actionCollection(), "view_use_document_specified_size"); // Zoom Actions zoomInAct = KStdAction::zoomIn (this, TQT_SLOT(zoomIn()), actionCollection()); zoomOutAct = KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection()); - fitPageAct = new KToggleAction(i18n("&Fit to Page"), "view_fit_window", Key_P, + fitPageAct = new TDEToggleAction(i18n("&Fit to Page"), "view_fit_window", Key_P, actionCollection(), "view_fit_to_page"); - fitWidthAct = new KToggleAction(i18n("Fit to Page &Width"), "view_fit_width", Key_W, + fitWidthAct = new TDEToggleAction(i18n("Fit to Page &Width"), "view_fit_width", Key_W, actionCollection(), "view_fit_to_width"); - fitHeightAct = new KToggleAction(i18n("Fit to Page &Height"), "view_fit_height", Key_H, + fitHeightAct = new TDEToggleAction(i18n("Fit to Page &Height"), "view_fit_height", Key_H, actionCollection(), "view_fit_to_height"); fitPageAct -> setExclusiveGroup("view_fit"); @@ -263,16 +263,16 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p gotoAct = KStdAction::gotoPage(this, TQT_SLOT(goToPage()), actionCollection()); gotoAct->setShortcut("CTRL+G"); - readUpAct = new KAction(i18n("Read Up Document"), "up", SHIFT+Key_Space, this, TQT_SLOT(mp_readUp()), actionCollection(), "go_read_up"); - readDownAct = new KAction(i18n("Read Down Document"), "down", Key_Space, this, TQT_SLOT(mp_readDown()), actionCollection(), "go_read_down"); + readUpAct = new TDEAction(i18n("Read Up Document"), "up", SHIFT+Key_Space, this, TQT_SLOT(mp_readUp()), actionCollection(), "go_read_up"); + readDownAct = new TDEAction(i18n("Read Down Document"), "down", Key_Space, this, TQT_SLOT(mp_readDown()), actionCollection(), "go_read_down"); printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection()); saveAsAction = KStdAction::saveAs(this, TQT_SLOT(mp_slotSave()), actionCollection()); // mode action - moveModeAction = new KRadioAction(i18n("&Move Tool"), "movetool", Key_F4, actionCollection(), "move_tool"); - selectionModeAction = new KRadioAction(i18n("&Selection Tool"), "selectiontool", Key_F5, actionCollection(), "selection_tool"); + moveModeAction = new TDERadioAction(i18n("&Move Tool"), "movetool", Key_F4, actionCollection(), "move_tool"); + selectionModeAction = new TDERadioAction(i18n("&Selection Tool"), "selectiontool", Key_F5, actionCollection(), "selection_tool"); moveModeAction->setExclusiveGroup("tools"); selectionModeAction->setExclusiveGroup("tools"); @@ -283,9 +283,9 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p //connect(selectionModeAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSelectionTool(bool))); // history action - backAction = new KAction(i18n("&Back"), "1leftarrow", 0, + backAction = new TDEAction(i18n("&Back"), "1leftarrow", 0, this, TQT_SLOT(mp_doGoBack()), actionCollection(), "go_back"); - forwardAction = new KAction(i18n("&Forward"), "1rightarrow", 0, + forwardAction = new TDEAction(i18n("&Forward"), "1rightarrow", 0, this, TQT_SLOT(mp_doGoForward()), actionCollection(), "go_forward"); backAction->setEnabled(false); @@ -299,12 +299,12 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // additional about information. if (!args.isEmpty()) { - aboutAction = new KAction(i18n("About KViewShell"), "kviewshell", 0, this, + aboutAction = new TDEAction(i18n("About KViewShell"), "kviewshell", 0, this, TQT_SLOT(aboutKViewShell()), actionCollection(), "help_about_kviewshell"); } // keyboard accelerators - accel = new KAccel(mainWidget); + accel = new TDEAccel(mainWidget); accel->insert(I18N_NOOP("Scroll Up"), Key_Up, this, TQT_SLOT(mp_scrollUp())); accel->insert(I18N_NOOP("Scroll Down"), Key_Down, this, TQT_SLOT(mp_scrollDown())); accel->insert(I18N_NOOP("Scroll Left"), Key_Left, this, TQT_SLOT(mp_scrollLeft())); diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h index cf66e69d..4af55fc7 100644 --- a/kviewshell/kviewpart.h +++ b/kviewshell/kviewpart.h @@ -11,16 +11,16 @@ class TDEAboutData; class KAboutDialog; -class KAccel; -class KAction; +class TDEAccel; +class TDEAction; class TDEConfig; class KDirWatch; class TDEInstance; class KMultiPage; -class KRadioAction; -class KSelectAction; +class TDERadioAction; +class TDESelectAction; class KTempFile; -class KToggleAction; +class TDEToggleAction; class KURL; class KViewPartExtension; class TQHBoxLayout; @@ -106,8 +106,8 @@ protected slots: protected: - KToggleAction *showSidebar, *scrollbarHandling; - KSelectAction *orientation, *media, *zoom_action; + TDEToggleAction *showSidebar, *scrollbarHandling; + TDESelectAction *orientation, *media, *zoom_action; virtual bool openFile(); @@ -181,30 +181,30 @@ private: KTempFile *tmpUnzipped; KDirWatch *watch; - KAccel *accel; - KAction *zoomInAct, *zoomOutAct, *backAct, *forwardAct, + TDEAccel *accel; + TDEAction *zoomInAct, *zoomOutAct, *backAct, *forwardAct, *startAct, *endAct, *gotoAct, *saveAction, *saveAsAction, *printAction, *readUpAct, *readDownAct; - KAction *backAction; - KAction *forwardAction; - KAction *settingsAction; - KAction* aboutAction; - KToggleAction *watchAct,*useDocumentSpecifiedSize, + TDEAction *backAction; + TDEAction *forwardAction; + TDEAction *settingsAction; + TDEAction* aboutAction; + TDEToggleAction *watchAct,*useDocumentSpecifiedSize, *fitPageAct, *fitHeightAct, *fitWidthAct; - KSelectAction* viewModeAction; + TDESelectAction* viewModeAction; - KRadioAction* moveModeAction; - KRadioAction* selectionModeAction; + TDERadioAction* moveModeAction; + TDERadioAction* selectionModeAction; - KAction* exportTextAction; + TDEAction* exportTextAction; - KAction* copyTextAction; - KAction* selectAllAction; - KAction* deselectAction; - KAction* findTextAction; - KAction* findNextTextAction; - KAction* findPrevAction; - KAction* findNextAction; + TDEAction* copyTextAction; + TDEAction* selectAllAction; + TDEAction* deselectAction; + TDEAction* findTextAction; + TDEAction* findNextTextAction; + TDEAction* findPrevAction; + TDEAction* findNextAction; KParts::PartManager* partManager; diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index a45563c3..93a39b7f 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -75,7 +75,7 @@ KViewShell::KViewShell(const TQString& defaultMimeType) // file menu KStdAction::open(TQT_TQOBJECT(view), TQT_SLOT(slotFileOpen()), actionCollection()); recent = KStdAction::openRecent (TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL &)), actionCollection()); - reloadAction = new KAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload"); + reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload"); closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); diff --git a/kviewshell/kviewshell.h b/kviewshell/kviewshell.h index 40cf3244..e4c45ee7 100644 --- a/kviewshell/kviewshell.h +++ b/kviewshell/kviewshell.h @@ -6,7 +6,7 @@ #include <tdeparts/mainwindow.h> -class KRecentFilesAction; +class TDERecentFilesAction; class KURL; class KViewPart_Iface; @@ -72,11 +72,11 @@ protected: private: KViewPart_Iface *view; - KRecentFilesAction *recent; + TDERecentFilesAction *recent; TQString cwd; - KAction *closeAction, *reloadAction; - KToggleAction *fullScreenAction; + TDEAction *closeAction, *reloadAction; + TDEToggleAction *fullScreenAction; // In the attribute, the status of the statusbar (shown of hidden) // is saved when the kviewshell switches to fullscreen mode. The diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index 31b257f2..1cbf6581 100644 --- a/kviewshell/marklist.cpp +++ b/kviewshell/marklist.cpp @@ -558,7 +558,7 @@ void MarkList::showPopupMenu(const PageNumber& pageNumber, const TQPoint& positi if (contextMenu == 0) { // Initialize Contextmenu - contextMenu = new KPopupMenu(this, "markListContext"); + contextMenu = new TDEPopupMenu(this, "markListContext"); contextMenu->insertItem(i18n("Select &Current Page"), 0); contextMenu->insertItem(i18n("Select &All Pages"), 1); diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h index 6fb46ac2..0ee15758 100644 --- a/kviewshell/marklist.h +++ b/kviewshell/marklist.h @@ -29,7 +29,7 @@ class TQCheckBox; class TQLabel; -class KPopupMenu; +class TDEPopupMenu; class DocumentPageCache; @@ -183,7 +183,7 @@ private: bool showThumbnails; - KPopupMenu* contextMenu; + TDEPopupMenu* contextMenu; }; #endif diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index c60c7c9c..0a8cdd78 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -62,12 +62,12 @@ DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQO renderModes.append(i18n("Black and White")); renderModes.append(i18n("Show foreground only")); renderModes.append(i18n("Show background only")); - renderModeAction = new KSelectAction (i18n("Render Mode"), 0, 0, 0, actionCollection(), "render_mode"); + renderModeAction = new TDESelectAction (i18n("Render Mode"), 0, 0, 0, actionCollection(), "render_mode"); renderModeAction->setItems(renderModes); renderModeAction->setCurrentItem(Prefs::renderMode()); - deletePagesAction = new KAction(i18n("Delete Pages..."), 0, this, TQT_SLOT(slotDeletePages()), actionCollection(), "delete_pages"); + deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQT_SLOT(slotDeletePages()), actionCollection(), "delete_pages"); // change the rendermode connect(renderModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setRenderMode(int))); diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h index e6c47b14..2bbc6f4a 100644 --- a/kviewshell/plugins/djvu/djvumultipage.h +++ b/kviewshell/plugins/djvu/djvumultipage.h @@ -31,7 +31,7 @@ #include "DjVuToPS.h" -class KSelectAction; +class TDESelectAction; /*! \mainpage DjVuMultiPage @@ -143,8 +143,8 @@ public: implementation */ DjVuRenderer djvuRenderer; - KSelectAction* renderModeAction; - KAction* deletePagesAction; + TDESelectAction* renderModeAction; + TDEAction* deletePagesAction; }; #endif diff --git a/kviewshell/tableOfContents.cpp b/kviewshell/tableOfContents.cpp index 51618d9a..e2ae9a02 100644 --- a/kviewshell/tableOfContents.cpp +++ b/kviewshell/tableOfContents.cpp @@ -29,18 +29,18 @@ TocItem::TocItem(TocItem* parent) - : KListViewItem(parent) + : TDEListViewItem(parent) { } TocItem::TocItem(TQListView* parent) - : KListViewItem(parent) + : TDEListViewItem(parent) { } TableOfContents::TableOfContents(TQWidget* parent) - : KListView(parent) + : TDEListView(parent) { addColumn(i18n("Topic")); addColumn(i18n("Page")); diff --git a/kviewshell/tableOfContents.h b/kviewshell/tableOfContents.h index 8e8c4983..ccd106e8 100644 --- a/kviewshell/tableOfContents.h +++ b/kviewshell/tableOfContents.h @@ -29,7 +29,7 @@ class Bookmark; -class TocItem : public KListViewItem +class TocItem : public TDEListViewItem { public: TocItem(TocItem* parent); @@ -43,7 +43,7 @@ private: }; -class TableOfContents : public KListView +class TableOfContents : public TDEListView { Q_OBJECT diff --git a/kviewshell/tdemultipage.h b/kviewshell/tdemultipage.h index ac3e6b02..1e0910ee 100644 --- a/kviewshell/tdemultipage.h +++ b/kviewshell/tdemultipage.h @@ -343,7 +343,7 @@ protected: place to connect to signals emitted by DocumentWidget. */ virtual DocumentWidget* createDocumentWidget(); - /* Used to enable/disable KActions of multiPage implementations. + /* Used to enable/disable TDEActions of multiPage implementations. enableActions(true) should be called whenever a file is successfully loaded. enableActions(false) is called when the file is closed. */ |