TDE
/
ksystemlog
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ksystemlog
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KDE_MAKE_VERSION and update TDE version string

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent b59a8a75a5
commit 24dd177d07
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

12
ksystemlog/src/ksystemlog.cpp
Unescape View File

@ -323,7 +323,7 @@ void KSystemLog::setupActions() {
//TODO Find a solution to display at the right place this action (see Akregator interface) //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"); 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); filterBarAction->setEnabled(true);
#else #else
filterBarAction->setEnabled(false); filterBarAction->setEnabled(false);
@ -393,7 +393,7 @@ void KSystemLog::setupActions() {
void KSystemLog::setupLogActions() { void KSystemLog::setupLogActions() {
//Define a macro allowing the connection of the signal from log action to the slotLogAction object //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))); #define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), slotLogAction, TQT_SLOT(slotLogAction(KAction::ActivationReason, TQt::ButtonState)));
#else #else
#define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated()), slotLogAction, TQT_SLOT(slotLogAction())); #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")); 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) { if (tabs->count()>1) {
tabs->setTabBarHidden(false); 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) { if (tabs->count()==1) {
tabs->setTabBarHidden(true); tabs->setTabBarHidden(true);
} }
@ -937,7 +937,7 @@ KToggleAction* KSystemLog::getLogAction(const char* name) {
return( static_cast<KToggleAction*> (actionCollection()->action(name)) ); return( static_cast<KToggleAction*> (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) { void KSystemLog::logActionClicked(const TQObject* sender, KAction::ActivationReason reason, TQt::ButtonState state) {
#else #else
void KSystemLog::logActionClicked(const TQObject* sender) { 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 //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 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)) if (state==Qt::MidButton || (state==TQt::ControlButton+Qt::LeftButton) || (state==TQt::ShiftButton+Qt::LeftButton))
newTab(); newTab();
#endif #endif

4
ksystemlog/src/ksystemlog.h
Unescape View File

@ -53,7 +53,7 @@
#include "globals.h" #include "globals.h"
//Include the right header for the management of Log Action clicking, depending of the version of KDE //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" #include "slotLogAction.h"
#else #else
#include "slotLogActionCompatibility.h" #include "slotLogActionCompatibility.h"
@ -108,7 +108,7 @@ class KSystemLog : public KMainWindow {
void setCurrentLogManager(LogManager* view); 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 //Actual KDE method
void logActionClicked(const TQObject* sender, KAction::ActivationReason reason, TQt::ButtonState state); void logActionClicked(const TQObject* sender, KAction::ActivationReason reason, TQt::ButtonState state);
#else #else

2
ksystemlog/src/logLineFilter.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tdeversion.h> #include <tdeversion.h>
//The filter is activated only if KDE version >= 3.3 //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 <tqpainter.h> #include <tqpainter.h>

2
ksystemlog/src/logLineFilter.h
Unescape View File

@ -25,7 +25,7 @@
#include <tdeversion.h> #include <tdeversion.h>
//The filter is activated only if KDE version >= 3.3 //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 <klistviewsearchline.h> #include <klistviewsearchline.h>

2
ksystemlog/src/logListItem.cpp
Unescape View File

@ -163,7 +163,7 @@ void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, in
//Use or not an alternate background //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) if (line->isParentLogLine()==true && column==0)
pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : cg.highlight() ); pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : cg.highlight() );
else else

6
ksystemlog/src/slotLogAction.cpp
Unescape View File

@ -25,7 +25,7 @@
#include "ksystemlog.h" #include "ksystemlog.h"
//Include the right header, depending of the version of KDE //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" #include "slotLogAction.h"
#else #else
#include "slotLogActionCompatibility.h" #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) { void SlotLogAction::slotLogAction(KAction::ActivationReason reason, TQt::ButtonState state) {
const TQObject* sender=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQObject::sender())); const TQObject* sender=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQObject::sender()));
@ -53,7 +53,7 @@ void SlotLogAction::slotLogAction() {
#endif #endif
//Include the right TQMOC file, depending of the version of KDE //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" #include "slotLogAction.moc"
#else #else
#include "slotLogActionCompatibility.moc" #include "slotLogActionCompatibility.moc"

14
ksystemlog/src/view.cpp
Unescape View File

@ -69,7 +69,7 @@ View::View(TQWidget *parent) :
topLayout->setAutoAdd(true); 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=new TQHBox(this);
filterBar->setSpacing(5); filterBar->setSpacing(5);
filterBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); filterBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
@ -103,7 +103,7 @@ View::View(TQWidget *parent) :
this->initLogList(); 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 //We initialize the table after, after the initialization of the table
search->setListView(table); search->setListView(table);
@ -115,7 +115,7 @@ View::View(TQWidget *parent) :
View::~View() { 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 clearSearch;
delete search; delete search;
@ -154,7 +154,7 @@ bool View::isTooltipEnabled() {
} }
void View::toggleFilterBar() { 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 //The newly created bar is only displayed if the config file allow it
if (KSystemLogConfig::toggleFilterBar()==true) if (KSystemLogConfig::toggleFilterBar()==true)
filterBar->show(); filterBar->show();
@ -244,7 +244,7 @@ void View::setLastItemSelected() {
} }
void View::updateSearchFilter() { 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 //We first delete all items
int count=searchFilter->count() - 1; int count=searchFilter->count() - 1;
while (count>=0) { while (count>=0) {
@ -361,7 +361,7 @@ void View::setSortEnabled(bool enabled) {
} }
void View::initSearchFilter(TQWidget* filterBox) { 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); searchFilter=new TQComboBox(filterBox);
TQWhatsThis::add(searchFilter, i18n("<qt>Allows you to apply the item filter only on the specified column here. \"<i>All</i>\" column means no specific filter.</qt>")); TQWhatsThis::add(searchFilter, i18n("<qt>Allows you to apply the item filter only on the specified column here. \"<i>All</i>\" column means no specific filter.</qt>"));
@ -403,7 +403,7 @@ KListView* View::getLogList() {
void View::changeColumnFilter(int column) { 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<int> filterColumns; TQValueList<int> filterColumns;
//The user select all columns //The user select all columns

4
ksystemlog/src/view.h
Unescape View File

@ -35,7 +35,7 @@
#include <tdeversion.h> #include <tdeversion.h>
//The filter is activated only if KDE version >= 3.3 //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" #include "logLineFilter.h"
#endif #endif
@ -167,7 +167,7 @@ class View : public TQWidget, public KSystemLogInterface {
*/ */
KListView* table; 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; TQHBox* filterBar;
KToolBarButton* clearSearch; KToolBarButton* clearSearch;

Write Preview
Loading…
Cancel
Save