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 --- khelpcenter/DESIGN | 10 +++++----- khelpcenter/fontdialog.cpp | 12 ++++++------ khelpcenter/fontdialog.h | 14 +++++++------- khelpcenter/glossary.cpp | 22 +++++++++++----------- khelpcenter/glossary.h | 2 +- khelpcenter/history.cpp | 12 ++++++------ khelpcenter/history.h | 14 +++++++------- khelpcenter/htmlsearch/kcmhtmlsearch.cpp | 2 +- khelpcenter/htmlsearch/kcmhtmlsearch.h | 4 ++-- khelpcenter/kcmhelpcenter.cpp | 2 +- khelpcenter/kcmhelpcenter.h | 4 ++-- khelpcenter/mainwindow.cpp | 20 ++++++++++---------- khelpcenter/mainwindow.h | 6 +++--- khelpcenter/navigator.cpp | 2 +- khelpcenter/navigator.h | 4 ++-- khelpcenter/view.cpp | 6 +++--- khelpcenter/view.h | 6 +++--- 17 files changed, 71 insertions(+), 71 deletions(-) (limited to 'khelpcenter') diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN index fd8bbb289..c5c961ae8 100644 --- a/khelpcenter/DESIGN +++ b/khelpcenter/DESIGN @@ -129,7 +129,7 @@ KHC::ContentsTab object and a KHC::SearchTab object. # This effectively enables people new to KDE in less time to become productive # (a task-oriented list isn't so useful for peoplew ho are familiar with KDE's # applications, of course). -# Implementation-wise, we should perhaps stop using a KListView and use a +# Implementation-wise, we should perhaps stop using a TDEListView and use a # KOffice-style component selection widget like koshell has at the left? The first five items are generated by KHC::Navigator itself and are direct @@ -138,14 +138,14 @@ items is (with one exception) delegated to four helper classes, which inherit a 'KHC::TreeBuilder' class which has the following interface: class KHC::TreeBuilder - virtual void build( KListViewItem *parent ) = 0; + virtual void build( TDEListViewItem *parent ) = 0; ## What about the trees generated as children of the contents list view? # Oops, that's a typo, what you mean is what I originally intented: a -# TreeBuilder should take a 'KListView' as it's parent, subclasses can then +# TreeBuilder should take a 'TDEListView' as it's parent, subclasses can then # overload that method (such as the KHC::TOCBuilder which will want to provide -# a build( KListViewItem *parent ) method). +# a build( TDEListViewItem *parent ) method). # This concept of using a TreeBuilder baseclass might make it possible to turn # all the classes which use that interface into plugins. That way we could @@ -387,7 +387,7 @@ protocol == "help") by itself and otherwise use the plain URL. # QObject::children() and iterate over all children, use QToolTip::textFor() to # check whether the given qwidget has a tooltip and if so, use QToolTip::tip() # to show the tooltip. -# One could probably add a standard dcop call to KMainWindow, like +# One could probably add a standard dcop call to TDEMainWindow, like # "showAllToolTips". KSnapShot could get a QCheckBox "Show all tooltips", and # if that box is checked it tells the selected window to show all it's # tooltips via that DCOP call right before it does the snapshot. The thing is diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp index ebaead73f..9bea68004 100644 --- a/khelpcenter/fontdialog.cpp +++ b/khelpcenter/fontdialog.cpp @@ -87,37 +87,37 @@ void FontDialog::setupFontTypesBox() TQLabel *lStandardFont = new TQLabel( i18n( "S&tandard font:" ), gb ); layout->addWidget( lStandardFont, 0, 0 ); - m_standardFontCombo = new KFontCombo( gb ); + m_standardFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_standardFontCombo, 0, 1 ); lStandardFont->setBuddy( m_standardFontCombo ); TQLabel *lFixedFont = new TQLabel( i18n( "F&ixed font:" ), gb ); layout->addWidget( lFixedFont, 1, 0 ); - m_fixedFontCombo = new KFontCombo( gb ); + m_fixedFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_fixedFontCombo, 1, 1 ); lFixedFont->setBuddy( m_fixedFontCombo ); TQLabel *lSerifFont = new TQLabel( i18n( "S&erif font:" ), gb ); layout->addWidget( lSerifFont, 2, 0 ); - m_serifFontCombo = new KFontCombo( gb ); + m_serifFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_serifFontCombo, 2, 1 ); lSerifFont->setBuddy( m_serifFontCombo ); TQLabel *lSansSerifFont = new TQLabel( i18n( "S&ans serif font:" ), gb ); layout->addWidget( lSansSerifFont, 3, 0 ); - m_sansSerifFontCombo = new KFontCombo( gb ); + m_sansSerifFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_sansSerifFontCombo, 3, 1 ); lSansSerifFont->setBuddy( m_sansSerifFontCombo ); TQLabel *lItalicFont = new TQLabel( i18n( "&Italic font:" ), gb ); layout->addWidget( lItalicFont, 4, 0 ); - m_italicFontCombo = new KFontCombo( gb ); + m_italicFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_italicFontCombo, 4, 1 ); lItalicFont->setBuddy( m_italicFontCombo ); TQLabel *lFantasyFont = new TQLabel( i18n( "&Fantasy font:" ), gb ); layout->addWidget( lFantasyFont, 5, 0 ); - m_fantasyFontCombo = new KFontCombo( gb ); + m_fantasyFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_fantasyFontCombo, 5, 1 ); lFantasyFont->setBuddy( m_fantasyFontCombo ); } diff --git a/khelpcenter/fontdialog.h b/khelpcenter/fontdialog.h index e0cc32a63..ef06f2b84 100644 --- a/khelpcenter/fontdialog.h +++ b/khelpcenter/fontdialog.h @@ -26,7 +26,7 @@ class TQBoxLayout; class TQSpinBox; class KComboBox; -class KFontCombo; +class TDEFontCombo; class KIntNumInput; namespace KHC { @@ -50,12 +50,12 @@ class FontDialog : public KDialogBase KIntNumInput *m_minFontSize; KIntNumInput *m_medFontSize; - KFontCombo *m_standardFontCombo; - KFontCombo *m_fixedFontCombo; - KFontCombo *m_serifFontCombo; - KFontCombo *m_sansSerifFontCombo; - KFontCombo *m_italicFontCombo; - KFontCombo *m_fantasyFontCombo; + TDEFontCombo *m_standardFontCombo; + TDEFontCombo *m_fixedFontCombo; + TDEFontCombo *m_serifFontCombo; + TDEFontCombo *m_sansSerifFontCombo; + TDEFontCombo *m_italicFontCombo; + TDEFontCombo *m_fantasyFontCombo; KComboBox *m_defaultEncoding; TQSpinBox *m_fontSizeAdjustement; }; diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index a2c0b0990..e1f6aaa73 100644 --- a/khelpcenter/glossary.cpp +++ b/khelpcenter/glossary.cpp @@ -36,29 +36,29 @@ using namespace KHC; -class SectionItem : public KListViewItem +class SectionItem : public TDEListViewItem { public: SectionItem( TQListViewItem *parent, const TQString &text ) - : KListViewItem( parent, text ) + : TDEListViewItem( parent, text ) { setOpen( false ); } virtual void setOpen( bool open ) { - KListViewItem::setOpen(open); + TDEListViewItem::setOpen(open); setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) ); } }; -class EntryItem : public KListViewItem +class EntryItem : public TDEListViewItem { public: EntryItem( SectionItem *parent, const TQString &term, const TQString &id ) - : KListViewItem( parent, term ), + : TDEListViewItem( parent, term ), m_id( id ) { } @@ -69,7 +69,7 @@ class EntryItem : public KListViewItem TQString m_id; }; -Glossary::Glossary( TQWidget *parent ) : KListView( parent ) +Glossary::Glossary( TQWidget *parent ) : TDEListView( parent ) { m_initialized = false; @@ -84,10 +84,10 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent ) setAllColumnsShowFocus( true ); setRootIsDecorated( true ); - m_byTopicItem = new KListViewItem( this, i18n( "By Topic" ) ); + m_byTopicItem = new TDEListViewItem( this, i18n( "By Topic" ) ); m_byTopicItem->setPixmap( 0, SmallIcon( "help" ) ); - m_alphabItem = new KListViewItem( this, i18n( "Alphabetically" ) ); + m_alphabItem = new TDEListViewItem( this, i18n( "Alphabetically" ) ); m_alphabItem->setPixmap( 0, SmallIcon( "charset" ) ); m_cacheFile = locateLocal( "cache", "help/glossary.xml" ); @@ -108,7 +108,7 @@ void Glossary::show() buildGlossaryTree(); m_initialized = true; } - KListView::show(); + TDEListView::show(); } Glossary::~Glossary() @@ -142,7 +142,7 @@ int Glossary::glossaryCTime() const void Glossary::rebuildGlossaryCache() { - KMainWindow *mainWindow = dynamic_cast( kapp->mainWidget() ); + TDEMainWindow *mainWindow = dynamic_cast( kapp->mainWidget() ); Q_ASSERT( mainWindow ); mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) ); @@ -172,7 +172,7 @@ void Glossary::meinprocExited( TDEProcess *meinproc ) m_status = CacheOk; - KMainWindow *mainWindow = dynamic_cast( kapp->mainWidget() ); + TDEMainWindow *mainWindow = dynamic_cast( kapp->mainWidget() ); Q_ASSERT( mainWindow ); mainWindow->statusBar()->message( i18n( "Rebuilding cache... done." ), 2000 ); diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h index cb79e25b4..e0d9fd901 100644 --- a/khelpcenter/glossary.h +++ b/khelpcenter/glossary.h @@ -97,7 +97,7 @@ inline TQDataStream &operator>>( TQDataStream &stream, GlossaryEntry &e ) return stream >> e.m_term >> e.m_definition >> e.m_seeAlso; } -class Glossary : public KListView +class Glossary : public TDEListView { Q_OBJECT public: diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index 123727ab9..1a5218da2 100644 --- a/khelpcenter/history.cpp +++ b/khelpcenter/history.cpp @@ -51,11 +51,11 @@ History::~History() { } -void History::setupActions( KActionCollection *coll ) +void History::setupActions( TDEActionCollection *coll ) { TQPair backForward = KStdGuiItem::backAndForward(); - m_backAction = new KToolBarPopupAction( backForward.first, ALT+Key_Left, + m_backAction = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left, this, TQT_SLOT( back() ), coll, "back" ); connect( m_backAction->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT( backActivated( int ) ) ); @@ -63,7 +63,7 @@ void History::setupActions( KActionCollection *coll ) TQT_SLOT( fillBackMenu() ) ); m_backAction->setEnabled( false ); - m_forwardAction = new KToolBarPopupAction( backForward.second, ALT+Key_Right, + m_forwardAction = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right, this, TQT_SLOT( forward() ), coll, "forward" ); connect( m_forwardAction->popupMenu(), TQT_SIGNAL( activated( int ) ), @@ -73,7 +73,7 @@ void History::setupActions( KActionCollection *coll ) m_forwardAction->setEnabled( false ); } -void History::installMenuBarHook( KMainWindow *mainWindow ) +void History::installMenuBarHook( TDEMainWindow *mainWindow ) { TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( "go_web", mainWindow ) ); @@ -256,7 +256,7 @@ void History::fillForwardMenu() void History::fillGoMenu() { - KMainWindow *mainWindow = static_cast( kapp->mainWidget() ); + TDEMainWindow *mainWindow = static_cast( kapp->mainWidget() ); TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); if ( !goMenu || m_goMenuIndex == -1 ) return; @@ -289,7 +289,7 @@ void History::fillGoMenu() void History::goMenuActivated( int id ) { - KMainWindow *mainWindow = static_cast( kapp->mainWidget() ); + TDEMainWindow *mainWindow = static_cast( kapp->mainWidget() ); TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); if ( !goMenu ) return; diff --git a/khelpcenter/history.h b/khelpcenter/history.h index aa3a405d4..c7c4c9532 100644 --- a/khelpcenter/history.h +++ b/khelpcenter/history.h @@ -25,9 +25,9 @@ #include #include -class KActionCollection; -class KMainWindow; -class KToolBarPopupAction; +class TDEActionCollection; +class TDEMainWindow; +class TDEToolBarPopupAction; class TQPopupMenu; namespace KHC { @@ -52,10 +52,10 @@ class History : public TQObject static History &self(); - void setupActions( KActionCollection *coll ); + void setupActions( TDEActionCollection *coll ); void updateActions(); - void installMenuBarHook( KMainWindow *mainWindow ); + void installMenuBarHook( TDEMainWindow *mainWindow ); void createEntry(); void updateCurrentEntry( KHC::View *view ); @@ -97,8 +97,8 @@ class History : public TQObject int m_goMenuHistoryStartPos; int m_goMenuHistoryCurrentPos; public: - KToolBarPopupAction *m_backAction; - KToolBarPopupAction *m_forwardAction; + TDEToolBarPopupAction *m_backAction; + TDEToolBarPopupAction *m_forwardAction; }; } diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index e0ef62dd4..245f3301d 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -135,7 +135,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) delButton = new TQPushButton(i18n("Delete"), gb); grid->addWidget(delButton, 2,0); - searchPaths = new KListBox(gb); + searchPaths = new TDEListBox(gb); grid->addMultiCellWidget(searchPaths, 1,3, 1,1); grid->setRowStretch(2,2); diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h index bc4e2fef3..28445437a 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.h +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h @@ -28,7 +28,7 @@ class TQLineEdit; class TQCheckBox; class TQPushButton; -class KListBox; +class TDEListBox; class TDEProcess; class KLanguageCombo; class KURLRequester; @@ -71,7 +71,7 @@ private: KURLRequester *htdigBin, *htsearchBin, *htmergeBin; TQCheckBox *indexKDE, *indexMan, *indexInfo; TQPushButton *addButton, *delButton, *runButton; - KListBox *searchPaths; + TDEListBox *searchPaths; KLanguageCombo *language; TDEProcess *indexProc; diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index 74f29c434..12646c330 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -273,7 +273,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent ) TQLabel *label = new TQLabel( helpText, parent ); topLayout->addWidget( label ); - mListView = new KListView( parent ); + mListView = new TDEListView( parent ); mListView->setFullWidth( true ); mListView->addColumn( i18n("Search Scope") ); mListView->addColumn( i18n("Status") ); diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h index 10f0c5311..0212a22c5 100644 --- a/khelpcenter/kcmhelpcenter.h +++ b/khelpcenter/kcmhelpcenter.h @@ -37,7 +37,7 @@ class TDEConfig; class TDEAboutData; class KTempFile; class KURLRequester; -class KListView; +class TDEListView; namespace KHC { class HtmlSearchConfig; @@ -154,7 +154,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface private: KHC::SearchEngine *mEngine; - KListView *mListView; + TDEListView *mListView; TQLabel *mIndexDirLabel; TQPushButton *mBuildButton; IndexProgressDialog *mProgressDialog; diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index 836307460..c5b4932b6 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -85,7 +85,7 @@ class LogDialog : public KDialogBase MainWindow::MainWindow() - : KMainWindow(0, "MainWindow"), DCOPObject( "KHelpCenterIface" ), + : TDEMainWindow(0, "MainWindow"), DCOPObject( "KHelpCenterIface" ), mLogDialog( 0 ) { mSplitter = new TQSplitter( this ); @@ -212,27 +212,27 @@ void MainWindow::setupActions() KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(), "printFrame" ); - KAction *prevPage = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ), + TDEAction *prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ), actionCollection(), "prevPage" ); prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) ); - KAction *nextPage = new KAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ), + TDEAction *nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ), actionCollection(), "nextPage" ); nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) ); - KAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() ); + TDEAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() ); home->setText(i18n("Table of &Contents")); home->setToolTip(i18n("Table of contents")); home->setWhatsThis(i18n("Go back to the table of contents")); mCopyText = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text"); - mLastSearchAction = new KAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this), + mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLastSearch() ), actionCollection(), "lastsearch" ); mLastSearchAction->setEnabled( false ); - new KAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator), + new TDEAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator), TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" ); KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); @@ -240,16 +240,16 @@ void MainWindow::setupActions() TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "Debug" ); if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) { - new KAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this), + new TDEAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this), TQT_SLOT( showSearchStderr() ), actionCollection(), "show_search_stderr" ); } History::self().setupActions( actionCollection() ); - new KAction( i18n( "Configure Fonts..." ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); - new KAction( i18n( "Increase Font Sizes" ), "viewmag+", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); - new KAction( i18n( "Decrease Font Sizes" ), "viewmag-", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); + new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); + new TDEAction( i18n( "Increase Font Sizes" ), "viewmag+", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); + new TDEAction( i18n( "Decrease Font Sizes" ), "viewmag-", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); } void MainWindow::slotCopySelectedText() diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h index e0472246a..698e0150f 100644 --- a/khelpcenter/mainwindow.h +++ b/khelpcenter/mainwindow.h @@ -22,7 +22,7 @@ namespace KHC { class View; -class MainWindow : public KMainWindow, public DCOPObject +class MainWindow : public TDEMainWindow, public DCOPObject { Q_OBJECT K_DCOP @@ -97,8 +97,8 @@ private: View *mDoc; Navigator *mNavigator; - KAction *mLastSearchAction; - KAction *mCopyText; + TDEAction *mLastSearchAction; + TDEAction *mCopyText; LogDialog *mLogDialog; }; diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 1c813972f..eb5e0c4f7 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -160,7 +160,7 @@ bool Navigator::showMissingDocs() const void Navigator::setupContentsTab() { - mContentsTree = new KListView( mTabWidget ); + mContentsTree = new TDEListView( mTabWidget ); mContentsTree->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); mContentsTree->addColumn(TQString::null); mContentsTree->setAllColumnsShowFocus(true); diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h index e6912d5ef..fef806e21 100644 --- a/khelpcenter/navigator.h +++ b/khelpcenter/navigator.h @@ -36,7 +36,7 @@ class TQPushButton; -class KListView; +class TDEListView; class KService; class TDEProcess; class KProcIO; @@ -118,7 +118,7 @@ class Navigator : public TQWidget void insertPlugins(); void hideSearch(); - KListView *mContentsTree; + TDEListView *mContentsTree; Glossary *mGlossaryTree; SearchWidget *mSearchWidget; diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index 8cdf52cca..c4bf2c182 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -21,7 +21,7 @@ using namespace KHC; View::View( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, KActionCollection *col ) + TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, TDEActionCollection *col ) : TDEHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col) { setJScriptEnabled(false); @@ -246,10 +246,10 @@ void View::slotDecFontSizes() void View::showMenu( const TQString& url, const TQPoint& pos) { - KPopupMenu* pop = new KPopupMenu(view()); + TDEPopupMenu* pop = new TDEPopupMenu(view()); if (url.isEmpty()) { - KAction *action; + TDEAction *action; action = mActionCollection->action("go_home"); if (action) action->plug(pop); diff --git a/khelpcenter/view.h b/khelpcenter/view.h index 8e5099917..2ad17af6b 100644 --- a/khelpcenter/view.h +++ b/khelpcenter/view.h @@ -6,7 +6,7 @@ #include "glossary.h" #include "navigator.h" -class KActionCollection; +class TDEActionCollection; namespace DOM { class Node; @@ -22,7 +22,7 @@ class View : public TDEHTMLPart public: View( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, - KActionCollection *col ); + TDEActionCollection *col ); ~View(); @@ -83,7 +83,7 @@ class View : public TDEHTMLPart int m_zoomStepping; Formatter *mFormatter; - KActionCollection *mActionCollection; + TDEActionCollection *mActionCollection; TQString mCopyURL; }; -- cgit v1.2.3