diff options
Diffstat (limited to 'kpdf')
-rw-r--r-- | kpdf/core/document.cpp | 2 | ||||
-rw-r--r-- | kpdf/core/document.h | 4 | ||||
-rw-r--r-- | kpdf/core/generator.h | 4 | ||||
-rw-r--r-- | kpdf/core/generator_kimgio/generator_kimgio.cpp | 2 | ||||
-rw-r--r-- | kpdf/core/generator_kimgio/generator_kimgio.h | 2 | ||||
-rw-r--r-- | kpdf/core/generator_pdf/generator_pdf.cpp | 8 | ||||
-rw-r--r-- | kpdf/core/generator_pdf/generator_pdf.h | 6 | ||||
-rw-r--r-- | kpdf/part.cpp | 24 | ||||
-rw-r--r-- | kpdf/part.h | 38 | ||||
-rw-r--r-- | kpdf/shell/shell.cpp | 6 | ||||
-rw-r--r-- | kpdf/shell/shell.h | 10 | ||||
-rw-r--r-- | kpdf/ui/minibar.cpp | 2 | ||||
-rw-r--r-- | kpdf/ui/pageview.cpp | 58 | ||||
-rw-r--r-- | kpdf/ui/pageview.h | 4 | ||||
-rw-r--r-- | kpdf/ui/presentationwidget.cpp | 6 | ||||
-rw-r--r-- | kpdf/ui/presentationwidget.h | 12 | ||||
-rw-r--r-- | kpdf/ui/propertiesdialog.cpp | 2 | ||||
-rw-r--r-- | kpdf/ui/searchwidget.cpp | 4 | ||||
-rw-r--r-- | kpdf/ui/searchwidget.h | 6 | ||||
-rw-r--r-- | kpdf/ui/thumbnaillist.cpp | 2 | ||||
-rw-r--r-- | kpdf/ui/thumbnaillist.h | 4 | ||||
-rw-r--r-- | kpdf/ui/toc.cpp | 14 | ||||
-rw-r--r-- | kpdf/ui/toc.h | 4 |
23 files changed, 112 insertions, 112 deletions
diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index c3c24a3d..8b1a2184 100644 --- a/kpdf/core/document.cpp +++ b/kpdf/core/document.cpp @@ -430,7 +430,7 @@ bool KPDFDocument::hasFonts() const return generator ? generator->hasFonts() : false; } -void KPDFDocument::putFontInfo(KListView *list) +void KPDFDocument::putFontInfo(TDEListView *list) { if (generator) generator->putFontInfo(list); } diff --git a/kpdf/core/document.h b/kpdf/core/document.h index d4d44f9a..a0529261 100644 --- a/kpdf/core/document.h +++ b/kpdf/core/document.h @@ -26,7 +26,7 @@ class DocumentInfo; class DocumentSynopsis; class Generator; class PixmapRequest; -class KListView; +class TDEListView; class KPrinter; class KURL; @@ -85,7 +85,7 @@ class KPDFDocument : public TQObject TQString getMetaData( const TQString & key, const TQString & option = TQString() ) const; bool supportsSearching() const; bool hasFonts() const; - void putFontInfo(KListView *list); + void putFontInfo(TDEListView *list); // perform actions on document / pages void setViewportPage( int page, int excludeId = -1, bool smoothMove = false ); diff --git a/kpdf/core/generator.h b/kpdf/core/generator.h index a3c1f985..5ed6aa73 100644 --- a/kpdf/core/generator.h +++ b/kpdf/core/generator.h @@ -14,7 +14,7 @@ #include <tqvaluevector.h> #include <tqstring.h> #include "core/document.h" -class KListView; +class TDEListView; class KPrinter; class KPDFPage; class KPDFLink; @@ -64,7 +64,7 @@ class Generator : public TQObject virtual bool hasFonts() const = 0; // font related - virtual void putFontInfo(KListView *list) = 0; + virtual void putFontInfo(TDEListView *list) = 0; // print document using already configured kprinter virtual bool print( KPrinter& /*printer*/ ) { return false; } diff --git a/kpdf/core/generator_kimgio/generator_kimgio.cpp b/kpdf/core/generator_kimgio/generator_kimgio.cpp index 82491ddc..2cba5559 100644 --- a/kpdf/core/generator_kimgio/generator_kimgio.cpp +++ b/kpdf/core/generator_kimgio/generator_kimgio.cpp @@ -60,7 +60,7 @@ bool KIMGIOGenerator::hasFonts() const return false; } -void KIMGIOGenerator::putFontInfo( KListView * ) +void KIMGIOGenerator::putFontInfo( TDEListView * ) { } diff --git a/kpdf/core/generator_kimgio/generator_kimgio.h b/kpdf/core/generator_kimgio/generator_kimgio.h index 2e4606a7..150d3581 100644 --- a/kpdf/core/generator_kimgio/generator_kimgio.h +++ b/kpdf/core/generator_kimgio/generator_kimgio.h @@ -31,7 +31,7 @@ class KIMGIOGenerator : public Generator bool hasFonts() const; // font related - void putFontInfo(KListView *list); + void putFontInfo(TDEListView *list); // [INHERITED] print document using already configured kprinter bool print( KPrinter& printer ); diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 1f03d9c0..20bb8516 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/kpdf/core/generator_pdf/generator_pdf.cpp @@ -360,7 +360,7 @@ bool PDFGenerator::hasFonts() const return true; } -void PDFGenerator::putFontInfo(KListView *list) +void PDFGenerator::putFontInfo(TDEListView *list) { Page *page; Dict *resDict; @@ -634,7 +634,7 @@ bool PDFGenerator::reparseConfig() } //END Generator inherited functions -void PDFGenerator::scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector<Ref> *visitedXObjects) +void PDFGenerator::scanFonts(Dict *resDict, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector<Ref> *visitedXObjects) { Object obj1, obj2, xObjDict, xObj, xObj2, resObj; Ref r; @@ -709,7 +709,7 @@ void PDFGenerator::scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &f xObjDict.free(); } -void PDFGenerator::scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize) +void PDFGenerator::scanFont(GfxFont *font, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize) { Ref fontRef, embRef; Object fontObj, toUnicodeObj; @@ -772,7 +772,7 @@ void PDFGenerator::scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fo sPath = i18n("-"); } sEmb = emb ? i18n("Yes") : i18n("No"); - new KListViewItem(list, sName, fontTypeNames[font->getType()], sEmb, sPath); + new TDEListViewItem(list, sName, fontTypeNames[font->getType()], sEmb, sPath); // add this font to the list if (fontsLen == fontsSize) diff --git a/kpdf/core/generator_pdf/generator_pdf.h b/kpdf/core/generator_pdf/generator_pdf.h index 0aba8224..025deb0c 100644 --- a/kpdf/core/generator_pdf/generator_pdf.h +++ b/kpdf/core/generator_pdf/generator_pdf.h @@ -71,7 +71,7 @@ class PDFGenerator : public Generator bool hasFonts() const; // [INHERITED] font related - void putFontInfo(KListView *list); + void putFontInfo(TDEListView *list); // [INHERITED] print page using an already configured kprinter bool print( KPrinter& printer ); @@ -86,8 +86,8 @@ class PDFGenerator : public Generator // friend class to access private document related variables friend class PDFPixmapGeneratorThread; - void scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector<Ref> *visitedXObjects); - void scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize); + void scanFonts(Dict *resDict, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector<Ref> *visitedXObjects); + void scanFont(GfxFont *font, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize); void fillViewportFromLink( DocumentViewport &viewport, LinkDest *destination ); diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 458a0e2f..d0d6ba8e 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -157,7 +157,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) ); // widgets: ^searchbar (toolbar containing label and SearchWidget) -// m_searchToolBar = new KToolBar( parentWidget, "searchBar" ); +// m_searchToolBar = new TDEToolBar( parentWidget, "searchBar" ); // m_searchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() ); // TQLabel * sLabel = new TQLabel( i18n( "&Search:" ), m_searchToolBar, "kde toolbar widget" ); // m_searchWidget = new SearchWidget( m_searchToolBar, m_document ); @@ -169,7 +169,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, m_splitter->setOpaqueResize( true ); setWidget( m_splitter ); - m_showLeftPanel = new KToggleAction( i18n( "Show &Navigation Panel"), "show_side_panel", 0, this, TQT_SLOT( slotShowLeftPanel() ), actionCollection(), "show_leftpanel" ); + m_showLeftPanel = new TDEToggleAction( i18n( "Show &Navigation Panel"), "show_side_panel", 0, this, TQT_SLOT( slotShowLeftPanel() ), actionCollection(), "show_leftpanel" ); m_showLeftPanel->setCheckedState( i18n( "Hide &Navigation Panel") ); m_showLeftPanel->setShortcut( "CTRL+L" ); m_showLeftPanel->setChecked( KpdfSettings::showLeftPanel() ); @@ -245,7 +245,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, m_document->addObserver( m_miniBar ); // ACTIONS - KActionCollection * ac = actionCollection(); + TDEActionCollection * ac = actionCollection(); // Page Traversal actions m_gotoPage = KStdAction::gotoPage( this, TQT_SLOT( slotGoToPage() ), ac, "goto_page" ); @@ -286,15 +286,15 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, m_saveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveFileAs() ), ac, "save" ); m_saveAs->setEnabled( false ); - KAction * prefs = KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), ac, "preferences" ); + TDEAction * prefs = KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), ac, "preferences" ); prefs->setText( i18n( "Configure KPDF..." ) ); m_printPreview = KStdAction::printPreview( this, TQT_SLOT( slotPrintPreview() ), ac ); m_printPreview->setEnabled( false ); - m_showProperties = new KAction(i18n("&Properties"), "info", 0, this, TQT_SLOT(slotShowProperties()), ac, "properties"); + m_showProperties = new TDEAction(i18n("&Properties"), "info", 0, this, TQT_SLOT(slotShowProperties()), ac, "properties"); m_showProperties->setEnabled( false ); - m_showPresentation = new KAction( i18n("P&resentation"), "kpresenter_kpr", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation"); + m_showPresentation = new TDEAction( i18n("P&resentation"), "kpresenter_kpr", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation"); m_showPresentation->setEnabled( false ); // attach the actions of the children widgets too @@ -910,9 +910,9 @@ void Part::slotShowMenu(const KPDFPage *page, const TQPoint &point) { // the quest for options_show_menubar KXMLGUIClient *client; - KActionCollection *ac; - KActionPtrList::const_iterator it, end, begin; - KActionPtrList actions; + TDEActionCollection *ac; + TDEActionPtrList::const_iterator it, end, begin; + TDEActionPtrList actions; if (factory()) { @@ -927,8 +927,8 @@ void Part::slotShowMenu(const KPDFPage *page, const TQPoint &point) begin = actions.begin(); for ( it = begin; it != end; ++it ) { - if (TQString((*it)->name()) == "options_show_menubar") m_showMenuBarAction = (KToggleAction*)(*it); - if (TQString((*it)->name()) == "fullscreen") m_showFullScreenAction = (KToggleAction*)(*it); + if (TQString((*it)->name()) == "options_show_menubar") m_showMenuBarAction = (TDEToggleAction*)(*it); + if (TQString((*it)->name()) == "fullscreen") m_showFullScreenAction = (TDEToggleAction*)(*it); } } } @@ -936,7 +936,7 @@ void Part::slotShowMenu(const KPDFPage *page, const TQPoint &point) } - KPopupMenu *popup = new KPopupMenu( widget(), "rmb popup" ); + TDEPopupMenu *popup = new TDEPopupMenu( widget(), "rmb popup" ); if (page) { popup->insertTitle( i18n( "Page %1" ).arg( page->number() + 1 ) ); diff --git a/kpdf/part.h b/kpdf/part.h index 426c89f4..50be072f 100644 --- a/kpdf/part.h +++ b/kpdf/part.h @@ -28,11 +28,11 @@ class TQSplitter; class TQToolBox; class KURL; -class KAction; +class TDEAction; class TDEConfig; class KDirWatch; -class KToggleAction; -class KSelectAction; +class TDEToggleAction; +class TDESelectAction; class TDEAboutData; class KPrinter; @@ -172,22 +172,22 @@ private: TQString m_jobMime; // actions - KAction *m_gotoPage; - KAction *m_prevPage; - KAction *m_nextPage; - KAction *m_firstPage; - KAction *m_lastPage; - KAction *m_historyBack; - KAction *m_historyNext; - KAction *m_find; - KAction *m_findNext; - KAction *m_saveAs; - KAction *m_printPreview; - KAction *m_showProperties; - KAction *m_showPresentation; - KToggleAction* m_showMenuBarAction; - KToggleAction* m_showLeftPanel; - KToggleAction* m_showFullScreenAction; + TDEAction *m_gotoPage; + TDEAction *m_prevPage; + TDEAction *m_nextPage; + TDEAction *m_firstPage; + TDEAction *m_lastPage; + TDEAction *m_historyBack; + TDEAction *m_historyNext; + TDEAction *m_find; + TDEAction *m_findNext; + TDEAction *m_saveAs; + TDEAction *m_printPreview; + TDEAction *m_showProperties; + TDEAction *m_showPresentation; + TDEToggleAction* m_showMenuBarAction; + TDEToggleAction* m_showLeftPanel; + TDEToggleAction* m_showFullScreenAction; bool m_actionsSearched; bool m_searchStarted; BrowserExtension *m_bExtension; diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index 8b101fa9..14baa149 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -76,7 +76,7 @@ void Shell::init() // and integrate the part's GUI with the shell's setupGUI(Keys | Save); createGUI(m_part); - m_showToolBarAction = static_cast<KToggleAction*>(toolBarMenuAction()); + m_showToolBarAction = static_cast<TDEToggleAction*>(toolBarMenuAction()); } } else @@ -94,7 +94,7 @@ void Shell::init() readSettings(); if (!TDEGlobal::config()->hasGroup("MainWindow")) { - KMainWindowInterface kmwi(this); + TDEMainWindowInterface kmwi(this); kmwi.maximize(); } setAutoSaveSettings(); @@ -146,7 +146,7 @@ void Shell::writeSettings() void Shell::setupActions() { - KAction * openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + TDEAction * openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); m_recent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( openURL( const KURL& ) ), actionCollection() ); connect( m_recent, TQT_SIGNAL( activated() ), openAction, TQT_SLOT( activate() ) ); m_recent->setWhatsThis( i18n( "<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file" ) ); diff --git a/kpdf/shell/shell.h b/kpdf/shell/shell.h index 6fc2a21e..560be8fd 100644 --- a/kpdf/shell/shell.h +++ b/kpdf/shell/shell.h @@ -97,11 +97,11 @@ namespace KPDF private: KParts::ReadOnlyPart* m_part; - KRecentFilesAction* m_recent; - KAction* m_printAction; - KToggleAction* m_fullScreenAction; - KToggleAction* m_showMenuBarAction; - KToggleAction* m_showToolBarAction; + TDERecentFilesAction* m_recent; + TDEAction* m_printAction; + TDEToggleAction* m_fullScreenAction; + TDEToggleAction* m_showMenuBarAction; + TDEToggleAction* m_showToolBarAction; bool m_menuBarWasShown, m_toolBarWasShown; KURL m_openUrl; }; diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp index eec74581..262b74c7 100644 --- a/kpdf/ui/minibar.cpp +++ b/kpdf/ui/minibar.cpp @@ -403,7 +403,7 @@ HoverButton::HoverButton( TQWidget * parent ) { setMouseTracking( true ); #if KDE_IS_VERSION(3,3,90) - KAcceleratorManager::setNoAccel( this ); + TDEAcceleratorManager::setNoAccel( this ); #endif } diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index a76d03ea..a0ce66e7 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -105,16 +105,16 @@ public: TQTimer dragScrollTimer; // actions - KToggleAction * aMouseNormal; - KToggleAction * aMouseSelect; - KToggleAction * aMouseEdit; - KSelectAction * aZoom; - KToggleAction * aZoomFitWidth; - KToggleAction * aZoomFitPage; - KToggleAction * aZoomFitText; - KToggleAction * aViewTwoPages; - KToggleAction * aViewContinuous; - KAction * aPrevAction; + TDEToggleAction * aMouseNormal; + TDEToggleAction * aMouseSelect; + TDEToggleAction * aMouseEdit; + TDESelectAction * aZoom; + TDEToggleAction * aZoomFitWidth; + TDEToggleAction * aZoomFitPage; + TDEToggleAction * aZoomFitText; + TDEToggleAction * aViewTwoPages; + TDEToggleAction * aViewContinuous; + TDEAction * aPrevAction; }; @@ -242,10 +242,10 @@ PageView::~PageView() delete d; } -void PageView::setupActions( KActionCollection * ac ) +void PageView::setupActions( TDEActionCollection * ac ) { // Zoom actions ( higher scales takes lots of memory! ) - d->aZoom = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotZoom() ), ac, "zoom_to" ); + d->aZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotZoom() ), ac, "zoom_to" ); d->aZoom->setEditable( true ); #if KDE_IS_VERSION(3,4,89) d->aZoom->setMaxComboViewCount( 13 ); @@ -256,52 +256,52 @@ void PageView::setupActions( KActionCollection * ac ) KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), ac, "zoom_out" ); - d->aZoomFitWidth = new KToggleAction( i18n("Fit to Page &Width"), "view_fit_width", 0, ac, "zoom_fit_width" ); + d->aZoomFitWidth = new TDEToggleAction( i18n("Fit to Page &Width"), "view_fit_width", 0, ac, "zoom_fit_width" ); connect( d->aZoomFitWidth, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToWidthToggled( bool ) ) ); - d->aZoomFitPage = new KToggleAction( i18n("Fit to &Page"), "view_fit_window", 0, ac, "zoom_fit_page" ); + d->aZoomFitPage = new TDEToggleAction( i18n("Fit to &Page"), "view_fit_window", 0, ac, "zoom_fit_page" ); connect( d->aZoomFitPage, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToPageToggled( bool ) ) ); - d->aZoomFitText = new KToggleAction( i18n("Fit to &Text"), "viewmagfit", 0, ac, "zoom_fit_text" ); + d->aZoomFitText = new TDEToggleAction( i18n("Fit to &Text"), "viewmagfit", 0, ac, "zoom_fit_text" ); connect( d->aZoomFitText, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToTextToggled( bool ) ) ); // rotate actions - KAction *action; - action = new KAction( i18n("Rotate Right"), "rotate_cw", KShortcut( "Ctrl+Shift++" ), + TDEAction *action; + action = new TDEAction( i18n("Rotate Right"), "rotate_cw", TDEShortcut( "Ctrl+Shift++" ), TQT_TQOBJECT(this), TQT_SLOT( slotRotateRight() ), ac, "rotate_right" ); - action = new KAction( i18n("Rotate Left"), "rotate_ccw", KShortcut( "Ctrl+Shift+-" ), + action = new TDEAction( i18n("Rotate Left"), "rotate_ccw", TDEShortcut( "Ctrl+Shift+-" ), TQT_TQOBJECT(this), TQT_SLOT( slotRotateLeft() ), ac, "rotate_left" ); // View-Layout actions - d->aViewTwoPages = new KToggleAction( i18n("&Two Pages"), "view_left_right", 0, ac, "view_twopages" ); + d->aViewTwoPages = new TDEToggleAction( i18n("&Two Pages"), "view_left_right", 0, ac, "view_twopages" ); connect( d->aViewTwoPages, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotTwoPagesToggled( bool ) ) ); d->aViewTwoPages->setChecked( KpdfSettings::viewColumns() > 1 ); - d->aViewContinuous = new KToggleAction( i18n("&Continuous"), "view_text", 0, ac, "view_continuous" ); + d->aViewContinuous = new TDEToggleAction( i18n("&Continuous"), "view_text", 0, ac, "view_continuous" ); connect( d->aViewContinuous, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotContinuousToggled( bool ) ) ); d->aViewContinuous->setChecked( KpdfSettings::viewContinuous() ); // Mouse-Mode actions - d->aMouseNormal = new KRadioAction( i18n("&Browse Tool"), "mouse", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" ); + d->aMouseNormal = new TDERadioAction( i18n("&Browse Tool"), "mouse", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" ); d->aMouseNormal->setExclusiveGroup( "MouseType" ); d->aMouseNormal->setChecked( true ); - KToggleAction * mz = new KRadioAction( i18n("&Zoom Tool"), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" ); + TDEToggleAction * mz = new TDERadioAction( i18n("&Zoom Tool"), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" ); mz->setExclusiveGroup( "MouseType" ); - d->aMouseSelect = new KRadioAction( i18n("&Select Tool"), "frame_edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseSelect() ), ac, "mouse_select" ); + d->aMouseSelect = new TDERadioAction( i18n("&Select Tool"), "frame_edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseSelect() ), ac, "mouse_select" ); d->aMouseSelect->setExclusiveGroup( "MouseType" ); -/* d->aMouseEdit = new KRadioAction( i18n("Draw"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" ); +/* d->aMouseEdit = new TDERadioAction( i18n("Draw"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" ); d->aMouseEdit->setExclusiveGroup("MouseType"); d->aMouseEdit->setEnabled( false ); // implement feature before removing this line*/ // Other actions - KAction * su = new KAction( i18n("Scroll Up"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollUp() ), ac, "view_scroll_up" ); + TDEAction * su = new TDEAction( i18n("Scroll Up"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollUp() ), ac, "view_scroll_up" ); su->setShortcut( "Shift+Up" ); - KAction * sd = new KAction( i18n("Scroll Down"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollDown() ), ac, "view_scroll_down" ); + TDEAction * sd = new TDEAction( i18n("Scroll Down"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollDown() ), ac, "view_scroll_down" ); sd->setShortcut( "Shift+Down" ); } @@ -673,7 +673,7 @@ void PageView::keyPressEvent( TQKeyEvent * e ) } } // F3: go to next occurrency - else if( e->key() == KStdAccel::findNext() ) + else if( e->key() == TDEStdAccel::findNext() ) { // part doesn't get this key event because of the keyboard grab d->findTimeoutTimer->stop(); // restore normal operation during possible messagebox is displayed @@ -1121,7 +1121,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e ) } // popup that ask to copy:text and copy/save:image - KPopupMenu menu( this ); + TDEPopupMenu menu( this ); if ( !selectedText.isEmpty() ) { menu.insertTitle( i18n( "Text (1 character)", "Text (%n characters)", selectedText.length() ) ); @@ -1508,7 +1508,7 @@ void PageView::updateZoom( ZoomMode newZoomMode ) } float newFactor = d->zoomFactor; - KAction * checkedZoomAction = 0; + TDEAction * checkedZoomAction = 0; switch ( newZoomMode ) { case ZoomFixed:{ //ZoomFixed case diff --git a/kpdf/ui/pageview.h b/kpdf/ui/pageview.h index 76c9607c..901ec9e6 100644 --- a/kpdf/ui/pageview.h +++ b/kpdf/ui/pageview.h @@ -24,7 +24,7 @@ #include "core/observer.h" class KURL; -class KActionCollection; +class TDEActionCollection; class KPDFDocument; class PageViewItem; @@ -53,7 +53,7 @@ class PageView : public TQScrollView, public DocumentObserver enum MouseMode { MouseNormal, MouseZoom, MouseSelect, MouseEdit }; // create actions that interact with this widget - void setupActions( KActionCollection * collection ); + void setupActions( TDEActionCollection * collection ); // used from RMB menu bool canFitPageWidth(); diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index 6639dbc5..94cfdc08 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -61,7 +61,7 @@ PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc ) m_width = -1; - m_accel = new KAccel( this, TQT_TQOBJECT(this), "presentationmode-accel" ); + m_accel = new TDEAccel( this, TQT_TQOBJECT(this), "presentationmode-accel" ); // show widget and take control showFullScreen(); @@ -98,7 +98,7 @@ PresentationWidget::~PresentationWidget() delete *fIt; } -void PresentationWidget::setupActions( KActionCollection * ac ) +void PresentationWidget::setupActions( TDEActionCollection * ac ) { m_accel->insert( "previous_page", ac->action( "previous_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ), false, true ); m_accel->insert( "next_page", ac->action( "next_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotNextPage() ), false, true ); @@ -304,7 +304,7 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe ) m_height = d.height(); // create top toolbar - m_topBar = new KToolBar( this, "presentationBar" ); + m_topBar = new TDEToolBar( this, "presentationBar" ); m_topBar->setIconSize( 32 ); m_topBar->setMovingEnabled( false ); m_topBar->insertButton( TQApplication::reverseLayout() ? "1rightarrow" : "1leftarrow", 2, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ) ); diff --git a/kpdf/ui/presentationwidget.h b/kpdf/ui/presentationwidget.h index 413f4258..177b3da0 100644 --- a/kpdf/ui/presentationwidget.h +++ b/kpdf/ui/presentationwidget.h @@ -17,9 +17,9 @@ #include "core/observer.h" #include "core/pagetransition.h" -class KAccel; -class KActionCollection; -class KToolBar; +class TDEAccel; +class TDEActionCollection; +class TDEToolBar; class TQTimer; class KPDFDocument; @@ -40,7 +40,7 @@ class PresentationWidget : public TQDialog, public DocumentObserver PresentationWidget( TQWidget * parent, KPDFDocument * doc ); ~PresentationWidget(); - void setupActions( KActionCollection * ac ); + void setupActions( TDEActionCollection * ac ); // inherited from DocumentObserver uint observerId() const { return PRESENTATION_ID; } @@ -94,8 +94,8 @@ class PresentationWidget : public TQDialog, public DocumentObserver TQValueVector< PresentationFrame * > m_frames; int m_frameIndex; TQStringList m_metaStrings; - KToolBar * m_topBar; - KAccel * m_accel; + TDEToolBar * m_topBar; + TDEAccel * m_accel; private slots: void slotNextPage(); diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp index e00d8cfe..feff5eae 100644 --- a/kpdf/ui/propertiesdialog.cpp +++ b/kpdf/ui/propertiesdialog.cpp @@ -76,7 +76,7 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc) { TQFrame *page2 = addPage(i18n("Fonts")); page2Layout = new TQVBoxLayout(page2, 0, KDialog::spacingHint()); - KListView *lv = new KListView(page2); + TDEListView *lv = new TDEListView(page2); page2Layout->add(lv); doc->putFontInfo(lv); } diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp index f21d8b73..19f77753 100644 --- a/kpdf/ui/searchwidget.cpp +++ b/kpdf/ui/searchwidget.cpp @@ -29,7 +29,7 @@ #define FIND_ID 3 SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document ) - : KToolBar( parent, "iSearchBar" ), m_document( document ), + : TDEToolBar( parent, "iSearchBar" ), m_document( document ), m_searchType( 0 ), m_caseSensitive( false ) { // change toolbar appearance @@ -55,7 +55,7 @@ SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document ) i18n( "Clear filter" ), 0/*index*/ ); // 3.1. create the popup menu for changing filtering features - m_menu = new KPopupMenu( this ); + m_menu = new TDEPopupMenu( this ); m_menu->insertItem( i18n("Case Sensitive"), 1 ); m_menu->insertSeparator( 2 ); m_menu->insertItem( i18n("Match Phrase"), 3 ); diff --git a/kpdf/ui/searchwidget.h b/kpdf/ui/searchwidget.h index b0be5dc9..a6a9efb4 100644 --- a/kpdf/ui/searchwidget.h +++ b/kpdf/ui/searchwidget.h @@ -12,7 +12,7 @@ #include <ktoolbar.h> -class KPopupMenu; +class TDEPopupMenu; class KPDFDocument; class m_inputDelayTimer; @@ -27,7 +27,7 @@ class m_inputDelayTimer; * It supports case sensitive/unsensitive(default) and provieds a button * for switching between the 2 modes. */ -class SearchWidget : public KToolBar +class SearchWidget : public TDEToolBar { Q_OBJECT @@ -37,7 +37,7 @@ class SearchWidget : public KToolBar private: KPDFDocument * m_document; - KPopupMenu * m_menu; + TDEPopupMenu * m_menu; TQTimer * m_inputDelayTimer; int m_searchType; bool m_caseSensitive; diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp index 6c5e2b5f..14d9d2f5 100644 --- a/kpdf/ui/thumbnaillist.cpp +++ b/kpdf/ui/thumbnaillist.cpp @@ -553,7 +553,7 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e ) #define FILTERB_ID 1 ThumbnailController::ThumbnailController( TQWidget * parent, ThumbnailList * list ) - : KToolBar( parent, "ThumbsControlBar" ) + : TDEToolBar( parent, "ThumbsControlBar" ) { // change toolbar appearance setMargin( 3 ); diff --git a/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h index 5365dff0..5b1e5f94 100644 --- a/kpdf/ui/thumbnaillist.h +++ b/kpdf/ui/thumbnaillist.h @@ -17,7 +17,7 @@ #include "core/observer.h" class TQTimer; -class KActionCollection; +class TDEActionCollection; class KPDFDocument; class ThumbnailWidget; @@ -113,7 +113,7 @@ class ThumbnailsBox : public TQVBox * emits signals whenever a button is pressed. A click action results * in invoking some method (or slot) in ThumbnailList. */ -class ThumbnailController : public KToolBar +class ThumbnailController : public TDEToolBar { public: ThumbnailController( TQWidget * parent, ThumbnailList * thumbnailList ); diff --git a/kpdf/ui/toc.cpp b/kpdf/ui/toc.cpp index 015ba313..8e2f9531 100644 --- a/kpdf/ui/toc.cpp +++ b/kpdf/ui/toc.cpp @@ -22,11 +22,11 @@ // they're slow when converted to page number. drop the 2nd column idea. //#define TOC_ENABLE_PAGE_COLUMN -class TOCItem : public KListViewItem +class TOCItem : public TDEListViewItem { public: - TOCItem( KListView *parent, TOCItem *after, const TQDomElement & e ) - : KListViewItem( parent, after, e.tagName() ), m_element( e ) + TOCItem( TDEListView *parent, TOCItem *after, const TQDomElement & e ) + : TDEListViewItem( parent, after, e.tagName() ), m_element( e ) { #ifdef TOC_ENABLE_PAGE_COLUMN if ( e.hasAttribute( "Page" ) ) @@ -35,8 +35,8 @@ class TOCItem : public KListViewItem setMultiLinesEnabled(true); } - TOCItem( KListViewItem *parent, TOCItem *after, const TQDomElement & e ) - : KListViewItem( parent, after, e.tagName() ), m_element( e ) + TOCItem( TDEListViewItem *parent, TOCItem *after, const TQDomElement & e ) + : TDEListViewItem( parent, after, e.tagName() ), m_element( e ) { #ifdef TOC_ENABLE_PAGE_COLUMN if ( e.hasAttribute( "Page" ) ) @@ -54,7 +54,7 @@ class TOCItem : public KListViewItem TQDomElement m_element; }; -TOC::TOC(TQWidget *parent, KPDFDocument *document) : KListView(parent), m_document(document) +TOC::TOC(TQWidget *parent, KPDFDocument *document) : TDEListView(parent), m_document(document) { addColumn( i18n("Topic") ); #ifdef TOC_ENABLE_PAGE_COLUMN @@ -104,7 +104,7 @@ void TOC::notifySetup( const TQValueVector< KPDFPage * > & /*pages*/, bool docum emit hasTOC( true ); } -void TOC::addChildren( const TQDomNode & parentNode, KListViewItem * parentItem ) +void TOC::addChildren( const TQDomNode & parentNode, TDEListViewItem * parentItem ) { // keep track of the current listViewItem TOCItem * currentItem = 0; diff --git a/kpdf/ui/toc.h b/kpdf/ui/toc.h index 6159bfd9..eef7dbb4 100644 --- a/kpdf/ui/toc.h +++ b/kpdf/ui/toc.h @@ -17,7 +17,7 @@ class KPDFDocument; -class TOC : public KListView, public DocumentObserver +class TOC : public TDEListView, public DocumentObserver { Q_OBJECT @@ -36,7 +36,7 @@ Q_OBJECT void slotExecuted(TQListViewItem *i); private: - void addChildren( const TQDomNode & parentNode, KListViewItem * parentItem = 0 ); + void addChildren( const TQDomNode & parentNode, TDEListViewItem * parentItem = 0 ); DocumentViewport getViewport( const TQDomElement &e ) const; KPDFDocument *m_document; }; |