From 24dd177d07e0a2aafda68d30c13c3b5fa3346563 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 26 Dec 2011 20:08:14 -0600 Subject: Rename KDE_MAKE_VERSION and update TDE version string --- ksystemlog/src/ksystemlog.cpp | 12 ++++++------ ksystemlog/src/ksystemlog.h | 4 ++-- ksystemlog/src/logLineFilter.cpp | 2 +- ksystemlog/src/logLineFilter.h | 2 +- ksystemlog/src/logListItem.cpp | 2 +- ksystemlog/src/slotLogAction.cpp | 6 +++--- ksystemlog/src/view.cpp | 14 +++++++------- ksystemlog/src/view.h | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ksystemlog/src/ksystemlog.cpp b/ksystemlog/src/ksystemlog.cpp index a8cc0a3..49cba9a 100644 --- a/ksystemlog/src/ksystemlog.cpp +++ b/ksystemlog/src/ksystemlog.cpp @@ -323,7 +323,7 @@ void KSystemLog::setupActions() { //TODO Find a solution to display at the right place this action (see Akregator interface) filterBarAction=new KToggleAction(i18n("Show &Filter Bar"), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFilterBar()), actionCollection(), "toggle_filter_bar"); -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) filterBarAction->setEnabled(true); #else filterBarAction->setEnabled(false); @@ -393,7 +393,7 @@ void KSystemLog::setupActions() { void KSystemLog::setupLogActions() { //Define a macro allowing the connection of the signal from log action to the slotLogAction object - #if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) + #if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) #define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), slotLogAction, TQT_SLOT(slotLogAction(KAction::ActivationReason, TQt::ButtonState))); #else #define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated()), slotLogAction, TQT_SLOT(slotLogAction())); @@ -678,7 +678,7 @@ LogManager* KSystemLog::newTab() { tabs->insertTab(manager->getView(), SmallIcon(NO_MODE_ICON), i18n("No Log")); -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) if (tabs->count()>1) { tabs->setTabBarHidden(false); } @@ -776,7 +776,7 @@ void KSystemLog::closeTab() { } */ -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) if (tabs->count()==1) { tabs->setTabBarHidden(true); } @@ -937,7 +937,7 @@ KToggleAction* KSystemLog::getLogAction(const char* name) { return( static_cast (actionCollection()->action(name)) ); } -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) void KSystemLog::logActionClicked(const TQObject* sender, KAction::ActivationReason reason, TQt::ButtonState state) { #else void KSystemLog::logActionClicked(const TQObject* sender) { @@ -954,7 +954,7 @@ void KSystemLog::logActionClicked(const TQObject* sender) { //TODO Be sure that the + is the right symbol to combine TQt Constants //If the user uses the middle button OR left button + shift OR left button + control : = it opens the log in a new tab -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) if (state==Qt::MidButton || (state==TQt::ControlButton+Qt::LeftButton) || (state==TQt::ShiftButton+Qt::LeftButton)) newTab(); #endif diff --git a/ksystemlog/src/ksystemlog.h b/ksystemlog/src/ksystemlog.h index d0d20b2..9263ec2 100644 --- a/ksystemlog/src/ksystemlog.h +++ b/ksystemlog/src/ksystemlog.h @@ -53,7 +53,7 @@ #include "globals.h" //Include the right header for the management of Log Action clicking, depending of the version of KDE -#if defined(KDE_MAKE_VERSION) && (TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)) +#if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)) #include "slotLogAction.h" #else #include "slotLogActionCompatibility.h" @@ -108,7 +108,7 @@ class KSystemLog : public KMainWindow { void setCurrentLogManager(LogManager* view); -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) //Actual KDE method void logActionClicked(const TQObject* sender, KAction::ActivationReason reason, TQt::ButtonState state); #else diff --git a/ksystemlog/src/logLineFilter.cpp b/ksystemlog/src/logLineFilter.cpp index 2253493..18c1e68 100644 --- a/ksystemlog/src/logLineFilter.cpp +++ b/ksystemlog/src/logLineFilter.cpp @@ -22,7 +22,7 @@ #include //The filter is activated only if KDE version >= 3.3 -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) #include diff --git a/ksystemlog/src/logLineFilter.h b/ksystemlog/src/logLineFilter.h index 2ef2f73..c613c0d 100644 --- a/ksystemlog/src/logLineFilter.h +++ b/ksystemlog/src/logLineFilter.h @@ -25,7 +25,7 @@ #include //The filter is activated only if KDE version >= 3.3 -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) #include diff --git a/ksystemlog/src/logListItem.cpp b/ksystemlog/src/logListItem.cpp index 17ad63d..95ff08b 100644 --- a/ksystemlog/src/logListItem.cpp +++ b/ksystemlog/src/logListItem.cpp @@ -163,7 +163,7 @@ void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, in //Use or not an alternate background -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) if (line->isParentLogLine()==true && column==0) pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : cg.highlight() ); else diff --git a/ksystemlog/src/slotLogAction.cpp b/ksystemlog/src/slotLogAction.cpp index 133d9a4..d62e916 100644 --- a/ksystemlog/src/slotLogAction.cpp +++ b/ksystemlog/src/slotLogAction.cpp @@ -25,7 +25,7 @@ #include "ksystemlog.h" //Include the right header, depending of the version of KDE -#if defined(KDE_MAKE_VERSION) && (TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)) +#if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)) #include "slotLogAction.h" #else #include "slotLogActionCompatibility.h" @@ -36,7 +36,7 @@ SlotLogAction::SlotLogAction(KSystemLog* p) : } -#if defined(KDE_MAKE_VERSION) && (TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)) +#if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)) void SlotLogAction::slotLogAction(KAction::ActivationReason reason, TQt::ButtonState state) { const TQObject* sender=TQT_TQOBJECT(const_cast(TQObject::sender())); @@ -53,7 +53,7 @@ void SlotLogAction::slotLogAction() { #endif //Include the right TQMOC file, depending of the version of KDE -#if defined(KDE_MAKE_VERSION) && (TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)) +#if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)) #include "slotLogAction.moc" #else #include "slotLogActionCompatibility.moc" diff --git a/ksystemlog/src/view.cpp b/ksystemlog/src/view.cpp index e852849..ff50760 100644 --- a/ksystemlog/src/view.cpp +++ b/ksystemlog/src/view.cpp @@ -69,7 +69,7 @@ View::View(TQWidget *parent) : topLayout->setAutoAdd(true); -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) filterBar=new TQHBox(this); filterBar->setSpacing(5); filterBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); @@ -103,7 +103,7 @@ View::View(TQWidget *parent) : this->initLogList(); -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) //We initialize the table after, after the initialization of the table search->setListView(table); @@ -115,7 +115,7 @@ View::View(TQWidget *parent) : View::~View() { -#if defined(KDE_MAKE_VERSION) && (TDE_VERSION >= KDE_MAKE_VERSION(3,3,0)) +#if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)) delete clearSearch; delete search; @@ -154,7 +154,7 @@ bool View::isTooltipEnabled() { } void View::toggleFilterBar() { -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) //The newly created bar is only displayed if the config file allow it if (KSystemLogConfig::toggleFilterBar()==true) filterBar->show(); @@ -244,7 +244,7 @@ void View::setLastItemSelected() { } void View::updateSearchFilter() { -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) //We first delete all items int count=searchFilter->count() - 1; while (count>=0) { @@ -361,7 +361,7 @@ void View::setSortEnabled(bool enabled) { } void View::initSearchFilter(TQWidget* filterBox) { -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) searchFilter=new TQComboBox(filterBox); TQWhatsThis::add(searchFilter, i18n("Allows you to apply the item filter only on the specified column here. \"All\" column means no specific filter.")); @@ -403,7 +403,7 @@ KListView* View::getLogList() { void View::changeColumnFilter(int column) { -#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) +#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) TQValueList filterColumns; //The user select all columns diff --git a/ksystemlog/src/view.h b/ksystemlog/src/view.h index 355b0ba..94ed330 100644 --- a/ksystemlog/src/view.h +++ b/ksystemlog/src/view.h @@ -35,7 +35,7 @@ #include //The filter is activated only if KDE version >= 3.3 -#if defined(KDE_MAKE_VERSION) && (TDE_VERSION >= KDE_MAKE_VERSION(3,3,0)) +#if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)) #include "logLineFilter.h" #endif @@ -167,7 +167,7 @@ class View : public TQWidget, public KSystemLogInterface { */ KListView* table; -#if defined(KDE_MAKE_VERSION) && (TDE_VERSION >= KDE_MAKE_VERSION(3,3,0)) +#if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)) TQHBox* filterBar; KToolBarButton* clearSearch; -- cgit v1.2.3