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 --- .../sidebar/trees/history_module/history_module.cpp | 16 ++++++++-------- konqueror/sidebar/trees/history_module/history_module.h | 4 ++-- konqueror/sidebar/trees/history_module/kcmhistory.cpp | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'konqueror/sidebar/trees/history_module') diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index fa7f8ba39..5d27e010f 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -74,23 +74,23 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )), TQT_SLOT( slotItemExpanded( TQListViewItem * ))); - m_collection = new KActionCollection( this, "history actions" ); - (void) new KAction( i18n("New &Window"), "window_new", 0, this, + m_collection = new TDEActionCollection( this, "history actions" ); + (void) new TDEAction( i18n("New &Window"), "window_new", 0, this, TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); - (void) new KAction( i18n("&Remove Entry"), "editdelete", 0, this, + (void) new TDEAction( i18n("&Remove Entry"), "editdelete", 0, this, TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); - (void) new KAction( i18n("C&lear History"), "history_clear", 0, this, + (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this, TQT_SLOT( slotClearHistory() ), m_collection, "clear"); - (void) new KAction( i18n("&Preferences..."), "configure", 0, this, + (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this, TQT_SLOT( slotPreferences()), m_collection, "preferences"); - KRadioAction *sort; - sort = new KRadioAction( i18n("By &Name"), 0, this, + TDERadioAction *sort; + sort = new TDERadioAction( i18n("By &Name"), 0, this, TQT_SLOT( slotSortByName() ), m_collection, "byName"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( m_sortsByName ); - sort = new KRadioAction( i18n("By &Date"), 0, this, + sort = new TDERadioAction( i18n("By &Date"), 0, this, TQT_SLOT( slotSortByDate() ), m_collection, "byDate"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( !m_sortsByName ); diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h index cbba40262..5c114a164 100644 --- a/konqueror/sidebar/trees/history_module/history_module.h +++ b/konqueror/sidebar/trees/history_module/history_module.h @@ -30,7 +30,7 @@ #include "history_item.h" -class KActionCollection; +class TDEActionCollection; class KDialogBase; class KonqSidebarHistorySettings; class KonqSidebarTree; @@ -94,7 +94,7 @@ private: KonqSidebarTreeTopLevelItem * m_topLevelItem; - KActionCollection *m_collection; + TDEActionCollection *m_collection; KDialogBase *m_dlg; TQPixmap m_folderClosed; diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index b2e92c6fd..813ece3df 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -243,15 +243,15 @@ void HistorySidebarConfig::slotOlderChanged( int value ) void HistorySidebarConfig::slotGetFontNewer() { - int result = KFontDialog::getFont( m_fontNewer, false, this ); - if ( result == KFontDialog::Accepted ) + int result = TDEFontDialog::getFont( m_fontNewer, false, this ); + if ( result == TDEFontDialog::Accepted ) configChanged(); } void HistorySidebarConfig::slotGetFontOlder() { - int result = KFontDialog::getFont( m_fontOlder, false, this ); - if ( result == KFontDialog::Accepted ) + int result = TDEFontDialog::getFont( m_fontOlder, false, this ); + if ( result == TDEFontDialog::Accepted ) configChanged(); } -- cgit v1.2.1