From 7716a5e605907a009e19f429cec4e6b5f346bd71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:36 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kbugbuster/gui/buglvi.cpp | 6 ++-- kbugbuster/gui/buglvi.h | 4 +-- kbugbuster/gui/cwbuglistcontainer.cpp | 4 +-- kbugbuster/gui/cwbuglistcontainer.h | 4 +-- kbugbuster/gui/kbbmainwindow.cpp | 60 +++++++++++++++++------------------ kbugbuster/gui/kbbmainwindow.h | 32 +++++++++---------- kbugbuster/gui/msginputdialog.cpp | 2 +- kbugbuster/gui/msginputdialog.h | 4 +-- 8 files changed, 58 insertions(+), 58 deletions(-) (limited to 'kbugbuster/gui') diff --git a/kbugbuster/gui/buglvi.cpp b/kbugbuster/gui/buglvi.cpp index 18d7c064..7026bd29 100644 --- a/kbugbuster/gui/buglvi.cpp +++ b/kbugbuster/gui/buglvi.cpp @@ -27,8 +27,8 @@ using namespace KBugBusterMainWindow; -BugLVI::BugLVI( KListView *parent , const Bug &bug ) -: KListViewItem( parent, bug.number() + " ", +BugLVI::BugLVI( TDEListView *parent , const Bug &bug ) +: TDEListViewItem( parent, bug.number() + " ", i18n( "1 day", "%n days", bug.age() ), bug.title(), //KStringHandler::csqueeze( bug.title(), 70 ), Bug::statusLabel( bug.status() ), @@ -97,7 +97,7 @@ void BugLVI::paintCell(TQPainter* p, const TQColorGroup& cg, newCg.setColor( TQColorGroup::Text, cg.color( TQColorGroup::Dark ) ); } - KListViewItem::paintCell( p, newCg, column, width, align ); + TDEListViewItem::paintCell( p, newCg, column, width, align ); } void BugLVI::setCommandState( BugCommand::State state) diff --git a/kbugbuster/gui/buglvi.h b/kbugbuster/gui/buglvi.h index 5f66f398..d1bd7558 100644 --- a/kbugbuster/gui/buglvi.h +++ b/kbugbuster/gui/buglvi.h @@ -28,10 +28,10 @@ namespace KBugBusterMainWindow /** * @author Martijn Klingens */ -class BugLVI : public KListViewItem +class BugLVI : public TDEListViewItem { public: - BugLVI( KListView *parent , const Bug &bug ); + BugLVI( TDEListView *parent , const Bug &bug ); ~BugLVI(); Bug& bug() { return m_bug; } diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index 14a601be..d7a39cad 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -59,9 +59,9 @@ CWBugListContainer::CWBugListContainer( TQWidget *parent , const char * name ) m_listStack = new TQWidgetStack( this ); // Create Outstanding Bugs listview - m_listBugs = new KListView( m_listStack ); + m_listBugs = new TDEListView( m_listStack ); - topLayout->addWidget( new KListViewSearchLineWidget( m_listBugs, this ) ); + topLayout->addWidget( new TDEListViewSearchLineWidget( m_listBugs, this ) ); topLayout->addWidget( m_listStack ); topLayout->setStretchFactor( m_listStack, 1 ); diff --git a/kbugbuster/gui/cwbuglistcontainer.h b/kbugbuster/gui/cwbuglistcontainer.h index d6ebda07..bb4b1f7a 100644 --- a/kbugbuster/gui/cwbuglistcontainer.h +++ b/kbugbuster/gui/cwbuglistcontainer.h @@ -22,7 +22,7 @@ #include -class KListView; +class TDEListView; class KFind; class BugCommand; class BugLVI; @@ -85,7 +85,7 @@ private: TQLabel *m_listLabel; TQWidgetStack *m_listStack; - KListView *m_listBugs; + TDEListView *m_listBugs; KFind *m_find; BugLVI *m_findItem; diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp index 34d4b0f2..df133bce 100644 --- a/kbugbuster/gui/kbbmainwindow.cpp +++ b/kbugbuster/gui/kbbmainwindow.cpp @@ -92,7 +92,7 @@ KBBMainWindow::KBBMainWindow( const TQCString &initialPackage, const TQCString &initialComponent, const TQCString &initialBug, TQWidget * , const char * name ) - : KMainWindow( 0, name ), mPreferencesDialog( 0 ), mResponseViewer( 0 ), + : TDEMainWindow( 0, name ), mPreferencesDialog( 0 ), mResponseViewer( 0 ), mBugSourceViewer( 0 ), mPackageSelectDialog( 0 ) { BugSystem::self()->setCurrentServer( KBBPrefs::instance()->mCurrentServer ); @@ -148,54 +148,54 @@ void KBBMainWindow::initActions() TQT_SLOT( close() ), actionCollection() ); fileQuit->setToolTip( i18n( "Quit KBugBuster" ) ); - new KAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ), + new TDEAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ), actionCollection(), "file_seechanges" ); - new KAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ), + new TDEAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ), actionCollection(), "file_submit" ); - reloadpacklist = new KAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ), + reloadpacklist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ), actionCollection(), "reload_packagelist" ); - reloadpack= new KAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackage() ), + reloadpack= new TDEAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackage() ), actionCollection(), "reload_package" ); - reloadbug = new KAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadBug() ), + reloadbug = new TDEAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadBug() ), actionCollection(), "reload_bug" ); - loadMyBugs = new KAction( i18n( "Load &My Bugs List" ), 0, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotLoadMyBugs() ), + loadMyBugs = new TDEAction( i18n( "Load &My Bugs List" ), 0, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotLoadMyBugs() ), actionCollection(), "load_my_bugs" ); - reloadall = new KAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" ); - new KAction( i18n("Extract &Attachments"), "filesave", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ), + reloadall = new TDEAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" ); + new TDEAction( i18n("Extract &Attachments"), "filesave", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ), actionCollection(), "extract_attachments" ); - new KAction( i18n("Clear Cache"), 0, TQT_TQOBJECT(this), TQT_SLOT( clearCache() ), + new TDEAction( i18n("Clear Cache"), 0, TQT_TQOBJECT(this), TQT_SLOT( clearCache() ), actionCollection(), "clear_cache" ); - new KAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, TQT_TQOBJECT(this), + new TDEAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT( searchPackage() ), actionCollection(), "search_package" ); - new KAction( i18n("Search by Bug &Number..."), "filefind", CTRL+TQt::Key_N, TQT_TQOBJECT(this), + new TDEAction( i18n("Search by Bug &Number..."), "filefind", CTRL+TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( searchBugNumber() ), actionCollection(), "search_bugnumber" ); // For now "Description" searches by title. Maybe later we can have a // full-text search interfacing bugs.trinitydesktop.org and rename the current one to "By Title". - new KAction( i18n("Search by &Description...") ,"find", CTRL+TQt::Key_D, TQT_TQOBJECT(this), + new TDEAction( i18n("Search by &Description...") ,"find", CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT( searchDescription() ), actionCollection(), "search_description" ); -// new KAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), +// new TDEAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( mergeBugs() ), actionCollection(), "cmd_merge" ); -// new KAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), +// new TDEAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( unmergeBugs() ), actionCollection(), "cmd_unmerge" ); - new KAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, TQT_TQOBJECT(m_mainWidget), + new TDEAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( closeBug() ), actionCollection(), "cmd_close" ); -// new KAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, TQT_TQOBJECT(m_mainWidget), +// new TDEAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( closeBugSilently() ), actionCollection(), "cmd_close_silently" ); - new KAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, TQT_TQOBJECT(m_mainWidget), + new TDEAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( reopenBug() ), actionCollection(), "cmd_reopen" ); -// new KAction( i18n("Re&assign..."), "folder_new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget), +// new TDEAction( i18n("Re&assign..."), "folder_new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( reassignBug() ), actionCollection(), "cmd_reassign" ); -// new KAction( i18n("Change &Title..."), "text_under", CTRL+TQt::Key_T, TQT_TQOBJECT(m_mainWidget), +// new TDEAction( i18n("Change &Title..."), "text_under", CTRL+TQt::Key_T, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( titleBug() ), actionCollection(), "cmd_title" ); -// new KAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget), +// new TDEAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( severityBug() ), actionCollection(), "cmd_severity" ); - new KAction( i18n("&Reply..."), "mail_replyall",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget), + new TDEAction( i18n("&Reply..."), "mail_replyall",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget), TQT_SLOT( replyBug() ), actionCollection(), "cmd_reply" ); - new KAction( i18n("Reply &Privately..."), "mail_reply", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget), + new TDEAction( i18n("Reply &Privately..."), "mail_reply", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" ); KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() ); @@ -204,7 +204,7 @@ void KBBMainWindow::initActions() setStandardToolBarMenuEnabled(true); #endif - m_disconnectedAction = new KToggleAction( i18n("&Disconnected Mode"), 0, + m_disconnectedAction = new TDEToggleAction( i18n("&Disconnected Mode"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDisconnectedAction() ), actionCollection(), @@ -212,26 +212,26 @@ void KBBMainWindow::initActions() m_disconnectedAction->setChecked( BugSystem::self()->disconnected() ); // Bookmarks menu - m_pamBookmarks = new KActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); + m_pamBookmarks = new TDEActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); m_pBookmarkMenu = new KBookmarkMenu( KBBBookmarkManager::self(), this, m_pamBookmarks->popupMenu(), actionCollection(), true ); KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection() ); - KToggleAction *toggleTmp = new KToggleAction( i18n("Show Closed Bugs"), "recycled", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ), + TDEToggleAction *toggleTmp = new TDEToggleAction( i18n("Show Closed Bugs"), "recycled", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ), actionCollection(), "cmd_toggle_done" ); #if KDE_IS_VERSION( 3, 2, 90 ) toggleTmp->setCheckedState(i18n("Hide Closed Bugs")); #endif toggleTmp->setChecked( KBBPrefs::instance()->mShowClosedBugs ); - toggleTmp =new KToggleAction( i18n("Show Wishes"), "bookmark", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleWishes() ), + toggleTmp =new TDEToggleAction( i18n("Show Wishes"), "bookmark", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleWishes() ), actionCollection(), "cmd_toggle_wishes" ); #if KDE_IS_VERSION( 3, 2, 90 ) toggleTmp->setCheckedState(i18n("Hide Wishes")); #endif toggleTmp->setChecked(KBBPrefs::instance()->mShowWishes); - mSelectServerAction = new KSelectAction( i18n( "Select Server" ), 0, 0, + mSelectServerAction = new TDESelectAction( i18n( "Select Server" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotSelectServer() ), actionCollection(), @@ -240,10 +240,10 @@ void KBBMainWindow::initActions() setupSelectServerAction(); if ( KBBPrefs::instance()->mDebugMode ) { - new KAction( i18n("Show Last Server Response..."), 0 , TQT_TQOBJECT(this), + new TDEAction( i18n("Show Last Server Response..."), 0 , TQT_TQOBJECT(this), TQT_SLOT( showLastResponse() ), actionCollection(), "debug_lastresponse" ); - new KAction( i18n("Show Bug HTML Source..."), 0 , TQT_TQOBJECT(this), + new TDEAction( i18n("Show Bug HTML Source..."), 0 , TQT_TQOBJECT(this), TQT_SLOT( showBugSource() ), actionCollection(), "debug_showbugsource" ); } diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h index 4b82934a..9ced8512 100644 --- a/kbugbuster/gui/kbbmainwindow.h +++ b/kbugbuster/gui/kbbmainwindow.h @@ -25,11 +25,11 @@ #include "bug.h" #include "bugdetails.h" -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class KBookmarkMenu; -class KToggleAction; -class KSelectAction; +class TDEToggleAction; +class TDESelectAction; class TQLabel; class TQListViewItem; class TQProgressBar; @@ -45,7 +45,7 @@ namespace KBugBusterMainWindow /** * @author Martijn Klingens */ -class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner +class KBBMainWindow : public TDEMainWindow, virtual public KBookmarkOwner { Q_OBJECT @@ -66,7 +66,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner public slots: /** - * Event handlers for our KActions + * Event handlers for our TDEActions */ void slotStatusMsg( const TQString &text ); void slotDisconnectedAction(); @@ -109,15 +109,15 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner KBugBusterMainWindow::CentralWidget *m_mainWidget; /** - * Used KActions + * Used TDEActions */ - KAction *fileQuit; - KAction *reloadpacklist; - KAction *reloadpack; - KAction *reloadbug; - KAction *reloadall; - KAction *loadMyBugs; - KToggleAction *m_disconnectedAction; + TDEAction *fileQuit; + TDEAction *reloadpacklist; + TDEAction *reloadpack; + TDEAction *reloadbug; + TDEAction *reloadall; + TDEAction *loadMyBugs; + TDEToggleAction *m_disconnectedAction; /** * Status bar label. We need this, because the default TQt version doesn't @@ -128,10 +128,10 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner PreferencesDialog *mPreferencesDialog; - KActionMenu *m_pamBookmarks; + TDEActionMenu *m_pamBookmarks; KBookmarkMenu* m_pBookmarkMenu; - KSelectAction *mSelectServerAction; + TDESelectAction *mSelectServerAction; TextViewer *mResponseViewer; TextViewer *mBugSourceViewer; diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp index c34a18be..4bd8437a 100644 --- a/kbugbuster/gui/msginputdialog.cpp +++ b/kbugbuster/gui/msginputdialog.cpp @@ -90,7 +90,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, l = new TQLabel( i18n( "&Preset Messages" ), w ); l->setFont( f ); - mPresets = new KListBox( w ); + mPresets = new TDEListBox( w ); updatePresets(); l->setBuddy( mPresets ); diff --git a/kbugbuster/gui/msginputdialog.h b/kbugbuster/gui/msginputdialog.h index 539a3589..ed7576e0 100644 --- a/kbugbuster/gui/msginputdialog.h +++ b/kbugbuster/gui/msginputdialog.h @@ -8,7 +8,7 @@ class KTextEdit; class TQSplitter; -class KListBox; +class TDEListBox; class MsgInputDialog : public KDialogBase { @@ -46,7 +46,7 @@ class MsgInputDialog : public KDialogBase TQComboBox *mRecipient; KTextEdit *mMessageEdit; TQSplitter *mSplitter; - KListBox *mPresets; + TDEListBox *mPresets; Bug mBug; Package mPackage; -- cgit v1.2.1