From b7f159779b1375c24fdb76dba23bb97931c78803 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Fri, 3 Jul 2026 01:19:46 +0300 Subject: kicker: [minor] cleanup of whitespace & warnings Signed-off-by: Alexander Golubev --- kcontrol/taskbar/kcmtaskbar.cpp | 4 +- kicker/kicker/core/containerarea.cpp | 4 +- kicker/kicker/core/showdesktop.cpp | 2 +- kicker/libkicker/panner.cpp | 18 +++--- kicker/libkicker/panner.h | 14 ++-- kicker/taskbar/taskbar.cpp | 19 +++--- kicker/taskbar/taskcontainer.cpp | 120 +++++++++++++++++------------------ 7 files changed, 90 insertions(+), 91 deletions(-) diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index c36ab811b..db19a0ba9 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -456,11 +456,11 @@ void TaskbarConfig::updateIconsTextCombo() void TaskbarConfig::appearanceChanged(int selected) { - if (selected < m_appearances.count()) + if (selected < (int) m_appearances.count()) { m_widget->customAppearance->setEnabled(false); } - else if(selected == m_appearances.count()) + else if(selected == (int) m_appearances.count()) { m_widget->customAppearance->setEnabled(true); updateCustomAppearance(); diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index cb61b16e8..ea2e85d07 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -85,12 +85,12 @@ ContainerArea::ContainerArea(TDEConfig* _c, _rootPixmap(0), _useBgTheme(false), _bgSet(false), + _autoScrollTimer(0, "ContainerArea::autoScrollTimer"), m_canAddContainers(true), m_immutable(_c->isImmutable()), m_updateBackgroundsCalled(false), m_layout(0), - m_addAppletDialog(0), - _autoScrollTimer(0, "ContainerArea::autoScrollTimer") + m_addAppletDialog(0) { setBackgroundOrigin( WidgetOrigin ); diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp index 0a1e2907c..f8da35ee3 100644 --- a/kicker/kicker/core/showdesktop.cpp +++ b/kicker/kicker/core/showdesktop.cpp @@ -120,7 +120,7 @@ void ShowDesktop::showDesktop( bool b ) { return; } - + if( m_wmSupport ) { NETRootInfo i( tqt_xdisplay(), 0 ); diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index 23397e941..b099c60d1 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -54,7 +54,7 @@ Panner::Panner( TQWidget* parent, const char* name ) _clipper->installEventFilter( this ); _viewport = new TQWidget(_clipper); _viewport->setBackgroundOrigin(AncestorOrigin); - + // layout _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); _layout->addWidget(_clipper, 1); @@ -66,7 +66,7 @@ Panner::Panner( TQWidget* parent, const char* name ) connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timedScroll())); } -Panner::~Panner() +Panner::~Panner() { } @@ -200,7 +200,7 @@ void Panner::stopScroll() void Panner::reallyUpdateScrollButtons() { int delta = 0; - + _updateScrollButtonsTimer->stop(); if (orientation() == TQt::Horizontal) @@ -239,15 +239,15 @@ void Panner::setContentsPos(int x, int y) x = 0; else if (x > (contentsWidth() - visibleWidth())) x = contentsWidth() - visibleWidth(); - + if (y < 0) y = 0; else if (y > (contentsHeight() - visibleHeight())) y = contentsHeight() - visibleHeight(); - + if (x == contentsX() && y == contentsY()) return; - + _viewport->move(-x, -y); emit contentsMoving(x, y); } @@ -342,9 +342,9 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin ) bool Panner::eventFilter( TQObject *obj, TQEvent *e ) { - if ( obj == _viewport || obj == _clipper ) + if ( obj == _viewport || obj == _clipper ) { - switch ( e->type() ) + switch ( e->type() ) { case TQEvent::Resize: viewportResizeEvent((TQResizeEvent *)e); @@ -373,7 +373,7 @@ bool Panner::eventFilter( TQObject *obj, TQEvent *e ) break; } } - + return TQWidget::eventFilter( obj, e ); // always continue with standard event processing } diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index bb87521c2..fb4dc6461 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -43,25 +43,25 @@ public: TQt::Orientation orientation() const { return _orient; } virtual void setOrientation(TQt::Orientation orientation); - + TQWidget *viewport() const { return _viewport; } - + TQRect contentsRect() const { return TQRect(0, 0, width(), height()); } - + int contentsX() const { return _viewport ? -_viewport->x() : 0; } int contentsY() const { return _viewport ? -_viewport->y() : 0; } int contentsWidth() const { return _viewport ? _viewport->width() : 0; } int contentsHeight() const { return _viewport ? _viewport->height() : 0; } void setContentsPos(int x, int y); - + int visibleWidth() const { return _clipper->width(); } int visibleHeight() const { return _clipper->height(); } - + void contentsToViewport( int x, int y, int& vx, int& vy ) const; void viewportToContents( int vx, int vy, int& x, int& y ) const; TQPoint contentsToViewport( const TQPoint& ) const; TQPoint viewportToContents( const TQPoint& ) const; - + void addChild(TQWidget *child) { child->show(); } void removeChild(TQWidget *child) { child->hide(); } int childX(TQWidget *child) const { return child->x(); } @@ -106,7 +106,7 @@ private: TQTimer *_updateScrollButtonsTimer; TQTimer *_scrollTimer; bool _scrollDir; // true = left/up, false = right/down - + TQWidget *_clipper; TQWidget *_viewport; int _cwidth, _cheight; diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 5b6f34b3e..268c790ec 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -41,7 +41,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include "kickerSettings.h" #include "taskbarsettings.h" #include "taskcontainer.h" #include "taskmanager.h" @@ -97,7 +96,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin connect(&m_relayoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reLayout())); - connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); // connect manager connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), @@ -183,7 +182,7 @@ int TaskBar::buttonHeight() const if(showIcons()) { - bh = TQMAX(bh, READ_MERGED_TASKBAR_SETTING(iconSize)); + bh = TQMAX(bh, (int) READ_MERGED_TASKBAR_SETTING(iconSize)); } return bh + 2; @@ -848,25 +847,25 @@ void TaskBar::reLayout() TaskContainer* c = *it; c->setArrowType(arrowType); - + if (c->width() != contentsRect().width() || c->height() != minButtonHeightAdjusted) c->resize(contentsRect().width(), minButtonHeightAdjusted); if (childX(c) != 0 || childY(c) != (i * minButtonHeightAdjusted)) moveChild(c, 0, i * minButtonHeightAdjusted); - + c->setBackground(); i++; } } - + TQTimer::singleShot(100, this, TQ_SLOT(publishIconGeometry())); } void TaskBar::setViewportBackground() { const TQPixmap *bg = parentWidget()->backgroundPixmap(); - + if (bg) { TQPixmap pm(parentWidget()->size()); @@ -881,9 +880,9 @@ void TaskBar::setViewportBackground() void TaskBar::setBackground() { setViewportBackground(); - + TaskContainer::List list = filteredContainers(); - + for (TaskContainer::Iterator it = list.begin(); it != list.end(); ++it) @@ -1106,7 +1105,7 @@ TaskContainer::List TaskBar::filteredContainers() c->hide(); } } - + return list; } diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 8e44f100f..50a1c1d52 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -76,56 +76,56 @@ static const int netAtomCount = 1; static void create_atoms(Display *d) { static const char * const names[netAtomCount] = { - "_NET_WM_PID" - }; + "_NET_WM_PID" + }; Atom atoms[netAtomCount], *atomsp[netAtomCount] = { - &net_wm_pid - }; + &net_wm_pid + }; assert( !netwm_atoms_created ); int i = netAtomCount; while (i--) - atoms[i] = 0; + atoms[i] = 0; XInternAtoms(d, (char **) names, netAtomCount, False, atoms); i = netAtomCount; while (i--) - *atomsp[i] = atoms[i]; + *atomsp[i] = atoms[i]; netwm_atoms_created = True; } bool is_process_resumable(pid_t pid) { #ifdef Q_OS_SOLARIS - TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid)); - if (procStatFile.open(IO_ReadOnly)) { - TQByteArray statRaw = procStatFile.readAll(); - lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data(); - - procStatFile.close(); - if( inf->pr_sname == 'T' ) { - return true; - } - } + TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid)); + if (procStatFile.open(IO_ReadOnly)) { + TQByteArray statRaw = procStatFile.readAll(); + lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data(); + + procStatFile.close(); + if( inf->pr_sname == 'T' ) { + return true; + } + } #else /* default */ - TQFile procStatFile(TQString("/proc/%1/stat").arg(pid)); - if (procStatFile.open(IO_ReadOnly)) { - TQByteArray statRaw = procStatFile.readAll(); - procStatFile.close(); - TQString statString(statRaw); - TQStringList statFields = TQStringList::split(" ", statString, true); - TQString tcomm = statFields[1]; - TQString state = statFields[2]; - if( state == "T" ) { - return true; - } - } + TQFile procStatFile(TQString("/proc/%1/stat").arg(pid)); + if (procStatFile.open(IO_ReadOnly)) { + TQByteArray statRaw = procStatFile.readAll(); + procStatFile.close(); + TQString statString(statRaw); + TQStringList statFields = TQStringList::split(" ", statString, true); + TQString tcomm = statFields[1]; + TQString state = statFields[2]; + if( state == "T" ) { + return true; + } + } #endif /* read process status */ - return false; + return false; } TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name) @@ -299,7 +299,7 @@ void TaskContainer::iconChanged() } return; } - + KickerTip::Client::updateKickerTip(); TQToolButton::update(); } @@ -329,23 +329,23 @@ void TaskContainer::animationTimerFired() // draw pixmap if ( pm && !pm->isNull() ) { - // we only have to redraw the background for frames 0, 8 and 9 - if ( currentFrame == 0 || currentFrame > 7 ) + // we only have to redraw the background for frames 0, 8 and 9 + if ( currentFrame == 0 || currentFrame > 7 ) { // double buffered painting TQPixmap composite( animBg ); bitBlt( &composite, 0, 0, pm ); bitBlt( this, iconRect.x(), iconRect.y(), &composite ); - } - else - bitBlt( this, iconRect.x(), iconRect.y(), pm ); - } + } + else + bitBlt( this, iconRect.x(), iconRect.y(), pm ); + } // increment frame counter if ( currentFrame >= 9) - currentFrame = 0; + currentFrame = 0; else - currentFrame++; + currentFrame++; } } @@ -768,12 +768,12 @@ void TaskContainer::drawButton(TQPainter *p) r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - iconSize) / 2, iconSize, iconSize), this); textPos += iconSize + 2; } - } - else if (taskBar->showIcons()) // has only icon - { - r = TQRect(0, 0, iconSize / 2, iconSize / 2); - r.moveBottomRight(iconRect.bottomRight()); - } + } + else if (taskBar->showIcons()) // has only icon + { + r = TQRect(0, 0, iconSize / 2, iconSize / 2); + r.moveBottomRight(iconRect.bottomRight()); + } p->drawPixmap(r, modPixmap); } @@ -910,7 +910,7 @@ void TaskContainer::drawButton(TQPainter *p) style().drawPrimitive(e, p, ar, colors, flags); } - + // draw mouse over frame in transparent mode if (m_mouseOver && halo) KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); @@ -1781,33 +1781,33 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) data.duration = 4000; data.subtext = i18n("Loading application ..."); data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(), - TDEIcon::Small, - iconSize, - TDEIcon::DefaultState, - 0, true); + TDEIcon::Small, + iconSize, + TDEIcon::DefaultState, + 0, true); return; } TQPixmap pixmap; TQString name; TQString details; - + if (m_filteredTasks.count() > 0) { if (READ_MERGED_TASKBAR_SETTING(showThumbnails) && m_filteredTasks.count() == 1) { Task::Ptr t = m_filteredTasks.first(); - + pixmap = t->thumbnail(READ_MERGED_TASKBAR_SETTING(thumbnailMaxDimension)); } - + if (pixmap.isNull() && tasks.count()) { // try to load icon via net_wm pixmap = KWin::icon(tasks.last()->window(), iconSize, iconSize, true); } - + // Collect all desktops the tasks are on. Sort naturally. TQMap desktopMap; bool demandsAttention = false; @@ -1821,12 +1821,12 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) { demandsAttention = true; } - + if (t->isModified()) { modified = true; } - + if (t->isOnAllDesktops()) { allDesktops = true; @@ -1838,7 +1838,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) TaskManager::the()->desktopName(t->desktop())); } } - + if (READ_MERGED_TASKBAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1) { if (desktopMap.isEmpty()) @@ -1851,20 +1851,20 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) details.append(i18n("On %1").arg(TQStyleSheet::escape(desktopNames.join(", "))) + "
"); } } - + if (demandsAttention) { details.append(i18n("Requesting attention") + "
"); } - + name = this->name(); if (modified) { details.append(i18n("Has unsaved changes")); - + static TQString modStr = "[" + i18n( "modified" ) + "]"; int modStrPos = name.find(modStr); - + if (modStrPos >= 0) { // +1 because we include a space after the closing brace. -- cgit v1.2.3