From e46eba349e7029d919b213b7130086503d1e042e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:22:07 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kbugbuster/gui/buglvi.h | 2 +- kbugbuster/gui/centralwidget.cpp | 2 +- kbugbuster/gui/cwbuglistcontainer.cpp | 4 ++-- kbugbuster/gui/kbbmainwindow.cpp | 10 +++++----- kbugbuster/gui/kbbmainwindow.h | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kbugbuster/gui') diff --git a/kbugbuster/gui/buglvi.h b/kbugbuster/gui/buglvi.h index d1bd7558..fbca0586 100644 --- a/kbugbuster/gui/buglvi.h +++ b/kbugbuster/gui/buglvi.h @@ -17,7 +17,7 @@ #ifndef KBBMAINWINDOW_BUGLVI_H #define KBBMAINWINDOW_BUGLVI_H -#include +#include #include "bug.h" #include "bugcommand.h" diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp index ca5c3b66..a8b87fc4 100644 --- a/kbugbuster/gui/centralwidget.cpp +++ b/kbugbuster/gui/centralwidget.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "kbbprefs.h" diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index d7a39cad..1b3ff878 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -21,11 +21,11 @@ #include #include -#include +#include #include #include #if KDE_IS_VERSION( 3, 2, 90 ) -#include +#include #endif #include diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp index df133bce..cfbde061 100644 --- a/kbugbuster/gui/kbbmainwindow.cpp +++ b/kbugbuster/gui/kbbmainwindow.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -153,7 +153,7 @@ void KBBMainWindow::initActions() new TDEAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ), actionCollection(), "file_submit" ); - reloadpacklist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ), + reloadpactdelist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ), actionCollection(), "reload_packagelist" ); reloadpack= new TDEAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackage() ), actionCollection(), "reload_package" ); @@ -316,8 +316,8 @@ void KBBMainWindow::slotDisconnectedAction() bool enable = !m_disconnectedAction->isChecked(); - reloadpacklist->setEnabled( enable ); - reloadpacklist->setEnabled( enable ); + reloadpactdelist->setEnabled( enable ); + reloadpactdelist->setEnabled( enable ); reloadpack->setEnabled( enable ); reloadbug->setEnabled( enable ); reloadall->setEnabled( enable ); diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h index 9ced8512..2c99effe 100644 --- a/kbugbuster/gui/kbbmainwindow.h +++ b/kbugbuster/gui/kbbmainwindow.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include "package.h" @@ -112,7 +112,7 @@ class KBBMainWindow : public TDEMainWindow, virtual public KBookmarkOwner * Used TDEActions */ TDEAction *fileQuit; - TDEAction *reloadpacklist; + TDEAction *reloadpactdelist; TDEAction *reloadpack; TDEAction *reloadbug; TDEAction *reloadall; -- cgit v1.2.1