diff options
Diffstat (limited to 'kicker')
254 files changed, 5751 insertions, 5751 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 19e91be5c..7bc46afa4 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -25,17 +25,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <ctime> #include <time.h> -#include <qcheckbox.h> -#include <qcursor.h> -#include <qgroupbox.h> -#include <qimage.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qclipboard.h> -#include <qtabwidget.h> -#include <qwidgetstack.h> -#include <qcombobox.h> +#include <tqcheckbox.h> +#include <tqcursor.h> +#include <tqgroupbox.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqclipboard.h> +#include <tqtabwidget.h> +#include <tqwidgetstack.h> +#include <tqcombobox.h> #include <kapplication.h> #include <kdebug.h> @@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("clockapplet"); KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations @@ -79,7 +79,7 @@ extern "C" // Settings -KConfigDialogSingle::KConfigDialogSingle(Zone *zone, QWidget *parent, +KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, const char *name, Prefs * prefs, KDialogBase::DialogType dialogType, bool modal) : @@ -95,7 +95,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, QWidget *parent, setIcon(SmallIcon("date")); settings = new SettingsWidgetImp(prefs, zone, 0, "General"); - connect(settings->kcfg_Type, SIGNAL(activated(int)), SLOT(selectPage(int))); + connect(settings->kcfg_Type, TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background()); settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background()); @@ -115,26 +115,26 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, QWidget *parent, settings->widgetStack->addWidget(fuzzyPage, 3); fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background()); - connect(settings->kcfg_PlainShowDate, SIGNAL(toggled(bool)), - SLOT(dateToggled())); - connect(settings->kcfg_PlainShowDayOfWeek, SIGNAL(toggled(bool)), - SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDate, SIGNAL(toggled(bool)), - SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDayOfWeek, SIGNAL(toggled(bool)), - SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDate, SIGNAL(toggled(bool)), - SLOT(dateToggled())); - connect(analogPage->kcfg_AnalogShowDate, SIGNAL(toggled(bool)), - SLOT(dateToggled())); - connect(analogPage->kcfg_AnalogShowDayOfWeek, SIGNAL(toggled(bool)), - SLOT(dateToggled())); - connect(fuzzyPage->kcfg_FuzzyShowDate, SIGNAL(toggled(bool)), - SLOT(dateToggled())); - connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, SIGNAL(toggled(bool)), - SLOT(dateToggled())); - - addPage(settings, i18n("General"), QString::fromLatin1("package_settings")); + connect(settings->kcfg_PlainShowDate, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(dateToggled())); + connect(settings->kcfg_PlainShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(dateToggled())); + connect(analogPage->kcfg_AnalogShowDate, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(dateToggled())); + connect(analogPage->kcfg_AnalogShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(dateToggled())); + connect(fuzzyPage->kcfg_FuzzyShowDate, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(dateToggled())); + connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(dateToggled())); + + addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); } void KConfigDialogSingle::updateSettings() @@ -155,7 +155,7 @@ void KConfigDialogSingle::updateWidgetsDefault() item->swapDefault(); // This is ugly, but kcfg_Type does not have its correct setting // at this point in time. - QTimer::singleShot(0, this, SLOT(dateToggled())); + TQTimer::singleShot(0, this, TQT_SLOT(dateToggled())); } void KConfigDialogSingle::selectPage(int p) @@ -190,7 +190,7 @@ void KConfigDialogSingle::dateToggled() settings->dateBox->setEnabled(showDate); } -SettingsWidgetImp::SettingsWidgetImp(Prefs *p, Zone *z, QWidget* parent, const char* name, WFlags fl) : +SettingsWidgetImp::SettingsWidgetImp(Prefs *p, Zone *z, TQWidget* parent, const char* name, WFlags fl) : SettingsWidget(parent, name, fl), prefs(p), zone(z) { zone->readZoneList(tzListView); @@ -217,8 +217,8 @@ ClockWidget::~ClockWidget() //************************************************************ -PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const char *name) - : QLabel(parent, name), ClockWidget(applet, prefs) +PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, const char *name) + : TQLabel(parent, name), ClockWidget(applet, prefs) { setWFlags(WNoAutoErase); setBackgroundOrigin(AncestorOrigin); @@ -229,7 +229,7 @@ PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const int PlainClock::preferedWidthForHeight(int ) const { - QString maxLengthTime = KGlobal::locale()->formatTime( QTime( 23, 59 ), _prefs->plainShowSeconds()); + TQString maxLengthTime = KGlobal::locale()->formatTime( TQTime( 23, 59 ), _prefs->plainShowSeconds()); return fontMetrics().width( maxLengthTime ) + 8; } @@ -242,7 +242,7 @@ int PlainClock::preferedHeightForWidth(int /*w*/) const void PlainClock::updateClock() { - QString newStr = KGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds()); + TQString newStr = KGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds()); if (_force || newStr != _timeStr) { _timeStr = newStr; @@ -268,10 +268,10 @@ bool PlainClock::showDayOfWeek() return _prefs->plainShowDayOfWeek(); } -void PlainClock::paintEvent(QPaintEvent *) +void PlainClock::paintEvent(TQPaintEvent *) { - QPainter p; - QPixmap buf(size()); + TQPainter p; + TQPixmap buf(size()); buf.fill(this, 0, 0); p.begin(&buf); p.setFont(font()); @@ -284,9 +284,9 @@ void PlainClock::paintEvent(QPaintEvent *) p.end(); } -void PlainClock::drawContents(QPainter *p) +void PlainClock::drawContents(TQPainter *p) { - QRect tr(0, 0, width(), height()); + TQRect tr(0, 0, width(), height()); if (!KickerSettings::transparent()) p->drawText(tr, AlignCenter, _timeStr); @@ -297,8 +297,8 @@ void PlainClock::drawContents(QPainter *p) //************************************************************ -DigitalClock::DigitalClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const char *name) - : QLCDNumber(parent, name), ClockWidget(applet, prefs) +DigitalClock::DigitalClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, const char *name) + : TQLCDNumber(parent, name), ClockWidget(applet, prefs) { setWFlags(WNoAutoErase); setBackgroundOrigin(AncestorOrigin); @@ -331,16 +331,16 @@ int DigitalClock::preferedHeightForWidth(int w) const void DigitalClock::updateClock() { static bool colon = true; - QString newStr; - QTime t(_applet->clockGetTime()); + TQString newStr; + TQTime t(_applet->clockGetTime()); int h = t.hour(); int m = t.minute(); int s = t.second(); - QString format("%02d"); + TQString format("%02d"); - QString sep(!colon && _prefs->digitalBlink() ? " " : ":"); + TQString sep(!colon && _prefs->digitalBlink() ? " " : ":"); if (_prefs->digitalShowSeconds()) format += sep + "%02d"; @@ -378,19 +378,19 @@ void DigitalClock::loadSettings() { setFrameStyle(_prefs->digitalShowFrame() ? Panel | Sunken : NoFrame); setMargin( 4 ); - setSegmentStyle(QLCDNumber::Flat); + setSegmentStyle(TQLCDNumber::Flat); if (_prefs->digitalLCDStyle()) lcdPattern = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User); setNumDigits(_prefs->digitalShowSeconds() ? 8:5); - _buffer = new QPixmap(width(), height()); + _buffer = new TQPixmap(width(), height()); } -void DigitalClock::paintEvent(QPaintEvent*) +void DigitalClock::paintEvent(TQPaintEvent*) { - QPainter p(_buffer); + TQPainter p(_buffer); if (_prefs->digitalLCDStyle()) { @@ -403,7 +403,7 @@ void DigitalClock::paintEvent(QPaintEvent*) } else if (paletteBackgroundPixmap()) { - QPoint offset = backgroundOffset(); + TQPoint offset = backgroundOffset(); p.drawTiledPixmap(0, 0, width(), height(), *paletteBackgroundPixmap(), offset.x(), offset.y()); } else @@ -424,34 +424,34 @@ void DigitalClock::paintEvent(QPaintEvent*) // yes, the colors for the lcd-lock are hardcoded, // but other colors would break the lcd-lock anyway -void DigitalClock::drawContents( QPainter * p) +void DigitalClock::drawContents( TQPainter * p) { setUpdatesEnabled( FALSE ); - QPalette pal = palette(); + TQPalette pal = palette(); if (_prefs->digitalLCDStyle()) - pal.setColor( QColorGroup::Foreground, QColor(128,128,128)); + pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128)); else - pal.setColor( QColorGroup::Foreground, _prefs->digitalShadowColor()); + pal.setColor( TQColorGroup::Foreground, _prefs->digitalShadowColor()); setPalette( pal ); p->translate( +1, +1 ); - QLCDNumber::drawContents( p ); + TQLCDNumber::drawContents( p ); if (_prefs->digitalLCDStyle()) - pal.setColor( QColorGroup::Foreground, Qt::black); + pal.setColor( TQColorGroup::Foreground, Qt::black); else - pal.setColor( QColorGroup::Foreground, _prefs->digitalForegroundColor()); + pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); setPalette( pal ); p->translate( -2, -2 ); setUpdatesEnabled( TRUE ); - QLCDNumber::drawContents( p ); + TQLCDNumber::drawContents( p ); p->translate( +1, +1 ); } // reallocate buffer pixmap -void DigitalClock::resizeEvent ( QResizeEvent *) +void DigitalClock::resizeEvent ( TQResizeEvent *) { delete _buffer; - _buffer = new QPixmap( width(), height() ); + _buffer = new TQPixmap( width(), height() ); } @@ -469,8 +469,8 @@ bool DigitalClock::showDayOfWeek() //************************************************************ -AnalogClock::AnalogClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const char *name) - : QFrame(parent, name), ClockWidget(applet, prefs), _spPx(NULL) +AnalogClock::AnalogClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, const char *name) + : TQFrame(parent, name), ClockWidget(applet, prefs), _spPx(NULL) { setWFlags(WNoAutoErase); setBackgroundOrigin(AncestorOrigin); @@ -495,8 +495,8 @@ void AnalogClock::initBackgroundPixmap() { //make a scaled pixmap -- so when image is reduced it'll look "OK". _bgScale = _prefs->analogAntialias()+1; - QImage bgImage = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User).convertToImage(); - lcdPattern = QPixmap(bgImage.scale(bgImage.width() * _bgScale, + TQImage bgImage = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User).convertToImage(); + lcdPattern = TQPixmap(bgImage.scale(bgImage.width() * _bgScale, bgImage.height() * _bgScale)); } @@ -528,13 +528,13 @@ void AnalogClock::loadSettings() setFrameStyle(_prefs->analogShowFrame() ? Panel | Sunken : NoFrame); _time = _applet->clockGetTime(); - _spPx = new QPixmap(size().width() * _prefs->analogAntialias()+1, + _spPx = new TQPixmap(size().width() * _prefs->analogAntialias()+1, size().height() * _prefs->analogAntialias()+1); update(); } -void AnalogClock::paintEvent( QPaintEvent * ) +void AnalogClock::paintEvent( TQPaintEvent * ) { if ( !isVisible() ) return; @@ -547,10 +547,10 @@ void AnalogClock::paintEvent( QPaintEvent * ) (spHeight != _spPx->size().height())) { delete _spPx; - _spPx = new QPixmap(spWidth, spHeight); + _spPx = new TQPixmap(spWidth, spHeight); } - QPainter paint; + TQPainter paint; paint.begin(_spPx); if (_prefs->analogLCDStyle()) @@ -570,12 +570,12 @@ void AnalogClock::paintEvent( QPaintEvent * ) } else if (paletteBackgroundPixmap()) { - QPixmap bg(width(), height()); - QPainter p(&bg); - QPoint offset = backgroundOffset(); + TQPixmap bg(width(), height()); + TQPainter p(&bg); + TQPoint offset = backgroundOffset(); p.drawTiledPixmap(0, 0, width(), height(), *paletteBackgroundPixmap(), offset.x(), offset.y()); p.end(); - QImage bgImage = bg.convertToImage().scale(spWidth, spHeight); + TQImage bgImage = bg.convertToImage().scale(spWidth, spHeight); paint.drawImage(0, 0, bgImage); } else @@ -583,26 +583,26 @@ void AnalogClock::paintEvent( QPaintEvent * ) _spPx->fill(_prefs->analogBackgroundColor()); } - QPointArray pts; - QPoint cp(spWidth / 2, spHeight / 2); + TQPointArray pts; + TQPoint cp(spWidth / 2, spHeight / 2); int d = KMIN(spWidth,spHeight) - (10 * aaFactor); if (_prefs->analogLCDStyle()) { - paint.setPen( QPen(QColor(100,100,100), aaFactor) ); - paint.setBrush( QColor(100,100,100) ); + paint.setPen( TQPen(TQColor(100,100,100), aaFactor) ); + paint.setBrush( TQColor(100,100,100) ); } else { - paint.setPen( QPen(_prefs->analogShadowColor(), aaFactor) ); + paint.setPen( TQPen(_prefs->analogShadowColor(), aaFactor) ); paint.setBrush( _prefs->analogShadowColor() ); } paint.setViewport(2,2,spWidth,spHeight); for ( int c=0 ; c < 2 ; c++ ) { - QWMatrix matrix; + TQWMatrix matrix; matrix.translate( cp.x(), cp.y()); matrix.scale( d/1000.0F, d/1000.0F ); @@ -631,7 +631,7 @@ void AnalogClock::paintEvent( QPaintEvent * ) matrix.rotate( -s_angle ); } - QWMatrix matrix2; + TQWMatrix matrix2; matrix2.translate( cp.x(), cp.y()); matrix2.scale( d/1000.0F, d/1000.0F ); @@ -644,10 +644,10 @@ void AnalogClock::paintEvent( QPaintEvent * ) } if (_prefs->analogLCDStyle()) { - paint.setPen( QPen(Qt::black, aaFactor) ); + paint.setPen( TQPen(Qt::black, aaFactor) ); paint.setBrush( Qt::black ); } else { - paint.setPen( QPen(_prefs->analogForegroundColor(), aaFactor) ); + paint.setPen( TQPen(_prefs->analogForegroundColor(), aaFactor) ); paint.setBrush( _prefs->analogForegroundColor() ); } @@ -655,13 +655,13 @@ void AnalogClock::paintEvent( QPaintEvent * ) } paint.end(); - QPainter paintFinal; + TQPainter paintFinal; paintFinal.begin(this); if (aaFactor != 1) { - QImage spImage = _spPx->convertToImage(); - QImage displayImage = spImage.smoothScale(size()); + TQImage spImage = _spPx->convertToImage(); + TQImage displayImage = spImage.smoothScale(size()); paintFinal.drawImage(0, 0, displayImage); } @@ -678,7 +678,7 @@ void AnalogClock::paintEvent( QPaintEvent * ) // the background pixmap disappears during a style change -void AnalogClock::styleChange(QStyle &) +void AnalogClock::styleChange(TQStyle &) { if (_prefs->analogLCDStyle()) { @@ -700,8 +700,8 @@ bool AnalogClock::showDayOfWeek() //************************************************************ -FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const char *name) - : QFrame(parent, name), ClockWidget(applet, prefs) +FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, const char *name) + : TQFrame(parent, name), ClockWidget(applet, prefs) { setBackgroundOrigin(AncestorOrigin); loadSettings(); @@ -754,7 +754,7 @@ FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const void FuzzyClock::deleteMyself() { if(alreadyDrawing) // try again later - QTimer::singleShot(1000, this, SLOT(deleteMyself())); + TQTimer::singleShot(1000, this, TQT_SLOT(deleteMyself())); else delete this; } @@ -762,14 +762,14 @@ void FuzzyClock::deleteMyself() int FuzzyClock::preferedWidthForHeight(int ) const { - QFontMetrics fm(_prefs->fuzzyFont()); + TQFontMetrics fm(_prefs->fuzzyFont()); return fm.width(_timeStr) + 8; } int FuzzyClock::preferedHeightForWidth(int ) const { - QFontMetrics fm(_prefs->fuzzyFont()); + TQFontMetrics fm(_prefs->fuzzyFont()); return fm.width(_timeStr) + 8; } @@ -792,7 +792,7 @@ void FuzzyClock::loadSettings() setFrameStyle(_prefs->fuzzyShowFrame() ? Panel | Sunken : 0); } -void FuzzyClock::drawContents(QPainter *p) +void FuzzyClock::drawContents(TQPainter *p) { if (!isVisible()) return; @@ -801,7 +801,7 @@ void FuzzyClock::drawContents(QPainter *p) return; alreadyDrawing = true; - QString newTimeStr; + TQString newTimeStr; if (_prefs->fuzzyness() == 1 || _prefs->fuzzyness() == 2) { int minute = _time.minute(); @@ -838,7 +838,7 @@ void FuzzyClock::drawContents(QPainter *p) } if (phStart >= 0) newTimeStr.replace(phStart, phLength, hourNames[realHour]); - newTimeStr.replace(0, 1, QString(newTimeStr.at(0).upper())); + newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper())); } } else if (_prefs->fuzzyness() == 3) { newTimeStr = dayTime[_time.hour() / 3]; @@ -863,15 +863,15 @@ void FuzzyClock::drawContents(QPainter *p) p->setFont(_prefs->fuzzyFont()); p->setPen(_prefs->fuzzyForegroundColor()); - QRect tr; + TQRect tr; if (_applet->getOrientation() == Vertical) { p->rotate(90); - tr = QRect(4, -2, height() - 8, -(width()) + 2); + tr = TQRect(4, -2, height() - 8, -(width()) + 2); } else - tr = QRect(4, 2, width() - 8, height() - 4); + tr = TQRect(4, 2, width() - 8, height() - 4); if (!KickerSettings::transparent()) p->drawText(tr, AlignCenter, _timeStr); @@ -895,14 +895,14 @@ bool FuzzyClock::showDayOfWeek() //************************************************************ -ClockApplet::ClockApplet(const QString& configFile, Type t, int actions, - QWidget *parent, const char *name) +ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, + TQWidget *parent, const char *name) : KPanelApplet(configFile, t, actions, parent, name), _calendar(0), _disableCalendar(false), _clock(0), - _timer(new QTimer(this)), - m_layoutTimer(new QTimer(this)), + _timer(new TQTimer(this)), + m_layoutTimer(new TQTimer(this)), m_layoutDelay(0), m_followBackgroundSetting(true), m_dateFollowBackgroundSetting(true), @@ -918,19 +918,19 @@ ClockApplet::ClockApplet(const QString& configFile, Type t, int actions, configFileName = configFile.latin1(); setBackgroundOrigin(AncestorOrigin); - _dayOfWeek = new QLabel(this); + _dayOfWeek = new TQLabel(this); _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _dayOfWeek->setBackgroundOrigin(AncestorOrigin); _dayOfWeek->installEventFilter(this); // catch mouse clicks - _date = new QLabel(this); + _date = new TQLabel(this); _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _date->setBackgroundOrigin(AncestorOrigin); _date->installEventFilter(this); // catch mouse clicks - connect(m_layoutTimer, SIGNAL(timeout()), this, SLOT(fixupLayout())); - connect(_timer, SIGNAL(timeout()), SLOT(slotUpdate())); - connect(kapp, SIGNAL(kdisplayPaletteChanged()), SLOT(globalPaletteChange())); + connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); + connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); reconfigure(); // initialize clock widget slotUpdate(); @@ -938,8 +938,8 @@ ClockApplet::ClockApplet(const QString& configFile, Type t, int actions, if (kapp->authorizeKAction("kicker_rmb")) { menu = new KPopupMenu(); - connect(menu, SIGNAL(aboutToShow()), SLOT(aboutToShowContextMenu())); - connect(menu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int))); + connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); + connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); setCustomMenu(menu); } @@ -1030,7 +1030,7 @@ int ClockApplet::widthForHeight(int h) const { // if the date format STARTS with a year, assume it's in descending // order and should therefore PRECEED the date. - QString dateFormat = KGlobal::locale()->dateFormatShort(); + TQString dateFormat = KGlobal::locale()->dateFormatShort(); dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y'; } @@ -1129,9 +1129,9 @@ int ClockApplet::heightForWidth(int w) const if (_date->minimumSizeHint().width() > w) { - QString dateStr = _date->text(); + TQString dateStr = _date->text(); // if we're too wide to fit, replace the first non-digit from the end with a space - int p = dateStr.findRev(QRegExp("[^0-9]")); + int p = dateStr.findRev(TQRegExp("[^0-9]")); if (p > 0) { _date->setText(dateStr.insert(p, '\n')); @@ -1167,7 +1167,7 @@ void ClockApplet::preferences(bool timezone) if (!dialog) { dialog = new KConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow); - connect(dialog, SIGNAL(settingsChanged()), this, SLOT(slotReconfigure())); + connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure())); } if (timezone) @@ -1180,8 +1180,8 @@ void ClockApplet::preferences(bool timezone) void ClockApplet::updateFollowBackground() { - QColor globalBgroundColor = KApplication::palette().active().background(); - QColor bgColor; + TQColor globalBgroundColor = KApplication::palette().active().background(); + TQColor bgColor; switch (_prefs->type()) { @@ -1253,7 +1253,7 @@ void ClockApplet::reconfigure() m_updateOnTheMinute = updateInterval != shortInterval; if (m_updateOnTheMinute) { - connect(_timer, SIGNAL(timeout()), this, SLOT(setTimerTo60())); + connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); updateInterval = ((60 - clockGetTime().second()) * 1000) + 500; } else @@ -1261,7 +1261,7 @@ void ClockApplet::reconfigure() // in case we reconfigure to show seconds but setTimerTo60 is going to be called // we need to make sure to disconnect this so we don't end up updating only once // a minute ;) - disconnect(_timer, SIGNAL(timeout()), this, SLOT(setTimerTo60())); + disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); } _timer->start(updateInterval); @@ -1311,14 +1311,14 @@ void ClockApplet::reconfigure() void ClockApplet::setTimerTo60() { // kdDebug() << "setTimerTo60" << endl; - disconnect(_timer, SIGNAL(timeout()), this, SLOT(setTimerTo60())); + disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); _timer->changeInterval(60000); } void ClockApplet::setBackground() { - QColor globalBgroundColor = KApplication::palette().active().background(); - QColor fgColor, bgColor; + TQColor globalBgroundColor = KApplication::palette().active().background(); + TQColor fgColor, bgColor; if (!_clock) return; @@ -1382,7 +1382,7 @@ void ClockApplet::globalPaletteChange() if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting) return; - QColor globalBgroundColor = KApplication::palette().active().background(); + TQColor globalBgroundColor = KApplication::palette().active().background(); if (m_dateFollowBackgroundSetting) _prefs->setDateBackgroundColor(globalBgroundColor); @@ -1428,7 +1428,7 @@ void ClockApplet::slotUpdate() if (seconds > 2) { - connect(_timer, SIGNAL(timeout()), this, SLOT(setTimerTo60())); + connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); _timer->changeInterval(((60 - seconds) * 1000) + 500); } } @@ -1441,7 +1441,7 @@ void ClockApplet::slotCalendarDeleted() _calendar = 0L; // don't reopen the calendar immediately ... _disableCalendar = true; - QTimer::singleShot(100, this, SLOT(slotEnableCalendar())); + TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar())); // we are free to show a tip know :) installEventFilter(KickerTip::the()); @@ -1471,11 +1471,11 @@ void ClockApplet::toggleCalendar() removeEventFilter(KickerTip::the()); _calendar = new DatePicker(this, _lastDate, _prefs); - connect(_calendar, SIGNAL(destroyed()), SLOT(slotCalendarDeleted())); + connect(_calendar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted())); - QSize size = _prefs->calendarSize(); + TQSize size = _prefs->calendarSize(); - if (size != QSize()) + if (size != TQSize()) { _calendar->resize(size); } @@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar() } // make calendar fully visible - QPoint popupAt = KickerLib::popupPosition(popupDirection(), + TQPoint popupAt = KickerLib::popupPosition(popupDirection(), _calendar, this); _calendar->move(popupAt); @@ -1499,7 +1499,7 @@ void ClockApplet::openContextMenu() if (!menu || !kapp->authorizeKAction("kicker_rmb")) return; - menu->exec( QCursor::pos() ); + menu->exec( TQCursor::pos() ); } void ClockApplet::contextMenuActivated(int result) @@ -1528,7 +1528,7 @@ void ClockApplet::contextMenuActivated(int result) case 103: proc << locate("exe", "kdesu"); proc << "--nonewdcop"; - proc << QString("%1 kde-clock.desktop --lang %2") + proc << TQString("%1 kde-clock.desktop --lang %2") .arg(locate("exe", "kcmshell")) .arg(KGlobal::locale()->language()); proc.start(KProcess::DontCare); @@ -1552,7 +1552,7 @@ void ClockApplet::aboutToShowContextMenu() menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); KLocale *loc = KGlobal::locale(); - QDateTime dt = QDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); dt = dt.addSecs(TZoffset); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -1565,12 +1565,12 @@ void ClockApplet::aboutToShowContextMenu() copyMenu->insertItem(dt.time().toString(), 207); copyMenu->insertItem(dt.toString(), 208); copyMenu->insertItem(dt.toString("yyyy-MM-dd hh:mm:ss"), 209); - connect( copyMenu, SIGNAL( activated(int) ), this, SLOT( slotCopyMenuActivated(int) ) ); + connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) ); if (!bImmutable) { KPopupMenu *zoneMenu = new KPopupMenu( menu ); - connect(zoneMenu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int))); + connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); for (int i = 0; i <= zone->remoteZoneCount(); i++) { if (i == 0) @@ -1587,7 +1587,7 @@ void ClockApplet::aboutToShowContextMenu() zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110); KPopupMenu *type_menu = new KPopupMenu(menu); - connect(type_menu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int))); + connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1); type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2); type_menu->insertItem(i18n("&Analog"), Prefs::EnumType::Analog, 3); @@ -1614,19 +1614,19 @@ void ClockApplet::aboutToShowContextMenu() void ClockApplet::slotCopyMenuActivated( int id ) { - QPopupMenu *m = (QPopupMenu *) sender(); - QString s = m->text(id); - QApplication::clipboard()->setText(s); + TQPopupMenu *m = (TQPopupMenu *) sender(); + TQString s = m->text(id); + TQApplication::clipboard()->setText(s); } -QTime ClockApplet::clockGetTime() +TQTime ClockApplet::clockGetTime() { - return QTime::currentTime().addSecs(TZoffset); + return TQTime::currentTime().addSecs(TZoffset); } -QDate ClockApplet::clockGetDate() +TQDate ClockApplet::clockGetDate() { - return QDateTime::currentDateTime().addSecs(TZoffset).date(); + return TQDateTime::currentDateTime().addSecs(TZoffset).date(); } void ClockApplet::showZone(int z) @@ -1649,26 +1649,26 @@ void ClockApplet::prevZone() showZone(zone->zoneIndex()); } -void ClockApplet::mousePressEvent(QMouseEvent *ev) +void ClockApplet::mousePressEvent(TQMouseEvent *ev) { switch (ev->button()) { - case QMouseEvent::LeftButton: + case TQMouseEvent::LeftButton: toggleCalendar(); break; - case QMouseEvent::RightButton: + case TQMouseEvent::RightButton: openContextMenu(); break; - case QMouseEvent::MidButton: + case TQMouseEvent::MidButton: nextZone(); - QToolTip::remove(_clock->widget()); + TQToolTip::remove(_clock->widget()); break; default: break; } } -void ClockApplet::wheelEvent(QWheelEvent* e) +void ClockApplet::wheelEvent(TQWheelEvent* e) { if (e->delta() < 0) { @@ -1679,17 +1679,17 @@ void ClockApplet::wheelEvent(QWheelEvent* e) nextZone(); } - QToolTip::remove(_clock->widget()); + TQToolTip::remove(_clock->widget()); KickerTip::Client::updateKickerTip(); } // catch the mouse clicks of our child widgets -bool ClockApplet::eventFilter( QObject *o, QEvent *e ) +bool ClockApplet::eventFilter( TQObject *o, TQEvent *e ) { if (( o == _clock->widget() || o == _date || o == _dayOfWeek) && - e->type() == QEvent::MouseButtonPress ) + e->type() == TQEvent::MouseButtonPress ) { - mousePressEvent(static_cast<QMouseEvent*>(e) ); + mousePressEvent(static_cast<TQMouseEvent*>(e) ); return true; } @@ -1709,13 +1709,13 @@ void ClockApplet::updateDateLabel(bool reLayout) if (zone->zoneIndex() != 0) { - QString zone_s = i18n(zone->zone().utf8()); + TQString zone_s = i18n(zone->zone().utf8()); _date->setText(zone_s.mid(zone_s.find('/') + 1).replace("_", " ")); _date->setShown(true); } else { - QString dateStr = KGlobal::locale()->formatDate(_lastDate, true); + TQString dateStr = KGlobal::locale()->formatDate(_lastDate, true); _date->setText(dateStr); _date->setShown(showDate); } @@ -1736,12 +1736,12 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) { int zoneCount = zone->remoteZoneCount(); - QString activeZone = zone->zone(); + TQString activeZone = zone->zone(); if (zoneCount == 0) { - QString _time = KGlobal::locale()->formatTime(clockGetTime(), + TQString _time = KGlobal::locale()->formatTime(clockGetTime(), _prefs->plainShowSeconds()); - QString _date = KGlobal::locale()->formatDate(clockGetDate(), false); + TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false); data.message = _time; data.subtext = _date; @@ -1757,7 +1757,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) for (int i = 0; i <= zone->remoteZoneCount(); i++) { - QString m_zone = zone->zone(i); + TQString m_zone = zone->zone(i); TZoffset = zone->calc_TZ_offset(m_zone); if (!m_zone.isEmpty()) @@ -1765,9 +1765,9 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) m_zone = i18n(m_zone.utf8()); // ensure it gets translated } - QString _time = KGlobal::locale()->formatTime(clockGetTime(), + TQString _time = KGlobal::locale()->formatTime(clockGetTime(), _prefs->plainShowSeconds()); - QString _date = KGlobal::locale()->formatDate(clockGetDate(), false); + TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false); if (activeIndex == i) { @@ -1839,19 +1839,19 @@ int ClockApplet::type() } ClockAppletToolTip::ClockAppletToolTip( ClockApplet* clock ) - : QToolTip( clock ), + : TQToolTip( clock ), m_clock( clock ) { } -void ClockAppletToolTip::maybeTip( const QPoint & /*point*/ ) +void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) { - QString tipText; + TQString tipText; if ( (m_clock->type() == Prefs::EnumType::Fuzzy) || (m_clock->type() == Prefs::EnumType::Analog) ) { // show full time (incl. hour) as tooltip for Fuzzy clock - tipText = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(m_clock->TZoffset)); + tipText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)); } else { diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h index efa67be46..e1bc980e8 100644 --- a/kicker/applets/clock/clock.h +++ b/kicker/applets/clock/clock.h @@ -24,15 +24,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __CLOCK_H #define __CLOCK_H -#include <qlcdnumber.h> -#include <qlabel.h> -#include <qtoolbutton.h> -#include <qguardedptr.h> -#include <qdatetime.h> -#include <qvbox.h> -#include <qstringlist.h> -#include <qtooltip.h> -#include <qevent.h> +#include <tqlcdnumber.h> +#include <tqlabel.h> +#include <tqtoolbutton.h> +#include <tqguardedptr.h> +#include <tqdatetime.h> +#include <tqvbox.h> +#include <tqstringlist.h> +#include <tqtooltip.h> +#include <tqevent.h> #include <dcopobject.h> #include <kpanelapplet.h> @@ -71,7 +71,7 @@ class SettingsWidgetImp : public SettingsWidget public: SettingsWidgetImp(Prefs *p=0, Zone *z=0, - QWidget* parent=0, + TQWidget* parent=0, const char* name=0, WFlags fl=0); public slots: @@ -88,7 +88,7 @@ class KConfigDialogSingle : public KConfigDialog public: KConfigDialogSingle(Zone *zone, - QWidget *parent=0, + TQWidget *parent=0, const char *name=0, Prefs *prefs=0, KDialogBase::DialogType dialogType = KDialogBase::IconList, @@ -120,7 +120,7 @@ class ClockWidget ClockWidget(ClockApplet *applet, Prefs *prefs); virtual ~ClockWidget(); - virtual QWidget* widget()=0; + virtual TQWidget* widget()=0; virtual int preferedWidthForHeight(int h) const =0; virtual int preferedHeightForWidth(int w) const =0; virtual void updateClock()=0; @@ -132,19 +132,19 @@ class ClockWidget protected: ClockApplet *_applet; Prefs *_prefs; - QTime _time; + TQTime _time; bool _force; }; -class PlainClock : public QLabel, public ClockWidget +class PlainClock : public TQLabel, public ClockWidget { Q_OBJECT public: - PlainClock(ClockApplet *applet, Prefs *prefs, QWidget *parent=0, const char *name=0); + PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0); - QWidget* widget() { return this; } + TQWidget* widget() { return this; } int preferedWidthForHeight(int h) const; int preferedHeightForWidth(int w) const; void updateClock(); @@ -153,22 +153,22 @@ class PlainClock : public QLabel, public ClockWidget bool showDayOfWeek(); protected: - void paintEvent(QPaintEvent *e); - void drawContents(QPainter *p); + void paintEvent(TQPaintEvent *e); + void drawContents(TQPainter *p); - QString _timeStr; + TQString _timeStr; }; -class DigitalClock : public QLCDNumber, public ClockWidget +class DigitalClock : public TQLCDNumber, public ClockWidget { Q_OBJECT public: - DigitalClock(ClockApplet *applet, Prefs *prefs, QWidget *parent=0, const char *name=0); + DigitalClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0); ~DigitalClock(); - QWidget* widget() { return this; } + TQWidget* widget() { return this; } int preferedWidthForHeight(int h) const; int preferedHeightForWidth(int w) const; void updateClock(); @@ -177,25 +177,25 @@ class DigitalClock : public QLCDNumber, public ClockWidget bool showDayOfWeek(); protected: - void paintEvent( QPaintEvent*); - void drawContents( QPainter * p); - void resizeEvent ( QResizeEvent *ev); + void paintEvent( TQPaintEvent*); + void drawContents( TQPainter * p); + void resizeEvent ( TQResizeEvent *ev); - QPixmap *_buffer; - QString _timeStr; - QPixmap lcdPattern; + TQPixmap *_buffer; + TQString _timeStr; + TQPixmap lcdPattern; }; -class AnalogClock : public QFrame, public ClockWidget +class AnalogClock : public TQFrame, public ClockWidget { Q_OBJECT public: - AnalogClock(ClockApplet *applet, Prefs *prefs, QWidget *parent=0, const char *name=0); + AnalogClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0); ~AnalogClock(); - QWidget* widget() { return this; } + TQWidget* widget() { return this; } int preferedWidthForHeight(int h) const { return h; } int preferedHeightForWidth(int w) const { return w; } void updateClock(); @@ -204,24 +204,24 @@ class AnalogClock : public QFrame, public ClockWidget bool showDayOfWeek(); protected: - virtual void paintEvent(QPaintEvent *); - void styleChange(QStyle&); + virtual void paintEvent(TQPaintEvent *); + void styleChange(TQStyle&); void initBackgroundPixmap(); - QPixmap *_spPx; - QPixmap lcdPattern; + TQPixmap *_spPx; + TQPixmap lcdPattern; int _bgScale; }; -class FuzzyClock : public QFrame, public ClockWidget +class FuzzyClock : public TQFrame, public ClockWidget { Q_OBJECT public: - FuzzyClock(ClockApplet *applet, Prefs* prefs, QWidget *parent=0, const char *name=0); + FuzzyClock(ClockApplet *applet, Prefs* prefs, TQWidget *parent=0, const char *name=0); - QWidget* widget() { return this; } + TQWidget* widget() { return this; } int preferedWidthForHeight(int h) const; int preferedHeightForWidth(int w) const; void updateClock(); @@ -233,14 +233,14 @@ class FuzzyClock : public QFrame, public ClockWidget void deleteMyself(); protected: - virtual void drawContents(QPainter *p); + virtual void drawContents(TQPainter *p); - QStringList hourNames; - QStringList normalFuzzy; - QStringList normalFuzzyOne; - QStringList dayTime; + TQStringList hourNames; + TQStringList normalFuzzy; + TQStringList normalFuzzyOne; + TQStringList dayTime; - QString _timeStr; + TQString _timeStr; private: bool alreadyDrawing; @@ -252,7 +252,7 @@ class ClockAppletToolTip : public QToolTip ClockAppletToolTip( ClockApplet* clock ); protected: - virtual void maybeTip( const QPoint & ); + virtual void maybeTip( const TQPoint & ); private: ClockApplet *m_clock; @@ -266,8 +266,8 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb friend class ClockAppletToolTip; public: - ClockApplet(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + ClockApplet(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); ~ClockApplet(); int widthForHeight(int h) const; @@ -279,8 +279,8 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb void resizeRequest() { emit(updateLayout()); } const Zone* timezones() { return zone; } - QTime clockGetTime(); - QDate clockGetDate(); + TQTime clockGetTime(); + TQDate clockGetDate(); virtual void updateKickerTip(KickerTip::Data&); @@ -310,23 +310,23 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb void prevZone(); void updateFollowBackground(); - void paletteChange(const QPalette &) { setBackground(); } + void paletteChange(const TQPalette &) { setBackground(); } void setBackground(); - void mousePressEvent(QMouseEvent *ev); - void wheelEvent(QWheelEvent* e); - bool eventFilter(QObject *, QEvent *); + void mousePressEvent(TQMouseEvent *ev); + void wheelEvent(TQWheelEvent* e); + bool eventFilter(TQObject *, TQEvent *); virtual void positionChange(Position p); - QCString configFileName; + TQCString configFileName; DatePicker *_calendar; bool _disableCalendar; ClockWidget *_clock; - QLabel *_date; - QLabel *_dayOfWeek; - QDate _lastDate; - QTimer *_timer; - QTimer *m_layoutTimer; + TQLabel *_date; + TQLabel *_dayOfWeek; + TQDate _lastDate; + TQTimer *_timer; + TQTimer *m_layoutTimer; int m_layoutDelay; bool m_followBackgroundSetting; bool m_dateFollowBackgroundSetting; @@ -338,7 +338,7 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb bool showDate; bool showDayOfWeek; bool m_updateOnTheMinute; - QStringList _remotezonelist; + TQStringList _remotezonelist; KPopupMenu* menu; ClockAppletToolTip m_tooltip; KTextShadowEngine *m_shadowEngine; diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp index 0ea677e8a..3864db556 100644 --- a/kicker/applets/clock/datepicker.cpp +++ b/kicker/applets/clock/datepicker.cpp @@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kwin.h> #include <netwm.h> -DatePicker::DatePicker(QWidget *parent, const QDate& date, Prefs* _prefs) - : QVBox( parent, 0, +DatePicker::DatePicker(TQWidget *parent, const TQDate& date, Prefs* _prefs) + : TQVBox( parent, 0, _prefs->calendarFullWindow() ? (WType_TopLevel | WDestructiveClose | WStyle_StaysOnTop) @@ -43,11 +43,11 @@ DatePicker::DatePicker(QWidget *parent, const QDate& date, Prefs* _prefs) if (prefs->calendarFullWindow()) { KWin::setType(winId(), NET::Utility); - setFrameStyle(QFrame::NoFrame); + setFrameStyle(TQFrame::NoFrame); } else { - setFrameStyle(QFrame::PopupPanel | QFrame::Raised); + setFrameStyle(TQFrame::PopupPanel | TQFrame::Raised); } KWin::setOnAllDesktops(handle(), true); @@ -59,15 +59,15 @@ DatePicker::DatePicker(QWidget *parent, const QDate& date, Prefs* _prefs) setIcon(SmallIcon("date")); } -void DatePicker::closeEvent(QCloseEvent* e) +void DatePicker::closeEvent(TQCloseEvent* e) { prefs->setCalendarSize(size()); - QVBox::closeEvent(e); + TQVBox::closeEvent(e); } -void DatePicker::keyPressEvent(QKeyEvent *e) +void DatePicker::keyPressEvent(TQKeyEvent *e) { - QVBox::keyPressEvent(e); + TQVBox::keyPressEvent(e); if (e->key() == Qt::Key_Escape) { @@ -75,12 +75,12 @@ void DatePicker::keyPressEvent(QKeyEvent *e) } } -bool DatePicker::setDate(const QDate& date) +bool DatePicker::setDate(const TQDate& date) { return picker->setDate(date); } -QDate DatePicker::date() +TQDate DatePicker::date() { return picker->date(); } diff --git a/kicker/applets/clock/datepicker.h b/kicker/applets/clock/datepicker.h index ee39261e0..f2e8a3397 100644 --- a/kicker/applets/clock/datepicker.h +++ b/kicker/applets/clock/datepicker.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __DATEPICKER_H #define __DATEPICKER_H -#include <qvbox.h> -#include <qdatetime.h> +#include <tqvbox.h> +#include <tqdatetime.h> class KDatePicker; class Prefs; @@ -33,13 +33,13 @@ class Prefs; class DatePicker : public QVBox { public: - DatePicker(QWidget*, const QDate&, Prefs* _prefs); - bool setDate(const QDate& date); - QDate date(); + DatePicker(TQWidget*, const TQDate&, Prefs* _prefs); + bool setDate(const TQDate& date); + TQDate date(); protected: - void closeEvent(QCloseEvent* e); - void keyPressEvent(QKeyEvent *e); + void closeEvent(TQCloseEvent* e); + void keyPressEvent(TQKeyEvent *e); private: KDatePicker *picker; diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index 1d952a765..320d84b4c 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -34,8 +34,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kstringhandler.h> #include <klocale.h> -#include <qfile.h> -#include <qtooltip.h> +#include <tqfile.h> +#include <tqtooltip.h> #include <klistview.h> #include <time.h> @@ -51,8 +51,8 @@ Zone::Zone(KConfig* conf): config->setGroup("General"); /* default displayable timezones */ - QString tzList = config->readEntry("RemoteZones"); - _remotezonelist = QStringList::split(",", tzList); + TQString tzList = config->readEntry("RemoteZones"); + _remotezonelist = TQStringList::split(",", tzList); setZone(config->readNumEntry("Initial_TZ", 0)); } @@ -69,12 +69,12 @@ void Zone::setZone(int z) _zoneIndex = z; } -QString Zone::zone(int z) const +TQString Zone::zone(int z) const { return (z == 0 ? _defaultTZ : _remotezonelist[z-1]); } -int Zone::calc_TZ_offset(const QString& zone, bool /* reset */) +int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */) { const KTimezone *z = zone.isEmpty() ? m_zoneDb.local() : m_zoneDb.zone(zone); @@ -94,26 +94,26 @@ int Zone::calc_TZ_offset(const QString& zone, bool /* reset */) void Zone::readZoneList(KListView *listView ) { const KTimezones::ZoneMap zones = m_zoneDb.allZones(); - QMap<QString, QListViewItem*> KontinentMap; + TQMap<TQString, TQListViewItem*> KontinentMap; listView->setRootIsDecorated(true); for (KTimezones::ZoneMap::ConstIterator it = zones.begin(); it != zones.end(); ++it) { const KTimezone *zone = it.data(); - QString tzName = zone->name(); - QString comment = zone->comment(); + TQString tzName = zone->name(); + TQString comment = zone->comment(); if (!comment.isEmpty()) comment = i18n(comment.utf8()); - const QStringList KontCity = QStringList::split("/", i18n(tzName.utf8()).replace("_", " ")); - QListViewItem* Kontinent = KontinentMap[KontCity[0]]; + const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).replace("_", " ")); + TQListViewItem* Kontinent = KontinentMap[KontCity[0]]; if (!Kontinent) { - KontinentMap[KontCity[0]] = new QListViewItem(listView, KontCity[0]); + KontinentMap[KontCity[0]] = new TQListViewItem(listView, KontCity[0]); Kontinent = KontinentMap[KontCity[0]]; Kontinent->setExpandable(true); } - QCheckListItem *li = new QCheckListItem(Kontinent, KontCity[1], QCheckListItem::CheckBox); + TQCheckListItem *li = new TQCheckListItem(Kontinent, KontCity[1], TQCheckListItem::CheckBox); li->setText(1, comment); li->setText(2, tzName); /* store complete path in ListView */ @@ -122,11 +122,11 @@ void Zone::readZoneList(KListView *listView ) // locate the flag from /l10n/%1/flag.png // if not available select default "C" flag - QString flag = locate( "locale", QString("l10n/%1/flag.png").arg(zone->countryCode().lower()) ); - if (!QFile::exists(flag)) + TQString flag = locate( "locale", TQString("l10n/%1/flag.png").arg(zone->countryCode().lower()) ); + if (!TQFile::exists(flag)) flag = locate( "locale", "l10n/C/flag.png" ); - if (QFile::exists(flag)) - li->setPixmap(0, QPixmap(flag)); + if (TQFile::exists(flag)) + li->setPixmap(0, TQPixmap(flag)); } } @@ -135,14 +135,14 @@ void Zone::getSelectedZonelist(KListView *listView) _remotezonelist.clear(); /* loop through all entries */ - QListViewItem *root = listView->firstChild(); + TQListViewItem *root = listView->firstChild(); while (root) { if (root->firstChild()) { root = root->firstChild(); continue; } - QCheckListItem *cl = (QCheckListItem*) root; + TQCheckListItem *cl = (TQCheckListItem*) root; if (cl->isOn()) { _remotezonelist.append(cl->text(2)); } diff --git a/kicker/applets/clock/zone.h b/kicker/applets/clock/zone.h index 34371c6ae..db34188bd 100644 --- a/kicker/applets/clock/zone.h +++ b/kicker/applets/clock/zone.h @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __ZONE_H #include <ktimezones.h> -#include <qstringlist.h> +#include <tqstringlist.h> class KConfig; class KListView; @@ -38,24 +38,24 @@ public: void writeSettings(); - QString zone() const { return zone(_zoneIndex); }; - QString zone(int z) const; - QStringList remoteZoneList() const { return _remotezonelist; }; + TQString zone() const { return zone(_zoneIndex); }; + TQString zone(int z) const; + TQStringList remoteZoneList() const { return _remotezonelist; }; int remoteZoneCount() { return _remotezonelist.count(); }; unsigned int zoneIndex() const { return _zoneIndex; } void setZone(int z = 0); void nextZone(); void prevZone(); - int calc_TZ_offset(const QString& zone, bool reset=false); + int calc_TZ_offset(const TQString& zone, bool reset=false); void readZoneList(KListView *listView); void getSelectedZonelist(KListView *listView); protected: KTimezones m_zoneDb; - QStringList _remotezonelist; + TQStringList _remotezonelist; KConfig *config; - QString _defaultTZ; + TQString _defaultTZ; unsigned int _zoneIndex; }; diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp index 9950dd2a9..c35f0970c 100644 --- a/kicker/applets/launcher/configdlg.cpp +++ b/kicker/applets/launcher/configdlg.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcombobox.h> +#include <tqcombobox.h> #include <klocale.h> #include <kdebug.h> @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "configdlg.h" #include "configdlgbase.h" -ConfigDlg::ConfigDlg(QWidget *parent, const char *name, Prefs *config, +ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize, KConfigDialog::DialogType dialogType, int dialogButtons) : KConfigDialog(parent, name, config, dialogType, dialogButtons), @@ -44,11 +44,11 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, Prefs *config, m_ui->iconDim->insertItem(i18n("Automatic")); for (int n=0; n<int(m_settings->iconDimChoices().size()); ++n) { - m_ui->iconDim->insertItem(QString::number( + m_ui->iconDim->insertItem(TQString::number( m_settings->iconDimChoices()[n])); } - connect(m_ui->iconDim, SIGNAL(textChanged(const QString&)), - this, SLOT(updateButtons())); + connect(m_ui->iconDim, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(updateButtons())); updateWidgets(); m_oldIconDimText = m_ui->iconDim->currentText(); updateButtons(); @@ -83,7 +83,7 @@ void ConfigDlg::updateWidgets() } else { - m_ui->iconDim->setEditText(QString::number(m_settings->iconDim())); + m_ui->iconDim->setEditText(TQString::number(m_settings->iconDim())); } } diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h index 1d03a9381..ff35098d3 100644 --- a/kicker/applets/launcher/configdlg.h +++ b/kicker/applets/launcher/configdlg.h @@ -34,7 +34,7 @@ class ConfigDlg : public KConfigDialog Q_OBJECT public: - ConfigDlg(QWidget *parent, const char *name, Prefs *config, int autoSize, + ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize, KConfigDialog::DialogType dialogType, int dialogButtons); protected: @@ -49,7 +49,7 @@ private: ConfigDlgBase *m_ui; Prefs* m_settings; int m_autoSize; - QString m_oldIconDimText; + TQString m_oldIconDimText; }; #endif diff --git a/kicker/applets/launcher/flowgridmanager.cpp b/kicker/applets/launcher/flowgridmanager.cpp index b5715097b..0cf3fba62 100644 --- a/kicker/applets/launcher/flowgridmanager.cpp +++ b/kicker/applets/launcher/flowgridmanager.cpp @@ -13,10 +13,10 @@ #endif -FlowGridManager::FlowGridManager(QSize p_item_size, - QSize p_space_size, - QSize p_border_size, - QSize p_frame_size, +FlowGridManager::FlowGridManager(TQSize p_item_size, + TQSize p_space_size, + TQSize p_border_size, + TQSize p_frame_size, Qt::Orientation orient, int num_items, Slack slack_x,Slack slack_y) @@ -42,25 +42,25 @@ void FlowGridManager::setNumItems(int num_items) return; _numItems=num_items; _dirty=true; } -void FlowGridManager::setItemSize(QSize p_item_size) +void FlowGridManager::setItemSize(TQSize p_item_size) { if (_pItemSize==p_item_size) return; _pItemSize=p_item_size; _dirty=true; } -void FlowGridManager::setSpaceSize(QSize p_space_size) +void FlowGridManager::setSpaceSize(TQSize p_space_size) { if (_pSpaceSize==p_space_size) return; _pSpaceSize=p_space_size; _dirty=true; } -void FlowGridManager::setBorderSize(QSize p_border_size) +void FlowGridManager::setBorderSize(TQSize p_border_size) { if (_pBorderSize==p_border_size) return; _pBorderSize=p_border_size; _dirty=true; } -void FlowGridManager::setFrameSize(QSize p_frame_size) +void FlowGridManager::setFrameSize(TQSize p_frame_size) { if (_pFrameSize==p_frame_size) return; _pFrameSize=p_frame_size; @@ -93,25 +93,25 @@ void FlowGridManager::setConserveSpace(bool conserve) // get members -QSize FlowGridManager::itemSize() const +TQSize FlowGridManager::itemSize() const { _checkReconfigure(); return _itemSize;} -QSize FlowGridManager::spaceSize() const +TQSize FlowGridManager::spaceSize() const { _checkReconfigure(); return _spaceSize;} -QSize FlowGridManager::borderSize() const +TQSize FlowGridManager::borderSize() const { _checkReconfigure(); return _borderSize;} -QSize FlowGridManager::gridDim() const +TQSize FlowGridManager::gridDim() const { _checkReconfigure(); return _gridDim;} -QSize FlowGridManager::gridSpacing() const +TQSize FlowGridManager::gridSpacing() const { _checkReconfigure(); return _gridSpacing;} -QSize FlowGridManager::frameSize() const +TQSize FlowGridManager::frameSize() const { _checkReconfigure(); return _frameSize;} -QPoint FlowGridManager::origin() const +TQPoint FlowGridManager::origin() const { _checkReconfigure(); return _origin;} Qt::Orientation FlowGridManager::orientation() const @@ -131,21 +131,21 @@ bool FlowGridManager::conserveSpace() const bool FlowGridManager::isValid() const { _checkReconfigure(); return _valid;} -QPoint FlowGridManager::posAtCell(int x,int y) const +TQPoint FlowGridManager::posAtCell(int x,int y) const { _checkReconfigure(); - return _origin+QPoint(_gridSpacing.width()*x,_gridSpacing.height()*y); + return _origin+TQPoint(_gridSpacing.width()*x,_gridSpacing.height()*y); } -QPoint FlowGridManager::pos(int i) const +TQPoint FlowGridManager::pos(int i) const { return posAtCell(cell(i).x(),cell(i).y()); } -QPoint FlowGridManager::cell(int index) const +TQPoint FlowGridManager::cell(int index) const { _checkReconfigure(); //assert((index>=0) && (index<_gridDim.width()*_gridDim.height())); int x=index % _gridDim.width(), y=index / _gridDim.width(); - return QPoint(x,y); + return TQPoint(x,y); } @@ -153,7 +153,7 @@ QPoint FlowGridManager::cell(int index) const // return height if orientation is Horizontal // return width if orientation is Vertical -int FlowGridManager::_getHH(QSize size) const +int FlowGridManager::_getHH(TQSize size) const { if (_orientation==Qt::Horizontal) return size.height(); return size.width(); @@ -161,17 +161,17 @@ int FlowGridManager::_getHH(QSize size) const // return height if orientation is Vertical // return width if orientation is Horizontal -int FlowGridManager::_getWH(QSize size) const +int FlowGridManager::_getWH(TQSize size) const { if (_orientation==Qt::Horizontal) return size.width(); return size.height(); } // swap horizontal and vertical if orientation is Vertical, otherwise return arg -QSize FlowGridManager::_swapHV(QSize hv) const +TQSize FlowGridManager::_swapHV(TQSize hv) const { if (_orientation==Qt::Horizontal) return hv; - QSize temp=hv; + TQSize temp=hv; temp.transpose(); return temp; } @@ -187,22 +187,22 @@ int FlowGridManager::_slack(int nitems,int length,int item,int space,int border) void FlowGridManager::_clear() const { - _borderSize=QSize(0,0); - _spaceSize=QSize(0,0); - _itemSize=QSize(0,0); - _gridDim=QSize(0,0); - _gridSpacing=QSize(0,0); - _origin=QPoint(0,0); - _frameSize=QSize(0,0); + _borderSize=TQSize(0,0); + _spaceSize=TQSize(0,0); + _itemSize=TQSize(0,0); + _gridDim=TQSize(0,0); + _gridSpacing=TQSize(0,0); + _origin=TQPoint(0,0); + _frameSize=TQSize(0,0); _dirty=false; _valid=false; } -int FlowGridManager::indexNearest(QPoint p) const +int FlowGridManager::indexNearest(TQPoint p) const { if (!isValid()) return -1; - QPoint c=(p-_origin)-QPoint(_spaceSize.width(),_spaceSize.height())/2; + TQPoint c=(p-_origin)-TQPoint(_spaceSize.width(),_spaceSize.height())/2; int x=c.x()/_gridSpacing.width(), y=c.y()/_gridSpacing.height(); int i= x+y*_gridDim.width(); @@ -254,20 +254,20 @@ void FlowGridManager::_reconfigure() const iSlack=slack/2; pBorderHeight+=iSlack; if (_conserveSpace) { - _itemSize=_swapHV(QSize(_getWH(_pItemSize),pItemHeight)); - _spaceSize=_swapHV(QSize(_getWH(_pSpaceSize),pSpaceHeight)); - _borderSize=_swapHV(QSize(_getWH(_pBorderSize),pBorderHeight)); + _itemSize=_swapHV(TQSize(_getWH(_pItemSize),pItemHeight)); + _spaceSize=_swapHV(TQSize(_getWH(_pSpaceSize),pSpaceHeight)); + _borderSize=_swapHV(TQSize(_getWH(_pBorderSize),pBorderHeight)); } else { - _itemSize=_swapHV(QSize(pItemHeight,pItemHeight)); - _spaceSize=_swapHV(QSize(pSpaceHeight,pSpaceHeight)); - _borderSize=_swapHV(QSize(pBorderHeight,pBorderHeight)); + _itemSize=_swapHV(TQSize(pItemHeight,pItemHeight)); + _spaceSize=_swapHV(TQSize(pSpaceHeight,pSpaceHeight)); + _borderSize=_swapHV(TQSize(pBorderHeight,pBorderHeight)); } - _gridDim=_swapHV(QSize(numspans,spanlen)); + _gridDim=_swapHV(TQSize(numspans,spanlen)); _gridSpacing=_itemSize+_spaceSize; - _origin=QPoint(_borderSize.width(),_borderSize.height()); - _frameSize=2*_borderSize+QSize(_gridDim.width()*_gridSpacing.width()-_spaceSize.width(), + _origin=TQPoint(_borderSize.width(),_borderSize.height()); + _frameSize=2*_borderSize+TQSize(_gridDim.width()*_gridSpacing.width()-_spaceSize.width(), _gridDim.height()*_gridSpacing.height()-_spaceSize.height()); _dirty=false; diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h index 9d100c74f..521490c51 100644 --- a/kicker/applets/launcher/flowgridmanager.h +++ b/kicker/applets/launcher/flowgridmanager.h @@ -7,9 +7,9 @@ #ifndef __const_space_grid_h__ #define __const_space_grid_h__ -#include <qnamespace.h> -#include <qpoint.h> -#include <qsize.h> +#include <tqnamespace.h> +#include <tqpoint.h> +#include <tqsize.h> class FlowGridManager { @@ -22,10 +22,10 @@ public: ItemSlack,SpaceSlack,BorderSlack,NoSlack } Slack; - FlowGridManager(QSize p_item_size=QSize(0,0), - QSize p_space_size=QSize(0,0), - QSize p_border_size=QSize(0,0), - QSize frame_size=QSize(0,0), + FlowGridManager(TQSize p_item_size=TQSize(0,0), + TQSize p_space_size=TQSize(0,0), + TQSize p_border_size=TQSize(0,0), + TQSize frame_size=TQSize(0,0), Qt::Orientation orient=Qt::Horizontal, int num_items=0, Slack slack_x=ItemSlack, @@ -33,39 +33,39 @@ public: void setNumItems(int num_items); - void setItemSize(QSize item_size); - void setSpaceSize(QSize space_size); - void setBorderSize(QSize border_size); + void setItemSize(TQSize item_size); + void setSpaceSize(TQSize space_size); + void setBorderSize(TQSize border_size); void setOrientation(Qt::Orientation orient); - void setFrameSize(QSize frame_size); + void setFrameSize(TQSize frame_size); void setSlack(Slack slack_x, Slack slack_y); void setConserveSpace(bool conserve); - QSize itemSize() const; - QSize spaceSize() const; - QSize borderSize() const; - QSize gridDim() const; - QSize gridSpacing() const; - QSize frameSize() const; - QPoint origin() const; + TQSize itemSize() const; + TQSize spaceSize() const; + TQSize borderSize() const; + TQSize gridDim() const; + TQSize gridSpacing() const; + TQSize frameSize() const; + TQPoint origin() const; Qt::Orientation orientation() const; bool conserveSpace() const; // Slack slackX() const; // Slack slackY() const; - QPoint posAtCell(int x,int y) const; - QPoint pos(int i) const; - QPoint cell(int index) const; + TQPoint posAtCell(int x,int y) const; + TQPoint pos(int i) const; + TQPoint cell(int index) const; bool isValid() const; - int indexNearest(QPoint p) const; + int indexNearest(TQPoint p) const; void dump(); protected: - int _getHH(QSize size) const; - int _getWH(QSize size) const; - QSize _swapHV(QSize hv) const; + int _getHH(TQSize size) const; + int _getWH(TQSize size) const; + TQSize _swapHV(TQSize hv) const; inline void _checkReconfigure() const; int _slack(int nitems,int length,int item,int space,int border) const; void _reconfigure() const; @@ -73,15 +73,15 @@ protected: protected: // user-definable data - QSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize; + TQSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize; Slack _slackX, _slackY; bool _conserveSpace; Qt::Orientation _orientation; int _numItems; // results - mutable QSize _itemSize, _spaceSize, _borderSize, _gridDim, _gridSpacing, _frameSize; - mutable QPoint _origin; + mutable TQSize _itemSize, _spaceSize, _borderSize, _gridDim, _gridSpacing, _frameSize; + mutable TQPoint _origin; // status mutable bool _dirty, _valid; diff --git a/kicker/applets/launcher/popularity.cpp b/kicker/applets/launcher/popularity.cpp index 3bfcdd872..a22a98c99 100644 --- a/kicker/applets/launcher/popularity.cpp +++ b/kicker/applets/launcher/popularity.cpp @@ -48,7 +48,7 @@ public: // gets also 1-falloff added to its popularity. double falloff; // popularity values for each service - map<QString, double> vals; + map<TQString, double> vals; // accumulated popularity of the unknown programs // started before the statistic started double iniVal; @@ -56,7 +56,7 @@ public: struct Popularity { - QString service; + TQString service; double popularity; bool operator<(const Popularity& p) const { @@ -70,7 +70,7 @@ public: vector<SingleFalloffHistory> m_stats; vector<Popularity> m_servicesByPopularity; - map<QString, int> m_serviceRanks; + map<TQString, int> m_serviceRanks; double m_historyHorizon; }; @@ -86,13 +86,13 @@ PopularityStatistics::~PopularityStatistics() delete d; } -void PopularityStatistics::useService(const QString& service) +void PopularityStatistics::useService(const TQString& service) { vector<PopularityStatisticsImpl::SingleFalloffHistory>::iterator it(d->m_stats.begin()), end(d->m_stats.end()); for (; it != end; ++it) { - map<QString, double>::iterator valIt; + map<TQString, double>::iterator valIt; bool found(false); for (valIt = it->vals.begin(); valIt != it->vals.end(); ++valIt) { @@ -113,19 +113,19 @@ void PopularityStatistics::useService(const QString& service) d->updateServiceRanks(); } -void PopularityStatistics::moveToTop(const QStringList& newTopServiceList) +void PopularityStatistics::moveToTop(const TQStringList& newTopServiceList) { vector<PopularityStatisticsImpl::SingleFalloffHistory>::iterator histIt(d->m_stats.begin()), histEnd(d->m_stats.end()); for (; histIt != histEnd; ++histIt) { - set<QString> newTopServices; + set<TQString> newTopServices; for (uint n=0; n<newTopServiceList.size(); ++n) newTopServices.insert(newTopServiceList[n]); // Sort by popularity vector<PopularityStatisticsImpl::Popularity> ranking; - map<QString, double>::iterator valIt; + map<TQString, double>::iterator valIt; for (valIt = histIt->vals.begin(); valIt != histIt->vals.end(); ++valIt) { PopularityStatisticsImpl::Popularity pop; @@ -137,7 +137,7 @@ void PopularityStatistics::moveToTop(const QStringList& newTopServiceList) // Get the new positions of each service in the ranking. // We don't touch the popularity values in the ranking. - list<QString> topServiceList, bottomServiceList; + list<TQString> topServiceList, bottomServiceList; vector<PopularityStatisticsImpl::Popularity>:: iterator rankIt; for (rankIt = ranking.begin(); rankIt != ranking.end(); ++rankIt) { @@ -160,16 +160,16 @@ void PopularityStatistics::moveToTop(const QStringList& newTopServiceList) newTopServices.erase(newTopServices.begin()); } - list<QString> newServiceList; + list<TQString> newServiceList; copy(topServiceList.begin(), topServiceList.end(), - back_insert_iterator<list<QString> >(newServiceList)); + back_insert_iterator<list<TQString> >(newServiceList)); copy(bottomServiceList.begin(), bottomServiceList.end(), - back_insert_iterator<list<QString> >(newServiceList)); + back_insert_iterator<list<TQString> >(newServiceList)); // Merge the old list of service popularities // with the new ordering of the services histIt->vals.clear(); - list<QString>::iterator servIt; + list<TQString>::iterator servIt; uint serviceIndex = 0; //kdDebug() << endl; @@ -207,12 +207,12 @@ void PopularityStatistics::moveToTop(const QStringList& newTopServiceList) /*v Old version - moves everything else one position up and 'service' to the bottom -void PopularityStatistics::moveToBottom(const QString& service) +void PopularityStatistics::moveToBottom(const TQString& service) { // Moves a service to the bottom of the ranking // by moving everything else to the top d->updateServiceRanks(); - QStringList allButOneServices; + TQStringList allButOneServices; vector<PopularityStatisticsImpl::Popularity>::iterator it(d->m_servicesByPopularity.begin()), end(d->m_servicesByPopularity.end()); @@ -224,7 +224,7 @@ void PopularityStatistics::moveToBottom(const QString& service) moveToTop(allButOneServices); }*/ -void PopularityStatistics::moveToBottom(const QString& service) +void PopularityStatistics::moveToBottom(const TQString& service) { vector<PopularityStatisticsImpl::SingleFalloffHistory>::iterator it(d->m_stats.begin()), end(d->m_stats.end()); @@ -237,12 +237,12 @@ void PopularityStatistics::moveToBottom(const QString& service) d->updateServiceRanks(); } -QString PopularityStatistics::serviceByRank(int n) const +TQString PopularityStatistics::serviceByRank(int n) const { if (n >= 0 && n < int(d->m_servicesByPopularity.size())) return d->m_servicesByPopularity[n].service; else - return QString(); + return TQString(); } double PopularityStatistics::popularityByRank(int n) const @@ -253,7 +253,7 @@ double PopularityStatistics::popularityByRank(int n) const return 0.0; } -int PopularityStatistics::rankByService(const QString service) +int PopularityStatistics::rankByService(const TQString service) { if (d->m_serviceRanks.find(service) != d->m_serviceRanks.end()) { @@ -264,16 +264,16 @@ int PopularityStatistics::rankByService(const QString service) void PopularityStatistics::writeConfig(Prefs* prefs) const { - QStringList serviceNames, serviceHistories; + TQStringList serviceNames, serviceHistories; int limit = prefs->serviceCacheSize(); //kdDebug() << "popularityData: writeConfig" << endl; for (int n=0; n<int(d->m_servicesByPopularity.size()) && n<limit; ++n) { PopularityStatisticsImpl::Popularity pop = d->m_servicesByPopularity[n]; - QStringList historyData; + TQStringList historyData; for (int i=0; i<int(d->m_stats.size()); ++i) { - historyData << QString::number(d->m_stats[i].vals[pop.service]); + historyData << TQString::number(d->m_stats[i].vals[pop.service]); } serviceNames << pop.service; serviceHistories << historyData.join("/"); @@ -286,13 +286,13 @@ void PopularityStatistics::writeConfig(Prefs* prefs) const void PopularityStatistics::readConfig(Prefs* prefs) { int n = 0; - QStringList serviceNames = prefs->serviceNames(); - QStringList histories = prefs->serviceHistories(); + TQStringList serviceNames = prefs->serviceNames(); + TQStringList histories = prefs->serviceHistories(); for (n = std::min(serviceNames.size(), histories.size())-1; n>=0; --n) { - QString serviceName = serviceNames[n]; - QStringList serviceHistory = - QStringList::split("/", histories[n]); + TQString serviceName = serviceNames[n]; + TQStringList serviceHistory = + TQStringList::split("/", histories[n]); for (int i=min(serviceHistory.size(), d->m_stats.size())-1; i>=0; --i) { d->m_stats[i].vals[serviceName] = serviceHistory[i].toDouble(); @@ -301,7 +301,7 @@ void PopularityStatistics::readConfig(Prefs* prefs) for (int i=0; i<int(d->m_stats.size()); ++i) { - map<QString, double>::iterator valIt; + map<TQString, double>::iterator valIt; double valSum = 0; for (valIt = d->m_stats[i].vals.begin(); valIt != d->m_stats[i].vals.end(); ++valIt) @@ -356,7 +356,7 @@ void PopularityStatisticsImpl::normalizeHistory(SingleFalloffHistory& h) { //kdDebug() << "Normalize history" << endl; double sum = h.iniVal; - map<QString, double>::iterator it; + map<TQString, double>::iterator it; for (it = h.vals.begin(); it != h.vals.end(); ++it) { sum += it->second; @@ -375,7 +375,7 @@ void PopularityStatisticsImpl::updateServiceRanks() vector<SingleFalloffHistory>::iterator it(m_stats.begin()), end(m_stats.end()); - map<QString, double> serviceValSum, serviceValWeightSum; + map<TQString, double> serviceValSum, serviceValWeightSum; int numStats = m_stats.size(); for (int statIndex = 0; it != end; ++it, ++statIndex) { @@ -387,7 +387,7 @@ void PopularityStatisticsImpl::updateServiceRanks() continue; } - map<QString, double>::iterator valIt; + map<TQString, double>::iterator valIt; /*double valSum = 0; for (valIt = it->vals.begin(); valIt != it->vals.end(); ++valIt) { @@ -402,7 +402,7 @@ void PopularityStatisticsImpl::updateServiceRanks() } m_servicesByPopularity.clear(); - map<QString, double>::iterator sIt; + map<TQString, double>::iterator sIt; for (sIt = serviceValWeightSum.begin(); sIt != serviceValWeightSum.end(); ++sIt) { @@ -417,7 +417,7 @@ void PopularityStatisticsImpl::updateServiceRanks() for (uint n = 0; n < m_servicesByPopularity.size(); ++n) { m_serviceRanks[m_servicesByPopularity[n].service] = n; - /*kdDebug() << QString("Rank %1: %2 %3").arg(n) + /*kdDebug() << TQString("Rank %1: %2 %3").arg(n) .arg(m_servicesByPopularity[n].popularity) .arg(m_servicesByPopularity[n].service) << endl;*/ } diff --git a/kicker/applets/launcher/popularity.h b/kicker/applets/launcher/popularity.h index b1dcb32d6..06e7e0454 100644 --- a/kicker/applets/launcher/popularity.h +++ b/kicker/applets/launcher/popularity.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __popularity_h__ #define __popularity_h__ -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> class PopularityStatisticsImpl; class Prefs; @@ -61,7 +61,7 @@ public: * counters for the given service and decrease the * counters for all the others. */ - void useService(const QString& service); + void useService(const TQString& service); /** * Exchange all state variables of the most @@ -71,18 +71,18 @@ public: * as before. Order of items in the string list * does *not* matter/ */ - void moveToTop(const QStringList& services); + void moveToTop(const TQStringList& services); /** * Sets all counters to zero for the given service */ - void moveToBottom(const QString& service); + void moveToBottom(const TQString& service); /** * Retrieve the name of a service by its position * in the current popularity ranking */ - QString serviceByRank(int n) const; + TQString serviceByRank(int n) const; /** * Retrieve the popularity (0-1) of a service by @@ -94,7 +94,7 @@ public: * Gets the rank of a given service. * Returns -1 if the service is not in the ranking */ - int rankByService(const QString service); + int rankByService(const TQString service); /** * Writes the configuration. diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index 74d00a6e4..0eebec315 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -33,22 +33,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include "quickaddappsmenu.h" -QuickAddAppsMenu::QuickAddAppsMenu(const QString &label, const QString &relPath, QWidget *target, QWidget *parent, const char *name, const QString &sender) +QuickAddAppsMenu::QuickAddAppsMenu(const TQString &label, const TQString &relPath, TQWidget *target, TQWidget *parent, const char *name, const TQString &sender) : PanelServiceMenu(label, relPath, parent, name) { _targetObject = target; _sender = sender; - connect(this, SIGNAL(addAppBefore(QString,QString)), - target, SLOT(addAppBeforeManually(QString,QString))); + connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), + target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); } -QuickAddAppsMenu::QuickAddAppsMenu(QWidget *target, QWidget *parent, const QString &sender, const char *name) - : PanelServiceMenu(QString::null, QString::null, parent, name) +QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQString &sender, const char *name) + : PanelServiceMenu(TQString::null, TQString::null, parent, name) { _targetObject = target; _sender = sender; - connect(this, SIGNAL(addAppBefore(QString,QString)), - target, SLOT(addAppBeforeManually(QString,QString))); + connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), + target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); } void QuickAddAppsMenu::slotExec(int id) @@ -60,7 +60,7 @@ void QuickAddAppsMenu::slotExec(int id) } -PanelServiceMenu *QuickAddAppsMenu::newSubMenu(const QString &label, const QString &relPath, QWidget *parent, const char *name, const QString &insertInlineHeader) +PanelServiceMenu *QuickAddAppsMenu::newSubMenu(const TQString &label, const TQString &relPath, TQWidget *parent, const char *name, const TQString &insertInlineHeader) { return new QuickAddAppsMenu(label, relPath, _targetObject, parent, name, _sender); } diff --git a/kicker/applets/launcher/quickaddappsmenu.h b/kicker/applets/launcher/quickaddappsmenu.h index 88465049c..01c185181 100644 --- a/kicker/applets/launcher/quickaddappsmenu.h +++ b/kicker/applets/launcher/quickaddappsmenu.h @@ -31,21 +31,21 @@ s class QuickAddAppsMenu: public PanelServiceMenu { Q_OBJECT public: - QuickAddAppsMenu(const QString &label, const QString &relPath, QWidget *target, QWidget *parent=0, const char *name=0, const QString &sender=QString("")); - QuickAddAppsMenu(QWidget *target, QWidget *parent=0, const QString &sender=QString(""), const char *name=0); + QuickAddAppsMenu(const TQString &label, const TQString &relPath, TQWidget *target, TQWidget *parent=0, const char *name=0, const TQString &sender=TQString("")); + QuickAddAppsMenu(TQWidget *target, TQWidget *parent=0, const TQString &sender=TQString(""), const char *name=0); signals: - void addAppBefore(QString,QString); + void addAppBefore(TQString,TQString); protected slots: virtual void slotExec(int id); protected: - virtual PanelServiceMenu *newSubMenu(const QString &label, - const QString &relPath, - QWidget *parent, + virtual PanelServiceMenu *newSubMenu(const TQString &label, + const TQString &relPath, + TQWidget *parent, const char *name, - const QString & _inlineHeader=QString::null); + const TQString & _inlineHeader=TQString::null); private: - QWidget *_targetObject; - QString _sender; + TQWidget *_targetObject; + TQString _sender; }; #endif diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 933088b04..2ac0742ca 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -24,10 +24,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "quickbutton.h" #include "quickaddappsmenu.h" -#include <qpainter.h> -#include <qdrawutil.h> -#include <qpopupmenu.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqdrawutil.h> +#include <tqpopupmenu.h> +#include <tqtooltip.h> #include <kactionclasses.h> #include <kickertip.h> @@ -52,7 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define DEBUGSTR kndDebug() #endif -QuickURL::QuickURL(const QString &u) +QuickURL::QuickURL(const TQString &u) { DEBUGSTR<<"QuickURL::QuickURL("<<u<<")"<<endl<<flush; KService::Ptr _service=0; _menuId = u; @@ -66,7 +66,7 @@ QuickURL::QuickURL(const QString &u) if (_menuId.endsWith(".desktop")) { // Strip path - QString s = _menuId; + TQString s = _menuId; s = s.mid(s.findRev('/')+1); s = s.left(s.length()-8); _service = KService::serviceByStorageId(s); @@ -116,18 +116,18 @@ void QuickURL::run() const } //similar to MimeType::pixmapForURL -QPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group, - int _force_size, int _state, QString *) const +TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group, + int _force_size, int _state, TQString *) const { // Load icon - QPixmap pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state); + TQPixmap pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state); // Resize to fit button - pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, QImage::ScaleMin)); + pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin)); return pxmap; } -QuickButton::QuickButton(const QString &u, KAction* configAction, - QWidget *parent, const char *name) : +QuickButton::QuickButton(const TQString &u, KAction* configAction, + TQWidget *parent, const char *name) : SimpleButton(parent, name), m_flashCounter(0), m_sticky(false) @@ -138,29 +138,29 @@ QuickButton::QuickButton(const QString &u, KAction* configAction, _oldCursor = cursor(); _qurl=new QuickURL(u); - QToolTip::add(this, _qurl->name()); + TQToolTip::add(this, _qurl->name()); resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM)); - QBrush bgbrush(colorGroup().brush(QColorGroup::Background)); + TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background)); QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu( parent, this, _qurl->url()); - _popup = new QPopupMenu(this); + _popup = new TQPopupMenu(this); _popup->insertItem(i18n("Add Application"), addAppsMenu); configAction->plug(_popup); _popup->insertSeparator(); _popup->insertItem(SmallIcon("remove"), i18n("Remove"), - this, SLOT(removeApp())); + this, TQT_SLOT(removeApp())); m_stickyAction = new KToggleAction(i18n("Never Remove Automatically"), KShortcut(), this); - connect(m_stickyAction, SIGNAL(toggled(bool)), - this, SLOT(slotStickyToggled(bool))); + connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); m_stickyId = _popup->idAt(2); - connect(this, SIGNAL(clicked()), SLOT(launch())); - connect(this, SIGNAL(removeApp(QuickButton *)), parent, - SLOT(removeAppManually(QuickButton *))); + connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch())); + connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent, + TQT_SLOT(removeAppManually(QuickButton *))); } QuickButton::~QuickButton() @@ -169,13 +169,13 @@ QuickButton::~QuickButton() } -QString QuickButton::url() const +TQString QuickButton::url() const { return _qurl->url(); } -QString QuickButton::menuId() const +TQString QuickButton::menuId() const { return _qurl->menuId();} @@ -189,26 +189,26 @@ void QuickButton::loadIcon() setPixmap(_icon); } -void QuickButton::resizeEvent(QResizeEvent *e) +void QuickButton::resizeEvent(TQResizeEvent *e) { loadIcon(); SimpleButton::resizeEvent(e); } -void QuickButton::mousePressEvent(QMouseEvent *e) +void QuickButton::mousePressEvent(TQMouseEvent *e) { if (e->button() == RightButton) _popup->popup(e->globalPos()); else if (e->button() == LeftButton) { _dragPos = e->pos(); - QButton::mousePressEvent(e); + TQButton::mousePressEvent(e); } } -void QuickButton::mouseMoveEvent(QMouseEvent *e) +void QuickButton::mouseMoveEvent(TQMouseEvent *e) { if ((e->state() & LeftButton) == 0) return; - QPoint p(e->pos() - _dragPos); + TQPoint p(e->pos() - _dragPos); if (p.manhattanLength() <= KGlobalSettings::dndEventDelay()) return; DEBUGSTR<<"dragstart"<<endl<<flush; @@ -264,7 +264,7 @@ void QuickButton::removeApp() void QuickButton::flash() { m_flashCounter = 2000; - QTimer::singleShot(0, this, SLOT(slotFlash())); + TQTimer::singleShot(0, this, TQT_SLOT(slotFlash())); } void QuickButton::slotFlash() @@ -275,7 +275,7 @@ void QuickButton::slotFlash() m_flashCounter -= timeout; if (m_flashCounter < 0) m_flashCounter = 0; update(); - QTimer::singleShot(timeout, this, SLOT(slotFlash())); + TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash())); } } @@ -300,7 +300,7 @@ void QuickButton::updateKickerTip(KickerTip::Data &data) data.message = _qurl->name(); data.direction = m_popupDirection; data.subtext = _qurl->genericName(); - if (data.subtext == QString()) + if (data.subtext == TQString()) { data.subtext = data.message; } diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h index 98eabec6e..263651cc0 100644 --- a/kicker/applets/launcher/quickbutton.h +++ b/kicker/applets/launcher/quickbutton.h @@ -24,11 +24,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __quickbutton_h__ #define __quickbutton_h__ -#include <qbutton.h> -#include <qpoint.h> -#include <qstring.h> -#include <qpixmap.h> -#include <qcursor.h> +#include <tqbutton.h> +#include <tqpoint.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqcursor.h> #include <kickertip.h> #include <kicontheme.h> @@ -45,22 +45,22 @@ class KToggleAction; class QuickURL { public: - QuickURL(const QString &u); + QuickURL(const TQString &u); KURL kurl() const {return _kurl;}; - QString url() const {return _kurl.url();}; - QString menuId() const {return _menuId;}; - QString genericName() const { return m_genericName; } - QString name() const { return m_name; } + TQString url() const {return _kurl.url();}; + TQString menuId() const {return _menuId;}; + TQString genericName() const { return m_genericName; } + TQString name() const { return m_name; } KService::Ptr service() const {return _service;}; void run() const; - QPixmap pixmap(mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop, - int _force_size = 0, int _state = 0, QString * _path = 0L) const; + TQPixmap pixmap(mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop, + int _force_size = 0, int _state = 0, TQString * _path = 0L) const; private: KURL _kurl; - QString _menuId; - QString m_genericName; - QString m_name; + TQString _menuId; + TQString m_genericName; + TQString m_name; KService::Ptr _service; }; @@ -71,12 +71,12 @@ class QuickButton: public SimpleButton, public KickerTip::Client { public: enum { DEFAULT_ICON_DIM = 16 }; enum { ICON_MARGIN = 1 }; - QuickButton(const QString &u, KAction* configAction, - QWidget *parent=0, const char *name=0); + QuickButton(const TQString &u, KAction* configAction, + TQWidget *parent=0, const char *name=0); ~QuickButton(); - QString url() const; - QString menuId() const; - QPixmap icon() const{ return _icon;} + TQString url() const; + TQString menuId() const; + TQPixmap icon() const{ return _icon;} bool sticky() { return m_sticky; } void setSticky(bool bSticky); void setPopupDirection(KPanelApplet::Direction d); @@ -88,13 +88,13 @@ public: signals: void removeApp(QuickButton *); - void executed(QString serviceStorageID); + void executed(TQString serviceStorageID); void stickyToggled(bool isSticky); protected: - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void resizeEvent(QResizeEvent *rsevent); + void mousePressEvent(TQMouseEvent *e); + void mouseMoveEvent(TQMouseEvent *e); + void resizeEvent(TQResizeEvent *rsevent); void loadIcon(); void updateKickerTip(KickerTip::Data &data); @@ -108,10 +108,10 @@ protected slots: private: int m_flashCounter; QuickURL *_qurl; - QPoint _dragPos; - QPopupMenu *_popup; - QPixmap _icon, _iconh; - QCursor _oldCursor; + TQPoint _dragPos; + TQPopupMenu *_popup; + TQPixmap _icon, _iconh; + TQCursor _oldCursor; bool _highlight, _changeCursorOverItem, _dragEnabled; int _iconDim; bool m_sticky; diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h index 1d373ae92..85f28845c 100644 --- a/kicker/applets/launcher/quickbuttongroup.h +++ b/kicker/applets/launcher/quickbuttongroup.h @@ -7,7 +7,7 @@ #ifndef __quickbuttongroup_h__ #define __quickbuttongroup_h__ -#include <qstring.h> +#include <tqstring.h> #include <functional> #include "easyvector.h" #include "quickbutton.h" @@ -17,7 +17,7 @@ class QuickButtonGroup: virtual public EasyVector< QuickButton* > { public: QuickButtonGroup(const EasyVector< QuickButton* > &kv):EasyVector< QuickButton* >(kv){}; QuickButtonGroup():EasyVector< QuickButton* >(){}; - Index findDescriptor(const QString &desc); + Index findDescriptor(const TQString &desc); void show(); void hide(); @@ -27,7 +27,7 @@ public: void setUpdatesEnabled(bool enable); }; -QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const QString &desc) +QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) { return findProperty(desc, std::mem_fun(&QuickButton::url));} inline void QuickButtonGroup::setUpdatesEnabled(bool enable) @@ -38,10 +38,10 @@ inline void QuickButtonGroup::setUpdatesEnabled(bool enable) } inline void QuickButtonGroup::show() -{ std::for_each(begin(),end(),std::mem_fun(&QWidget::show));} +{ std::for_each(begin(),end(),std::mem_fun(&TQWidget::show));} inline void QuickButtonGroup::hide() -{ std::for_each(begin(),end(),std::mem_fun(&QWidget::hide));} +{ std::for_each(begin(),end(),std::mem_fun(&TQWidget::hide));} inline void QuickButtonGroup::setDragging(bool drag) { std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setDragging),drag));} diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index abae9efe1..557ea4cd3 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qpainter.h> -#include <qpopupmenu.h> -#include <qslider.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqpopupmenu.h> +#include <tqslider.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <dcopclient.h> #include <kaction.h> @@ -69,7 +69,7 @@ const ButtonGroup::Index Append=ButtonGroup::Append; extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("quicklauncher"); return new QuickLauncher(configFile, KPanelApplet::Normal, @@ -78,8 +78,8 @@ extern "C" } } -QuickLauncher::QuickLauncher(const QString& configFile, Type type, int actions, - QWidget *parent, const char *name) : +QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, + TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name) { DCOPObject::setObjId("QuickLauncherApplet"); @@ -108,10 +108,10 @@ QuickLauncher::QuickLauncher(const QString& configFile, Type type, int actions, m_dragButtons = 0; m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(), - this, SLOT(slotConfigure()), this); + this, TQT_SLOT(slotConfigure()), this); - m_saveTimer = new QTimer(this); - connect(m_saveTimer, SIGNAL(timeout()), this, SLOT(saveConfig())); + m_saveTimer = new TQTimer(this); + connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); m_popularity = new PopularityStatistics(); @@ -125,15 +125,15 @@ QuickLauncher::QuickLauncher(const QString& configFile, Type type, int actions, setRefreshEnabled(true); setAcceptDrops(true); - //QToolTip::add(this, i18n("Drop applications here")); + //TQToolTip::add(this, i18n("Drop applications here")); DEBUGSTR << " QuickLauncher::QuickLauncher(" << configFile << ",...) END" << endl << flush; DCOPClient *dcopClient = KApplication::dcopClient(); dcopClient->connectDCOPSignal(0, "appLauncher", - "serviceStartedByStorageId(QString,QString)", + "serviceStartedByStorageId(TQString,TQString)", "QuickLauncherApplet", - "serviceStartedByStorageId(QString,QString)", + "serviceStartedByStorageId(TQString,TQString)", false); kdDebug() << "Quicklauncher registered DCOP signal" << endl; } @@ -161,22 +161,22 @@ QuickLauncher::~QuickLauncher() void QuickLauncher::buildPopupMenu() { QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu(this, this); - m_popup = new QPopupMenu(this); + m_popup = new TQPopupMenu(this); m_popup->insertItem(i18n("Add Application"), addAppsMenu); m_configAction->plug(m_popup); - m_appletPopup = new QPopupMenu(this); + m_appletPopup = new TQPopupMenu(this); m_appletPopup->insertItem(i18n("Add Application"), addAppsMenu); - m_removeAppsMenu = new QPopupMenu(this); - connect(m_removeAppsMenu, SIGNAL(aboutToShow()), - SLOT(fillRemoveAppsMenu())); - connect(m_removeAppsMenu, SIGNAL(activated(int)), - SLOT(removeAppManually(int))); + m_removeAppsMenu = new TQPopupMenu(this); + connect(m_removeAppsMenu, TQT_SIGNAL(aboutToShow()), + TQT_SLOT(fillRemoveAppsMenu())); + connect(m_removeAppsMenu, TQT_SIGNAL(activated(int)), + TQT_SLOT(removeAppManually(int))); m_appletPopup->insertItem(i18n("Remove Application"), m_removeAppsMenu); m_appletPopup->insertSeparator(); m_appletPopup->setCheckable( true ); - m_appletPopup->insertItem(i18n("About"), this, SLOT(about())); + m_appletPopup->insertItem(i18n("About"), this, TQT_SLOT(about())); setCustomMenu(m_appletPopup); } @@ -189,7 +189,7 @@ void QuickLauncher::fillRemoveAppsMenu() int i = 0; while (iter != m_buttons->end()) { - QString text = QToolTip::textFor(*iter); + TQString text = TQToolTip::textFor(*iter); if (text.isEmpty()) { text = (*iter)->url(); @@ -235,8 +235,8 @@ void QuickLauncher::slotConfigure() m_configDialog = new ConfigDlg(this, "configdialog", m_settings, SIZE_AUTO, KDialogBase::Plain, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Default); - connect(m_configDialog, SIGNAL(settingsChanged()), - this, SLOT(slotSettingsDialogChanged())); + connect(m_configDialog, TQT_SIGNAL(settingsChanged()), + this, TQT_SLOT(slotSettingsDialogChanged())); } m_configDialog->show(); @@ -254,7 +254,7 @@ int QuickLauncher::findApp(QuickButton *button) } -int QuickLauncher::findApp(QString url) +int QuickLauncher::findApp(TQString url) { if (m_buttons->empty()) { @@ -285,8 +285,8 @@ void QuickLauncher::removeApp(int index, bool manuallyRemoved) DEBUGSTR << "Removing button. index=" << index << " url='" << (*m_buttons)[index]->url() << "'" << endl << flush; - QString removeAppUrl = (*m_buttons)[index]->url(); - QString removeAppMenuId = (*m_buttons)[index]->menuId(); + TQString removeAppUrl = (*m_buttons)[index]->url(); + TQString removeAppMenuId = (*m_buttons)[index]->menuId(); delete (*m_buttons)[index]; m_buttons->eraseAt(index); @@ -307,7 +307,7 @@ void QuickLauncher::removeApp(int index, bool manuallyRemoved) } -void QuickLauncher::removeApp(QString url, bool manuallyRemoved) +void QuickLauncher::removeApp(TQString url, bool manuallyRemoved) { int index = findApp(url); if (index == NotFound) @@ -333,7 +333,7 @@ void QuickLauncher::removeAppManually(QuickButton *button) int QuickLauncher::widthForHeight(int h) const { FlowGridManager temp_manager = *m_manager; - temp_manager.setFrameSize(QSize(h,h)); + temp_manager.setFrameSize(TQSize(h,h)); temp_manager.setOrientation(Qt::Horizontal); // ??? probably not necessary if (temp_manager.isValid()) { @@ -346,7 +346,7 @@ int QuickLauncher::widthForHeight(int h) const int QuickLauncher::heightForWidth(int w) const { FlowGridManager temp_manager=*m_manager; - temp_manager.setFrameSize(QSize(w,w)); + temp_manager.setFrameSize(TQSize(w,w)); temp_manager.setOrientation(Qt::Vertical); // ??? probably not necessary if (temp_manager.isValid()) { @@ -365,10 +365,10 @@ int QuickLauncher::dimension() const return size().height(); } -void QuickLauncher::addApp(QString url, bool manuallyAdded) +void QuickLauncher::addApp(TQString url, bool manuallyAdded) { assert(m_buttons); - QString newButtonId = QuickURL(url).menuId(); + TQString newButtonId = QuickURL(url).menuId(); if (m_appOrdering.find(newButtonId) == m_appOrdering.end()) { m_appOrdering[newButtonId] = m_appOrdering.size(); @@ -376,7 +376,7 @@ void QuickLauncher::addApp(QString url, bool manuallyAdded) uint appPos; for (appPos = 0; appPos < m_buttons->size(); ++appPos) { - QString buttonId = (*m_buttons)[appPos]->menuId(); + TQString buttonId = (*m_buttons)[appPos]->menuId(); if (m_appOrdering[buttonId] >= m_appOrdering[newButtonId]) { break; @@ -385,18 +385,18 @@ void QuickLauncher::addApp(QString url, bool manuallyAdded) addApp(url, appPos, manuallyAdded); } -QuickButton* QuickLauncher::createButton(QString url) +QuickButton* QuickLauncher::createButton(TQString url) { QuickButton* newButton=new QuickButton(url, m_configAction, this); - connect(newButton, SIGNAL(executed(QString)), - this, SLOT(slotOwnServiceExecuted(QString))); - connect(newButton, SIGNAL(stickyToggled(bool)), - this, SLOT(slotStickyToggled())); + connect(newButton, TQT_SIGNAL(executed(TQString)), + this, TQT_SLOT(slotOwnServiceExecuted(TQString))); + connect(newButton, TQT_SIGNAL(stickyToggled(bool)), + this, TQT_SLOT(slotStickyToggled())); newButton->setPopupDirection(popupDirection()); return newButton; } -void QuickLauncher::addApp(QString url, int index, bool manuallyAdded) +void QuickLauncher::addApp(TQString url, int index, bool manuallyAdded) { DEBUGSTR << endl <<"About to add: url='" << url << "' index=" << index << endl << flush; @@ -447,12 +447,12 @@ void QuickLauncher::updateInsertionPosToStatusQuo() // Update the app ordering map, so that next time, // addApp(url,manAdded) (without index) will insert the // item at the same position again. - std::list<QString> appList; + std::list<TQString> appList; std::set<int> posList; //kdDebug() << "Rearranging application order. Before:" << endl; for (uint n = 0; n < m_buttons->size(); ++n) { - QString buttonId = (*m_buttons)[n]->menuId(); + TQString buttonId = (*m_buttons)[n]->menuId(); appList.push_back(buttonId); if (m_appOrdering.find(buttonId) == m_appOrdering.end()) { @@ -473,7 +473,7 @@ void QuickLauncher::updateInsertionPosToStatusQuo() //kdDebug() << "Done." << endl; } -void QuickLauncher::addAppBeforeManually(QString url, QString sender) +void QuickLauncher::addAppBeforeManually(TQString url, TQString sender) { if (sender.isNull()) { @@ -501,7 +501,7 @@ void QuickLauncher::about() } -void QuickLauncher::mousePressEvent(QMouseEvent *e) +void QuickLauncher::mousePressEvent(TQMouseEvent *e) { if (e->button() == RightButton) { @@ -509,12 +509,12 @@ void QuickLauncher::mousePressEvent(QMouseEvent *e) } } -void QuickLauncher::resizeEvent(QResizeEvent*) +void QuickLauncher::resizeEvent(TQResizeEvent*) { refreshContents(); } -void QuickLauncher::dragEnterEvent(QDragEnterEvent *e) +void QuickLauncher::dragEnterEvent(TQDragEnterEvent *e) { DEBUGSTR << "QuickLauncher::dragEnterEvent(pos=" << e->pos() << " type=" << e->type() << ")" << endl << flush; @@ -534,7 +534,7 @@ void QuickLauncher::dragEnterEvent(QDragEnterEvent *e) m_dragButtons=new ButtonGroup; m_oldButtons=new ButtonGroup(*m_buttons); - QString url; + TQString url; KURL::List::ConstIterator it = kurlList.begin(); for ( ; it != kurlList.end(); ++it ) { @@ -568,7 +568,7 @@ void QuickLauncher::dragEnterEvent(QDragEnterEvent *e) } -void QuickLauncher::dragMoveEvent(QDragMoveEvent *e) +void QuickLauncher::dragMoveEvent(TQDragMoveEvent *e) { if (!m_dragAccepted) { @@ -594,7 +594,7 @@ void QuickLauncher::dragMoveEvent(QDragMoveEvent *e) } -void QuickLauncher::dragLeaveEvent(QDragLeaveEvent *e) +void QuickLauncher::dragLeaveEvent(TQDragLeaveEvent *e) { DEBUGSTR << "QuickLauncher::dragLeaveEvent(type=" << e->type() << ")" << endl << flush; @@ -612,7 +612,7 @@ void QuickLauncher::dragLeaveEvent(QDragLeaveEvent *e) } -void QuickLauncher::dropEvent(QDropEvent *e) +void QuickLauncher::dropEvent(TQDropEvent *e) { DEBUGSTR << "QuickLauncher::dropEvent(pos=" << e->pos() << " type=" << e->type() << ")" << endl << flush; @@ -719,13 +719,13 @@ void QuickLauncher::refreshContents() } m_space = std::max((idim/8)-1, 0); m_border = m_space; - m_buttonSize = QSize(idim, idim); + m_buttonSize = TQSize(idim, idim); m_manager->setOrientation(orientation()); m_manager->setNumItems(m_buttons->size()); m_manager->setFrameSize(size()); m_manager->setItemSize(m_buttonSize); - m_manager->setSpaceSize(QSize(m_space, m_space)); - m_manager->setBorderSize(QSize(m_border, m_border)); + m_manager->setSpaceSize(TQSize(m_space, m_space)); + m_manager->setBorderSize(TQSize(m_border, m_border)); if (!m_refreshEnabled) { m_needsRefresh=true; @@ -740,7 +740,7 @@ void QuickLauncher::refreshContents() } unsigned index; - QPoint pos; + TQPoint pos; setUpdatesEnabled(false); m_buttons->setUpdatesEnabled(false); for (index = 0; index < m_buttons->size(); index++) @@ -812,13 +812,13 @@ void QuickLauncher::loadConfig() DEBUGSTR << " ConserveSpace=" << (m_manager->conserveSpace()) << endl << flush; DEBUGSTR << " DragEnabled=" << isDragEnabled() << endl << flush;*/ - QStringList volatileButtons = m_settings->volatileButtons(); - QStringList urls = m_settings->buttons(); + TQStringList volatileButtons = m_settings->volatileButtons(); + TQStringList urls = m_settings->buttons(); kdDebug() << "GetButtons " << urls.join("/") << endl; - QStringList::Iterator iter(urls.begin()); + TQStringList::Iterator iter(urls.begin()); int n = 0; while (iter != urls.end()) { - QString url = *iter; + TQString url = *iter; addApp(url, n, false); ++iter; ++n; @@ -838,8 +838,8 @@ void QuickLauncher::loadConfig() m_popularity->readConfig(m_settings); m_popularity->setHistoryHorizon(m_settings->historyHorizon()/100.0); - QStringList serviceNames = m_settings->serviceNames(); - QValueList<int> insPos = m_settings->serviceInspos(); + TQStringList serviceNames = m_settings->serviceNames(); + TQValueList<int> insPos = m_settings->serviceInspos(); for (int n=std::min(serviceNames.size(),insPos.size())-1; n>=0; --n) { m_appOrdering[serviceNames[n]] = insPos[n]; @@ -853,7 +853,7 @@ void QuickLauncher::saveConfig() m_needsSave=true; return; } - QStringList urls, volatileUrls; + TQStringList urls, volatileUrls; ButtonIter iter = m_buttons->begin(); while (iter != m_buttons->end()) { if ((*iter)->sticky() == false) @@ -872,8 +872,8 @@ void QuickLauncher::saveConfig() m_popularity->writeConfig(m_settings); // m_popularity must have written the current service list by now - QStringList serviceNames = m_settings->serviceNames(); - QValueList<int> insertionPositions; + TQStringList serviceNames = m_settings->serviceNames(); + TQValueList<int> insertionPositions; for (int n=0; n<int(serviceNames.size()); ++n) { if (m_appOrdering.find(serviceNames[n]) != m_appOrdering.end()) @@ -901,25 +901,25 @@ void QuickLauncher::setRefreshEnabled(bool enable) } } -void QuickLauncher::serviceStartedByStorageId(QString /*starter*/, QString storageId) +void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString storageId) { KService::Ptr service = KService::serviceByStorageId(storageId); - if (service->icon() == QString::null) + if (service->icon() == TQString::null) { kdDebug() << storageId << " has no icon. Makes no sense to add it."; return; } QuickURL url = QuickURL(locate("apps", service->desktopEntryPath())); - QString desktopMenuId(url.menuId()); + TQString desktopMenuId(url.menuId()); kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl; // A service was started somwhere else. If the quicklauncher contains // this service too, we flash the icon QuickButton *startedButton = 0; - std::set<QString> buttonIdSet; + std::set<TQString> buttonIdSet; for (uint n = 0; n < m_buttons->size(); ++n) { QuickButton *button = (*m_buttons)[n]; - QString buttonMenuId = button->menuId(); + TQString buttonMenuId = button->menuId(); buttonIdSet.insert(buttonMenuId); if (desktopMenuId == buttonMenuId) { @@ -936,7 +936,7 @@ void QuickLauncher::serviceStartedByStorageId(QString /*starter*/, QString stora if (m_settings->autoAdjustEnabled()) { - QTimer::singleShot(0, this, SLOT(slotAdjustToCurrentPopularity())); + TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); } } @@ -958,8 +958,8 @@ void QuickLauncher::slotAdjustToCurrentPopularity() minAddPopularity += (belowAvgAllowed * stats->popularityByRank(n)) / maxItems; } double minDelPopularity = minAddPopularity * hysteresisFactor; - std::map<QString, QuickButton*> removeableApps; - std::set<QString> existingApps; + std::map<TQString, QuickButton*> removeableApps; + std::set<TQString> existingApps; int numApps = m_buttons->size(); for (int n = 0; n < int(m_buttons->size()); ++n) { @@ -978,7 +978,7 @@ void QuickLauncher::slotAdjustToCurrentPopularity() (numApps < maxItems && stats->popularityByRank(n) > minAddPopularity); ++n) { - QString app = m_popularity->serviceByRank(n); + TQString app = m_popularity->serviceByRank(n); if (existingApps.find(app) == existingApps.end()) { addApp(QuickURL(m_popularity->serviceByRank(n)).url(), false); @@ -1005,12 +1005,12 @@ void QuickLauncher::slotAdjustToCurrentPopularity() m_saveTimer->start(10000,true); } -void QuickLauncher::slotOwnServiceExecuted(QString serviceMenuId) +void QuickLauncher::slotOwnServiceExecuted(TQString serviceMenuId) { m_popularity->useService(serviceMenuId); if (m_settings->autoAdjustEnabled()) { - QTimer::singleShot(0, this, SLOT(slotAdjustToCurrentPopularity())); + TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); } } @@ -1019,25 +1019,25 @@ void QuickLauncher::updateStickyHighlightLayer() // Creates a transparent image which is used // to highlight those buttons which will never // be removed automatically from the launcher - QPixmap areaPix(width(), height()); - QPainter areaPixPainter(&areaPix); - areaPixPainter.fillRect(0, 0, width(), height(), QColor(255, 255, 255)); - QSize itemSize = m_manager->itemSize(); - QSize spaceSize = m_manager->spaceSize(); + TQPixmap areaPix(width(), height()); + TQPainter areaPixPainter(&areaPix); + areaPixPainter.fillRect(0, 0, width(), height(), TQColor(255, 255, 255)); + TQSize itemSize = m_manager->itemSize(); + TQSize spaceSize = m_manager->spaceSize(); for (uint n=0; n<m_buttons->size(); ++n) { - QPoint pos = m_manager->pos(n); + TQPoint pos = m_manager->pos(n); if ((*m_buttons)[n]->sticky() == false) { areaPixPainter.fillRect(pos.x()-(spaceSize.width()+1)/2, pos.y()-(spaceSize.height()+1)/2, itemSize.width()+spaceSize.width()+1, itemSize.height()+spaceSize.height()+1, - QColor(0, 0, 0)); + TQColor(0, 0, 0)); } } - QImage areaLayer = areaPix.convertToImage(); - m_stickyHighlightLayer = QImage(width(), height(), 32); + TQImage areaLayer = areaPix.convertToImage(); + m_stickyHighlightLayer = TQImage(width(), height(), 32); m_stickyHighlightLayer.setAlphaBuffer(true); int pix, tlPix, brPix, w(width()), h(height()); QRgb transparent(qRgba(0, 0, 0, 0)); @@ -1063,14 +1063,14 @@ void QuickLauncher::updateStickyHighlightLayer() repaint(); } -void QuickLauncher::paintEvent(QPaintEvent* e) +void QuickLauncher::paintEvent(TQPaintEvent* e) { KPanelApplet::paintEvent(e); if (m_settings->autoAdjustEnabled() && m_settings->showVolatileButtonIndicator()) { - QPainter p(this); + TQPainter p(this); p.drawImage(0, 0, m_stickyHighlightLayer); } } diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quicklauncher.h index c82d39661..bb53cfa9c 100644 --- a/kicker/applets/launcher/quicklauncher.h +++ b/kicker/applets/launcher/quicklauncher.h @@ -25,9 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __quicklauncher_h__ #include <dcopobject.h> -#include <qimage.h> -#include <qstring.h> -#include <qvaluevector.h> +#include <tqimage.h> +#include <tqstring.h> +#include <tqvaluevector.h> #include <kpanelapplet.h> #include <map> @@ -49,7 +49,7 @@ class QuickLauncher: public KPanelApplet, public DCOPObject K_DCOP k_dcop: - void serviceStartedByStorageId(QString starter, QString storageId); + void serviceStartedByStorageId(TQString starter, TQString storageId); public: enum {DEFAULT_ICON_DIM=QuickButton::DEFAULT_ICON_DIM}; @@ -59,34 +59,34 @@ public: float popularity; }; - QuickLauncher(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + QuickLauncher(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); ~QuickLauncher(); int widthForHeight(int height) const; int heightForWidth(int width) const; - void addApp(QString url, int index, bool manuallyAdded); + void addApp(TQString url, int index, bool manuallyAdded); virtual void action(Action a); public slots: - void addApp(QString url, bool manuallyAdded); - void addAppBeforeManually(QString url, QString sender); + void addApp(TQString url, bool manuallyAdded); + void addAppBeforeManually(TQString url, TQString sender); void removeAppManually(QuickButton *button); - void removeApp(QString url, bool manuallyRemoved); + void removeApp(TQString url, bool manuallyRemoved); void removeApp(int index, bool manuallyRemoved); void removeAppManually(int index); void saveConfig(); void about(); protected: - int findApp(QString url); + int findApp(TQString url); int findApp(QuickButton *button); - void mousePressEvent(QMouseEvent *e); - void resizeEvent(QResizeEvent*); - void dragEnterEvent(QDragEnterEvent *e); - void dragLeaveEvent(QDragLeaveEvent *e); - void dragMoveEvent(QDragMoveEvent *e); - void dropEvent(QDropEvent *e); + void mousePressEvent(TQMouseEvent *e); + void resizeEvent(TQResizeEvent*); + void dragEnterEvent(TQDragEnterEvent *e); + void dragLeaveEvent(TQDragLeaveEvent *e); + void dragMoveEvent(TQDragMoveEvent *e); + void dropEvent(TQDropEvent *e); void refreshContents(); void setRefreshEnabled(bool enable); void setConserveSpace(bool conserve_space); @@ -106,33 +106,33 @@ protected slots: void slotConfigure(); void slotSettingsDialogChanged(); void fillRemoveAppsMenu(); - void slotOwnServiceExecuted(QString serviceMenuId); + void slotOwnServiceExecuted(TQString serviceMenuId); void slotAdjustToCurrentPopularity(); void slotStickyToggled(); protected: void updateInsertionPosToStatusQuo(); void updateStickyHighlightLayer(); - QuickButton* createButton(QString url); - virtual void paintEvent(QPaintEvent* e); + QuickButton* createButton(TQString url); + virtual void paintEvent(TQPaintEvent* e); virtual void positionChange(Position); - QPopupMenu *m_popup; - QPopupMenu *m_appletPopup; - QPopupMenu *m_removeAppsMenu; + TQPopupMenu *m_popup; + TQPopupMenu *m_appletPopup; + TQPopupMenu *m_removeAppsMenu; QuickButtonGroup *m_buttons, *m_newButtons, *m_oldButtons, *m_dragButtons; int m_space, m_border; - QSize m_buttonSize; + TQSize m_buttonSize; FlowGridManager *m_manager; int m_dropLen, m_dropPos, m_minPanelDim; bool m_dragAccepted, m_refreshEnabled, m_needsSave, m_needsRefresh; - std::map<QString, int> m_appOrdering; + std::map<TQString, int> m_appOrdering; Prefs* m_settings; KAction *m_configAction; ConfigDlg *m_configDialog; PopularityStatistics* m_popularity; - QImage m_stickyHighlightLayer; - QTimer *m_saveTimer; + TQImage m_stickyHighlightLayer; + TQTimer *m_saveTimer; }; #endif diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index d22e4a8ed..3bc53efae 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -24,13 +24,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlayout.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qpopupmenu.h> -#include <qtoolbutton.h> -#include <qstyle.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpopupmenu.h> +#include <tqtoolbutton.h> +#include <tqstyle.h> +#include <tqtooltip.h> #include <dcopclient.h> @@ -46,14 +46,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("lockout"); return new Lockout(configFile, parent, "lockout"); } } -Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name) +Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name) : KPanelApplet( configFile, KPanelApplet::Normal, 0, parent, name ), bTransparent( false ) { KConfig *conf = config(); @@ -63,9 +63,9 @@ Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name) setBackgroundOrigin( AncestorOrigin ); if ( orientation() == Horizontal ) - layout = new QBoxLayout( this, QBoxLayout::TopToBottom ); + layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom ); else - layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); + layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); layout->setAutoAdd( true ); layout->setMargin( 0 ); @@ -74,16 +74,16 @@ Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name) lockButton = new SimpleButton( this, "lock"); logoutButton = new SimpleButton( this, "logout"); - QToolTip::add( lockButton, i18n("Lock the session") ); - QToolTip::add( logoutButton, i18n("Log out") ); + TQToolTip::add( lockButton, i18n("Lock the session") ); + TQToolTip::add( logoutButton, i18n("Log out") ); lockButton->setPixmap( SmallIcon( "lock" )); logoutButton->setPixmap( SmallIcon( "exit" )); bTransparent = conf->readBoolEntry( "Transparent", bTransparent ); - connect( lockButton, SIGNAL( clicked() ), SLOT( lock() )); - connect( logoutButton, SIGNAL( clicked() ), SLOT( logout() )); + connect( lockButton, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() )); + connect( logoutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( logout() )); lockButton->installEventFilter( this ); logoutButton->installEventFilter( this ); @@ -94,13 +94,13 @@ Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name) if (!kapp->authorize("logout")) logoutButton->hide(); - lockButton->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); - logoutButton->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); + lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - connect( kapp, SIGNAL( iconChanged(int) ), SLOT( slotIconChanged() )); + connect( kapp, TQT_SIGNAL( iconChanged(int) ), TQT_SLOT( slotIconChanged() )); } Lockout::~Lockout() @@ -113,18 +113,18 @@ Lockout::~Lockout() // direction and wasting a lot of space. void Lockout::checkLayout( int height ) const { - QSize s = minimumSizeHint(); - QBoxLayout::Direction direction = layout->direction(); + TQSize s = minimumSizeHint(); + TQBoxLayout::Direction direction = layout->direction(); - if ( direction == QBoxLayout::LeftToRight && + if ( direction == TQBoxLayout::LeftToRight && ( ( orientation() == Vertical && s.width() - 2 >= height ) || ( orientation() == Horizontal && s.width() - 2 < height ) ) ) { - layout->setDirection( QBoxLayout::TopToBottom ); + layout->setDirection( TQBoxLayout::TopToBottom ); } - else if ( direction == QBoxLayout::TopToBottom && + else if ( direction == TQBoxLayout::TopToBottom && ( ( orientation() == Vertical && s.height() - 2 < height ) || ( orientation() == Horizontal && s.height() - 2 >= height ) ) ) { - layout->setDirection( QBoxLayout::LeftToRight ); + layout->setDirection( TQBoxLayout::LeftToRight ); } } @@ -142,7 +142,7 @@ int Lockout::heightForWidth( int width ) const void Lockout::lock() { - QCString appname( "kdesktop" ); + TQCString appname( "kdesktop" ); int kicker_screen_number = qt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); @@ -154,64 +154,64 @@ void Lockout::logout() kapp->requestShutDown(); } -void Lockout::mousePressEvent(QMouseEvent* e) +void Lockout::mousePressEvent(TQMouseEvent* e) { propagateMouseEvent(e); } -void Lockout::mouseReleaseEvent(QMouseEvent* e) +void Lockout::mouseReleaseEvent(TQMouseEvent* e) { propagateMouseEvent(e); } -void Lockout::mouseDoubleClickEvent(QMouseEvent* e) +void Lockout::mouseDoubleClickEvent(TQMouseEvent* e) { propagateMouseEvent(e); } -void Lockout::mouseMoveEvent(QMouseEvent* e) +void Lockout::mouseMoveEvent(TQMouseEvent* e) { propagateMouseEvent(e); } -void Lockout::propagateMouseEvent(QMouseEvent* e) +void Lockout::propagateMouseEvent(TQMouseEvent* e) { if ( !isTopLevel() ) { - QMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), + TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - QApplication::sendEvent( topLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } -bool Lockout::eventFilter( QObject *o, QEvent *e ) +bool Lockout::eventFilter( TQObject *o, TQEvent *e ) { if (!kapp->authorizeKAction("kicker_rmb")) return false; // Process event normally: - if( e->type() == QEvent::MouseButtonPress ) + if( e->type() == TQEvent::MouseButtonPress ) { KConfig *conf = config(); conf->setGroup("lockout"); - QMouseEvent *me = static_cast<QMouseEvent *>( e ); - if( me->button() == QMouseEvent::RightButton ) + TQMouseEvent *me = static_cast<TQMouseEvent *>( e ); + if( me->button() == TQMouseEvent::RightButton ) { if( o == lockButton ) { - QPopupMenu *popup = new QPopupMenu(); + TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem( SmallIcon( "lock" ), i18n("Lock Session"), - this, SLOT( lock() ) ); + this, TQT_SLOT( lock() ) ); popup->insertSeparator(); i18n("&Transparent"); //popup->insertItem( i18n( "&Transparent" ), 100 ); popup->insertItem( SmallIcon( "configure" ), i18n( "&Configure Screen Saver..." ), - this, SLOT( slotLockPrefs() ) ); + this, TQT_SLOT( slotLockPrefs() ) ); //popup->setItemChecked( 100, bTransparent ); - //popup->connectItem(100, this, SLOT( slotTransparent() ) ); + //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) ); //if (conf->entryIsImmutable( "Transparent" )) // popup->setItemEnabled( 100, false ); popup->exec( me->globalPos() ); @@ -221,18 +221,18 @@ bool Lockout::eventFilter( QObject *o, QEvent *e ) } else if ( o == logoutButton ) { - QPopupMenu *popup = new QPopupMenu(); + TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem( SmallIcon( "exit" ), i18n("&Log Out..."), - this, SLOT( logout() ) ); + this, TQT_SLOT( logout() ) ); popup->insertSeparator(); //popup->insertItem( i18n( "&Transparent" ), 100 ); popup->insertItem( SmallIcon( "configure" ), i18n( "&Configure Session Manager..." ), - this, SLOT( slotLogoutPrefs() ) ); + this, TQT_SLOT( slotLogoutPrefs() ) ); //popup->setItemChecked( 100, bTransparent ); - //popup->connectItem(100, this, SLOT( slotTransparent() ) ); + //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) ); //if (conf->entryIsImmutable( "Transparent" )) // popup->setItemEnabled( 100, false ); popup->exec( me->globalPos() ); diff --git a/kicker/applets/lockout/lockout.h b/kicker/applets/lockout/lockout.h index 606870a99..a0b2d67e0 100644 --- a/kicker/applets/lockout/lockout.h +++ b/kicker/applets/lockout/lockout.h @@ -1,8 +1,8 @@ #ifndef LOCKOUT_H #define LOCKOUT_H -#include <qevent.h> -#include <qstring.h> +#include <tqevent.h> +#include <tqstring.h> #include <kpanelapplet.h> #include "simplebutton.h" @@ -15,20 +15,20 @@ class Lockout : public KPanelApplet Q_OBJECT public: - Lockout( const QString& configFile, - QWidget *parent = 0, const char *name = 0 ); + Lockout( const TQString& configFile, + TQWidget *parent = 0, const char *name = 0 ); ~Lockout(); int widthForHeight(int height) const; int heightForWidth(int width) const; protected: - virtual void mousePressEvent( QMouseEvent * ); - virtual void mouseMoveEvent( QMouseEvent * ); - virtual void mouseReleaseEvent( QMouseEvent * ); - virtual void mouseDoubleClickEvent( QMouseEvent * ); + virtual void mousePressEvent( TQMouseEvent * ); + virtual void mouseMoveEvent( TQMouseEvent * ); + virtual void mouseReleaseEvent( TQMouseEvent * ); + virtual void mouseDoubleClickEvent( TQMouseEvent * ); - virtual bool eventFilter( QObject *, QEvent * ); + virtual bool eventFilter( TQObject *, TQEvent * ); private slots: void lock(); @@ -40,11 +40,11 @@ private slots: void slotIconChanged(); private: - void propagateMouseEvent( QMouseEvent * ); + void propagateMouseEvent( TQMouseEvent * ); void checkLayout( int height ) const; SimpleButton *lockButton, *logoutButton; - QBoxLayout *layout; + TQBoxLayout *layout; bool bTransparent; }; diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 4ccd0eeef..b137b5d5c 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString configFile) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { KGlobal::locale()->insertCatalogue("mediaapplet"); return new MediaApplet(configFile, KPanelApplet::Normal, @@ -42,7 +42,7 @@ extern "C" } } -MediaApplet::MediaApplet(const QString& configFile, Type type, int actions, QWidget *parent, const char *name) +MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name), mButtonSizeSum(0) { @@ -57,18 +57,18 @@ MediaApplet::MediaApplet(const QString& configFile, Type type, int actions, QWid mpDirLister = new KDirLister(); - connect( mpDirLister, SIGNAL( clear() ), - this, SLOT( slotClear() ) ); - connect( mpDirLister, SIGNAL( started(const KURL&) ), - this, SLOT( slotStarted(const KURL&) ) ); - connect( mpDirLister, SIGNAL( completed() ), - this, SLOT( slotCompleted() ) ); - connect( mpDirLister, SIGNAL( newItems( const KFileItemList & ) ), - this, SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( mpDirLister, SIGNAL( deleteItem( KFileItem * ) ), - this, SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( mpDirLister, SIGNAL( refreshItems( const KFileItemList & ) ), - this, SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQT_SIGNAL( clear() ), + this, TQT_SLOT( slotClear() ) ); + connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ), + this, TQT_SLOT( slotStarted(const KURL&) ) ); + connect( mpDirLister, TQT_SIGNAL( completed() ), + this, TQT_SLOT( slotCompleted() ) ); + connect( mpDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), + this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), + this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); reloadList(); } @@ -135,7 +135,7 @@ int MediaApplet::heightForWidth( int /*width*/ ) const return mButtonSizeSum; } -void MediaApplet::resizeEvent( QResizeEvent *) +void MediaApplet::resizeEvent( TQResizeEvent *) { arrangeButtons(); } @@ -323,7 +323,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries) { kdDebug()<<"MediaApplet::slotRefreshItems:"<<(*it.current()).url().url()<<endl; - QString mimetype = (*it.current()).mimetype(); + TQString mimetype = (*it.current()).mimetype(); bool found = false; kdDebug()<<"mimetype="<<mimetype<<endl; @@ -423,7 +423,7 @@ void MediaApplet::reloadList() mpDirLister->openURL(KURL("media:/")); } -void MediaApplet::mousePressEvent(QMouseEvent *e) +void MediaApplet::mousePressEvent(TQMouseEvent *e) { if(e->button()==RightButton) { diff --git a/kicker/applets/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h index 5e2320be0..68d0b5d99 100644 --- a/kicker/applets/media/mediaapplet.h +++ b/kicker/applets/media/mediaapplet.h @@ -25,15 +25,15 @@ #endif #include <kpanelapplet.h> -#include <qstring.h> +#include <tqstring.h> #include <kconfig.h> #include <kurl.h> #include <kfileitem.h> #include <kdirlister.h> -#include <qptrlist.h> +#include <tqptrlist.h> #include "mediumbutton.h" -typedef QValueList<MediumButton*> MediumButtonList; +typedef TQValueList<MediumButton*> MediumButtonList; class MediaApplet : public KPanelApplet @@ -41,8 +41,8 @@ class MediaApplet : public KPanelApplet Q_OBJECT public: - MediaApplet(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + MediaApplet(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); ~MediaApplet(); int widthForHeight(int height) const; @@ -52,12 +52,12 @@ public: protected: void arrangeButtons(); - void resizeEvent(QResizeEvent *e); + void resizeEvent(TQResizeEvent *e); void positionChange(Position p); void reloadList(); void loadConfig(); void saveConfig(); - void mousePressEvent(QMouseEvent *e); + void mousePressEvent(TQMouseEvent *e); protected slots: void slotClear(); @@ -70,8 +70,8 @@ protected slots: private: KDirLister *mpDirLister; MediumButtonList mButtonList; - QStringList mExcludedTypesList; - QStringList mExcludedList; + TQStringList mExcludedTypesList; + TQStringList mExcludedList; KFileItemList mMedia; int mButtonSizeSum; }; diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index e8007a989..5be2acbab 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -19,13 +19,13 @@ #include "mediumbutton.h" -#include <qapplication.h> -#include <qclipboard.h> -#include <qpainter.h> -#include <qdrawutil.h> -#include <qpopupmenu.h> -#include <qstyle.h> -#include <qtooltip.h> +#include <tqapplication.h> +#include <tqclipboard.h> +#include <tqpainter.h> +#include <tqdrawutil.h> +#include <tqpopupmenu.h> +#include <tqstyle.h> +#include <tqtooltip.h> #include <kmessagebox.h> #include <kmimetype.h> @@ -44,13 +44,13 @@ #include <konq_popupmenu.h> #include <konq_drag.h> -MediumButton::MediumButton(QWidget *parent, const KFileItem &fileItem) +MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem) { - KAction *a = KStdAction::paste(this, SLOT(slotPaste()), + KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); - a = KStdAction::copy(this, SLOT(slotCopy()), &mActions, "copy"); + a = KStdAction::copy(this, TQT_SLOT(slotCopy()), &mActions, "copy"); a->setShortcut(0); setBackgroundOrigin(AncestorOrigin); @@ -63,18 +63,18 @@ MediumButton::MediumButton(QWidget *parent, const KFileItem &fileItem) refreshType(); - connect(&mOpenTimer, SIGNAL(timeout()), SLOT(slotDragOpen())); + connect(&mOpenTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDragOpen())); // Activate this code only if we find a way to have both an // action and a popup menu for the same kicker button - //connect(this, SIGNAL(clicked()), this, SLOT(slotClicked())); + //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); - setPopup(new QPopupMenu()); + setPopup(new TQPopupMenu()); } MediumButton::~MediumButton() { - QPopupMenu *menu = popup(); + TQPopupMenu *menu = popup(); setPopup(0); delete menu; } @@ -94,7 +94,7 @@ void MediumButton::setFileItem(const KFileItem &fileItem) void MediumButton::initPopup() { - QPopupMenu *old_popup = popup(); + TQPopupMenu *old_popup = popup(); KFileItemList items; items.append(&mFileItem); @@ -122,7 +122,7 @@ void MediumButton::initPopup() void MediumButton::refreshType() { KMimeType::Ptr mime = mFileItem.determineMimeType(); - QToolTip::add(this, mime->comment()); + TQToolTip::add(this, mime->comment()); setIcon(mFileItem.iconName()); } @@ -144,10 +144,10 @@ void MediumButton::slotCopy() { KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false); - QApplication::clipboard()->setData( obj ); + TQApplication::clipboard()->setData( obj ); } -void MediumButton::dragEnterEvent(QDragEnterEvent* e) +void MediumButton::dragEnterEvent(TQDragEnterEvent* e) { if (mFileItem.isWritable()) { @@ -156,14 +156,14 @@ void MediumButton::dragEnterEvent(QDragEnterEvent* e) } } -void MediumButton::dragLeaveEvent(QDragLeaveEvent* e) +void MediumButton::dragLeaveEvent(TQDragLeaveEvent* e) { mOpenTimer.stop(); PanelPopupButton::dragLeaveEvent( e ); } -void MediumButton::dropEvent(QDropEvent *e) +void MediumButton::dropEvent(TQDropEvent *e) { mOpenTimer.stop(); @@ -175,7 +175,7 @@ void MediumButton::slotDragOpen() mFileItem.run(); } -QString MediumButton::tileName() +TQString MediumButton::tileName() { return mFileItem.text(); } diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h index 8d7970d89..3fa31756a 100644 --- a/kicker/applets/media/mediumbutton.h +++ b/kicker/applets/media/mediumbutton.h @@ -21,11 +21,11 @@ #define MEDIUMBUTTON_H #include <panelbutton.h> -#include <qpoint.h> -#include <qstring.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qtimer.h> +#include <tqpoint.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqtimer.h> #include <kfileitem.h> #include <kpanelapplet.h> #include <kactioncollection.h> @@ -35,19 +35,19 @@ class MediumButton : public PanelPopupButton Q_OBJECT public: - MediumButton(QWidget *parent, const KFileItem &fileItem); + MediumButton(TQWidget *parent, const KFileItem &fileItem); ~MediumButton(); const KFileItem &fileItem() const; void setFileItem(const KFileItem &fileItem); void setPanelPosition(KPanelApplet::Position position); protected: - QString tileName(); + TQString tileName(); void refreshType(); void initPopup(); - void dragEnterEvent( QDragEnterEvent* ); - void dragLeaveEvent( QDragLeaveEvent* ); - void dropEvent(QDropEvent *e); + void dragEnterEvent( TQDragEnterEvent* ); + void dragLeaveEvent( TQDragLeaveEvent* ); + void dropEvent(TQDropEvent *e); protected slots: // Activate this code only if we find a way to have both an @@ -60,7 +60,7 @@ protected slots: private: KActionCollection mActions; KFileItem mFileItem; - QTimer mOpenTimer; + TQTimer mOpenTimer; }; #endif diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp index 179878e89..8d9cdcc94 100644 --- a/kicker/applets/media/preferencesdialog.cpp +++ b/kicker/applets/media/preferencesdialog.cpp @@ -21,34 +21,34 @@ #include <klocale.h> #include <kmimetype.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <klistview.h> #include <kfiledetailview.h> class MediumTypeItem : public QCheckListItem { public: - MediumTypeItem(QListView *parent, const QString name, - const QString mimetype) - : QCheckListItem(parent, name, CheckBox), + MediumTypeItem(TQListView *parent, const TQString name, + const TQString mimetype) + : TQCheckListItem(parent, name, CheckBox), mMimeType(mimetype) { } - const QString &mimeType() const { return mMimeType; } + const TQString &mimeType() const { return mMimeType; } private: - QString mMimeType; + TQString mMimeType; }; class MediumItem : public QCheckListItem { public: - MediumItem(QListView *parent, const QString name, + MediumItem(TQListView *parent, const TQString name, const KFileItem medium) - : QCheckListItem(parent, name, CheckBox), + : TQCheckListItem(parent, name, CheckBox), mMedium(medium) { } - const QString itemURL() const { return mMedium.url().url(); } + const TQString itemURL() const { return mMedium.url().url(); } private: KFileItem mMedium; @@ -56,27 +56,27 @@ private: -PreferencesDialog::PreferencesDialog(KFileItemList media, QWidget *parent, +PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent, const char *name) : KDialogBase(Tabbed, i18n("Media Applet Preferences"), Ok|Cancel|Default, Ok, parent, name, true), mMedia(media) { - QVBox *types_page = addVBoxPage( i18n("Medium Types") ); + TQVBox *types_page = addVBoxPage( i18n("Medium Types") ); mpMediumTypesListView = new KListView(types_page); //mpMediumTypesListView->setFullWidth(true); mpMediumTypesListView->addColumn( i18n("Types to Display") ); - QWhatsThis::add(mpMediumTypesListView, i18n("Deselect the medium types which you do not want to see in the applet")); + TQWhatsThis::add(mpMediumTypesListView, i18n("Deselect the medium types which you do not want to see in the applet")); - QVBox *media_page = addVBoxPage( i18n("Media") ); + TQVBox *media_page = addVBoxPage( i18n("Media") ); mpMediaListView = new KListView(media_page); //mpMediaListView->setFullWidth(true); mpMediaListView->addColumn( i18n("Media to Display") ); - QWhatsThis::add(mpMediaListView, i18n("Deselect the media which you do not want to see in the applet")); + TQWhatsThis::add(mpMediaListView, i18n("Deselect the media which you do not want to see in the applet")); slotDefault(); } @@ -87,7 +87,7 @@ PreferencesDialog::~PreferencesDialog() void PreferencesDialog::slotDefault() { - QStringList defaultExclude; + TQStringList defaultExclude; defaultExclude << "media/hdd_mounted"; defaultExclude << "media/hdd_unmounted"; @@ -97,12 +97,12 @@ void PreferencesDialog::slotDefault() defaultExclude << "media/smb_unmounted"; setExcludedMediumTypes(defaultExclude); - setExcludedMedia(QStringList()); + setExcludedMedia(TQStringList()); } -QStringList PreferencesDialog::excludedMediumTypes() +TQStringList PreferencesDialog::excludedMediumTypes() { - QStringList excludedTypes; + TQStringList excludedTypes; for(MediumTypeItem *it=static_cast<MediumTypeItem *>(mpMediumTypesListView->firstChild()); it; it=static_cast<MediumTypeItem *>(it->nextSibling())) @@ -113,13 +113,13 @@ QStringList PreferencesDialog::excludedMediumTypes() return excludedTypes; } -void PreferencesDialog::setExcludedMediumTypes(QStringList excludedTypesList) +void PreferencesDialog::setExcludedMediumTypes(TQStringList excludedTypesList) { mpMediumTypesListView->clear(); mpMediumTypesListView->setRootIsDecorated(false); KMimeType::List mimetypes = KMimeType::allMimeTypes(); - QValueListIterator<KMimeType::Ptr> it(mimetypes.begin()); + TQValueListIterator<KMimeType::Ptr> it(mimetypes.begin()); for(; it != mimetypes.end(); ++it) { @@ -132,9 +132,9 @@ void PreferencesDialog::setExcludedMediumTypes(QStringList excludedTypesList) } } -QStringList PreferencesDialog::excludedMedia() +TQStringList PreferencesDialog::excludedMedia() { - QStringList excluded; + TQStringList excluded; for(MediumItem *it=static_cast<MediumItem *>(mpMediaListView->firstChild()); it; it=static_cast<MediumItem *>(it->nextSibling())) @@ -145,7 +145,7 @@ QStringList PreferencesDialog::excludedMedia() return excluded; } -void PreferencesDialog::setExcludedMedia(QStringList excludedList) +void PreferencesDialog::setExcludedMedia(TQStringList excludedList) { mpMediaListView->clear(); mpMediaListView->setRootIsDecorated(false); diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h index bb400564b..e946f81de 100644 --- a/kicker/applets/media/preferencesdialog.h +++ b/kicker/applets/media/preferencesdialog.h @@ -20,7 +20,7 @@ #ifndef PREFERENCESDIALOG_H #define PREFERENCESDIALOG_H -#include <qwidget.h> +#include <tqwidget.h> #include <kdialogbase.h> #include <kfileitem.h> @@ -32,14 +32,14 @@ class PreferencesDialog : public KDialogBase { Q_OBJECT public: - PreferencesDialog(KFileItemList media, QWidget *parent=0, const char *name=0); + PreferencesDialog(KFileItemList media, TQWidget *parent=0, const char *name=0); ~PreferencesDialog(); - QStringList excludedMediumTypes(); - void setExcludedMediumTypes(QStringList excludedTypesList); + TQStringList excludedMediumTypes(); + void setExcludedMediumTypes(TQStringList excludedTypesList); - QStringList excludedMedia(); - void setExcludedMedia(QStringList excludedList); + TQStringList excludedMedia(); + void setExcludedMedia(TQStringList excludedList); protected slots: void slotDefault(); diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index ae10614c6..472f3bd0d 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "menuapplet.h" -#include <qlayout.h> -#include <qtooltip.h> -#include <qvariant.h> // avoid X11 #define's +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqvariant.h> // avoid X11 #define's #include <kapplication.h> #include <kconfig.h> @@ -45,7 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* KMenuBar from KDE3.1 and older won't work very well with this applet. - This is because QMenuBar tries really hard to keep its preffered size, + This is because TQMenuBar tries really hard to keep its preffered size, se even if the X window for the menubar has the size enforced by this applet, Qt thinks it has the size Qt wants. This results in parts of the menubar not being repainted. Also, old KMenuBar always forced @@ -61,7 +61,7 @@ extern Time qt_x_time; extern "C" { - KDE_EXPORT KPanelApplet* init( QWidget* parent_P, const QString& configFile_P ) + KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) { KGlobal::locale()->insertCatalogue("kmenuapplet"); return new KickerMenuApplet::Applet( configFile_P, parent_P ); @@ -78,7 +78,7 @@ const long SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::Do | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask; -Applet::Applet( const QString& configFile_P, QWidget* parent_P ) +Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApplet( configFile_P, Normal, 0, parent_P, "menuapplet" ), DCOPObject( "menuapplet" ), module( NULL ), @@ -91,8 +91,8 @@ Applet::Applet( const QString& configFile_P, QWidget* parent_P ) setBackgroundOrigin(AncestorOrigin); dcopclient.registerAs( "menuapplet", false ); // toolbarAppearanceChanged(int) is sent when changing macstyle - connect( kapp, SIGNAL( toolbarAppearanceChanged( int )), - this, SLOT( readSettings())); + connect( kapp, TQT_SIGNAL( toolbarAppearanceChanged( int )), + this, TQT_SLOT( readSettings())); claimSelection(); readSettings(); updateTopEdgeOffset(); @@ -152,7 +152,7 @@ void Applet::activeWindowChanged( WId w_P ) window != None; window = tryTransientFor( window )) { - for( QValueList< MenuEmbed* >::ConstIterator it = menus.begin(); + for( TQValueList< MenuEmbed* >::ConstIterator it = menus.begin(); it != menus.end(); ++it ) { @@ -175,7 +175,7 @@ void Applet::activeWindowChanged( WId w_P ) } if( try_desktop ) { - for( QValueList< MenuEmbed* >::ConstIterator it = menus.begin(); + for( TQValueList< MenuEmbed* >::ConstIterator it = menus.begin(); it != menus.end(); ++it ) { @@ -233,7 +233,7 @@ WId Applet::tryTransientFor( WId w_P ) void Applet::menuLost( MenuEmbed* embed ) { - for( QValueList< MenuEmbed* >::Iterator it = menus.begin(); + for( TQValueList< MenuEmbed* >::Iterator it = menus.begin(); it != menus.end(); ++it ) { @@ -266,21 +266,21 @@ void Applet::positionChange( Position ) // Kicker's frame). void Applet::updateTopEdgeOffset() { - QPoint p = topLevelWidget()->mapToGlobal( QPoint( 0, 0 )); + TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); if( p.y() <= 2 ) // 2 = work also when running in appletproxy - topEdgeOffset = mapToGlobal( QPoint( 0, 0 )).y() - p.y(); + topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y(); else topEdgeOffset = 0; if( active_menu != NULL ) active_menu->move( active_menu->x(), -topEdgeOffset ); } -void Applet::paletteChange(const QPalette & /* oldPalette */) +void Applet::paletteChange(const TQPalette & /* oldPalette */) { setBackground(); } -void Applet::moveEvent( QMoveEvent* ) +void Applet::moveEvent( TQMoveEvent* ) { setBackground(); } @@ -300,13 +300,13 @@ void Applet::claimSelection() { delete selection_watcher; selection_watcher = NULL; - connect( selection, SIGNAL( lostOwnership()), SLOT( lostSelection())); + connect( selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); module = new KWinModule; - connect( module, SIGNAL( windowAdded( WId )), this, SLOT( windowAdded( WId ))); - connect( module, SIGNAL( activeWindowChanged( WId )), - this, SLOT( activeWindowChanged( WId ))); - QValueList< WId > windows = module->windows(); - for( QValueList< WId >::ConstIterator it = windows.begin(); + connect( module, TQT_SIGNAL( windowAdded( WId )), this, TQT_SLOT( windowAdded( WId ))); + connect( module, TQT_SIGNAL( activeWindowChanged( WId )), + this, TQT_SLOT( activeWindowChanged( WId ))); + TQValueList< WId > windows = module->windows(); + for( TQValueList< WId >::ConstIterator it = windows.begin(); it != windows.end(); ++it ) windowAdded( *it ); @@ -321,7 +321,7 @@ void Applet::lostSelection() if( selection == NULL ) return; // kdDebug() << "lost selection" << endl; - for( QValueList< MenuEmbed* >::ConstIterator it = menus.begin(); + for( TQValueList< MenuEmbed* >::ConstIterator it = menus.begin(); it != menus.end(); ++it ) delete (*it); // delete all MenuEmbed's = release all menus @@ -330,7 +330,7 @@ void Applet::lostSelection() if( selection_watcher == NULL ) { selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( qt_xdisplay())); - connect( selection_watcher, SIGNAL( lostOwner()), this, SLOT( claimSelection())); + connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection())); } delete module; module = NULL; @@ -346,9 +346,9 @@ void Applet::readSettings() desktop_menu = cfg.readBoolEntry( "ShowMenubar", false ); cfg.setGroup( "KDE" ); if( cfg.readBoolEntry( "macStyle", false ) || desktop_menu ) - QToolTip::remove( this ); + TQToolTip::remove( this ); else - QToolTip::add( this, i18n( + TQToolTip::add( this, i18n( "You do not appear to have enabled the standalone menubar; " "enable it in the Behavior control module for desktop." )); if( !isDisabled() && active_menu == NULL ) @@ -397,7 +397,7 @@ Atom Applet::makeSelectionAtom() } MenuEmbed::MenuEmbed( WId mainwindow_P, bool desktop_P, - QWidget* parent_P, const char* name_P ) + TQWidget* parent_P, const char* name_P ) : QXEmbed( parent_P, name_P ), main_window( mainwindow_P ), desktop( desktop_P ) @@ -418,7 +418,7 @@ bool MenuEmbed::x11Event( XEvent* ev_P ) && ev_P->xconfigurerequest.value_mask & ( CWWidth | CWHeight )) { XConfigureRequestEvent& ev = ev_P->xconfigurerequest; - QSize new_size = size(); + TQSize new_size = size(); if( ev.value_mask & CWWidth ) new_size.setWidth( ev.width ); if( ev.value_mask & CWHeight ) @@ -443,7 +443,7 @@ bool MenuEmbed::x11Event( XEvent* ev_P ) void MenuEmbed::sendSyntheticConfigureNotifyEvent() { - QPoint globalPos = mapToGlobal(QPoint(0,0)); + TQPoint globalPos = mapToGlobal(TQPoint(0,0)); if (embeddedWinId()) { XConfigureEvent c; memset(&c, 0, sizeof(c)); @@ -489,11 +489,11 @@ void MenuEmbed::setMinimumSize( int w, int h ) void MenuEmbed::setBackground() { - const QPixmap *pbg = parentWidget()->backgroundPixmap(); + const TQPixmap *pbg = parentWidget()->backgroundPixmap(); if (pbg) { - QPixmap bg(width(), height()); + TQPixmap bg(width(), height()); bg.fill(parentWidget(), pos()); setPaletteBackgroundPixmap(bg); setBackgroundOrigin(WidgetOrigin); diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h index 8374e897b..5ba54cd66 100644 --- a/kicker/applets/menu/menuapplet.h +++ b/kicker/applets/menu/menuapplet.h @@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <assert.h> -#include <qvaluelist.h> -#include <qevent.h> +#include <tqvaluelist.h> +#include <tqevent.h> #include <qxembed.h> #include <kpanelapplet.h> @@ -78,7 +78,7 @@ k_dcop: ASYNC configure(); public: - Applet( const QString& configFile, QWidget *parent ); + Applet( const TQString& configFile, TQWidget *parent ); virtual ~Applet(); virtual int widthForHeight( int height ) const; virtual int heightForWidth( int width ) const; @@ -92,9 +92,9 @@ public: protected: - virtual void paletteChange(const QPalette& ); + virtual void paletteChange(const TQPalette& ); virtual void positionChange( Position p ); - virtual void moveEvent(QMoveEvent *); + virtual void moveEvent(TQMoveEvent *); private slots: @@ -150,7 +150,7 @@ private: /** * List of all known menus. */ - QValueList< MenuEmbed* > menus; + TQValueList< MenuEmbed* > menus; /** * A pointer to the current active menu, which is member @@ -197,7 +197,7 @@ public: * @param desktop true if @p mainwindow is the desktop */ MenuEmbed( WId mainwindow, bool desktop, - QWidget* parent = NULL, const char* name = NULL ); + TQWidget* parent = NULL, const char* name = NULL ); void setBackground(); @@ -210,7 +210,7 @@ public: */ bool isDesktopMenu() const; virtual void setMinimumSize( int w, int h ); - void setMinimumSize( const QSize& s ) { setMinimumSize( s.width(), s.height()); } + void setMinimumSize( const TQSize& s ) { setMinimumSize( s.width(), s.height()); } protected: diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index defc21795..dc2431e15 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -21,12 +21,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qpainter.h> -#include <qtooltip.h> -#include <qlineedit.h> -#include <qpopupmenu.h> -#include <qlayout.h> -#include <qbuttongroup.h> +#include <tqpainter.h> +#include <tqtooltip.h> +#include <tqlineedit.h> +#include <tqpopupmenu.h> +#include <tqlayout.h> +#include <tqbuttongroup.h> #include <dcopref.h> #include <kglobalsettings.h> @@ -73,15 +73,15 @@ static const int bgOffset = 300; extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kminipagerapplet"); return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet"); } } -KMiniPager::KMiniPager(const QString& configFile, Type type, int actions, - QWidget *parent, const char *name) +KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, + TQWidget *parent, const char *name) : KPanelApplet( configFile, type, actions, parent, name ), m_layout(0), m_desktopLayoutOwner( NULL ), @@ -90,8 +90,8 @@ KMiniPager::KMiniPager(const QString& configFile, Type type, int actions, m_settings( new PagerSettings(sharedConfig()) ) { setBackgroundOrigin( AncestorOrigin ); - int scnum = QApplication::desktop()->screenNumber(this); - QRect desk = QApplication::desktop()->screenGeometry(scnum); + int scnum = TQApplication::desktop()->screenNumber(this); + TQRect desk = TQApplication::desktop()->screenGeometry(scnum); if (desk.width() <= 800) { KConfigSkeleton::ItemBool* item = dynamic_cast<KConfigSkeleton::ItemBool*>(m_settings->findItem("Preview")); @@ -107,9 +107,9 @@ KMiniPager::KMiniPager(const QString& configFile, Type type, int actions, TaskManager::the()->trackGeometry(); } - m_group = new QButtonGroup(this); + m_group = new TQButtonGroup(this); m_group->setBackgroundOrigin(AncestorOrigin); - m_group->setFrameStyle(QFrame::NoFrame); + m_group->setFrameStyle(TQFrame::NoFrame); m_group->setExclusive( true ); setFont( KGlobalSettings::taskbarFont() ); @@ -127,32 +127,32 @@ KMiniPager::KMiniPager(const QString& configFile, Type type, int actions, desktopLayoutX = -1; desktopLayoutY = -1; - QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; drawButtons(); - connect( m_kwin, SIGNAL( currentDesktopChanged(int)), SLOT( slotSetDesktop(int) ) ); - connect( m_kwin, SIGNAL( currentDesktopViewportChanged(int, const QPoint&)), SLOT(slotSetDesktopViewport(int, const QPoint&))); - connect( m_kwin, SIGNAL( numberOfDesktopsChanged(int)), SLOT( slotSetDesktopCount(int) ) ); - connect( m_kwin, SIGNAL( desktopGeometryChanged(int)), SLOT( slotRefreshViewportCount(int) ) ); - connect( m_kwin, SIGNAL( activeWindowChanged(WId)), SLOT( slotActiveWindowChanged(WId) ) ); - connect( m_kwin, SIGNAL( windowAdded(WId) ), this, SLOT( slotWindowAdded(WId) ) ); - connect( m_kwin, SIGNAL( windowRemoved(WId) ), this, SLOT( slotWindowRemoved(WId) ) ); - connect( m_kwin, SIGNAL( windowChanged(WId,unsigned int) ), this, SLOT( slotWindowChanged(WId,unsigned int) ) ); - connect( m_kwin, SIGNAL( desktopNamesChanged() ), this, SLOT( slotDesktopNamesChanged() ) ); - connect( kapp, SIGNAL(backgroundChanged(int)), SLOT(slotBackgroundChanged(int)) ); + connect( m_kwin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) ); + connect( m_kwin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&))); + connect( m_kwin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) ); + connect( m_kwin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) ); + connect( m_kwin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) ); + connect( m_kwin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) ); + connect( m_kwin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) ); + connect( m_kwin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) ); + connect( m_kwin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) ); + connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) ); if (kapp->authorizeKAction("kicker_rmb") && kapp->authorizeControlModule("kde-kcmtaskbar.desktop")) { - m_contextMenu = new QPopupMenu(); - connect(m_contextMenu, SIGNAL(aboutToShow()), SLOT(aboutToShowContextMenu())); - connect(m_contextMenu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int))); + m_contextMenu = new TQPopupMenu(); + connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); + connect(m_contextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); setCustomMenu(m_contextMenu); } - QValueList<WId>::ConstIterator it; - QValueList<WId>::ConstIterator itEnd = m_kwin->windows().end(); + TQValueList<WId>::ConstIterator it; + TQValueList<WId>::ConstIterator itEnd = m_kwin->windows().end(); for ( it = m_kwin->windows().begin(); it != itEnd; ++it) { slotWindowAdded( (*it) ); @@ -218,11 +218,11 @@ void KMiniPager::slotSetDesktop(int desktop) } } -void KMiniPager::slotSetDesktopViewport(int desktop, const QPoint& viewport) +void KMiniPager::slotSetDesktopViewport(int desktop, const TQPoint& viewport) { // ### Q_UNUSED(desktop); - QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); slotSetDesktop((viewport.y()-1) * s.width() + viewport.x() ); } @@ -231,9 +231,9 @@ void KMiniPager::slotButtonSelected( int desk ) if (m_kwin->numberOfViewports(m_kwin->currentDesktop()).width() * m_kwin->numberOfViewports(m_kwin->currentDesktop()).height() > 1) { - QPoint p; + TQPoint p; - p.setX( (desk-1) * QApplication::desktop()->width()); + p.setX( (desk-1) * TQApplication::desktop()->width()); p.setY( 0 ); KWin::setCurrentDesktopViewport(m_kwin->currentDesktop(), p); @@ -276,14 +276,14 @@ int KMiniPager::widthForHeight(int h) const { if (desktopPreview() || m_settings->backgroundType() == PagerSettings::EnumBackgroundType::BgLive) { - bw = (int) ( bw * (double) QApplication::desktop()->width() / QApplication::desktop()->height() ); + bw = (int) ( bw * (double) TQApplication::desktop()->width() / TQApplication::desktop()->height() ); } } else { // scale to desktop width as a minimum - bw = (int) (bw * (double) QApplication::desktop()->width() / QApplication::desktop()->height()); - QFontMetrics fm = fontMetrics(); + bw = (int) (bw * (double) TQApplication::desktop()->width() / TQApplication::desktop()->height()); + TQFontMetrics fm = fontMetrics(); for (int i = 1; i <= deskNum; i++) { int sw = fm.width( m_kwin->desktopName( i ) ) + 8; @@ -331,7 +331,7 @@ int KMiniPager::heightForWidth(int w) const int bh = (w/rowNum) + 1; if ( desktopPreview() ) { - bh = (int) ( bh * (double) QApplication::desktop()->height() / QApplication::desktop()->width() ); + bh = (int) ( bh * (double) TQApplication::desktop()->height() / TQApplication::desktop()->width() ); } else if ( m_settings->labelType() == PagerSettings::EnumLabelType::LabelName ) { @@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) if( m_desktopLayoutOwner == NULL ) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( qt_xdisplay()); - m_desktopLayoutOwner = new KSelectionOwner( QString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), + m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), screen, this ); if( !m_desktopLayoutOwner->claim( false )) { @@ -379,7 +379,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft ); } -void KMiniPager::resizeEvent(QResizeEvent*) +void KMiniPager::resizeEvent(TQResizeEvent*) { bool horiz = orientation() == Horizontal; @@ -418,10 +418,10 @@ void KMiniPager::resizeEvent(QResizeEvent*) } // 1 pixel spacing. - m_layout = new QGridLayout(this, nDX, nDY, 0, 1); + m_layout = new TQGridLayout(this, nDX, nDY, 0, 1); - QValueList<KMiniPagerButton*>::Iterator it = m_desktops.begin(); - QValueList<KMiniPagerButton*>::Iterator itEnd = m_desktops.end(); + TQValueList<KMiniPagerButton*>::Iterator it = m_desktops.begin(); + TQValueList<KMiniPagerButton*>::Iterator itEnd = m_desktops.end(); int c = 0, r = 0; while( it != itEnd ) { @@ -438,7 +438,7 @@ void KMiniPager::resizeEvent(QResizeEvent*) updateGeometry(); } -void KMiniPager::wheelEvent( QWheelEvent* e ) +void KMiniPager::wheelEvent( TQWheelEvent* e ) { int newDesk; int desktops = KWin::numberOfDesktops(); @@ -465,24 +465,24 @@ void KMiniPager::drawButtons() int i = 1; do { - QSize viewportNum = m_kwin->numberOfViewports(i); + TQSize viewportNum = m_kwin->numberOfViewports(i); for (int j = 1; j <= viewportNum.width() * viewportNum.height(); ++j) { - QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); - QPoint viewport( (j-1) % s.width(), (j-1) / s.width()); + TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQPoint viewport( (j-1) % s.width(), (j-1) / s.width()); desk = new KMiniPagerButton( count, m_useViewports, viewport, this ); if ( m_settings->labelType() != PagerSettings::EnumLabelType::LabelName ) { - QToolTip::add( desk, desk->desktopName() ); + TQToolTip::add( desk, desk->desktopName() ); } m_desktops.append( desk ); m_group->insert( desk, count ); - connect(desk, SIGNAL(buttonSelected(int)), - SLOT(slotButtonSelected(int)) ); - connect(desk, SIGNAL(showMenu(const QPoint&, int )), - SLOT(slotShowMenu(const QPoint&, int )) ); + connect(desk, TQT_SIGNAL(buttonSelected(int)), + TQT_SLOT(slotButtonSelected(int)) ); + connect(desk, TQT_SIGNAL(showMenu(const TQPoint&, int )), + TQT_SLOT(slotShowMenu(const TQPoint&, int )) ); desk->show(); ++count; @@ -493,11 +493,11 @@ void KMiniPager::drawButtons() void KMiniPager::slotSetDesktopCount( int ) { - QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; - QValueList<KMiniPagerButton*>::ConstIterator it; - QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); + TQValueList<KMiniPagerButton*>::ConstIterator it; + TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); for( it = m_desktops.begin(); it != itEnd; ++it ) { delete (*it); @@ -518,11 +518,11 @@ void KMiniPager::slotSetDesktopCount( int ) void KMiniPager::slotRefreshViewportCount( int ) { - QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; - QValueList<KMiniPagerButton*>::ConstIterator it; - QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); + TQValueList<KMiniPagerButton*>::ConstIterator it; + TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); for( it = m_desktops.begin(); it != itEnd; ++it ) { delete (*it); @@ -549,8 +549,8 @@ void KMiniPager::slotActiveWindowChanged( WId win ) KWin::WindowInfo* inf2 = win ? info( win ) : NULL; m_activeWindow = win; - QValueList<KMiniPagerButton*>::ConstIterator it; - QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); + TQValueList<KMiniPagerButton*>::ConstIterator it; + TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); for ( it = m_desktops.begin(); it != itEnd; ++it) { if ( ( inf1 && (*it)->shouldPaintWindow(inf1)) || @@ -573,8 +573,8 @@ void KMiniPager::slotWindowAdded( WId win) return; } - QValueList<KMiniPagerButton*>::ConstIterator it; - QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); + TQValueList<KMiniPagerButton*>::ConstIterator it; + TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); for ( it = m_desktops.begin(); it != itEnd; ++it) { if ( (*it)->shouldPaintWindow(inf) ) @@ -605,8 +605,8 @@ void KMiniPager::slotWindowRemoved(WId win) return; } - QValueList<KMiniPagerButton*>::ConstIterator it; - QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); + TQValueList<KMiniPagerButton*>::ConstIterator it; + TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); for (it = m_desktops.begin(); it != itEnd; ++it) { if (onAllDesktops || onAllViewports || desktop == (*it)->desktop()) @@ -637,9 +637,9 @@ void KMiniPager::slotWindowChanged( WId win , unsigned int properties ) { KWin::WindowInfo* inf = m_windows[win]; bool skipPager = inf->hasState(NET::SkipPager); - QMemArray<bool> old_shouldPaintWindow(m_desktops.size()); - QValueList<KMiniPagerButton*>::ConstIterator it; - QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); + TQMemArray<bool> old_shouldPaintWindow(m_desktops.size()); + TQValueList<KMiniPagerButton*>::ConstIterator it; + TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); int i = 0; for ( it = m_desktops.begin(); it != itEnd; ++it) { @@ -693,8 +693,8 @@ KTextShadowEngine* KMiniPager::shadowEngine() void KMiniPager::refresh() { - QValueList<KMiniPagerButton*>::ConstIterator it; - QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); + TQValueList<KMiniPagerButton*>::ConstIterator it; + TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); for ( it = m_desktops.begin(); it != itEnd; ++it) { (*it)->update(); @@ -716,13 +716,13 @@ void KMiniPager::aboutToShowContextMenu() showMenu->setCheckable(true); showMenu->insertTitle(i18n("Pager Layout")); - QPopupMenu* rowMenu = new QPopupMenu(showMenu); + TQPopupMenu* rowMenu = new TQPopupMenu(showMenu); rowMenu->setCheckable(true); rowMenu->insertItem(i18n("&Automatic"), 0 + rowOffset); rowMenu->insertItem(i18n("one row or column", "&1"), 1 + rowOffset); rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset); rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset); - connect(rowMenu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int))); + connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); showMenu->insertItem((orientation()==Horizontal) ? i18n("&Rows"): i18n("&Columns"), rowMenu); @@ -747,7 +747,7 @@ void KMiniPager::aboutToShowContextMenu() showMenu->insertItem(i18n("&Desktop Wallpaper"), PagerSettings::EnumBackgroundType::BgLive + bgOffset); } - connect(showMenu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int))); + connect(showMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); m_contextMenu->insertItem(i18n("&Pager Options"),showMenu); m_contextMenu->insertItem(SmallIcon("configure"), @@ -766,7 +766,7 @@ void KMiniPager::aboutToShowContextMenu() PagerSettings::EnumLabelType::LabelName); } -void KMiniPager::slotShowMenu(const QPoint& pos, int desktop) +void KMiniPager::slotShowMenu(const TQPoint& pos, int desktop) { if (!m_contextMenu) { @@ -827,8 +827,8 @@ void KMiniPager::contextMenuActivated(int result) { if (m_useViewports == false) { m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgLive); - QValueList<KMiniPagerButton*>::ConstIterator it; - QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); + TQValueList<KMiniPagerButton*>::ConstIterator it; + TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); for( it = m_desktops.begin(); it != itEnd; ++it ) { (*it)->backgroundChanged(); @@ -858,16 +858,16 @@ void KMiniPager::contextMenuActivated(int result) void KMiniPager::slotDesktopNamesChanged() { - QValueList<KMiniPagerButton*>::ConstIterator it = m_desktops.begin(); - QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); + TQValueList<KMiniPagerButton*>::ConstIterator it = m_desktops.begin(); + TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end(); for (int i = 1; it != itEnd; ++it, ++i) { - QString name = m_kwin->desktopName(i); + TQString name = m_kwin->desktopName(i); (*it)->setDesktopName(name); (*it)->repaint(); - QToolTip::remove((*it)); - QToolTip::add((*it), name); + TQToolTip::remove((*it)); + TQToolTip::add((*it), name); } updateLayout(); @@ -884,9 +884,9 @@ void KMiniPager::showPager() else { // Let's run kpager if it isn't running - connect( dcop, SIGNAL( applicationRegistered(const QCString &) ), this, SLOT(applicationRegistered(const QCString &)) ); + connect( dcop, TQT_SIGNAL( applicationRegistered(const TQCString &) ), this, TQT_SLOT(applicationRegistered(const TQCString &)) ); dcop->setNotifications(true); - QString strAppPath(locate("exe", "kpager")); + TQString strAppPath(locate("exe", "kpager")); if (!strAppPath.isEmpty()) { KProcess process; @@ -899,25 +899,25 @@ void KMiniPager::showPager() void KMiniPager::showKPager(bool toggleShow) { - QPoint pt; + TQPoint pt; switch ( position() ) { case pTop: - pt = mapToGlobal( QPoint(x(), y() + height()) ); + pt = mapToGlobal( TQPoint(x(), y() + height()) ); break; case pLeft: - pt = mapToGlobal( QPoint(x() + width(), y()) ); + pt = mapToGlobal( TQPoint(x() + width(), y()) ); break; case pRight: case pBottom: default: - pt=mapToGlobal( QPoint(x(), y()) ); + pt=mapToGlobal( TQPoint(x(), y()) ); } DCOPClient *dcop=kapp->dcopClient(); - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << pt.x() << pt.y() ; if (toggleShow) { @@ -929,12 +929,12 @@ void KMiniPager::showKPager(bool toggleShow) } } -void KMiniPager::applicationRegistered( const QCString & appName ) +void KMiniPager::applicationRegistered( const TQCString & appName ) { if (appName == "kpager") { - disconnect( kapp->dcopClient(), SIGNAL( applicationRegistered(const QCString &) ), - this, SLOT(applicationRegistered(const QCString &)) ); + disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString &) ), + this, TQT_SLOT(applicationRegistered(const TQCString &)) ); showKPager(false); } } diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index d96ba83f7..88712d9ff 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __MINIPAGER_H #define __MINIPAGER_H -#include <qvaluelist.h> -#include <qintdict.h> +#include <tqvaluelist.h> +#include <tqintdict.h> #include <kpanelapplet.h> #include <kwin.h> @@ -49,8 +49,8 @@ class KMiniPager : public KPanelApplet Q_OBJECT public: - KMiniPager(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + KMiniPager(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); virtual ~KMiniPager(); @@ -78,11 +78,11 @@ public: void emitRequestFocus() { emit requestFocus(); } - QPoint clickPos; + TQPoint clickPos; public slots: void slotSetDesktop(int desktop); - void slotSetDesktopViewport(int desktop, const QPoint& viewport); + void slotSetDesktopViewport(int desktop, const TQPoint& viewport); void slotSetDesktopCount(int count); void slotRefreshViewportCount(int currentDesktop); void slotButtonSelected(int desk ); @@ -90,7 +90,7 @@ public slots: void slotWindowAdded( WId ); void slotWindowRemoved( WId ); void slotWindowChanged( WId, unsigned int ); - void slotShowMenu( const QPoint&, int ); + void slotShowMenu( const TQPoint&, int ); void slotDesktopNamesChanged(); void slotBackgroundChanged( int ); @@ -98,30 +98,30 @@ public slots: protected: void drawButtons(); - void startDrag( const QPoint &point ); + void startDrag( const TQPoint &point ); void updateDesktopLayout(int,int,int); - void resizeEvent(QResizeEvent*); - void wheelEvent( QWheelEvent* e ); + void resizeEvent(TQResizeEvent*); + void wheelEvent( TQWheelEvent* e ); void showKPager(bool toggleShow); protected slots: void showPager(); - void applicationRegistered(const QCString &appName); + void applicationRegistered(const TQCString &appName); void aboutToShowContextMenu(); void contextMenuActivated(int); private: - QValueList<KMiniPagerButton*> m_desktops; + TQValueList<KMiniPagerButton*> m_desktops; int m_curDesk; int m_rmbDesk; - QIntDict<KWin::WindowInfo> m_windows; + TQIntDict<KWin::WindowInfo> m_windows; WId m_activeWindow; - QButtonGroup *m_group; + TQButtonGroup *m_group; - QGridLayout *m_layout; + TQGridLayout *m_layout; bool m_useViewports; int desktopLayoutOrientation; int desktopLayoutX; @@ -131,7 +131,7 @@ private: KWinModule *m_kwin; KTextShadowEngine* m_shadowEngine; - QPopupMenu *m_contextMenu; + TQPopupMenu *m_contextMenu; PagerSettings *m_settings; }; diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index c17e0e1cb..c56afca38 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -23,12 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> -#include <qcursor.h> -#include <qdrawutil.h> -#include <qlineedit.h> -#include <qpainter.h> -#include <qpopupmenu.h> -#include <qstylesheet.h> +#include <tqcursor.h> +#include <tqdrawutil.h> +#include <tqlineedit.h> +#include <tqpainter.h> +#include <tqpopupmenu.h> +#include <tqstylesheet.h> #include <netwm.h> #include <dcopclient.h> @@ -58,9 +58,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. KSharedPixmap* KMiniPagerButton::s_commonSharedPixmap; KPixmap* KMiniPagerButton::s_commonBgPixmap; -KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const QPoint& viewport, +KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& viewport, KMiniPager *parent, const char *name) - : QButton(parent, name), + : TQButton(parent, name), m_pager(parent), m_desktop(desk), m_useViewports(useViewPorts), @@ -81,10 +81,10 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const QPoint& vi m_desktopName = m_pager->kwin()->desktopName(m_desktop); - connect(this, SIGNAL(clicked()), SLOT(slotClicked())); - connect(this, SIGNAL(toggled(bool)), SLOT(slotToggled(bool))); - connect(&m_dragSwitchTimer, SIGNAL(timeout()), this, SLOT(slotDragSwitch())); - connect(&m_updateCompressor, SIGNAL(timeout()), this, SLOT(update())); + connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked())); + connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); + connect(&m_dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragSwitch())); + connect(&m_updateCompressor, TQT_SIGNAL(timeout()), this, TQT_SLOT(update())); if (m_pager->desktopPreview()) { @@ -99,37 +99,37 @@ KMiniPagerButton::~KMiniPagerButton() delete m_bgPixmap; } -QRect KMiniPagerButton::mapGeometryToViewport(const KWin::WindowInfo& info) const +TQRect KMiniPagerButton::mapGeometryToViewport(const KWin::WindowInfo& info) const { if (!m_useViewports) return info.frameGeometry(); // ### fix vertically layouted viewports - QRect _r(info.frameGeometry()); - QPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop())); + TQRect _r(info.frameGeometry()); + TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop())); - _r.moveBy( - (m_desktop - vx.x()) * QApplication::desktop()->width(), + _r.moveBy( - (m_desktop - vx.x()) * TQApplication::desktop()->width(), 0); if ((info.state() & NET::Sticky)) { - _r.moveTopLeft(QPoint(_r.x() % QApplication::desktop()->width(), - _r.y() % QApplication::desktop()->height())); + _r.moveTopLeft(TQPoint(_r.x() % TQApplication::desktop()->width(), + _r.y() % TQApplication::desktop()->height())); } return _r; } -QPoint KMiniPagerButton::mapPointToViewport(const QPoint& _p) const +TQPoint KMiniPagerButton::mapPointToViewport(const TQPoint& _p) const { if (!m_useViewports) return _p; - QPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop())); + TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop())); // ### fix vertically layouted viewports - QPoint p(_p); - p.setX(p.x() + (m_desktop - vx.x()) * QApplication::desktop()->width()); + TQPoint p(_p); + p.setX(p.x() + (m_desktop - vx.x()) * TQApplication::desktop()->width()); return p; } @@ -152,11 +152,11 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const return false; if (m_useViewports) { - QRect r = mapGeometryToViewport(*info); + TQRect r = mapGeometryToViewport(*info); if (!info->hasState(NET::Sticky) && - !QApplication::desktop()->geometry().contains(r.topLeft()) && - !QApplication::desktop()->geometry().contains(r.topRight())) + !TQApplication::desktop()->geometry().contains(r.topLeft()) && + !TQApplication::desktop()->geometry().contains(r.topRight())) return false; } @@ -172,7 +172,7 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const return true; } -void KMiniPagerButton::resizeEvent(QResizeEvent *ev) +void KMiniPagerButton::resizeEvent(TQResizeEvent *ev) { if (m_lineEdit) { @@ -182,7 +182,7 @@ void KMiniPagerButton::resizeEvent(QResizeEvent *ev) delete m_bgPixmap; m_bgPixmap = 0; - QButton::resizeEvent(ev); + TQButton::resizeEvent(ev); } void KMiniPagerButton::windowsChanged() @@ -217,21 +217,21 @@ void KMiniPagerButton::loadBgPixmap() client->attach(); } - QCString kdesktop_name; + TQCString kdesktop_name; int screen_number = DefaultScreen(qt_xdisplay()); if (screen_number == 0) kdesktop_name = "kdesktop"; else kdesktop_name.sprintf("kdesktop-screen-%d", screen_number); - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (client->call(kdesktop_name, "KBackgroundIface", "isCommon()", data, replyType, replyData)) { if (replyType == "bool") { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); reply >> m_isCommon; } } @@ -245,8 +245,8 @@ void KMiniPagerButton::loadBgPixmap() } else if (s_commonSharedPixmap) { // other button is already fetching the pixmap - connect(s_commonSharedPixmap, SIGNAL(done(bool)), - SLOT(backgroundLoaded(bool))); + connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)), + TQT_SLOT(backgroundLoaded(bool))); return; } } @@ -256,15 +256,15 @@ void KMiniPagerButton::loadBgPixmap() if (!s_commonSharedPixmap) { s_commonSharedPixmap = new KSharedPixmap; - connect(s_commonSharedPixmap, SIGNAL(done(bool)), - SLOT(backgroundLoaded(bool))); + connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)), + TQT_SLOT(backgroundLoaded(bool))); } - retval = s_commonSharedPixmap->loadFromShared(QString("DESKTOP1")); + retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1")); if (retval == false) { - QDataStream args( data, IO_WriteOnly ); + TQDataStream args( data, IO_WriteOnly ); args << 1; // Argument is 1 (true) client->send(kdesktop_name, "KBackgroundIface", "setExport(int)", data); - retval = s_commonSharedPixmap->loadFromShared(QString("DESKTOP1")); + retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1")); } } else @@ -272,30 +272,30 @@ void KMiniPagerButton::loadBgPixmap() if (!m_sharedPixmap) { m_sharedPixmap = new KSharedPixmap; - connect(m_sharedPixmap, SIGNAL(done(bool)), - SLOT(backgroundLoaded(bool))); + connect(m_sharedPixmap, TQT_SIGNAL(done(bool)), + TQT_SLOT(backgroundLoaded(bool))); } - retval = m_sharedPixmap->loadFromShared(QString("DESKTOP%1").arg(m_desktop)); + retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop)); if (retval == false) { - QDataStream args( data, IO_WriteOnly ); + TQDataStream args( data, IO_WriteOnly ); args << 1; client->send(kdesktop_name, "KBackgroundIface", "setExport(int)", data); - retval = m_sharedPixmap->loadFromShared(QString("DESKTOP%1").arg(m_desktop)); + retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop)); } } } -static QPixmap scalePixmap(const QPixmap &pixmap, int width, int height) +static TQPixmap scalePixmap(const TQPixmap &pixmap, int width, int height) { if (pixmap.width()>100) { KPixmapIO io; - QImage img( io.convertToImage( pixmap ) ); + TQImage img( io.convertToImage( pixmap ) ); return io.convertToPixmap( img.smoothScale( width, height ) ); } - QImage img( pixmap.convertToImage().smoothScale( width, height ) ); - QPixmap pix; + TQImage img( pixmap.convertToImage().smoothScale( width, height ) ); + TQPixmap pix; pix.convertFromImage( img ); return pix; @@ -335,26 +335,26 @@ void KMiniPagerButton::backgroundLoaded( bool loaded ) } } -void KMiniPagerButton::enterEvent(QEvent *) +void KMiniPagerButton::enterEvent(TQEvent *) { m_inside = true; update(); } -void KMiniPagerButton::leaveEvent(QEvent *) +void KMiniPagerButton::leaveEvent(TQEvent *) { m_inside = false; update(); } -void KMiniPagerButton::drawButton(QPainter *bp) +void KMiniPagerButton::drawButton(TQPainter *bp) { int w = width(); int h = height(); bool on = isOn(); bool down = isDown(); - QBrush background; + TQBrush background; bool liveBkgnd = m_pager->bgType() == PagerSettings::EnumBackgroundType::BgLive; bool transparent = m_pager->bgType() == PagerSettings::EnumBackgroundType::BgTransparent; @@ -363,7 +363,7 @@ void KMiniPagerButton::drawButton(QPainter *bp) if (backgroundPixmap()) { - QPoint pt = backgroundOffset(); + TQPoint pt = backgroundOffset(); bp->drawTiledPixmap(0, 0, width(), height(), *backgroundPixmap(), pt.x(), pt.y()); } else @@ -418,11 +418,11 @@ void KMiniPagerButton::drawButton(QPainter *bp) } else { - QBrush background; + TQBrush background; if (on) { - background = colorGroup().brush(QColorGroup::Midlight); + background = colorGroup().brush(TQColorGroup::Midlight); } else if (down) { @@ -431,7 +431,7 @@ void KMiniPagerButton::drawButton(QPainter *bp) } else { - background = colorGroup().brush(QColorGroup::Mid); + background = colorGroup().brush(TQColorGroup::Mid); } bp->fillRect(0, 0, w, h, background); @@ -443,29 +443,29 @@ void KMiniPagerButton::drawButton(QPainter *bp) { KWinModule* kwin = m_pager->kwin(); KWin::WindowInfo *info = 0; - int dw = QApplication::desktop()->width(); - int dh = QApplication::desktop()->height(); + int dw = TQApplication::desktop()->width(); + int dh = TQApplication::desktop()->height(); - QValueList<WId> windows = kwin->stackingOrder(); - QValueList<WId>::const_iterator itEnd = windows.constEnd(); - for (QValueList<WId>::ConstIterator it = windows.constBegin(); it != itEnd; ++it) + TQValueList<WId> windows = kwin->stackingOrder(); + TQValueList<WId>::const_iterator itEnd = windows.constEnd(); + for (TQValueList<WId>::ConstIterator it = windows.constBegin(); it != itEnd; ++it) { info = m_pager->info(*it); if (shouldPaintWindow(info)) { - QRect r = mapGeometryToViewport(*info); - r = QRect(r.x() * width() / dw, 2 + r.y() * height() / dh, + TQRect r = mapGeometryToViewport(*info); + r = TQRect(r.x() * width() / dw, 2 + r.y() * height() / dh, r.width() * width() / dw, r.height() * height() / dh); if (kwin->activeWindow() == info->win()) { - QBrush brush = colorGroup().brush(QColorGroup::Highlight); + TQBrush brush = colorGroup().brush(TQColorGroup::Highlight); qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush); } else { - QBrush brush = colorGroup().brush(QColorGroup::Button); + TQBrush brush = colorGroup().brush(TQColorGroup::Button); if (on) { @@ -478,7 +478,7 @@ void KMiniPagerButton::drawButton(QPainter *bp) if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15) { - QPixmap icon = KWin::icon(*it, 16, 16, true); + TQPixmap icon = KWin::icon(*it, 16, 16, true); if (!icon.isNull()) { bp->drawPixmap(r.left() + ((r.width() - 16) / 2), @@ -508,23 +508,23 @@ void KMiniPagerButton::drawButton(QPainter *bp) if (m_pager->labelType() != PagerSettings::EnumLabelType::LabelNone) { - QString label = (m_pager->labelType() == PagerSettings::EnumLabelType::LabelNumber) ? - QString::number(m_desktop) : m_desktopName; + TQString label = (m_pager->labelType() == PagerSettings::EnumLabelType::LabelNumber) ? + TQString::number(m_desktop) : m_desktopName; if (transparent || liveBkgnd) { bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText()); - m_pager->shadowEngine()->drawText(*bp, QRect(0, 0, w, h), AlignCenter, label, size()); + m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size()); } else bp->drawText(0, 0, w, h, AlignCenter, label); } if (m_inside) - KickerLib::drawBlendedRect(bp, QRect(1, 1, width() - 2, height() - 2), colorGroup().foreground()); + KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground()); } -void KMiniPagerButton::mousePressEvent(QMouseEvent * e) +void KMiniPagerButton::mousePressEvent(TQMouseEvent * e) { if (e->button() == RightButton) { @@ -541,29 +541,29 @@ void KMiniPagerButton::mousePressEvent(QMouseEvent * e) m_pager->clickPos = e->pos(); } - QButton::mousePressEvent(e); + TQButton::mousePressEvent(e); } -void KMiniPagerButton::mouseReleaseEvent(QMouseEvent* e) +void KMiniPagerButton::mouseReleaseEvent(TQMouseEvent* e) { - m_pager->clickPos = QPoint(); - QButton::mouseReleaseEvent(e); + m_pager->clickPos = TQPoint(); + TQButton::mouseReleaseEvent(e); } -void KMiniPagerButton::mouseMoveEvent(QMouseEvent* e) +void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e) { if (!m_pager->desktopPreview()) { return; } - int dw = QApplication::desktop()->width(); - int dh = QApplication::desktop()->height(); + int dw = TQApplication::desktop()->width(); + int dh = TQApplication::desktop()->height(); int w = width(); int h = height(); - QPoint pos(m_pager->clickPos.isNull() ? mapFromGlobal(QCursor::pos()) : m_pager->clickPos); - QPoint p = mapPointToViewport(QPoint(pos.x() * dw / w, pos.y() * dh / h)); + TQPoint pos(m_pager->clickPos.isNull() ? mapFromGlobal(TQCursor::pos()) : m_pager->clickPos); + TQPoint p = mapPointToViewport(TQPoint(pos.x() * dw / w, pos.y() * dh / h)); Task::Ptr wasWindow = m_currentWindow; m_currentWindow = TaskManager::the()->findTask(m_useViewports ? 1 : m_desktop, p); @@ -576,13 +576,13 @@ void KMiniPagerButton::mouseMoveEvent(QMouseEvent* e) if (m_currentWindow && !m_pager->clickPos.isNull() && (m_pager->clickPos - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay()) { - QRect r = m_currentWindow->geometry(); + TQRect r = m_currentWindow->geometry(); // preview window height, window width int ww = r.width() * w / dw; int wh = r.height() * h / dh; - QPixmap windowImage(ww, wh); - QPainter bp(&windowImage, this); + TQPixmap windowImage(ww, wh); + TQPainter bp(&windowImage, this); bp.setPen(colorGroup().foreground()); bp.drawRect(0, 0, ww, wh); @@ -591,7 +591,7 @@ void KMiniPagerButton::mouseMoveEvent(QMouseEvent* e) Task::List tasklist; tasklist.append(m_currentWindow); TaskDrag* drag = new TaskDrag(tasklist, this); - QPoint offset(m_pager->clickPos.x() - (r.x() * w / dw), + TQPoint offset(m_pager->clickPos.x() - (r.x() * w / dw), m_pager->clickPos.y() - (r.y() * h / dh)); drag->setPixmap(windowImage, offset); drag->dragMove(); @@ -601,11 +601,11 @@ void KMiniPagerButton::mouseMoveEvent(QMouseEvent* e) setDown(false); } - m_pager->clickPos = QPoint(); + m_pager->clickPos = TQPoint(); } } -void KMiniPagerButton::dragEnterEvent(QDragEnterEvent* e) +void KMiniPagerButton::dragEnterEvent(TQDragEnterEvent* e) { if (PanelDrag::canDecode(e)) { @@ -623,11 +623,11 @@ void KMiniPagerButton::dragEnterEvent(QDragEnterEvent* e) // if a dragitem is held for over a pager button for two seconds, // activate corresponding desktop m_dragSwitchTimer.start(1000, true); - QButton::dragEnterEvent(e); + TQButton::dragEnterEvent(e); } } -void KMiniPagerButton::dropEvent(QDropEvent* e) +void KMiniPagerButton::dropEvent(TQDropEvent* e) { if (TaskDrag::canDecode(e)) { @@ -637,12 +637,12 @@ void KMiniPagerButton::dropEvent(QDropEvent* e) if ((m_useViewports || e->source() == this) && tasks.count() == 1) { Task::Ptr task = tasks[0]; - int dw = QApplication::desktop()->width(); - int dh = QApplication::desktop()->height(); + int dw = TQApplication::desktop()->width(); + int dh = TQApplication::desktop()->height(); int w = width(); int h = height(); - QRect location = mapGeometryToViewport(task->info()); - QPoint pos = mapPointToViewport(e->pos()); + TQRect location = mapGeometryToViewport(task->info()); + TQPoint pos = mapPointToViewport(e->pos()); int deltaX = pos.x() - m_pager->clickPos.x(); int deltaY = pos.y() - m_pager->clickPos.y(); @@ -685,7 +685,7 @@ void KMiniPagerButton::dropEvent(QDropEvent* e) setDown(false); } - QButton::dropEvent( e ); + TQButton::dropEvent( e ); } void KMiniPagerButton::enabledChange( bool oldEnabled ) @@ -695,10 +695,10 @@ void KMiniPagerButton::enabledChange( bool oldEnabled ) m_pager->refresh(); } - QButton::enabledChange(oldEnabled); + TQButton::enabledChange(oldEnabled); } -void KMiniPagerButton::dragLeaveEvent( QDragLeaveEvent* e ) +void KMiniPagerButton::dragLeaveEvent( TQDragLeaveEvent* e ) { m_dragSwitchTimer.stop(); @@ -707,7 +707,7 @@ void KMiniPagerButton::dragLeaveEvent( QDragLeaveEvent* e ) setDown(false); } - QButton::dragLeaveEvent( e ); + TQButton::dragLeaveEvent( e ); } void KMiniPagerButton::slotDragSwitch() @@ -723,8 +723,8 @@ void KMiniPagerButton::slotClicked() void KMiniPagerButton::rename() { if ( !m_lineEdit ) { - m_lineEdit = new QLineEdit( this ); - connect( m_lineEdit, SIGNAL( returnPressed() ), m_lineEdit, SLOT( hide() ) ); + m_lineEdit = new TQLineEdit( this ); + connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) ); m_lineEdit->installEventFilter( this ); } m_lineEdit->setGeometry( rect() ); @@ -743,19 +743,19 @@ void KMiniPagerButton::slotToggled( bool b ) } } -bool KMiniPagerButton::eventFilter( QObject *o, QEvent * e) +bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e) { if (o && o == m_lineEdit && - (e->type() == QEvent::FocusOut || e->type() == QEvent::Hide)) + (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide)) { m_pager->kwin()->setDesktopName( m_desktop, m_lineEdit->text() ); m_desktopName = m_lineEdit->text(); - QTimer::singleShot( 0, m_lineEdit, SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) ); m_lineEdit = 0; return true; } - return QButton::eventFilter(o, e); + return TQButton::eventFilter(o, e); } void KMiniPagerButton::updateKickerTip(KickerTip::Data &data) @@ -764,7 +764,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data) Task::Dict::iterator taskEnd = tasks.end(); uint taskCounter = 0; uint taskLimiter = 4; - QString lastWindow; + TQString lastWindow; for (Task::Dict::iterator it = tasks.begin(); it != taskEnd; ++it) { @@ -777,8 +777,8 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data) continue; } - QPixmap winIcon = it.data()->pixmap(); - QString bullet; + TQPixmap winIcon = it.data()->pixmap(); + TQString bullet; if (winIcon.isNull()) { @@ -786,20 +786,20 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data) } else { - data.mimeFactory->setPixmap(QString::number(taskCounter), winIcon); - bullet = QString("<img src=\"%1\" width=\"%2\" height=\"%3\">").arg(taskCounter).arg(16).arg(16); + data.mimeFactory->setPixmap(TQString::number(taskCounter), winIcon); + bullet = TQString("<img src=\"%1\" width=\"%2\" height=\"%3\">").arg(taskCounter).arg(16).arg(16); } - QString name = KStringHandler::cPixelSqueeze(it.data()->visibleName(), fontMetrics(), 400); - name = QStyleSheet::escape(name); + TQString name = KStringHandler::cPixelSqueeze(it.data()->visibleName(), fontMetrics(), 400); + name = TQStyleSheet::escape(name); if (it.data() == m_currentWindow) { - data.subtext.append(QString("<br>%1 <u>").arg(bullet)); + data.subtext.append(TQString("<br>%1 <u>").arg(bullet)); data.subtext.append(name).append("</u>"); } else { - data.subtext.append(QString("<br>%1 ").arg(bullet)); + data.subtext.append(TQString("<br>%1 ").arg(bullet)); data.subtext.append(name); } } @@ -828,7 +828,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data) data.duration = 4000; data.icon = DesktopIcon("window_list", KIcon::SizeMedium); - data.message = QStyleSheet::escape(m_desktopName); + data.message = TQStyleSheet::escape(m_desktopName); data.direction = m_pager->popupDirection(); } diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h index 1547201e0..50baf68c9 100644 --- a/kicker/applets/minipager/pagerbutton.h +++ b/kicker/applets/minipager/pagerbutton.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __MINIPAGERBUTTON_H #define __MINIPAGERBUTTON_H -#include <qbutton.h> +#include <tqbutton.h> #include "taskmanager.h" #include "kickertip.h" @@ -35,18 +35,18 @@ class KMiniPager; class KSharedPixmap; class QLineEdit; -class KMiniPagerButton : public QButton, public KickerTip::Client +class KMiniPagerButton : public TQButton, public KickerTip::Client { Q_OBJECT public: - KMiniPagerButton(int desk, bool useViewports, const QPoint& viewport, + KMiniPagerButton(int desk, bool useViewports, const TQPoint& viewport, KMiniPager *parent=0, const char *name=0); ~KMiniPagerButton(); int desktop() { return m_desktop; } - QString desktopName() { return m_desktopName; } - void setDesktopName( QString name ) { m_desktopName = name; } + TQString desktopName() { return m_desktopName; } + void setDesktopName( TQString name ) { m_desktopName = name; } void rename(); void backgroundChanged(); @@ -56,22 +56,22 @@ public: signals: void buttonSelected( int desk ); - void showMenu( const QPoint&, int ); + void showMenu( const TQPoint&, int ); protected: - void drawButton(QPainter *); - void enterEvent(QEvent*); - void leaveEvent(QEvent*); - void resizeEvent(QResizeEvent *ev); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void dragEnterEvent(QDragEnterEvent* e); - void dragLeaveEvent(QDragLeaveEvent* e); + void drawButton(TQPainter *); + void enterEvent(TQEvent*); + void leaveEvent(TQEvent*); + void resizeEvent(TQResizeEvent *ev); + void mousePressEvent(TQMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); + void dragEnterEvent(TQDragEnterEvent* e); + void dragLeaveEvent(TQDragLeaveEvent* e); void enabledChange( bool oldEnabled ); - void dropEvent(QDropEvent* e); + void dropEvent(TQDropEvent* e); - bool eventFilter(QObject*, QEvent*); + bool eventFilter(TQObject*, TQEvent*); void updateKickerTip(KickerTip::Data &data); private slots: @@ -83,20 +83,20 @@ private slots: private: void loadBgPixmap(); - QRect mapGeometryToViewport(const KWin::WindowInfo&) const; - QPoint mapPointToViewport(const QPoint&) const; + TQRect mapGeometryToViewport(const KWin::WindowInfo&) const; + TQPoint mapPointToViewport(const TQPoint&) const; KMiniPager* m_pager; int m_desktop; bool m_useViewports; - QString m_desktopName; - QPoint m_viewport; + TQString m_desktopName; + TQPoint m_viewport; - QTimer m_updateCompressor; - QTimer m_dragSwitchTimer; + TQTimer m_updateCompressor; + TQTimer m_dragSwitchTimer; Task::Ptr m_dragging; - QLineEdit* m_lineEdit; + TQLineEdit* m_lineEdit; KSharedPixmap *m_sharedPixmap; KPixmap *m_bgPixmap; diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index c256aa36f..44f2229ec 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -22,9 +22,9 @@ #include "NaughtyProcessMonitor.h" #include "NaughtyConfigDialog.h" -#include <qmessagebox.h> -#include <qtoolbutton.h> -#include <qlayout.h> +#include <tqmessagebox.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> #include <kiconloader.h> #include <kglobal.h> @@ -34,11 +34,11 @@ #include <klocale.h> #include <kpopupmenu.h> #include <kmessagebox.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget * parent, const QString & configFile) + KDE_EXPORT KPanelApplet* init(TQWidget * parent, const TQString & configFile) { KGlobal::locale()->insertCatalogue("naughtyapplet"); @@ -55,10 +55,10 @@ extern "C" NaughtyApplet::NaughtyApplet ( - const QString & configFile, + const TQString & configFile, Type t, int actions, - QWidget * parent, + TQWidget * parent, const char * name ) : KPanelApplet(configFile, t, actions, parent, name) @@ -69,27 +69,27 @@ NaughtyApplet::NaughtyApplet button_ = new SimpleButton(this); button_->setFixedSize(20, 20); - QVBoxLayout * layout = new QVBoxLayout(this); + TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(button_); monitor_ = new NaughtyProcessMonitor(2, 20, this); connect ( - button_, SIGNAL(clicked()), - this, SLOT(slotPreferences()) + button_, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotPreferences()) ); connect ( - monitor_, SIGNAL(runawayProcess(ulong, const QString &)), - this, SLOT(slotWarn(ulong, const QString &)) + monitor_, TQT_SIGNAL(runawayProcess(ulong, const TQString &)), + this, TQT_SLOT(slotWarn(ulong, const TQString &)) ); connect ( - monitor_, SIGNAL(load(uint)), - this, SLOT(slotLoad(uint)) + monitor_, TQT_SIGNAL(load(uint)), + this, TQT_SLOT(slotLoad(uint)) ); loadSettings(); @@ -103,17 +103,17 @@ NaughtyApplet::~NaughtyApplet() } void -NaughtyApplet::slotWarn(ulong pid, const QString & name) +NaughtyApplet::slotWarn(ulong pid, const TQString & name) { if (ignoreList_.contains(name)) return; - QString s = i18n("A program called '%1' is slowing down the others " + TQString s = i18n("A program called '%1' is slowing down the others " "on your machine. It may have a bug that is causing " "this, or it may just be busy.\n" "Would you like to try to stop the program?"); - int retval = KMessageBox::warningYesNo(this, s.arg(name), QString::null, i18n("Stop"), i18n("Keep Running")); + int retval = KMessageBox::warningYesNo(this, s.arg(name), TQString::null, i18n("Stop"), i18n("Keep Running")); if (KMessageBox::Yes == retval) monitor_->kill(pid); @@ -121,7 +121,7 @@ NaughtyApplet::slotWarn(ulong pid, const QString & name) { s = i18n("In future, should busy programs called '%1' be ignored?"); - retval = KMessageBox::questionYesNo(this, s.arg(name), QString::null, i18n("Ignore"), i18n("Do Not Ignore")); + retval = KMessageBox::questionYesNo(this, s.arg(name), TQString::null, i18n("Ignore"), i18n("Do Not Ignore")); if (KMessageBox::Yes == retval) { @@ -187,9 +187,9 @@ NaughtyApplet::preferences() this ); - QDialog::DialogCode retval = QDialog::DialogCode(d.exec()); + TQDialog::DialogCode retval = TQDialog::DialogCode(d.exec()); - if (QDialog::Accepted == retval) + if (TQDialog::Accepted == retval) { ignoreList_ = d.ignoreList(); monitor_->setInterval(d.updateInterval()); diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h index 00df51ec4..b9da7b3f9 100644 --- a/kicker/applets/naughty/NaughtyApplet.h +++ b/kicker/applets/naughty/NaughtyApplet.h @@ -22,7 +22,7 @@ #define NAUGHTY_H #include <kpanelapplet.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include "simplebutton.h" @@ -37,10 +37,10 @@ class NaughtyApplet : public KPanelApplet NaughtyApplet ( - const QString & configFile, + const TQString & configFile, Type t = Normal, int actions = 0, - QWidget * parent = 0, + TQWidget * parent = 0, const char * name = 0 ); @@ -55,7 +55,7 @@ class NaughtyApplet : public KPanelApplet protected slots: - void slotWarn(ulong pid, const QString & name); + void slotWarn(ulong pid, const TQString & name); void slotLoad(uint); void slotPreferences(); @@ -70,7 +70,7 @@ class NaughtyApplet : public KPanelApplet NaughtyProcessMonitor * monitor_; SimpleButton * button_; - QStringList ignoreList_; + TQStringList ignoreList_; }; #endif diff --git a/kicker/applets/naughty/NaughtyConfigDialog.cpp b/kicker/applets/naughty/NaughtyConfigDialog.cpp index e03a955cc..57146778d 100644 --- a/kicker/applets/naughty/NaughtyConfigDialog.cpp +++ b/kicker/applets/naughty/NaughtyConfigDialog.cpp @@ -21,17 +21,17 @@ #include <keditlistbox.h> #include <knuminput.h> #include <klocale.h> -#include <qvbox.h> +#include <tqvbox.h> #include "NaughtyConfigDialog.h" #include "NaughtyConfigDialog.moc" NaughtyConfigDialog::NaughtyConfigDialog ( - const QStringList & items, + const TQStringList & items, uint updateInterval, uint threshold, - QWidget * parent, + TQWidget * parent, const char * name ) : @@ -46,7 +46,7 @@ NaughtyConfigDialog::NaughtyConfigDialog true ) { - QVBox * v = new QVBox(this); + TQVBox * v = new TQVBox(this); setMainWidget(v); kini_updateInterval_ = new KIntNumInput(updateInterval, v); @@ -88,7 +88,7 @@ NaughtyConfigDialog::threshold() const QStringList NaughtyConfigDialog::ignoreList() const { - QStringList retval; + TQStringList retval; for (int i = 0; i < listBox_->count(); i++) retval << listBox_->text(i); diff --git a/kicker/applets/naughty/NaughtyConfigDialog.h b/kicker/applets/naughty/NaughtyConfigDialog.h index 485cbf14f..2f5ca311f 100644 --- a/kicker/applets/naughty/NaughtyConfigDialog.h +++ b/kicker/applets/naughty/NaughtyConfigDialog.h @@ -34,16 +34,16 @@ class NaughtyConfigDialog : public KDialogBase NaughtyConfigDialog ( - const QStringList & items, + const TQStringList & items, uint interval, uint threshold, - QWidget * parent = 0, + TQWidget * parent = 0, const char * name = 0 ); ~NaughtyConfigDialog(); - QStringList ignoreList() const; + TQStringList ignoreList() const; uint updateInterval() const; uint threshold() const; diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index f9d352902..37cba7a37 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -33,14 +33,14 @@ #include <signal.h> #include <unistd.h> -#include <qfile.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qtextstream.h> -#include <qdir.h> -#include <qtimer.h> -#include <qmap.h> -#include <qdatetime.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqtextstream.h> +#include <tqdir.h> +#include <tqtimer.h> +#include <tqmap.h> +#include <tqdatetime.h> #include <klocale.h> @@ -64,12 +64,12 @@ class NaughtyProcessMonitorPrivate } uint interval_; - QTimer * timer_; - QMap<ulong, uint> loadMap_; - QMap<ulong, uint> scoreMap_; + TQTimer * timer_; + TQMap<ulong, uint> loadMap_; + TQMap<ulong, uint> scoreMap_; #ifdef __OpenBSD__ - QMap<ulong, uint> cacheLoadMap_; - QMap<ulong, uid_t> uidMap_; + TQMap<ulong, uint> cacheLoadMap_; + TQMap<ulong, uid_t> uidMap_; #endif uint oldLoad_; uint triggerLevel_; @@ -86,16 +86,16 @@ NaughtyProcessMonitor::NaughtyProcessMonitor ( uint interval, uint triggerLevel, - QObject * parent, + TQObject * parent, const char * name ) - : QObject(parent, name) + : TQObject(parent, name) { d = new NaughtyProcessMonitorPrivate; d->interval_ = interval * 1000; d->triggerLevel_ = triggerLevel; - d->timer_ = new QTimer(this); - connect(d->timer_, SIGNAL(timeout()), this, SLOT(slotTimeout())); + d->timer_ = new TQTimer(this); + connect(d->timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); } NaughtyProcessMonitor::~NaughtyProcessMonitor() @@ -151,9 +151,9 @@ NaughtyProcessMonitor::slotTimeout() if (cpu > d->triggerLevel_ * (d->interval_ / 1000)) { uint load; - QValueList<ulong> l(pidList()); + TQValueList<ulong> l(pidList()); - for (QValueList<ulong>::ConstIterator it(l.begin()); it != l.end(); ++it) + for (TQValueList<ulong>::ConstIterator it(l.begin()); it != l.end(); ++it) if (getLoad(*it, load)) _process(*it, load); } @@ -196,19 +196,19 @@ NaughtyProcessMonitor::_process(ulong pid, uint load) NaughtyProcessMonitor::canKill(ulong pid) const { #ifdef __linux__ - QFile f("/proc/" + QString::number(pid) + "/status"); + TQFile f("/proc/" + TQString::number(pid) + "/status"); if (!f.open(IO_ReadOnly)) return false; - QTextStream t(&f); + TQTextStream t(&f); - QString s; + TQString s; while (!t.atEnd() && s.left(4) != "Uid:") s = t.readLine(); - QStringList l(QStringList::split('\t', s)); + TQStringList l(TQStringList::split('\t', s)); uint a(l[1].toUInt()); @@ -236,12 +236,12 @@ NaughtyProcessMonitor::processName(ulong pid) const { #if defined(__linux__) || defined(__OpenBSD__) #ifdef __linux__ - QFile f("/proc/" + QString::number(pid) + "/cmdline"); + TQFile f("/proc/" + TQString::number(pid) + "/cmdline"); if (!f.open(IO_ReadOnly)) return i18n("Unknown"); - QCString s; + TQCString s; while (true) { @@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'kdeinit:' prefix. - QString unicode(QString::fromLocal8Bit(s)); + TQString unicode(TQString::fromLocal8Bit(s)); #elif defined(__OpenBSD__) int mib[4] ; @@ -280,14 +280,14 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'kdeinit:' prefix. - QString unicode(QString::fromLocal8Bit(argv[0])); + TQString unicode(TQString::fromLocal8Bit(argv[0])); free (argv) ; #endif - QStringList parts(QStringList::split(' ', unicode)); + TQStringList parts(TQStringList::split(' ', unicode)); - QString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0]; + TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0]; int lastSlash = processName.findRev('/'); @@ -299,7 +299,7 @@ NaughtyProcessMonitor::processName(ulong pid) const #else Q_UNUSED( pid ); - return QString::null; + return TQString::null; #endif } @@ -307,18 +307,18 @@ NaughtyProcessMonitor::processName(ulong pid) const NaughtyProcessMonitor::cpuLoad() const { #ifdef __linux__ - QFile f("/proc/stat"); + TQFile f("/proc/stat"); if (!f.open(IO_ReadOnly)) return 0; bool forgetThisOne = 0 == d->oldLoad_; - QTextStream t(&f); + TQTextStream t(&f); - QString s = t.readLine(); + TQString s = t.readLine(); - QStringList l(QStringList::split(' ', s)); + TQStringList l(TQStringList::split(' ', s)); uint user = l[1].toUInt(); uint sys = l[3].toUInt(); @@ -355,15 +355,15 @@ NaughtyProcessMonitor::cpuLoad() const #endif } - QValueList<ulong> + TQValueList<ulong> NaughtyProcessMonitor::pidList() const { #ifdef __linux__ - QStringList dl(QDir("/proc").entryList()); + TQStringList dl(TQDir("/proc").entryList()); - QValueList<ulong> pl; + TQValueList<ulong> pl; - for (QStringList::ConstIterator it(dl.begin()); it != dl.end(); ++it) + for (TQStringList::ConstIterator it(dl.begin()); it != dl.end(); ++it) if (((*it)[0].isDigit())) pl << (*it).toUInt(); @@ -374,7 +374,7 @@ NaughtyProcessMonitor::pidList() const size_t size ; struct kinfo_proc *kp ; int i ; - QValueList<ulong> l; + TQValueList<ulong> l; // fetch number of processes @@ -421,7 +421,7 @@ NaughtyProcessMonitor::pidList() const return l ; #else - QValueList<ulong> l; + TQValueList<ulong> l; return l; #endif } @@ -430,16 +430,16 @@ NaughtyProcessMonitor::pidList() const NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const { #ifdef __linux__ - QFile f("/proc/" + QString::number(pid) + "/stat"); + TQFile f("/proc/" + TQString::number(pid) + "/stat"); if (!f.open(IO_ReadOnly)) return false; - QTextStream t(&f); + TQTextStream t(&f); - QString line(t.readLine()); + TQString line(t.readLine()); - QStringList fields(QStringList::split(' ', line)); + TQStringList fields(TQStringList::split(' ', line)); uint userTime (fields[13].toUInt()); uint sysTime (fields[14].toUInt()); diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.h b/kicker/applets/naughty/NaughtyProcessMonitor.h index d7023dbd7..cc5c91cfc 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.h +++ b/kicker/applets/naughty/NaughtyProcessMonitor.h @@ -21,7 +21,7 @@ #ifndef NAUGHTY_PROCESS_MONITOR_H #define NAUGHTY_PROCESS_MONITOR_H -#include <qobject.h> +#include <tqobject.h> class NaughtyProcessMonitorPrivate; @@ -35,7 +35,7 @@ class NaughtyProcessMonitor : public QObject ( uint interval, uint triggerLevel, - QObject * parent = 0, + TQObject * parent = 0, const char * name = 0 ); @@ -50,9 +50,9 @@ class NaughtyProcessMonitor : public QObject void setInterval(uint); virtual uint cpuLoad() const; - virtual QValueList<ulong> pidList() const; + virtual TQValueList<ulong> pidList() const; virtual bool getLoad(ulong pid, uint & load) const; - virtual QString processName(ulong pid) const; + virtual TQString processName(ulong pid) const; virtual bool canKill(ulong pid) const; virtual bool kill(ulong pid) const; @@ -63,7 +63,7 @@ class NaughtyProcessMonitor : public QObject signals: void load(uint); - void runawayProcess(ulong pid, const QString & name); + void runawayProcess(ulong pid, const TQString & name); private: diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index 93bb5d7ad..94f30f33a 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlabel.h> -#include <qfont.h> -#include <qstringlist.h> -#include <qpushbutton.h> -#include <qhbox.h> +#include <tqlabel.h> +#include <tqfont.h> +#include <tqstringlist.h> +#include <tqpushbutton.h> +#include <tqhbox.h> #include <kapplication.h> #include <kglobal.h> @@ -42,22 +42,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("krunapplet"); return new RunApplet(configFile, KPanelApplet::Stretch, 0, parent, "krunapplet"); } } -RunApplet::RunApplet(const QString& configFile, Type type, int actions, - QWidget *parent, const char *name) +RunApplet::RunApplet(const TQString& configFile, Type type, int actions, + TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name) { // setBackgroundMode(X11ParentRelative); setBackgroundOrigin( AncestorOrigin ); // setup label - _label = new QLabel(i18n("Run command:"), this); - QFont f(_label->font()); + _label = new TQLabel(i18n("Run command:"), this); + TQFont f(_label->font()); f.setPixelSize(12); // _label->setBackgroundMode(X11ParentRelative); _label->setBackgroundOrigin( AncestorOrigin ); @@ -65,25 +65,25 @@ RunApplet::RunApplet(const QString& configFile, Type type, int actions, _label->setFont(f); // setup popup button - _btn = new QPushButton(this); + _btn = new TQPushButton(this); f = _btn->font(); f.setPixelSize(12); _btn->setFont(f); - connect(_btn, SIGNAL(clicked()), SLOT(popup_combo())); + connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo())); // setup history combo _input = new KHistoryCombo(this); _input->setFocus(); _input->clearEdit(); watchForFocus(_input->lineEdit()); - connect(_input, SIGNAL(activated(const QString&)), - SLOT(run_command(const QString&))); + connect(_input, TQT_SIGNAL(activated(const TQString&)), + TQT_SLOT(run_command(const TQString&))); KConfig *c = config(); c->setGroup("General"); // restore history and completion list - QStringList list = c->readListEntry("Completion list"); + TQStringList list = c->readListEntry("Completion list"); _input->completionObject()->setItems(list); list = c->readListEntry("History list"); _input->setHistoryItems(list); @@ -92,7 +92,7 @@ RunApplet::RunApplet(const QString& configFile, Type type, int actions, _filterData = new KURIFilterData(); - _hbox = new QHBox( 0, 0, WStyle_Customize | WType_Popup ); + _hbox = new TQHBox( 0, 0, WStyle_Customize | WType_Popup ); _hbox->setFixedSize(120, 22); } @@ -102,7 +102,7 @@ RunApplet::~RunApplet() c->setGroup("General"); // save history and completion list - QStringList list = _input->completionObject()->items(); + TQStringList list = _input->completionObject()->items(); c->writeEntry("Completion list", list); list = _input->historyItems(); c->writeEntry("History list", list); @@ -113,12 +113,12 @@ RunApplet::~RunApplet() KGlobal::locale()->removeCatalogue("krunapplet"); } -void RunApplet::resizeEvent(QResizeEvent*) +void RunApplet::resizeEvent(TQResizeEvent*) { if(orientation() == Horizontal) { _btn->hide(); - _input->reparent(this, QPoint(0,0), true); + _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); if(height() >= _input->sizeHint().height() + _label->height()) @@ -149,7 +149,7 @@ void RunApplet::resizeEvent(QResizeEvent*) { _btn->show(); _btn->setFixedSize(width(), 22); - _input->reparent( _hbox, QPoint(0, 0), false); + _input->reparent( _hbox, TQPoint(0, 0), false); _label->hide(); } setButtonText(); @@ -162,7 +162,7 @@ void RunApplet::positionChange(KPanelApplet::Position) void RunApplet::setButtonText() { - QString t; + TQString t; if (position() == pRight) { @@ -194,32 +194,32 @@ int RunApplet::heightForWidth(int ) const void RunApplet::popup_combo() { - QPoint p; + TQPoint p; if (position() == pRight) - p = mapToGlobal(QPoint(-_input->width()-1, 0)); + p = mapToGlobal(TQPoint(-_input->width()-1, 0)); else - p = mapToGlobal(QPoint(width()+1, 0)); + p = mapToGlobal(TQPoint(width()+1, 0)); _hbox->move(p); _hbox->show(); _input->setFocus(); } -void RunApplet::run_command(const QString& command) +void RunApplet::run_command(const TQString& command) { - QString exec; + TQString exec; bool focusNeeded = false; kapp->propagateSessionManager(); _filterData->setData( _input->currentText().stripWhiteSpace() ); - QStringList filters; + TQStringList filters; filters << "kurisearchfilter" << "kshorturifilter"; KURIFilter::self()->filterURI( *(_filterData), filters ); _input->addToHistory(command); _input->clearEdit(); - QString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url()); + TQString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url()); // Nothing interesting. Quit! if ( cmd.isEmpty() ){ diff --git a/kicker/applets/run/runapplet.h b/kicker/applets/run/runapplet.h index ded8fc398..520d6e00b 100644 --- a/kicker/applets/run/runapplet.h +++ b/kicker/applets/run/runapplet.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __runapplet_h__ #define __runapplet_h__ -#include <qstring.h> +#include <tqstring.h> #include <kpanelapplet.h> class QLabel; @@ -38,28 +38,28 @@ class RunApplet : public KPanelApplet Q_OBJECT public: - RunApplet(const QString& configFile, Type t = Stretch, int actions = 0, - QWidget *parent = 0, const char *name = 0); + RunApplet(const TQString& configFile, Type t = Stretch, int actions = 0, + TQWidget *parent = 0, const char *name = 0); virtual ~RunApplet(); int widthForHeight(int height) const; int heightForWidth(int width) const; protected: - void resizeEvent(QResizeEvent*); + void resizeEvent(TQResizeEvent*); void positionChange(KPanelApplet::Position); protected slots: - void run_command(const QString&); + void run_command(const TQString&); void popup_combo(); void setButtonText(); private: KHistoryCombo *_input; KURIFilterData *_filterData; - QLabel *_label; - QPushButton *_btn; - QHBox *_hbox; + TQLabel *_label; + TQPushButton *_btn; + TQHBox *_hbox; }; #endif diff --git a/kicker/applets/swallow/prefwidget.cpp b/kicker/applets/swallow/prefwidget.cpp index 2e443a6b2..0afdd90b8 100644 --- a/kicker/applets/swallow/prefwidget.cpp +++ b/kicker/applets/swallow/prefwidget.cpp @@ -19,7 +19,7 @@ #include "prefwidget.h" -PreferencesWidget::PreferencesWidget( SwallowCommandList *swc, QWidget *parent ) +PreferencesWidget::PreferencesWidget( SwallowCommandList *swc, TQWidget *parent ) : PreferencesWidgetBase(parent) { diff --git a/kicker/applets/swallow/prefwidget.h b/kicker/applets/swallow/prefwidget.h index 76ecce35e..a23d6414b 100644 --- a/kicker/applets/swallow/prefwidget.h +++ b/kicker/applets/swallow/prefwidget.h @@ -26,7 +26,7 @@ class PreferencesWidget : public PreferencesWidgetBase Q_OBJECT public: - PreferencesWidget( SwallowCommandList* swc, QWidget* parent = 0 ); + PreferencesWidget( SwallowCommandList* swc, TQWidget* parent = 0 ); // ~PreferencesWidget(); }; diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index b1224986b..7112c706a 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -20,8 +20,8 @@ #include <stdlib.h> -#include <qlayout.h> -#include <qstringlist.h> +#include <tqlayout.h> +#include <tqstringlist.h> #include <kapplication.h> #include <kcmdlineargs.h> @@ -40,9 +40,9 @@ #include "swallow.h" #include "prefwidget.h" -template class QPtrList<SwallowApp>; -typedef QPtrListIterator<SwallowApp> SwallowAppListIterator; -template class QPtrList<SwallowCommand>; +template class TQPtrList<SwallowApp>; +typedef TQPtrListIterator<SwallowApp> SwallowAppListIterator; +template class TQPtrList<SwallowCommand>; // init static variables @@ -53,14 +53,14 @@ SwallowApplet * SwallowApplet::self = 0L; extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) { + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { return new SwallowApplet(configFile, parent, "kswallow applet"); } } -SwallowApplet::SwallowApplet( const QString& configFile, - QWidget *parent, const char *name ) +SwallowApplet::SwallowApplet( const TQString& configFile, + TQWidget *parent, const char *name ) : KPanelApplet( configFile, Normal, Preferences, parent, name ) { resize( 30, 30 ); @@ -74,9 +74,9 @@ SwallowApplet::SwallowApplet( const QString& configFile, appList = new SwallowAppList; appList->setAutoDelete( true ); - QBoxLayout::Direction d = (orientation() == Horizontal) ? - QBoxLayout::LeftToRight : QBoxLayout::TopToBottom; - m_layout = new QBoxLayout( this, d, 0, 2 ); // make stretch configurable? + TQBoxLayout::Direction d = (orientation() == Horizontal) ? + TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom; + m_layout = new TQBoxLayout( this, d, 0, 2 ); // make stretch configurable? m_layout->setAutoAdd( false ); // read the config file and start all the configured apps @@ -116,8 +116,8 @@ SwallowCommandList* SwallowApplet::readConfig() kc->setGroup("General"); int count = kc->readNumEntry("Number of apps"); kdDebug() << "*** Registered " << count << " App(s) to be swallow'ed!" << endl; - QString group = "SwallowApp %1"; - QString title, cmd; + TQString group = "SwallowApp %1"; + TQString title, cmd; ushort errors = 0; SwallowCommand *swc = 0L; @@ -140,7 +140,7 @@ SwallowCommandList* SwallowApplet::readConfig() } if ( errors > 0 ) { - QString entry = (errors == 1) ? i18n("entry") : i18n("entries"); + TQString entry = (errors == 1) ? i18n("entry") : i18n("entries"); if ( KMessageBox::questionYesNo(0L, i18n("I found %1 invalid/incomplete %2\nin the configuration file.\n\nBoth the window title and the commandline\n of the to be swallowed application\nare required.\n\n.Do you want to correct this?").arg(errors).arg(entry), i18n("Configuration Error"),i18n("Correct"),i18n("Ignore Error")) == KMessageBox::Yes) preferences(); } @@ -157,8 +157,8 @@ void SwallowApplet::createApps( SwallowCommandList* list ) while ( (it.current()) ) { app = new SwallowApp( it.current(), this ); app->hide(); - connect( app, SIGNAL( embedded(SwallowApp *)), - SLOT( embedded(SwallowApp *))); + connect( app, TQT_SIGNAL( embedded(SwallowApp *)), + TQT_SLOT( embedded(SwallowApp *))); appList->append( app ); ++it; kapp->processEvents(); @@ -179,8 +179,8 @@ void SwallowApplet::embedded( SwallowApp *app ) kdDebug() << "--> ratio: " << app->sizeRatio() << endl; kdDebug() << "**** " << app << " is embedded now, with (" << app->width() << ", " << app->height() << ")" << endl; - disconnect( app, SIGNAL( embedded(SwallowApp *)), - this, SLOT( embedded(SwallowApp *))); + disconnect( app, TQT_SIGNAL( embedded(SwallowApp *)), + this, TQT_SLOT( embedded(SwallowApp *))); embeddedList->append( app ); @@ -236,9 +236,9 @@ int SwallowApplet::heightForWidth(int) void SwallowApplet::layoutApps() { if ( KPanelApplet::orientation() == Horizontal ) - m_layout->setDirection( QBoxLayout::LeftToRight ); + m_layout->setDirection( TQBoxLayout::LeftToRight ); else - m_layout->setDirection( QBoxLayout::TopToBottom ); + m_layout->setDirection( TQBoxLayout::TopToBottom ); } @@ -255,7 +255,7 @@ void SwallowApplet::removeApplet( SwallowApp *app ) /////////////////////////////////////////////////////////////////// -static void parseCommand(KProcess *proc, QString cmd) +static void parseCommand(KProcess *proc, TQString cmd) { int pos; @@ -269,7 +269,7 @@ static void parseCommand(KProcess *proc, QString cmd) } -SwallowApp::SwallowApp(const SwallowCommand *swc, QWidget* parent, +SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, const char* /* name */) : QXEmbed( parent ) { @@ -278,8 +278,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, QWidget* parent, QXEmbed::initialize(); winTitle = swc->title; - connect(SwallowApplet::winModule(), SIGNAL(windowAdded(WId)), - this, SLOT(windowAdded(WId))); + connect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)), + this, TQT_SLOT(windowAdded(WId))); if (!swc->cmdline.isEmpty()) { KProcess *process = new KProcess; @@ -287,10 +287,10 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, QWidget* parent, // move window out of sight // *process << "-geometry"; - // *process << QString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height()); + // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height()); - connect(process, SIGNAL(processExited(KProcess*)), - this, SLOT(processExited(KProcess*))); + connect(process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(processExited(KProcess*))); process->start(); } @@ -320,7 +320,7 @@ void SwallowApp::windowAdded(WId win) if (winTitle == names[0]) { kdDebug()<< "embedding window with title: "<<winTitle.latin1() << endl; - QRect r = KWin::windowInfo(win).geometry(); + TQRect r = KWin::windowInfo(win).geometry(); int h = r.height(); if ( h == 0 ) h = 1; wh_ratio = (float) r.width() / (float) h; @@ -330,8 +330,8 @@ void SwallowApp::windowAdded(WId win) embed(win); XReparentWindow(qt_xdisplay(), win, winId(), 0, 0); - disconnect(SwallowApplet::winModule(), SIGNAL(windowAdded(WId)), - this, SLOT(windowAdded(WId))); + disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)), + this, TQT_SLOT(windowAdded(WId))); emit embedded( this ); } diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h index 8e472f415..7488e913b 100644 --- a/kicker/applets/swallow/swallow.h +++ b/kicker/applets/swallow/swallow.h @@ -20,8 +20,8 @@ #define __swallow_h__ -#include <qevent.h> -#include <qptrlist.h> +#include <tqevent.h> +#include <tqptrlist.h> #include <qxembed.h> #include <kpanelapplet.h> @@ -34,20 +34,20 @@ class KWinModule; class SwallowApp; typedef struct _SwallowCommand { - QString cmdline; - QString title; + TQString cmdline; + TQString title; } SwallowCommand; -typedef QPtrList<SwallowCommand> SwallowCommandList; -typedef QPtrListIterator<SwallowCommand> SwallowCommandListIterator; -typedef QPtrList<SwallowApp> SwallowAppList; +typedef TQPtrList<SwallowCommand> SwallowCommandList; +typedef TQPtrListIterator<SwallowCommand> SwallowCommandListIterator; +typedef TQPtrList<SwallowApp> SwallowAppList; class SwallowApplet : public KPanelApplet { Q_OBJECT public: - SwallowApplet( const QString& configFile, QWidget *parent, + SwallowApplet( const TQString& configFile, TQWidget *parent, const char *name = 0L ); ~SwallowApplet(); @@ -81,7 +81,7 @@ private: static KWinModule *wModule; SwallowCommandList * m_swcList; - QBoxLayout *m_layout; + TQBoxLayout *m_layout; }; @@ -91,7 +91,7 @@ class SwallowApp : public QXEmbed Q_OBJECT public: - SwallowApp( const SwallowCommand * swc, QWidget* parent = 0, + SwallowApp( const SwallowCommand * swc, TQWidget* parent = 0, const char* name = 0); ~SwallowApp(); @@ -106,7 +106,7 @@ protected slots: private: KProcess *process; - QString winTitle; + TQString winTitle; float wh_ratio; }; diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 1d9e40747..933855f74 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -26,14 +26,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcursor.h> -#include <qlayout.h> -#include <qpopupmenu.h> -#include <qtimer.h> -#include <qpixmap.h> -#include <qevent.h> -#include <qstyle.h> -#include <qpainter.h> +#include <tqcursor.h> +#include <tqlayout.h> +#include <tqpopupmenu.h> +#include <tqtimer.h> +#include <tqpixmap.h> +#include <tqevent.h> +#include <tqstyle.h> +#include <tqpainter.h> #include <dcopclient.h> #include <kapplication.h> @@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("ksystemtrayapplet"); return new SystemTrayApplet(configFile, KPanelApplet::Normal, @@ -67,8 +67,8 @@ extern "C" } } -SystemTrayApplet::SystemTrayApplet(const QString& configFile, Type type, int actions, - QWidget *parent, const char *name) +SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int actions, + TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name), m_showFrame(false), m_showHidden(false), @@ -92,15 +92,15 @@ SystemTrayApplet::SystemTrayApplet(const QString& configFile, Type type, int act kapp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false); - QTimer::singleShot(0, this, SLOT(initialize())); + TQTimer::singleShot(0, this, TQT_SLOT(initialize())); } void SystemTrayApplet::initialize() { // register existing tray windows - const QValueList<WId> systemTrayWindows = kwin_module->systemTrayWindows(); + const TQValueList<WId> systemTrayWindows = kwin_module->systemTrayWindows(); bool existing = false; - for (QValueList<WId>::ConstIterator it = systemTrayWindows.begin(); + for (TQValueList<WId>::ConstIterator it = systemTrayWindows.begin(); it != systemTrayWindows.end(); ++it ) { embedWindow(*it, true); @@ -116,14 +116,14 @@ void SystemTrayApplet::initialize() } // the KWinModule notifies us when tray windows are added or removed - connect( kwin_module, SIGNAL( systemTrayWindowAdded(WId) ), - this, SLOT( systemTrayWindowAdded(WId) ) ); - connect( kwin_module, SIGNAL( systemTrayWindowRemoved(WId) ), - this, SLOT( updateTrayWindows() ) ); + connect( kwin_module, TQT_SIGNAL( systemTrayWindowAdded(WId) ), + this, TQT_SLOT( systemTrayWindowAdded(WId) ) ); + connect( kwin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ), + this, TQT_SLOT( updateTrayWindows() ) ); - QCString screenstr; + TQCString screenstr; screenstr.setNum(qt_xscreen()); - QCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr; + TQCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr; Display *display = qt_xdisplay(); @@ -210,9 +210,9 @@ void SystemTrayApplet::preferences() KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok, true); m_settingsDialog->resize(450, 400); - connect(m_settingsDialog, SIGNAL(applyClicked()), this, SLOT(applySettings())); - connect(m_settingsDialog, SIGNAL(okClicked()), this, SLOT(applySettings())); - connect(m_settingsDialog, SIGNAL(finished()), this, SLOT(settingsDialogFinished())); + connect(m_settingsDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(applySettings())); + connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings())); + connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(settingsDialogFinished())); m_iconSelector = new KActionSelector(m_settingsDialog); m_iconSelector->setAvailableLabel(i18n("Visible icons:")); @@ -220,14 +220,14 @@ void SystemTrayApplet::preferences() m_iconSelector->setShowUpDownButtons(false); m_settingsDialog->setMainWidget(m_iconSelector); - QListBox *shownListBox = m_iconSelector->availableListBox(); - QListBox *hiddenListBox = m_iconSelector->selectedListBox(); + TQListBox *shownListBox = m_iconSelector->availableListBox(); + TQListBox *hiddenListBox = m_iconSelector->selectedListBox(); TrayEmbedList::const_iterator it = m_shownWins.begin(); TrayEmbedList::const_iterator itEnd = m_shownWins.end(); for (; it != itEnd; ++it) { - QString name = KWin::windowInfo((*it)->embeddedWinId()).name(); + TQString name = KWin::windowInfo((*it)->embeddedWinId()).name(); if(!shownListBox->findItem(name, Qt::ExactMatch | Qt::CaseSensitive)) { shownListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name); @@ -238,7 +238,7 @@ void SystemTrayApplet::preferences() itEnd = m_hiddenWins.end(); for (; it != itEnd; ++it) { - QString name = KWin::windowInfo((*it)->embeddedWinId()).name(); + TQString name = KWin::windowInfo((*it)->embeddedWinId()).name(); if(!hiddenListBox->findItem(name, Qt::ExactMatch | Qt::CaseSensitive)) { hiddenListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name); @@ -264,13 +264,13 @@ void SystemTrayApplet::applySettings() KConfig *conf = config(); conf->setGroup("HiddenTrayIcons"); - QString name; + TQString name; // use the following snippet of code someday to implement ordering // of icons /* m_visibleIconList.clear(); - QListBoxItem* item = m_iconSelector->availableListBox()->firstItem(); + TQListBoxItem* item = m_iconSelector->availableListBox()->firstItem(); for (; item; item = item->next()) { m_visibleIconList.append(item->text()); @@ -279,7 +279,7 @@ void SystemTrayApplet::applySettings() selection.clear();*/ m_hiddenIconList.clear(); - QListBoxItem* item = m_iconSelector->selectedListBox()->firstItem(); + TQListBoxItem* item = m_iconSelector->selectedListBox()->firstItem(); for (; item; item = item->next()) { m_hiddenIconList.append(item->text()); @@ -328,7 +328,7 @@ void SystemTrayApplet::checkAutoRetract() return; } - if (!geometry().contains(mapFromGlobal(QCursor::pos()))) + if (!geometry().contains(mapFromGlobal(TQCursor::pos()))) { m_autoRetractTimer->stop(); if (m_autoRetract) @@ -376,12 +376,12 @@ void SystemTrayApplet::showExpandButton(bool show) .width(), height() - 4); } - connect(m_expandButton, SIGNAL(clicked()), - this, SLOT(toggleExpanded())); + connect(m_expandButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(toggleExpanded())); - m_autoRetractTimer = new QTimer(this); - connect(m_autoRetractTimer, SIGNAL(timeout()), - this, SLOT(checkAutoRetract())); + m_autoRetractTimer = new TQTimer(this); + connect(m_autoRetractTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(checkAutoRetract())); } else { @@ -483,7 +483,7 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray ) return; } - connect(emb, SIGNAL(embeddedWindowDestroyed()), SLOT(updateTrayWindows())); + connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows())); emb->getIconSize(m_iconSize); if (shouldHide(w)) @@ -724,18 +724,18 @@ int SystemTrayApplet::maxIconHeight() const return largest; } -bool SystemTrayApplet::eventFilter(QObject* watched, QEvent* e) +bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) { if (watched == m_expandButton) { - QPoint p; - if (e->type() == QEvent::ContextMenu) + TQPoint p; + if (e->type() == TQEvent::ContextMenu) { - p = static_cast<QContextMenuEvent*>(e)->globalPos(); + p = static_cast<TQContextMenuEvent*>(e)->globalPos(); } - else if (e->type() == QEvent::MouseButtonPress) + else if (e->type() == TQEvent::MouseButtonPress) { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if (me->button() == Qt::RightButton) { p = me->globalPos(); @@ -744,11 +744,11 @@ bool SystemTrayApplet::eventFilter(QObject* watched, QEvent* e) if (!p.isNull()) { - QPopupMenu* contextMenu = new QPopupMenu(this); + TQPopupMenu* contextMenu = new TQPopupMenu(this); contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."), - this, SLOT(configure())); + this, TQT_SLOT(configure())); - contextMenu->exec(static_cast<QContextMenuEvent*>(e)->globalPos()); + contextMenu->exec(static_cast<TQContextMenuEvent*>(e)->globalPos()); delete contextMenu; return true; @@ -796,17 +796,17 @@ int SystemTrayApplet::heightForWidth(int w) const return sizeHint().height(); } -void SystemTrayApplet::moveEvent( QMoveEvent* ) +void SystemTrayApplet::moveEvent( TQMoveEvent* ) { setBackground(); } -void SystemTrayApplet::resizeEvent( QResizeEvent* ) +void SystemTrayApplet::resizeEvent( TQResizeEvent* ) { layoutTray(); // we need to give ourselves a chance to adjust our size before calling this - QTimer::singleShot(0, this, SIGNAL(updateLayout())); + TQTimer::singleShot(0, this, TQT_SIGNAL(updateLayout())); } void SystemTrayApplet::layoutTray() @@ -826,7 +826,7 @@ void SystemTrayApplet::layoutTray() int i = 0, line, nbrOfLines, heightWidth; bool showExpandButton = m_expandButton && m_expandButton->isVisibleTo(this); delete m_layout; - m_layout = new QGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN); + m_layout = new TQGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN); if (m_expandButton) { @@ -966,7 +966,7 @@ void SystemTrayApplet::layoutTray() setBackground(); } -void SystemTrayApplet::paletteChange(const QPalette & /* oldPalette */) +void SystemTrayApplet::paletteChange(const TQPalette & /* oldPalette */) { setBackground(); } @@ -985,17 +985,17 @@ void SystemTrayApplet::setBackground() } -TrayEmbed::TrayEmbed( bool kdeTray, QWidget* parent ) +TrayEmbed::TrayEmbed( bool kdeTray, TQWidget* parent ) : QXEmbed( parent ), kde_tray( kdeTray ) { hide(); - m_scaledWidget = new QWidget(parent); + m_scaledWidget = new TQWidget(parent); m_scaledWidget->hide(); } void TrayEmbed::getIconSize(int defaultIconSize) { - QSize minSize = minimumSizeHint(); + TQSize minSize = minimumSizeHint(); int width = minSize.width(); int height = minSize.height(); @@ -1011,11 +1011,11 @@ void TrayEmbed::getIconSize(int defaultIconSize) void TrayEmbed::setBackground() { - const QPixmap *pbg = parentWidget()->backgroundPixmap(); + const TQPixmap *pbg = parentWidget()->backgroundPixmap(); if (pbg) { - QPixmap bg(width(), height()); + TQPixmap bg(width(), height()); bg.fill(parentWidget(), pos()); setPaletteBackgroundPixmap(bg); setBackgroundOrigin(WidgetOrigin); diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index 848be90f0..e2f8f64af 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __systemtrayapplet_h__ #define __systemtrayapplet_h__ -#include <qvaluevector.h> -#include <qstringlist.h> -#include <qevent.h> +#include <tqvaluevector.h> +#include <tqstringlist.h> +#include <tqevent.h> #include <qxembed.h> #include <dcopobject.h> @@ -46,12 +46,12 @@ class SystemTrayApplet : public KPanelApplet, public DCOPObject { Q_OBJECT K_DCOP - typedef QValueVector<TrayEmbed*> TrayEmbedList; + typedef TQValueVector<TrayEmbed*> TrayEmbedList; public: - SystemTrayApplet(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + SystemTrayApplet(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); ~SystemTrayApplet(); int widthForHeight(int h) const; @@ -59,15 +59,15 @@ public: int maxIconWidth() const; int maxIconHeight() const; - bool eventFilter(QObject* watched, QEvent* e); + bool eventFilter(TQObject* watched, TQEvent* e); k_dcop: void loadSettings(); void iconSizeChanged(); protected: - void resizeEvent(QResizeEvent*); - void moveEvent(QMoveEvent *); + void resizeEvent(TQResizeEvent*); + void moveEvent(TQMoveEvent *); bool x11Event( XEvent *e ); void preferences(); void orientationChange( Orientation ); @@ -77,7 +77,7 @@ protected slots: void systemTrayWindowAdded( WId ); void updateTrayWindows(); void layoutTray(); - void paletteChange(const QPalette & /* oldPalette */); + void paletteChange(const TQPalette & /* oldPalette */); void toggleExpanded(); void settingsDialogFinished(); void applySettings(); @@ -97,7 +97,7 @@ private: TrayEmbedList m_shownWins; TrayEmbedList m_hiddenWins; - QStringList m_hiddenIconList; + TQStringList m_hiddenIconList; KWinModule *kwin_module; Atom net_system_tray_selection; Atom net_system_tray_opcode; @@ -106,23 +106,23 @@ private: SimpleArrowButton *m_expandButton; KDialogBase* m_settingsDialog; KActionSelector* m_iconSelector; - QTimer* m_autoRetractTimer; + TQTimer* m_autoRetractTimer; bool m_autoRetract; int m_iconSize; - QGridLayout* m_layout; + TQGridLayout* m_layout; }; class TrayEmbed : public QXEmbed { Q_OBJECT public: - TrayEmbed( bool kdeTray, QWidget* parent = NULL ); + TrayEmbed( bool kdeTray, TQWidget* parent = NULL ); bool kdeTray() const { return kde_tray; } void setBackground(); void getIconSize(int defaultIconSize); private: bool kde_tray; - QWidget *m_scaledWidget; + TQWidget *m_scaledWidget; }; #endif diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index dc3428bf8..55e5d113f 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlayout.h> -#include <qpalette.h> +#include <tqlayout.h> +#include <tqpalette.h> #include <kapplication.h> #include <kglobal.h> @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString& configFile ) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { // FIXME: what about two taskbars? perhaps this should be inserted just once KGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); @@ -51,15 +51,15 @@ extern "C" } } -TaskbarApplet::TaskbarApplet( const QString& configFile, Type type, int actions, - QWidget *parent, const char *name ) +TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions, + TQWidget *parent, const char *name ) : KPanelApplet( configFile, type, actions, parent, name ) { setBackgroundOrigin( AncestorOrigin ); - QHBoxLayout* layout = new QHBoxLayout( this ); + TQHBoxLayout* layout = new TQHBoxLayout( this ); container = new TaskBarContainer( false, this ); container->setBackgroundOrigin( AncestorOrigin ); - connect(container, SIGNAL(containerCountChanged()), this, SIGNAL(updateLayout())); + connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout())); layout->addWidget( container, 1 ); container->popupDirectionChange(popupDirection()); } @@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->sizeHint(d, QSize(200, h)).width(); + return container->sizeHint(d, TQSize(200, h)).width(); } int TaskbarApplet::heightForWidth(int w) const @@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->sizeHint(d, QSize(w, 200)).height(); + return container->sizeHint(d, TQSize(w, 200)).height(); } void TaskbarApplet::preferences() @@ -115,12 +115,12 @@ void TaskbarApplet::popupDirectionChange( Direction d ) container->popupDirectionChange( d ); } -void TaskbarApplet::moveEvent(QMoveEvent *) +void TaskbarApplet::moveEvent(TQMoveEvent *) { container->setBackground(); } -void TaskbarApplet::paletteChange(const QPalette &) +void TaskbarApplet::paletteChange(const TQPalette &) { container->setBackground(); } diff --git a/kicker/applets/taskbar/taskbarapplet.h b/kicker/applets/taskbar/taskbarapplet.h index f0842baca..69ef5eda1 100644 --- a/kicker/applets/taskbar/taskbarapplet.h +++ b/kicker/applets/taskbar/taskbarapplet.h @@ -34,8 +34,8 @@ class TaskbarApplet : public KPanelApplet Q_OBJECT public: - TaskbarApplet( const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0 ); + TaskbarApplet( const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0 ); ~TaskbarApplet(); int widthForHeight( int h ) const; @@ -44,10 +44,10 @@ public: void preferences(); protected: - void moveEvent(QMoveEvent *); + void moveEvent(TQMoveEvent *); void popupDirectionChange( Direction ); void orientationChange( Orientation ); - void paletteChange(const QPalette &); + void paletteChange(const TQPalette &); private: TaskBarContainer* container; diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index c27c4e281..18962b2ea 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -31,7 +31,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("trashapplet"); return new TrashApplet(configFile, KPanelApplet::Normal, @@ -39,7 +39,7 @@ extern "C" } } -TrashApplet::TrashApplet(const QString& configFile, Type type, int actions, QWidget *parent, const char *name) +TrashApplet::TrashApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name), mButton(0) { mButton = new TrashButton(this); @@ -53,12 +53,12 @@ TrashApplet::TrashApplet(const QString& configFile, Type type, int actions, QWid mpDirLister = new KDirLister(); - connect( mpDirLister, SIGNAL( clear() ), - this, SLOT( slotClear() ) ); - connect( mpDirLister, SIGNAL( completed() ), - this, SLOT( slotCompleted() ) ); - connect( mpDirLister, SIGNAL( deleteItem( KFileItem * ) ), - this, SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( mpDirLister, TQT_SIGNAL( clear() ), + this, TQT_SLOT( slotClear() ) ); + connect( mpDirLister, TQT_SIGNAL( completed() ), + this, TQT_SLOT( slotCompleted() ) ); + connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), + this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); mpDirLister->openURL("trash:/"); } @@ -67,8 +67,8 @@ TrashApplet::~TrashApplet() { // disconnect the dir lister before quitting so as not to crash // on kicker exit - disconnect( mpDirLister, SIGNAL( clear() ), - this, SLOT( slotClear() ) ); + disconnect( mpDirLister, TQT_SIGNAL( clear() ), + this, TQT_SLOT( slotClear() ) ); delete mpDirLister; KGlobal::locale()->removeCatalogue("trashapplet"); } @@ -111,7 +111,7 @@ int TrashApplet::heightForWidth( int width ) const return mButton->heightForWidth( width ); } -void TrashApplet::resizeEvent( QResizeEvent * ) +void TrashApplet::resizeEvent( TQResizeEvent * ) { if (!mButton) { diff --git a/kicker/applets/trash/trashapplet.h b/kicker/applets/trash/trashapplet.h index bc9662af4..c77cf3755 100644 --- a/kicker/applets/trash/trashapplet.h +++ b/kicker/applets/trash/trashapplet.h @@ -25,7 +25,7 @@ #endif #include <kpanelapplet.h> -#include <qstring.h> +#include <tqstring.h> #include <kurl.h> #include <kdirlister.h> @@ -36,8 +36,8 @@ class TrashApplet : public KPanelApplet Q_OBJECT public: - TrashApplet(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + TrashApplet(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); ~TrashApplet(); int widthForHeight(int height) const; @@ -45,7 +45,7 @@ public: void about(); protected: - void resizeEvent(QResizeEvent *e); + void resizeEvent(TQResizeEvent *e); void positionChange(Position p); protected slots: diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index e6934a983..eb036c119 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -19,8 +19,8 @@ #include "trashbutton.h" -#include <qpopupmenu.h> -#include <qtooltip.h> +#include <tqpopupmenu.h> +#include <tqtooltip.h> #include <klocale.h> #include <krun.h> @@ -31,7 +31,7 @@ #include <konq_operations.h> #include <konq_popupmenu.h> -TrashButton::TrashButton(QWidget *parent) +TrashButton::TrashButton(TQWidget *parent) : PanelPopupButton(parent), mActions(this, this), mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/") { @@ -39,7 +39,7 @@ TrashButton::TrashButton(QWidget *parent) KIO::NetAccess::stat("trash:/", entry, 0L); mFileItem.assign(KFileItem(entry, "trash:/")); - KAction *a = KStdAction::paste(this, SLOT(slotPaste()), + KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), &mActions, "paste"); a->setShortcut(0); @@ -53,9 +53,9 @@ TrashButton::TrashButton(QWidget *parent) // Activate this code only if we find a way to have both an // action and a popup menu for the same kicker button - //connect(this, SIGNAL(clicked()), this, SLOT(slotClicked())); + //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); - setPopup(new QPopupMenu()); + setPopup(new TQPopupMenu()); } TrashButton::~TrashButton() @@ -67,18 +67,18 @@ void TrashButton::setItemCount(int count) if (count==0) { setIcon( "trashcan_empty" ); - QToolTip::add(this, i18n("Empty")); + TQToolTip::add(this, i18n("Empty")); } else { setIcon( "trashcan_full" ); - QToolTip::add(this, i18n("One item", "%n items", count)); + TQToolTip::add(this, i18n("One item", "%n items", count)); } } void TrashButton::initPopup() { - QPopupMenu *old_popup = popup(); + TQPopupMenu *old_popup = popup(); KFileItemList items; items.append(&mFileItem); @@ -117,17 +117,17 @@ void TrashButton::slotPaste() KonqOperations::doPaste(this, mFileItem.url()); } -void TrashButton::dragEnterEvent(QDragEnterEvent* e) +void TrashButton::dragEnterEvent(TQDragEnterEvent* e) { e->accept(true); } -void TrashButton::dropEvent(QDropEvent *e) +void TrashButton::dropEvent(TQDropEvent *e) { KonqOperations::doDrop(0L, mFileItem.url(), e, this); } -QString TrashButton::tileName() +TQString TrashButton::tileName() { return mFileItem.name(); } diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h index 7a5d8b59f..891e274c0 100644 --- a/kicker/applets/trash/trashbutton.h +++ b/kicker/applets/trash/trashbutton.h @@ -21,11 +21,11 @@ #define TRASHBUTTON_H #include <panelbutton.h> -#include <qpoint.h> -#include <qstring.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qtimer.h> +#include <tqpoint.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqtimer.h> #include <kfileitem.h> #include <kpanelapplet.h> #include <kactioncollection.h> @@ -35,16 +35,16 @@ class TrashButton : public PanelPopupButton Q_OBJECT public: - TrashButton(QWidget *parent); + TrashButton(TQWidget *parent); ~TrashButton(); void setItemCount(int count); void setPanelPosition(KPanelApplet::Position position); protected: - QString tileName(); + TQString tileName(); void initPopup(); - void dragEnterEvent(QDragEnterEvent *e); - void dropEvent(QDropEvent *e); + void dragEnterEvent(TQDragEnterEvent *e); + void dropEvent(TQDropEvent *e); protected slots: // Activate this code only if we find a way to have both an diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 71b583f35..d3b625f80 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelExtension* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("dockbarextension"); return new DockBarExtension(configFile, KPanelExtension::Normal, @@ -52,15 +52,15 @@ extern "C" } } -DockBarExtension::DockBarExtension(const QString& configFile, Type type, - int actions, QWidget *parent, const char *name) +DockBarExtension::DockBarExtension(const TQString& configFile, Type type, + int actions, TQWidget *parent, const char *name) : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; kwin_module = new KWinModule(this); - connect( kwin_module, SIGNAL( windowAdded(WId) ), SLOT( windowAdded(WId) ) ); + connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); } @@ -77,15 +77,15 @@ DockBarExtension::~DockBarExtension() if (dragging_container) delete dragging_container; } -QSize DockBarExtension::sizeHint(Position p, QSize) const +TQSize DockBarExtension::sizeHint(Position p, TQSize) const { if (p == Left || p == Right) - return QSize(DockContainer::sz(), DockContainer::sz() * containers.count()); + return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count()); else - return QSize(DockContainer::sz() * containers.count(), DockContainer::sz()); + return TQSize(DockContainer::sz() * containers.count(), DockContainer::sz()); } -void DockBarExtension::resizeEvent(QResizeEvent*) +void DockBarExtension::resizeEvent(TQResizeEvent*) { layoutContainers(); } @@ -96,7 +96,7 @@ void DockBarExtension::windowAdded(WId win) // try to read WM_COMMAND int argc; char **argv; - QString command; + TQString command; if (XGetCommand(qt_xdisplay(), win, &argv, &argc)) { command = KShell::joinArgs(argv, argc); XFreeStringList(argv); @@ -145,7 +145,7 @@ void DockBarExtension::windowAdded(WId win) // try to read class hint XClassHint hint; - QString resClass, resName; + TQString resClass, resName; if (XGetClassHint(qt_xdisplay(), win, &hint)) { resName = hint.res_name; resClass = hint.res_class; @@ -182,7 +182,7 @@ void DockBarExtension::layoutContainers() } } -void DockBarExtension::embedWindow(WId win, QString command, QString resName, QString resClass) +void DockBarExtension::embedWindow(WId win, TQString command, TQString resName, TQString resClass) { if (win == 0) return; DockContainer* container = 0; @@ -204,7 +204,7 @@ void DockBarExtension::embedWindow(WId win, QString command, QString resName, QS } if (container == 0) { - QString cmd = command.isNull() ? resClass : command; + TQString cmd = command.isNull() ? resClass : command; if (KStandardDirs::findExe(KShell::splitArgs(cmd).front()).isEmpty()) ncmd = true; container = new DockContainer(cmd, this, resName, resClass); @@ -236,10 +236,10 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) containers.insert(it, c); } - connect(c, SIGNAL(embeddedWindowDestroyed(DockContainer*)), - SLOT(embeddedWindowDestroyed(DockContainer*))); - connect(c, SIGNAL(settingsChanged(DockContainer*)), - SLOT(settingsChanged(DockContainer*))); + connect(c, TQT_SIGNAL(embeddedWindowDestroyed(DockContainer*)), + TQT_SLOT(embeddedWindowDestroyed(DockContainer*))); + connect(c, TQT_SIGNAL(settingsChanged(DockContainer*)), + TQT_SLOT(settingsChanged(DockContainer*))); c->resize(DockContainer::sz(), DockContainer::sz()); c->show(); } @@ -272,7 +272,7 @@ void DockBarExtension::settingsChanged(DockContainer *) void DockBarExtension::saveContainerConfig() { - QStringList applet_list; + TQStringList applet_list; KConfig *conf = config(); unsigned count = 0; @@ -283,7 +283,7 @@ void DockBarExtension::saveContainerConfig() DockContainer* c = *it; if (!c->command().isEmpty()) { - QString applet_gid = QString("Applet_%1").arg(QString::number(count)); + TQString applet_gid = TQString("Applet_%1").arg(TQString::number(count)); applet_list.append(applet_gid); conf->setGroup(applet_gid); conf->writePathEntry("Command", c->command()); @@ -302,15 +302,15 @@ void DockBarExtension::loadContainerConfig() { KConfig *conf = config(); conf->setGroup("General"); - QStringList applets = conf->readListEntry("Applets"); + TQStringList applets = conf->readListEntry("Applets"); - QStringList fail_list; - for (QStringList::Iterator it = applets.begin(); it != applets.end(); ++it) { + TQStringList fail_list; + for (TQStringList::Iterator it = applets.begin(); it != applets.end(); ++it) { if (!conf->hasGroup(*it)) continue; conf->setGroup(*it); - QString cmd = conf->readPathEntry("Command"); - QString resName = conf->readPathEntry("resName"); - QString resClass = conf->readEntry("resClass"); + TQString cmd = conf->readPathEntry("Command"); + TQString resName = conf->readPathEntry("resName"); + TQString resClass = conf->readEntry("resClass"); if (cmd.isEmpty() || resName.isEmpty() || resClass.isEmpty()) continue; DockContainer* c = new DockContainer(cmd, this, resName, resClass ); @@ -328,7 +328,7 @@ void DockBarExtension::loadContainerConfig() saveContainerConfig(); } -int DockBarExtension::findContainerAtPoint(const QPoint& p) +int DockBarExtension::findContainerAtPoint(const TQPoint& p) { int i = 0; for (DockContainer::Vector::const_iterator it = containers.constBegin(); @@ -344,7 +344,7 @@ int DockBarExtension::findContainerAtPoint(const QPoint& p) return -1; } -void DockBarExtension::mousePressEvent(QMouseEvent *e ) { +void DockBarExtension::mousePressEvent(TQMouseEvent *e ) { if (e->button() == LeftButton) { // Store the position of the mouse clic. mclic_pos = e->pos(); @@ -354,7 +354,7 @@ void DockBarExtension::mousePressEvent(QMouseEvent *e ) { } } -void DockBarExtension::mouseReleaseEvent(QMouseEvent *e ) { +void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { if (e->button() != LeftButton) return; if (dragging_container) { releaseMouse(); @@ -365,11 +365,11 @@ void DockBarExtension::mouseReleaseEvent(QMouseEvent *e ) { } } -void DockBarExtension::mouseMoveEvent(QMouseEvent *e) { +void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { if (! (e->state() & LeftButton) ) return; if (dragging_container == 0) { // Check whether the user has moved far enough. - int delay = QApplication::startDragDistance(); + int delay = TQApplication::startDragDistance(); if ( (mclic_pos - e->pos()).manhattanLength() > delay ) { int pos = findContainerAtPoint(e->pos()); original_container = 0; @@ -388,7 +388,7 @@ void DockBarExtension::mouseMoveEvent(QMouseEvent *e) { dragging_container->move(e->globalPos() - mclic_dock_pos); // change layout of other containers - QPoint dragpos(dragging_container->pos()), + TQPoint dragpos(dragging_container->pos()), barpos(mapToGlobal(pos())); int pdrag1,pdrag2,psz; pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2; diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index 0003ec6fa..e735ec708 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __dockbarextension_h__ #define __dockbarextension_h__ -#include <qvaluevector.h> +#include <tqvaluevector.h> #include <kpanelextension.h> #include "dockcontainer.h" @@ -35,12 +35,12 @@ class DockBarExtension : public KPanelExtension Q_OBJECT public: - DockBarExtension(const QString& configFile, Type t = Normal, - int actions = 0, QWidget *parent = 0, const char *name = 0); + DockBarExtension(const TQString& configFile, Type t = Normal, + int actions = 0, TQWidget *parent = 0, const char *name = 0); virtual ~DockBarExtension(); - QSize sizeHint(Position, QSize maxSize) const; + TQSize sizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Right; } protected slots: @@ -49,24 +49,24 @@ protected slots: void settingsChanged(DockContainer*); protected: - void resizeEvent(QResizeEvent*); - void embedWindow(WId win, QString command, QString resName, QString resClass); + void resizeEvent(TQResizeEvent*); + void embedWindow(WId win, TQString command, TQString resName, TQString resClass); void addContainer(DockContainer*, int pos=-1); void removeContainer(DockContainer*); void saveContainerConfig(); void loadContainerConfig(); void layoutContainers(); - int findContainerAtPoint(const QPoint&); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + int findContainerAtPoint(const TQPoint&); + void mousePressEvent(TQMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); private: KWinModule* kwin_module; DockContainer::Vector containers; // handle the dragging of applets DockContainer *dragging_container, *original_container; - QPoint mclic_pos, mclic_dock_pos; + TQPoint mclic_pos, mclic_dock_pos; int dragged_container_original_pos; }; diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp index f2117346d..d363b6b30 100644 --- a/kicker/extensions/dockbar/dockcontainer.cpp +++ b/kicker/extensions/dockbar/dockcontainer.cpp @@ -21,10 +21,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qwidget.h> -#include <qtooltip.h> +#include <tqwidget.h> +#include <tqtooltip.h> #include <kwin.h> -#include <qvalidator.h> +#include <tqvalidator.h> #include <kinputdialog.h> #include <klocale.h> #include <kpopupmenu.h> @@ -38,9 +38,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <X11/Xutil.h> -DockContainer::DockContainer( QString command, QWidget *parent, - QString resname, QString resclass, bool undocked_style ) - : QFrame( parent, resname.ascii(), +DockContainer::DockContainer( TQString command, TQWidget *parent, + TQString resname, TQString resclass, bool undocked_style ) + : TQFrame( parent, resname.ascii(), undocked_style ? WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM : 0 ), @@ -64,7 +64,7 @@ DockContainer::DockContainer( QString command, QWidget *parent, if (!undocked_style) { setFrameStyle(StyledPanel | Raised); setLineWidth(border()); - QToolTip::add(this, command); + TQToolTip::add(this, command); } else { setFrameStyle(StyledPanel | Plain); setLineWidth(1); @@ -76,7 +76,7 @@ void DockContainer::embed( WId id ) { if( id == _embeddedWinId || id == 0) return; - QRect geom = KWin::windowInfo(id,NET::WMKDEFrameStrut).frameGeometry(); + TQRect geom = KWin::windowInfo(id,NET::WMKDEFrameStrut).frameGeometry(); // does the same as KWM::prepareForSwallowing() XWithdrawWindow( qt_xdisplay(), id, qt_xscreen() ); @@ -147,10 +147,10 @@ bool DockContainer::x11Event( XEvent *e ) void DockContainer::askNewCommand(bool bad_command) { bool ok; - QString title( i18n("Enter Command Line for Applet %1.%2").arg(resName()).arg(resClass()) ); - QString description( i18n("This applet does not behave correctly and the dockbar was unable to " + TQString title( i18n("Enter Command Line for Applet %1.%2").arg(resName()).arg(resClass()) ); + TQString description( i18n("This applet does not behave correctly and the dockbar was unable to " "find the command line necessary to launch it the next time KDE starts up") ); - QString cmd; + TQString cmd; /* I was not able to figure out why valgrind complains inside the getText call.. @@ -160,13 +160,13 @@ void DockContainer::askNewCommand(bool bad_command) cmd = KInputDialog::getText( title, description, command(), &ok, this ); } else { - cmd = KInputDialog::getText( title, QString::null, + cmd = KInputDialog::getText( title, TQString::null, command(), &ok, this ); } if (ok) { _command = cmd; emit settingsChanged(this); } } -void DockContainer::popupMenu(QPoint p) +void DockContainer::popupMenu(TQPoint p) { int r; { diff --git a/kicker/extensions/dockbar/dockcontainer.h b/kicker/extensions/dockbar/dockcontainer.h index bc9962290..d1968fa28 100644 --- a/kicker/extensions/dockbar/dockcontainer.h +++ b/kicker/extensions/dockbar/dockcontainer.h @@ -24,19 +24,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __dockcontainer_h__ #define __dockcontainer_h__ -#include <qframe.h> -#include <qvaluevector.h> +#include <tqframe.h> +#include <tqvaluevector.h> class DockContainer : public QFrame { Q_OBJECT public: - typedef QValueVector<DockContainer*> Vector; + typedef TQValueVector<DockContainer*> Vector; - DockContainer( QString command, QWidget *parent, - QString resname, - QString resclass, + DockContainer( TQString command, TQWidget *parent, + TQString resname, + TQString resclass, bool undocked_style=false); void embed(WId); @@ -44,11 +44,11 @@ public: void kill(); WId embeddedWinId() const; - QString command() const; - QString resClass() const; - QString resName() const; + TQString command() const; + TQString resClass() const; + TQString resName() const; void askNewCommand(bool bad_command=true); - void popupMenu(QPoint p); + void popupMenu(TQPoint p); static int& sz(); static int& border(); signals: @@ -60,8 +60,8 @@ protected: private: WId _embeddedWinId; - QString _command; - QString _resName, _resClass; + TQString _command; + TQString _resName, _resClass; }; @@ -70,17 +70,17 @@ inline WId DockContainer::embeddedWinId() const return _embeddedWinId; } -inline QString DockContainer::command() const +inline TQString DockContainer::command() const { return _command; } -inline QString DockContainer::resClass() const +inline TQString DockContainer::resClass() const { return _resClass; } -inline QString DockContainer::resName() const +inline TQString DockContainer::resName() const { return _resName; } diff --git a/kicker/extensions/kasbar/docs.h b/kicker/extensions/kasbar/docs.h index 6a9aa5849..105176d08 100644 --- a/kicker/extensions/kasbar/docs.h +++ b/kicker/extensions/kasbar/docs.h @@ -40,23 +40,23 @@ class QObject { }; -class QWidget : public QObject +class TQWidget : public QObject { }; -class QDialog : public QWidget +class TQDialog : public QWidget { }; -class QFrame : public QWidget +class TQFrame : public QWidget { }; -class QHBox : public QFrame +class TQHBox : public QFrame { }; -class QLCDNumber : public QFrame +class TQLCDNumber : public QFrame { }; diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 73d20d94b..d32f0a1dd 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -52,12 +52,12 @@ ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include <qcheckbox.h> -#include <qgrid.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqcheckbox.h> +#include <tqgrid.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kdeversion.h> #include <klocale.h> @@ -83,7 +83,7 @@ #define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) #define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) -KasAboutDialog::KasAboutDialog( QWidget *parent ) +KasAboutDialog::KasAboutDialog( TQWidget *parent ) : KDialogBase( KDialogBase::IconList, i18n("About Kasbar"), KDialogBase::Ok, KDialogBase::Ok, @@ -110,10 +110,10 @@ KasAboutDialog::~KasAboutDialog() void KasAboutDialog::addDemoBar() { - QHBox *box = new QHBox( this ); + TQHBox *box = new TQHBox( this ); box->setLineWidth(2); - box->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + box->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); box->setSpacing( spacingHint() ); box->setMargin( marginHint() ); @@ -129,7 +129,7 @@ void KasAboutDialog::addDemoBar() KasPopup *pop = new KasPopup( ci ); ci->setPopup( pop ); ci->setCustomPopup( true ); - connect( ci, SIGNAL(leftButtonClicked(QMouseEvent *)), ci, SLOT(togglePopup()) ); + connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) ); KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Horizontal ) ? Vertical : Horizontal, pop ); KasItem *i = 0; @@ -150,10 +150,10 @@ void KasAboutDialog::addDemoBar() void KasAboutDialog::addInfoPage() { - QVBox *aboutPage = addVBoxPage( i18n("About"), i18n("About Kasbar"), Icon( "appearance" ) ); + TQVBox *aboutPage = addVBoxPage( i18n("About"), i18n("About Kasbar"), Icon( "appearance" ) ); aboutPage->setSpacing( spacingHint() ); - new QLabel( i18n( "<qt><body>" + new TQLabel( i18n( "<qt><body>" "<h2>Kasbar Version: %1</h2>" "<b>KDE Version:</b> %2" "</body></qt>" ) @@ -176,12 +176,12 @@ void KasAboutDialog::addInfoPage() "</body></html>" ) .arg( HOMEPAGE_URL ).arg( HOMEPAGE_URL ) ); - text5->setWordWrap( QTextEdit::WidgetWidth ); + text5->setWordWrap( TQTextEdit::WidgetWidth ); } void KasAboutDialog::addAuthorsPage() { - QVBox *authorsPage = addVBoxPage( i18n("Authors"), + TQVBox *authorsPage = addVBoxPage( i18n("Authors"), i18n("Kasbar Authors"), Icon( "kuser" ) ); @@ -206,28 +206,28 @@ void KasAboutDialog::addAuthorsPage() "</html>" ) ); - text->setWordWrap( QTextEdit::WidgetWidth ); + text->setWordWrap( TQTextEdit::WidgetWidth ); } void KasAboutDialog::addBSDPage() { - QVBox *bsdLicense = addVBoxPage( i18n("BSD License"), QString::null, Icon( "filefind" ) ); + TQVBox *bsdLicense = addVBoxPage( i18n("BSD License"), TQString::null, Icon( "filefind" ) ); - new QLabel( i18n( "Kasbar may be used under the terms of either the BSD license, " + new TQLabel( i18n( "Kasbar may be used under the terms of either the BSD license, " "or the GNU Public License." ), bsdLicense ); KTextBrowser *text2 = new KTextBrowser( bsdLicense ); text2->setText( "Some text of unsurpassed tediousness goes here." ); - text2->setWordWrap( QTextEdit::NoWrap ); + text2->setWordWrap( TQTextEdit::NoWrap ); - QString bsdFile = locate("data", "LICENSES/BSD"); + TQString bsdFile = locate("data", "LICENSES/BSD"); if ( !bsdFile.isEmpty() ) { - QString result; - QFile file( bsdFile ); + TQString result; + TQFile file( bsdFile ); if ( file.open( IO_ReadOnly ) ) { - QTextStream str(&file); + TQTextStream str(&file); result += str.read(); } @@ -237,23 +237,23 @@ void KasAboutDialog::addBSDPage() void KasAboutDialog::addGPLPage() { - QVBox *gplPage = addVBoxPage( i18n("GPL License"), QString::null, Icon( "filefind" ) ); + TQVBox *gplPage = addVBoxPage( i18n("GPL License"), TQString::null, Icon( "filefind" ) ); - new QLabel( i18n( "Kasbar may be used under the terms of either the BSD license, " + new TQLabel( i18n( "Kasbar may be used under the terms of either the BSD license, " "or the GNU Public License." ), gplPage ); KTextBrowser *text3 = new KTextBrowser( gplPage ); text3->setText( "Some more text of unsurpassed tediousness goes here." ); - text3->setWordWrap( QTextEdit::NoWrap ); + text3->setWordWrap( TQTextEdit::NoWrap ); - QString gplFile = locate("data", "LICENSES/GPL_V2"); + TQString gplFile = locate("data", "LICENSES/GPL_V2"); if ( !gplFile.isEmpty() ) { - QString result; - QFile file( gplFile ); + TQString result; + TQFile file( gplFile ); if ( file.open( IO_ReadOnly ) ) { - QTextStream str(&file); + TQTextStream str(&file); result += str.read(); } diff --git a/kicker/extensions/kasbar/kasaboutdlg.h b/kicker/extensions/kasbar/kasaboutdlg.h index c217ead79..0311202ba 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.h +++ b/kicker/extensions/kasbar/kasaboutdlg.h @@ -68,7 +68,7 @@ class KasAboutDialog : public KDialogBase Q_OBJECT public: - KasAboutDialog( QWidget *parent=0 ); + KasAboutDialog( TQWidget *parent=0 ); ~KasAboutDialog(); void addAuthorsPage(); diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 8210190c8..06bf3c24f 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -53,11 +53,11 @@ */ #include <math.h> -#include <qbitmap.h> -#include <qcursor.h> -#include <qpainter.h> -#include <qmemarray.h> -#include <qtimer.h> +#include <tqbitmap.h> +#include <tqcursor.h> +#include <tqpainter.h> +#include <tqmemarray.h> +#include <tqtimer.h> #include <kapplication.h> #include <kdebug.h> @@ -76,11 +76,11 @@ static const int LARGE_EXTENT = 68; static const int HUGE_EXTENT = 84; static const int ENORMOUS_EXTENT = 148; -KasBar::KasBar( Orientation o, QWidget *parent, const char *name, WFlags f ) - : QWidget( parent, name, f ), +KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) + : TQWidget( parent, name, f ), master_(0), orient( o ), - direction_( o == Horizontal ? QBoxLayout::LeftToRight : QBoxLayout::TopToBottom ), + direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -102,14 +102,14 @@ KasBar::KasBar( Orientation o, QWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, SIGNAL( configChanged() ), SLOT( repaint() ) ); + connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } -KasBar::KasBar( Orientation o, KasBar *master, QWidget *parent, const char *name, WFlags f ) - : QWidget( parent, name, f ), +KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) + : TQWidget( parent, name, f ), master_(master), orient( o ), - direction_( o == Horizontal ? QBoxLayout::LeftToRight : QBoxLayout::TopToBottom ), + direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, QWidget *parent, const char *name items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, SIGNAL( configChanged() ), SLOT( repaint() ) ); + connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } KasBar::~KasBar() @@ -145,15 +145,15 @@ KasResources *KasBar::resources() if ( isTopLevel() ) { res = new KasResources( this ); - connect( res, SIGNAL( changed() ), SIGNAL( configChanged() ) ); - connect( this, SIGNAL( itemSizeChanged(int) ), res, SLOT( itemSizeChanged() ) ); + connect( res, TQT_SIGNAL( changed() ), TQT_SIGNAL( configChanged() ) ); + connect( this, TQT_SIGNAL( itemSizeChanged(int) ), res, TQT_SLOT( itemSizeChanged() ) ); return res; } return master_->resources(); } -KasBar *KasBar::createChildBar( Orientation o, QWidget *parent, const char *name ) +KasBar *KasBar::createChildBar( Orientation o, TQWidget *parent, const char *name ) { KasBar *child = new KasBar( o, this, parent, name ); child->rereadMaster(); @@ -218,8 +218,8 @@ void KasBar::setTransparent( bool enable ) kdDebug(1345) << "KasBar: Enabling transparency" << endl; rootPix = new KRootPixmap( this ); - connect( rootPix, SIGNAL( backgroundUpdated(const QPixmap &) ), - this, SLOT( setBackground(const QPixmap &) ) ); + connect( rootPix, TQT_SIGNAL( backgroundUpdated(const TQPixmap &) ), + this, TQT_SLOT( setBackground(const TQPixmap &) ) ); rootPix->setCustomPainting( true ); @@ -259,7 +259,7 @@ void KasBar::setTint( bool enable ) } } -void KasBar::setTint( double amount, QColor color ) +void KasBar::setTint( double amount, TQColor color ) { tintAmount_ = amount; tintColour_ = color; @@ -273,7 +273,7 @@ void KasBar::setTint( double amount, QColor color ) } } -void KasBar::setTintColor( const QColor &c ) +void KasBar::setTintColor( const TQColor &c ) { setTint( tintAmount_, c ); } @@ -303,7 +303,7 @@ void KasBar::setBoxesPerLine( int count ) updateLayout(); } -void KasBar::setDetachedPosition( const QPoint &pos ) +void KasBar::setDetachedPosition( const TQPoint &pos ) { if ( detachedPos == pos ) return; @@ -317,7 +317,7 @@ void KasBar::setDirection( Direction dir ) if ( direction_ == dir ) return; - if ( ( dir == QBoxLayout::LeftToRight ) || ( dir == QBoxLayout::RightToLeft ) ) + if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) ) orient = Horizontal; else orient = Vertical; @@ -333,29 +333,29 @@ void KasBar::setOrientation( Orientation o ) return; if ( o == Horizontal ) - setDirection( QBoxLayout::LeftToRight ); + setDirection( TQBoxLayout::LeftToRight ); else - setDirection( QBoxLayout::TopToBottom ); + setDirection( TQBoxLayout::TopToBottom ); } void KasBar::toggleOrientation() { switch( direction_ ) { - case QBoxLayout::LeftToRight: - setDirection( QBoxLayout::RightToLeft ); + case TQBoxLayout::LeftToRight: + setDirection( TQBoxLayout::RightToLeft ); break; - case QBoxLayout::RightToLeft: - setDirection( QBoxLayout::TopToBottom ); + case TQBoxLayout::RightToLeft: + setDirection( TQBoxLayout::TopToBottom ); break; - case QBoxLayout::TopToBottom: - setDirection( QBoxLayout::BottomToTop ); + case TQBoxLayout::TopToBottom: + setDirection( TQBoxLayout::BottomToTop ); break; - case QBoxLayout::BottomToTop: - setDirection( QBoxLayout::LeftToRight ); + case TQBoxLayout::BottomToTop: + setDirection( TQBoxLayout::LeftToRight ); break; default: kdWarning() << "toggleOrientation got an odd direction: " << (uint) direction_ << endl; - setDirection( QBoxLayout::LeftToRight ); + setDirection( TQBoxLayout::LeftToRight ); break; } } @@ -375,7 +375,7 @@ void KasBar::setDetached( bool detach ) emit detachedChanged( detached ); } -QSize KasBar::sizeHint( Orientation o, QSize sz ) +TQSize KasBar::sizeHint( Orientation o, TQSize sz ) { if ( o == Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); @@ -395,7 +395,7 @@ QSize KasBar::sizeHint( Orientation o, QSize sz ) if( r*c < items.count() ) // remainders ++r; - QSize s; + TQSize s; if( o == Horizontal ) { s.setWidth( c*itemExtent() ); s.setHeight( r*itemExtent() ); @@ -433,11 +433,11 @@ void KasBar::updateLayout() if( r*c < items.count() ) // remainders ++r; - QSize sz; + TQSize sz; if ( orient == Horizontal ) - sz = QSize( c * itemExtent(), r * itemExtent() ); + sz = TQSize( c * itemExtent(), r * itemExtent() ); else - sz = QSize( r * itemExtent(), c * itemExtent() ); + sz = TQSize( r * itemExtent(), c * itemExtent() ); if ( sz != size() ) { resize( sz ); @@ -445,32 +445,32 @@ void KasBar::updateLayout() setUpdatesEnabled( updates ); - QWidget *top = topLevelWidget(); - QRegion mask; + TQWidget *top = topLevelWidget(); + TQRegion mask; KasItem *i; if ( orient == Horizontal ) { for ( i = items.first(); i; i = items.next() ) { int x = (items.at() % c) * itemExtent(); - if ( direction_ == QBoxLayout::RightToLeft ) + if ( direction_ == TQBoxLayout::RightToLeft ) x = width() - x - itemExtent(); i->setPos( x, (items.at() / c) * itemExtent() ); i->update(); - mask = mask.unite( QRegion( QRect( i->pos(), QSize(itemExtent(),itemExtent()) ) ) ); + mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } else { for ( i = items.first(); i; i = items.next() ) { int y = (items.at() / r) * itemExtent(); - if ( direction_ == QBoxLayout::BottomToTop ) + if ( direction_ == TQBoxLayout::BottomToTop ) y = height() - y - itemExtent(); i->setPos( (items.at() % r) * itemExtent(), y ); i->update(); - mask = mask.unite( QRegion( QRect( i->pos(), QSize(itemExtent(),itemExtent()) ) ) ); + mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } @@ -526,7 +526,7 @@ void KasBar::clear() updateLayout(); } -void KasBar::mousePressEvent(QMouseEvent *ev) +void KasBar::mousePressEvent(TQMouseEvent *ev) { KasItem *i = itemAt( ev->pos() ); if ( i ) @@ -535,7 +535,7 @@ void KasBar::mousePressEvent(QMouseEvent *ev) pressPos = ev->globalPos(); } -void KasBar::mouseReleaseEvent(QMouseEvent *ev) +void KasBar::mouseReleaseEvent(TQMouseEvent *ev) { if ( !inDrag ) { KasItem *i = itemAt( ev->pos() ); @@ -547,16 +547,16 @@ void KasBar::mouseReleaseEvent(QMouseEvent *ev) emit configChanged(); } - pressPos = QPoint(); + pressPos = TQPoint(); inDrag = false; } void KasBar::updateMouseOver() { - updateMouseOver( mapFromGlobal( QCursor::pos() ) ); + updateMouseOver( mapFromGlobal( TQCursor::pos() ) ); } -void KasBar::updateMouseOver( QPoint pos ) +void KasBar::updateMouseOver( TQPoint pos ) { KasItem *i = itemAt(pos); @@ -573,10 +573,10 @@ void KasBar::updateMouseOver( QPoint pos ) itemUnderMouse_ = i; } -void KasBar::mouseMoveEvent(QMouseEvent *ev) +void KasBar::mouseMoveEvent(TQMouseEvent *ev) { if ( detached && (!pressPos.isNull()) ) { - QPoint moved = ev->globalPos() - pressPos; + TQPoint moved = ev->globalPos() - pressPos; if ( !inDrag ) { if ( moved.manhattanLength() > 6 ) { @@ -598,7 +598,7 @@ void KasBar::mouseMoveEvent(QMouseEvent *ev) } } -void KasBar::dragMoveEvent ( QDragMoveEvent *ev ) +void KasBar::dragMoveEvent ( TQDragMoveEvent *ev ) { KasItem *i = itemAt( ev->pos() ); if ( itemUnderMouse_ != i ) { @@ -610,23 +610,23 @@ void KasBar::dragMoveEvent ( QDragMoveEvent *ev ) } } -void KasBar::paintEvent(QPaintEvent *ev) +void KasBar::paintEvent(TQPaintEvent *ev) { - QPainter q( this ); + TQPainter q( this ); q.drawPixmap( ev->rect().topLeft(), offscreen, ev->rect() ); } -void KasBar::resizeEvent(QResizeEvent *ev) +void KasBar::resizeEvent(TQResizeEvent *ev) { offscreen.resize( ev->size() ); - QPainter p( &offscreen ); - paintBackground( &p, QRect(QPoint(0,0),size()) ); - QWidget::resizeEvent(ev); + TQPainter p( &offscreen ); + paintBackground( &p, TQRect(TQPoint(0,0),size()) ); + TQWidget::resizeEvent(ev); emit layoutChanged(); } -QPoint KasBar::itemPos( KasItem *i ) +TQPoint KasBar::itemPos( KasItem *i ) { return i->pos(); } @@ -638,12 +638,12 @@ void KasBar::updateItem( KasItem *i ) if ( !isShown() ) return; - QPainter p( &offscreen ); - QPoint pos = i->pos(); + TQPainter p( &offscreen ); + TQPoint pos = i->pos(); - paintBackground( &p, QRect( pos, QSize( itemExtent(), itemExtent() ) ) ); + paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); i->paint( &p, pos.x(), pos.y() ); - update( QRect( pos, QSize( itemExtent(), itemExtent() ) ) ); + update( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); } void KasBar::repaintItem(KasItem *i, bool erase ) @@ -653,22 +653,22 @@ void KasBar::repaintItem(KasItem *i, bool erase ) if ( !isShown() ) return; - QPainter p( &offscreen ); - QPoint pos = i->pos(); + TQPainter p( &offscreen ); + TQPoint pos = i->pos(); - paintBackground( &p, QRect( pos, QSize( itemExtent(), itemExtent() ) ) ); + paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); i->paint( &p, pos.x(), pos.y() ); - repaint( QRect( pos, QSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); + repaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); } -KasItem* KasBar::itemAt(const QPoint &p) +KasItem* KasBar::itemAt(const TQPoint &p) { KasItem *i; - QRect cr; + TQRect cr; for (i = items.first(); i; i = items.next()) { cr.setTopLeft( i->pos() ); - cr.setSize( QSize( itemExtent(), itemExtent() ) ); + cr.setSize( TQSize( itemExtent(), itemExtent() ) ); if(cr.contains(p)) return i; @@ -677,12 +677,12 @@ KasItem* KasBar::itemAt(const QPoint &p) return 0; } -void KasBar::setBackground( const QPixmap &newBg ) +void KasBar::setBackground( const TQPixmap &newBg ) { bg = newBg; - QPainter p( &offscreen ); - paintBackground( &p, QRect(QPoint(0,0),size()) ); + TQPainter p( &offscreen ); + paintBackground( &p, TQRect(TQPoint(0,0),size()) ); updateLayout(); } @@ -701,7 +701,7 @@ void KasBar::setPaintInactiveFrames( bool enable ) update(); } -void KasBar::paintBackground( QPainter *p, const QRect &r ) +void KasBar::paintBackground( TQPainter *p, const TQRect &r ) { // If we're transparent if ( transparent_ ) { @@ -719,8 +719,8 @@ void KasBar::addTestItems() i->setText( "Animated" ); i->setIcon( KGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) ); i->setAnimation( resources()->startupAnimation() ); - QTimer *aniTimer = new QTimer( i ); - connect( aniTimer, SIGNAL( timeout() ), i, SLOT( advanceAnimation() ) ); + TQTimer *aniTimer = new TQTimer( i ); + connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) ); aniTimer->start( 100 ); i->setShowAnimation( true ); diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 297291d4f..8ff745475 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -59,10 +59,10 @@ #ifndef __KASBAR_H #define __KASBAR_H -#include <qwidget.h> -#include <qpoint.h> -#include <qptrlist.h> -#include <qlayout.h> +#include <tqwidget.h> +#include <tqpoint.h> +#include <tqptrlist.h> +#include <tqlayout.h> #include "kasresources.h" @@ -71,7 +71,7 @@ class KRootPixmap; class KasItem; class KasResources; -typedef QPtrList<KasItem> KasItemList; +typedef TQPtrList<KasItem> KasItemList; /** @@ -89,13 +89,13 @@ class KDE_EXPORT KasBar : public QWidget friend class KasItem; public: - KasBar( Orientation o, QWidget *parent=0, const char *name=0, WFlags f=0 ); + KasBar( Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); KasBar( Orientation o, KasBar *master, - QWidget* parent=0, const char* name=0, WFlags f=0 ); + TQWidget* parent=0, const char* name=0, WFlags f=0 ); virtual ~KasBar(); - typedef QBoxLayout::Direction Direction; + typedef TQBoxLayout::Direction Direction; /** Returns true iff this is a top-level bar. This is unrelated to it being a top-level widget. */ bool isTopLevel() const { return !master_; } @@ -104,7 +104,7 @@ public: KasBar *master() const { return master_; } /** Creates a child bar of the kasbar. The child will inherit the appearance options. */ - virtual KasBar *createChildBar( Orientation o, QWidget *parent, const char *name=0 ); + virtual KasBar *createChildBar( Orientation o, TQWidget *parent, const char *name=0 ); /** Factory method that returns the singleton resources object. */ virtual KasResources *resources(); @@ -148,11 +148,11 @@ public: Direction direction() const { return direction_; } bool isDetached() const { return detached; } - QPoint detachedPosition() const { return detachedPos; } + TQPoint detachedPosition() const { return detachedPos; } bool isDrag() const { return inDrag; } - QSize sizeHint( Orientation, QSize max ); + TQSize sizeHint( Orientation, TQSize max ); // // Look and feel options @@ -167,7 +167,7 @@ public: bool hasTint() const { return enableTint_; } /** Sets the amount and color of the tint. */ - void setTint( double amount, QColor color ); + void setTint( double amount, TQColor color ); /** Sets the amount of tinting. */ void setTintAmount( double amount ) { setTint( amount, tintColour_ ); } @@ -176,7 +176,7 @@ public: double tintAmount() const { return tintAmount_; } /** Get the color of the tint. */ - QColor tintColor() const { return tintColour_; } + TQColor tintColor() const { return tintColour_; } /** Returns true iff we will paint frames around inactive items. */ bool paintInactiveFrames() const { return paintInactiveFrame_; } @@ -191,10 +191,10 @@ public: void repaintItem(KasItem *i, bool erase = true ); /** Returns the item at p or 0. */ - KasItem* itemAt(const QPoint &p); + KasItem* itemAt(const TQPoint &p); /** Get the position of the specified item. */ - QPoint itemPos( KasItem *i ); + TQPoint itemPos( KasItem *i ); /** The item under the mouse pointer (or 0). */ KasItem *itemUnderMouse() const { return itemUnderMouse_; } @@ -208,12 +208,12 @@ public slots: void setItemSize( int size ); void setItemExtent( int size ); - void setDetachedPosition( const QPoint &pos ); + void setDetachedPosition( const TQPoint &pos ); virtual void updateLayout(); void updateMouseOver(); - void updateMouseOver( QPoint pos ); + void updateMouseOver( TQPoint pos ); /** Enable or disable tinting. */ void setTint( bool enable ); @@ -222,12 +222,12 @@ public slots: void setTransparent( bool enable ); /** Set the color of the tint. */ - void setTintColor( const QColor &c ); + void setTintColor( const TQColor &c ); /** Set the strength of the tint (as a percentage). */ void setTintAmount( int percent ); - void setBackground( const QPixmap &pix ); + void setBackground( const TQPixmap &pix ); void setMasked( bool mask ); @@ -245,7 +245,7 @@ public slots: signals: void detachedChanged( bool ); - void detachedPositionChanged( const QPoint & ); + void detachedPositionChanged( const TQPoint & ); void dragStarted(); void directionChanged(); @@ -262,42 +262,42 @@ protected: KRootPixmap *rootPixmap() const { return rootPix; } /** Displays the popup menus, hides/shows windows. */ - void mousePressEvent(QMouseEvent *ev); + void mousePressEvent(TQMouseEvent *ev); /** Displays the popup menus, hides/shows windows. */ - void mouseReleaseEvent(QMouseEvent *ev); + void mouseReleaseEvent(TQMouseEvent *ev); /** Overridden to implement the mouse-over highlight effect. */ - void mouseMoveEvent(QMouseEvent *ev); + void mouseMoveEvent(TQMouseEvent *ev); /** Overridden to implement the drag-over task switching. */ - void dragMoveEvent(QDragMoveEvent *ev); + void dragMoveEvent(TQDragMoveEvent *ev); /** Paints the background of the item to the painter. */ - void paintBackground( QPainter *p, const QRect &r ); + void paintBackground( TQPainter *p, const TQRect &r ); /** Calls the paint methods for the items in the rectangle specified by the event. */ - void paintEvent(QPaintEvent *ev); + void paintEvent(TQPaintEvent *ev); /** Forces the widget to re-layout it's contents. */ - void resizeEvent(QResizeEvent *ev); + void resizeEvent(TQResizeEvent *ev); private: // Core data - QPixmap offscreen; + TQPixmap offscreen; KasBar *master_; KasItemList items; Orientation orient; Direction direction_; KasItem *itemUnderMouse_; uint boxesPerLine_; - QPoint pressPos; + TQPoint pressPos; bool inDrag; bool detached; int maxBoxes_; int itemSize_; int itemExtent_; - QPoint detachedPos; + TQPoint detachedPos; bool paintInactiveFrame_; // Implements pseudo-transparency @@ -306,7 +306,7 @@ private: KRootPixmap *rootPix; bool enableTint_; double tintAmount_; - QColor tintColour_; + TQColor tintColour_; bool useMask_; // Look and feel resources diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 6c006af16..ffd1b766e 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -104,7 +104,7 @@ int main( int argc, char **argv ) kastasker->readConfig(); kastasker->move( kastasker->detachedPosition() ); - kastasker->connect( kastasker->resources(), SIGNAL(changed()), SLOT(readConfig()) ); + kastasker->connect( kastasker->resources(), TQT_SIGNAL(changed()), TQT_SLOT(readConfig()) ); kastasker->refreshAll(); } @@ -118,7 +118,7 @@ int main( int argc, char **argv ) KApplication::kApplication()->dcopClient()->registerAs( "kasbar" ); - app.connect( &app, SIGNAL( lastWindowClosed() ), SLOT(quit()) ); + app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); return app.exec(); } diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 9b1e2435e..3bc3dcd1b 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -51,7 +51,7 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include <qlayout.h> +#include <tqlayout.h> #include <dcopclient.h> #include <kapplication.h> @@ -74,7 +74,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init( QWidget *parent, const QString& configFile ) + KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue("kasbarextension"); return new KasBarExtension( configFile, @@ -84,10 +84,10 @@ extern "C" } } -KasBarExtension::KasBarExtension( const QString& configFile, +KasBarExtension::KasBarExtension( const TQString& configFile, Type type, int actions, - QWidget *parent, const char *name ) + TQWidget *parent, const char *name ) : KPanelExtension( configFile, type, actions, parent, name ), detached_( false ) { @@ -97,8 +97,8 @@ KasBarExtension::KasBarExtension( const QString& configFile, // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); - connect( kasbar, SIGNAL( layoutChanged() ), this, SIGNAL( updateLayout() ) ); - connect( kasbar, SIGNAL( detachedChanged(bool) ), this, SLOT( setDetached(bool) ) ); + connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); + connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); kasbar->readConfig(); @@ -127,7 +127,7 @@ void KasBarExtension::setDetached( bool detach ) resize( detachedSize() ); } else { - kasbar->reparent( this, QPoint(0,0), true ); + kasbar->reparent( this, TQPoint(0,0), true ); kasbar->setOrientation( orientation() ); updateGeometry(); @@ -137,23 +137,23 @@ void KasBarExtension::setDetached( bool detach ) emit updateLayout(); } -void KasBarExtension::showEvent( QShowEvent */*se*/ ) +void KasBarExtension::showEvent( TQShowEvent */*se*/ ) { updateGeometry(); resize( kasbar->size() ); repaint( true ); } -QSize KasBarExtension::detachedSize() +TQSize KasBarExtension::detachedSize() { if ( orientation() == Vertical ) - return QSize( kasbar->itemExtent()/2, 0 ); + return TQSize( kasbar->itemExtent()/2, 0 ); else - return QSize( 0, kasbar->itemExtent()/2 ); + return TQSize( 0, kasbar->itemExtent()/2 ); } -QSize KasBarExtension::sizeHint(Position p, QSize maxSize ) const +TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const { Orientation o = Horizontal; @@ -162,9 +162,9 @@ QSize KasBarExtension::sizeHint(Position p, QSize maxSize ) const if ( detached_ ) { if ( o == Vertical ) - return QSize( kasbar->itemExtent()/2, 0 ); + return TQSize( kasbar->itemExtent()/2, 0 ); else - return QSize( 0, kasbar->itemExtent()/2 ); + return TQSize( 0, kasbar->itemExtent()/2 ); } return kasbar->sizeHint( o, maxSize ); diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h index e85750d40..7fbb4fbc6 100644 --- a/kicker/extensions/kasbar/kasbarextension.h +++ b/kicker/extensions/kasbar/kasbarextension.h @@ -56,7 +56,7 @@ #ifndef KASBAREXTENSION_H #define KASBAREXTENSION_H -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kpanelextension.h> class KasTasker; @@ -69,31 +69,31 @@ class KasBarExtension : public KPanelExtension Q_OBJECT public: - KasBarExtension( const QString& configFile, + KasBarExtension( const TQString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); virtual ~KasBarExtension(); - QSize sizeHint( Position, QSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Right; } virtual void positionChange( Position position ); bool isDetached() const { return detached_; } - QSize detachedSize(); + TQSize detachedSize(); public slots: void setDetached( bool detach ); protected: - void showEvent( QShowEvent *se ); + void showEvent( TQShowEvent *se ); virtual void about(); virtual void preferences(); private: - QGuardedPtr<KasTasker> kasbar; + TQGuardedPtr<KasTasker> kasbar; bool detached_; }; diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 0292a93cb..386a7922d 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -1,9 +1,9 @@ -#include <qpainter.h> -#include <qbitmap.h> -#include <qdatetime.h> -#include <qdrawutil.h> -#include <qlcdnumber.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqbitmap.h> +#include <tqdatetime.h> +#include <tqdrawutil.h> +#include <tqlcdnumber.h> +#include <tqtimer.h> #include <kdatepicker.h> #include <kglobal.h> @@ -26,11 +26,11 @@ class LCD : public QLCDNumber { public: - LCD( QWidget *parent, const char *name=0 ) - : QLCDNumber(parent,name) {} + LCD( TQWidget *parent, const char *name=0 ) + : TQLCDNumber(parent,name) {} ~LCD() {} - void draw( QPainter *p ) { drawContents(p); } + void draw( TQPainter *p ) { drawContents(p); } }; KasClockItem::KasClockItem( KasBar *parent ) @@ -38,23 +38,23 @@ KasClockItem::KasClockItem( KasBar *parent ) { setCustomPopup( true ); - QTimer *t = new QTimer( this ); - connect( t, SIGNAL( timeout() ), SLOT( updateTime() ) ); + TQTimer *t = new TQTimer( this ); + connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateTime() ) ); t->start( 1000 ); lcd = new LCD( parent ); lcd->hide(); - lcd->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); + lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); lcd->setBackgroundMode( NoBackground ); - lcd->setFrameStyle( QFrame::NoFrame ); - lcd->setSegmentStyle( QLCDNumber::Flat ); + lcd->setFrameStyle( TQFrame::NoFrame ); + lcd->setSegmentStyle( TQLCDNumber::Flat ); lcd->setNumDigits( 5 ); lcd->setAutoMask( true ); updateTime(); - connect( this, SIGNAL(leftButtonClicked(QMouseEvent *)), SLOT(togglePopup()) ); - connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showMenuAt(QMouseEvent *) ) ); + connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); + connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasClockItem::~KasClockItem() @@ -75,17 +75,17 @@ KasPopup *KasClockItem::createPopup() void KasClockItem::updateTime() { - setText( KGlobal::locale()->formatDate( QDate::currentDate(), true /* shortFormat */ ) ); - lcd->display( KGlobal::locale()->formatTime( QTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); + setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) ); + lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); update(); } -void KasClockItem::paint( QPainter *p ) +void KasClockItem::paint( TQPainter *p ) { KasItem::paint( p ); - lcd->setGeometry( QRect( 0, 0, extent(), extent()-15 ) ); + lcd->setGeometry( TQRect( 0, 0, extent(), extent()-15 ) ); p->save(); p->translate( 3, 15 ); @@ -100,13 +100,13 @@ void KasClockItem::paint( QPainter *p ) p->restore(); } -void KasClockItem::showMenuAt( QMouseEvent *ev ) +void KasClockItem::showMenuAt( TQMouseEvent *ev ) { hidePopup(); showMenuAt( ev->globalPos() ); } -void KasClockItem::showMenuAt( QPoint p ) +void KasClockItem::showMenuAt( TQPoint p ) { mouseLeave(); kasbar()->updateMouseOver(); diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h index 380901765..a95ebac7b 100644 --- a/kicker/extensions/kasbar/kasclockitem.h +++ b/kicker/extensions/kasbar/kasclockitem.h @@ -17,13 +17,13 @@ public: KasClockItem( KasBar *parent ); virtual ~KasClockItem(); - void paint( QPainter *p ); + void paint( TQPainter *p ); public slots: void updateTime(); - void showMenuAt( QMouseEvent *ev ); - void showMenuAt( QPoint p ); + void showMenuAt( TQMouseEvent *ev ); + void showMenuAt( TQPoint p ); protected: /** Reimplemented from KasItem to create a date picker. */ diff --git a/kicker/extensions/kasbar/kasgrouper.cpp b/kicker/extensions/kasbar/kasgrouper.cpp index 44dcc57b5..c1f000947 100644 --- a/kicker/extensions/kasbar/kasgrouper.cpp +++ b/kicker/extensions/kasbar/kasgrouper.cpp @@ -116,7 +116,7 @@ KasItem *KasGrouper::maybeAddToGroup( Task::Ptr t ) { KasItem *item = 0; - QString taskClass = t->className().lower(); + TQString taskClass = t->className().lower(); for ( uint i = 0; (!item) && (i < kasbar->itemCount()); i++ ) { KasItem *ei = kasbar->itemAt( i ); @@ -125,8 +125,8 @@ KasItem *KasGrouper::maybeAddToGroup( Task::Ptr t ) KasTaskItem *eti = static_cast<KasTaskItem *> (ei); - // NB This calls Task::className() not QObject::className() - QString currClass = eti->task()->className().lower(); + // NB This calls Task::className() not TQObject::className() + TQString currClass = eti->task()->className().lower(); if ( Task::idMatch( currClass, taskClass ) ) { KasGroupItem *egi = kasbar->convertToGroup( eti->task() ); @@ -140,8 +140,8 @@ KasItem *KasGrouper::maybeAddToGroup( Task::Ptr t ) for ( int i = 0; i < egi->taskCount(); i++ ) { - // NB This calls Task::className() not QObject::className() - QString currClass = egi->task( i )->className().lower(); + // NB This calls Task::className() not TQObject::className() + TQString currClass = egi->task( i )->className().lower(); if ( Task::idMatch( currClass, taskClass ) ) { egi->addTask( t ); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index a4435f7c2..6e03e8e3c 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -51,10 +51,10 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include <qpainter.h> -#include <qbitmap.h> -#include <qtimer.h> -#include <qwmatrix.h> +#include <tqpainter.h> +#include <tqbitmap.h> +#include <tqtimer.h> +#include <tqwmatrix.h> #include <kdebug.h> #include <kglobal.h> @@ -83,10 +83,10 @@ KasGroupItem::KasGroupItem( KasTasker *parent ) setGroupItem( true ); setText( i18n("Group") ); - connect( parent, SIGNAL( layoutChanged() ), this, SLOT( hidePopup() ) ); - connect( parent, SIGNAL( layoutChanged() ), this, SLOT( update() ) ); - connect( this, SIGNAL(leftButtonClicked(QMouseEvent *)), SLOT(togglePopup()) ); - connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showGroupMenuAt(QMouseEvent *) ) ); + connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); + connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) ); + connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); + connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } KasGroupItem::~KasGroupItem() @@ -109,7 +109,7 @@ void KasGroupItem::addTask( Task::Ptr t ) updateIcon(); } - connect( t, SIGNAL( changed(bool) ), this, SLOT( update() ) ); + connect( t, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( update() ) ); update(); } @@ -140,7 +140,7 @@ void KasGroupItem::removeTask( Task::Ptr t ) void KasGroupItem::updateIcon() { - QPixmap p; + TQPixmap p; bool usedIconLoader = false; Task::Ptr t = items.first(); if (!t) @@ -162,7 +162,7 @@ void KasGroupItem::updateIcon() setIcon( p ); } -void KasGroupItem::paint( QPainter *p ) +void KasGroupItem::paint( TQPainter *p ) { KasItem::paint( p ); @@ -180,7 +180,7 @@ void KasGroupItem::paint( QPainter *p ) p->setPen( isShowingPopup() ? res->activePenColor() : res->inactivePenColor() ); if ( modCount ) { - QString modCountStr; + TQString modCountStr; modCountStr.setNum( modCount ); p->drawText( extent()-fontMetrics().width( modCountStr )-3, 15+fontMetrics().ascent(), @@ -226,7 +226,7 @@ void KasGroupItem::paint( QPainter *p ) } if ( ((int) items.count() > microsPerCol) && ( kasbar()->itemSize() != KasBar::Small ) ) { - QString countStr; + TQString countStr; countStr.setNum( items.count() ); p->drawText( extent()-fontMetrics().width( countStr )-3, extent()+fontMetrics().ascent()-16, @@ -257,7 +257,7 @@ KasPopup *KasGroupItem::createPopup() KasPopup *pop = new KasPopup( this ); bar = kasbar()->createChildBar( ( kasbar()->orientation() == Horizontal ) ? Vertical : Horizontal, pop ); - connect( pop, SIGNAL(shown()), SLOT(updatePopup()) ); + connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) ); return pop; @@ -283,15 +283,15 @@ void KasGroupItem::ungroup() kasbar()->moveToMain( this ); } -void KasGroupItem::showGroupMenuAt( QMouseEvent *ev ) +void KasGroupItem::showGroupMenuAt( TQMouseEvent *ev ) { showGroupMenuAt( ev->globalPos() ); } -void KasGroupItem::showGroupMenuAt( const QPoint &p ) +void KasGroupItem::showGroupMenuAt( const TQPoint &p ) { TaskRMBMenu *tm = new TaskRMBMenu(items, true, kasbar()); - tm->insertItem( i18n("&Ungroup" ), this, SLOT( ungroup() ) ); + tm->insertItem( i18n("&Ungroup" ), this, TQT_SLOT( ungroup() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h index 348fb2839..e30260f57 100644 --- a/kicker/extensions/kasbar/kasgroupitem.h +++ b/kicker/extensions/kasbar/kasgroupitem.h @@ -59,7 +59,7 @@ #ifndef KASGROUPITEM_H #define KASGROUPITEM_H -#include <qpixmap.h> +#include <tqpixmap.h> #include <taskmanager.h> #include "kasitem.h" @@ -87,14 +87,14 @@ public: void setGroupType( uint type ) { groupType_ = type; } /** Reimplemented to paint the item. */ - virtual void paint( QPainter *p ); + virtual void paint( TQPainter *p ); KasTasker *kasbar() const; Task::Ptr task( uint i ) { return items.at( i ); } int taskCount() const { return items.count(); } - QPixmap icon(); + TQPixmap icon(); public slots: void addTask( Task::Ptr t ); @@ -102,8 +102,8 @@ public slots: void ungroup(); - void showGroupMenuAt( QMouseEvent *ev ); - void showGroupMenuAt( const QPoint &p ); + void showGroupMenuAt( TQMouseEvent *ev ); + void showGroupMenuAt( const TQPoint &p ); void updateIcon(); @@ -114,7 +114,7 @@ protected: virtual KasPopup *createPopup(); private: - QString title_; + TQString title_; Task::List items; uint groupType_; KasTasker *bar; diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 5cd8ef7f0..8fd795363 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -51,11 +51,11 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include <qcursor.h> -#include <qpainter.h> -#include <qdrawutil.h> -#include <qregexp.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqpainter.h> +#include <tqdrawutil.h> +#include <tqregexp.h> +#include <tqtimer.h> #include <kdebug.h> #include <kglobal.h> @@ -86,7 +86,7 @@ static const char *tiny_arrow[]={ static const int KASITEM_CHECK_POPUP_DELAY = 500; KasItem::KasItem( KasBar *parent ) - : QObject( parent ), + : TQObject( parent ), kas( parent ), popupTimer( 0 ), dragTimer( 0 ), title( i18n( "Kasbar" ) ), mouseOver( false ), activated( false ), @@ -94,8 +94,8 @@ KasItem::KasItem( KasBar *parent ) frame(true), modified(false), attention_(false), prog( -1 ), anim(), aniFrame( 0 ), drawAnim( false ) { - connect( parent, SIGNAL( dragStarted() ), SLOT( hidePopup() ) ); - connect( this, SIGNAL( middleButtonClicked(QMouseEvent *) ), parent, SLOT( toggleOrientation() ) ); + connect( parent, TQT_SIGNAL( dragStarted() ), TQT_SLOT( hidePopup() ) ); + connect( this, TQT_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQT_SLOT( toggleOrientation() ) ); } KasItem::~KasItem() @@ -112,7 +112,7 @@ void KasItem::setActive( bool yesno ) update(); } -void KasItem::setText( const QString &text ) +void KasItem::setText( const TQString &text ) { if ( title == text ) return; @@ -121,7 +121,7 @@ void KasItem::setText( const QString &text ) update(); } -void KasItem::setIcon( const QPixmap &p ) +void KasItem::setIcon( const TQPixmap &p ) { pix = p; update(); @@ -168,8 +168,8 @@ void KasItem::mouseEnter() static const int POPUP_DELAY = 300; if ( (!customPopup) && (popupTimer == 0) ) { - popupTimer = new QTimer( this, "popupTimer" ); - connect( popupTimer, SIGNAL( timeout() ), SLOT( showPopup() ) ); + popupTimer = new TQTimer( this, "popupTimer" ); + connect( popupTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( showPopup() ) ); popupTimer->start( POPUP_DELAY, true ); } @@ -177,7 +177,7 @@ void KasItem::mouseEnter() update(); } -void KasItem::mouseReleaseEvent( QMouseEvent *ev ) +void KasItem::mouseReleaseEvent( TQMouseEvent *ev ) { if ( ev->button() == LeftButton ) emit leftButtonClicked( ev ); @@ -195,7 +195,7 @@ void KasItem::checkPopup() if ( !pop->isVisible() ) return; - QWidget *w = QApplication::widgetAt( QCursor::pos() ); + TQWidget *w = TQApplication::widgetAt( TQCursor::pos() ); if ( !w ) { if ( popupTimer ) { delete popupTimer; @@ -205,7 +205,7 @@ void KasItem::checkPopup() hidePopup(); } else { - QTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); } } @@ -214,8 +214,8 @@ void KasItem::dragEnter() static const int DRAG_SWITCH_DELAY = 1000; if ( dragTimer == 0 ) { - dragTimer = new QTimer( this, "dragTimer" ); - connect( dragTimer, SIGNAL( timeout() ), SLOT( dragOverAction() ) ); + dragTimer = new TQTimer( this, "dragTimer" ); + connect( dragTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( dragOverAction() ) ); dragTimer->start( DRAG_SWITCH_DELAY, true ); } @@ -268,7 +268,7 @@ void KasItem::showPopup() pop->show(); update(); - QTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); } void KasItem::hidePopup() @@ -296,23 +296,23 @@ void KasItem::setPopup( KasPopup *popup ) pop = popup; } -void KasItem::paintFrame( QPainter *p ) +void KasItem::paintFrame( TQPainter *p ) { if ( !frame ) return; qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2); - QPen pen; + TQPen pen; if ( mouseOver ) { if ( attention_ ) { - pen = QPen( resources()->attentionColor(), 2 ); + pen = TQPen( resources()->attentionColor(), 2 ); p->setPen( pen ); p->drawRect( 0, 0, extent(), extent()); } else { - pen = QPen( Qt::white ); + pen = TQPen( Qt::white ); p->setPen( pen ); p->drawRect(0, 0, extent(), extent()); } @@ -323,15 +323,15 @@ void KasItem::paintFrame( QPainter *p ) } } -void KasItem::paintLabel( QPainter *p ) +void KasItem::paintLabel( TQPainter *p ) { - QString text = title; + TQString text = title; if ( !groupItem ) { - p->fillRect( 2, 2, extent()-4, 13, QBrush( resources()->labelBgColor() ) ); + p->fillRect( 2, 2, extent()-4, 13, TQBrush( resources()->labelBgColor() ) ); if ( isProgressItem() ) { - QRegExp reg( "(1?[0-9]?[0-9])%" ); + TQRegExp reg( "(1?[0-9]?[0-9])%" ); if ( -1 != reg.search( text ) ) { prog = reg.cap(1).toInt(); paintProgress( p, prog ); @@ -352,11 +352,11 @@ void KasItem::paintLabel( QPainter *p ) return; } else { - QPixmap arrow( tiny_arrow ); + TQPixmap arrow( tiny_arrow ); - QPoint popupPos = KasPopup::calcPosition( this, 10, 10 ); - QPoint iPos = kas->mapToGlobal( kas->itemPos( this ) ); - QWMatrix turn; + TQPoint popupPos = KasPopup::calcPosition( this, 10, 10 ); + TQPoint iPos = kas->mapToGlobal( kas->itemPos( this ) ); + TQWMatrix turn; if ( popupPos.x() < iPos.x() ) { paintArrowLabel( p, arrow.width(), true ); @@ -385,16 +385,16 @@ void KasItem::paintLabel( QPainter *p ) } } -void KasItem::paintArrowLabel( QPainter *p, int arrowSize, bool arrowOnLeft ) +void KasItem::paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft ) { - QString text = title; + TQString text = title; int lx = 2; int ly = 2; int w = extent()-4; int h = 13; arrowSize+=2; // Add a space - p->fillRect( lx, ly, w, h, QBrush( resources()->labelBgColor() ) ); + p->fillRect( lx, ly, w, h, TQBrush( resources()->labelBgColor() ) ); // Adjust for arrow if ( arrowOnLeft ) { @@ -413,13 +413,13 @@ void KasItem::paintArrowLabel( QPainter *p, int arrowSize, bool arrowOnLeft ) p->drawText( lx, ly, w, h-1, AlignCenter, text ); } -void KasItem::paintModified( QPainter *p ) +void KasItem::paintModified( TQPainter *p ) { if ( modified ) p->drawPixmap(extent()-12, extent()-22, resources()->modifiedIcon() ); } -void KasItem::paintBackground( QPainter *p ) +void KasItem::paintBackground( TQPainter *p ) { if ( activated ) p->drawPixmap( 0, 0, resources()->activeBg() ); @@ -429,13 +429,13 @@ void KasItem::paintBackground( QPainter *p ) p->drawPixmap( 0, 0, resources()->inactiveBg() ); } -void KasItem::paintProgress( QPainter *p, int percent ) +void KasItem::paintProgress( TQPainter *p, int percent ) { double amt = (extent()-4) * (percent / 100.0L); - p->fillRect( 2, 13, (int) amt, 2, QBrush( resources()->progressColor() ) ); + p->fillRect( 2, 13, (int) amt, 2, TQBrush( resources()->progressColor() ) ); } -void KasItem::paintStateIcon( QPainter *p, uint state ) +void KasItem::paintStateIcon( TQPainter *p, uint state ) { if ( kas->itemSize() != KasBar::Small ) { switch(state) { @@ -469,7 +469,7 @@ void KasItem::paintStateIcon( QPainter *p, uint state ) } } -void KasItem::paintAttention( QPainter *p ) +void KasItem::paintAttention( TQPainter *p ) { p->setPen( resources()->attentionColor() ); p->drawPixmap( 3, extent()-11, resources()->attentionIcon() ); @@ -500,12 +500,12 @@ void KasItem::setShowAnimation( bool yes ) update(); } -void KasItem::paintAnimation( QPainter *p ) +void KasItem::paintAnimation( TQPainter *p ) { if ( (aniFrame+1) > anim.count() ) return; - QPixmap pix = anim[ aniFrame ]; + TQPixmap pix = anim[ aniFrame ]; if ( pix.isNull() ) return; @@ -515,7 +515,7 @@ void KasItem::paintAnimation( QPainter *p ) p->drawPixmap( extent()-18, 16, pix ); } -void KasItem::paintIcon( QPainter *p ) +void KasItem::paintIcon( TQPainter *p ) { if ( pix.isNull() ) return; @@ -525,7 +525,7 @@ void KasItem::paintIcon( QPainter *p ) p->drawPixmap( x-4, y+15, pix ); } -void KasItem::paint( QPainter *p ) +void KasItem::paint( TQPainter *p ) { paintBackground( p ); paintFrame( p ); @@ -539,7 +539,7 @@ void KasItem::paint( QPainter *p ) paintAttention( p ); } -void KasItem::paint( QPainter *p, int x, int y ) +void KasItem::paint( TQPainter *p, int x, int y ) { p->save(); p->translate( x, y ); diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 3555d576f..268754f75 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -60,10 +60,10 @@ class QPainter; class QMouseEvent; class KasPopup; -#include <qobject.h> -#include <qguardedptr.h> -#include <qpoint.h> -#include <qvaluevector.h> +#include <tqobject.h> +#include <tqguardedptr.h> +#include <tqpoint.h> +#include <tqvaluevector.h> #include <kdemacros.h> @@ -81,7 +81,7 @@ class KDE_EXPORT KasItem : public QObject public: friend class KasBar; - typedef QValueVector<QPixmap> PixmapList; + typedef TQValueVector<TQPixmap> PixmapList; /** The states that a window can be in. */ enum WindowState { @@ -98,12 +98,12 @@ public: int extent() const { return kas->itemExtent(); } /** Returns the text that will be displayed in the title. */ - QString text() const { return title; } + TQString text() const { return title; } /** Returns the position of this item. */ - QPoint pos() const { return pos_; } - void setPos( const QPoint &p ) { pos_ = p; } - void setPos( int x, int y ) { pos_ = QPoint( x, y ); } + TQPoint pos() const { return pos_; } + void setPos( const TQPoint &p ) { pos_ = p; } + void setPos( int x, int y ) { pos_ = TQPoint( x, y ); } /** Returns the progress so far. This will -1 if the item is not displaying progress info. */ int progress() const { return prog; } @@ -147,27 +147,27 @@ public: // Drawing Methods // - /** Translates the QPainter then calls paintItem(). */ - void paint( QPainter *p, int x, int y ); + /** Translates the TQPainter then calls paintItem(). */ + void paint( TQPainter *p, int x, int y ); /** * Subclasses should reimplement this method to paint themselves. The painter is setup so * that the item is always at 0, 0. */ - virtual void paint( QPainter *p ); + virtual void paint( TQPainter *p ); /** Draw a standard frame for the item. */ - void paintFrame( QPainter *p ); + void paintFrame( TQPainter *p ); /** Paint the background. */ - void paintBackground( QPainter *p ); + void paintBackground( TQPainter *p ); /** Draw the label for the item. */ - void paintLabel( QPainter *p ); + void paintLabel( TQPainter *p ); - void paintIcon( QPainter *p ); + void paintIcon( TQPainter *p ); - void paintModified( QPainter *p ); + void paintModified( TQPainter *p ); public slots: void repaint(); @@ -175,8 +175,8 @@ public slots: void update(); void setActive( bool yes ); - void setText( const QString &title ); - void setIcon( const QPixmap &icon ); + void setText( const TQString &title ); + void setIcon( const TQPixmap &icon ); void setProgress( int percent ); void setShowFrame( bool yes ); void setModified( bool yes ); @@ -206,43 +206,43 @@ public slots: virtual void dragOverAction() {} signals: - void leftButtonClicked( QMouseEvent *ev ); - void middleButtonClicked( QMouseEvent *ev ); - void rightButtonClicked( QMouseEvent *ev ); + void leftButtonClicked( TQMouseEvent *ev ); + void middleButtonClicked( TQMouseEvent *ev ); + void rightButtonClicked( TQMouseEvent *ev ); protected: KasResources *resources() { return kas->resources(); } /** Gets the font metrics from the parent. */ - QFontMetrics fontMetrics() const { return kas->fontMetrics(); } + TQFontMetrics fontMetrics() const { return kas->fontMetrics(); } /** Gets the color group from the parent. */ - const QColorGroup &colorGroup() const { return kas->colorGroup(); } + const TQColorGroup &colorGroup() const { return kas->colorGroup(); } /** Factory method that creates a popup widget for the item. */ virtual KasPopup *createPopup(); /** Draw a label with an arrow, the parameters specify the position and size of the arrow. */ - void paintArrowLabel( QPainter *p, int arrowSize, bool arrowOnLeft ); + void paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft ); /** Paints a progress graph. */ - void paintProgress( QPainter *p, int percent ); + void paintProgress( TQPainter *p, int percent ); - void paintStateIcon( QPainter *p, uint state ); + void paintStateIcon( TQPainter *p, uint state ); - void paintAttention( QPainter *p ); + void paintAttention( TQPainter *p ); - void paintAnimation( QPainter *p ); + void paintAnimation( TQPainter *p ); // // Event Handlers // /** Called when the item receives a mouse event. */ - virtual void mousePressEvent( QMouseEvent * ) {} + virtual void mousePressEvent( TQMouseEvent * ) {} /** Called when the item receives a mouse event. */ - virtual void mouseReleaseEvent( QMouseEvent * ); + virtual void mouseReleaseEvent( TQMouseEvent * ); /** Called when the mouse enters the item. */ virtual void mouseEnter(); @@ -258,13 +258,13 @@ protected: private: KasBar *kas; - QGuardedPtr<KasPopup> pop; - QTimer *popupTimer; - QTimer *dragTimer; + TQGuardedPtr<KasPopup> pop; + TQTimer *popupTimer; + TQTimer *dragTimer; - QPoint pos_; - QString title; - QPixmap pix; + TQPoint pos_; + TQString title; + TQPixmap pix; bool mouseOver; bool activated; bool customPopup; diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index b0f9c23e3..2d33a068d 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -6,11 +6,11 @@ #include <sys/loadavg.h> // e.g. Solaris #endif -#include <qpainter.h> -#include <qbitmap.h> -#include <qdatetime.h> -#include <qdrawutil.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqbitmap.h> +#include <tqdatetime.h> +#include <tqdrawutil.h> +#include <tqtimer.h> #include <kdebug.h> #include <kglobal.h> @@ -33,12 +33,12 @@ KasLoadItem::KasLoadItem( KasBar *parent ) : KasItem( parent ) { - QTimer *t = new QTimer( this ); - connect( t, SIGNAL( timeout() ), SLOT( updateDisplay() ) ); + TQTimer *t = new TQTimer( this ); + connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateDisplay() ) ); t->start( 1000 ); updateDisplay(); - connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showMenuAt(QMouseEvent *) ) ); + connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasLoadItem::~KasLoadItem() @@ -63,10 +63,10 @@ void KasLoadItem::updateDisplay() valuesFifteen.pop_front(); } - setText( QString("%1").arg( valuesOne.last(), 3, 'f', 2 ) ); + setText( TQString("%1").arg( valuesOne.last(), 3, 'f', 2 ) ); } -void KasLoadItem::paint( QPainter *p ) +void KasLoadItem::paint( TQPainter *p ) { double val = valuesOne.last(); double maxValue = 1.0; @@ -95,8 +95,8 @@ void KasLoadItem::paint( QPainter *p ) KasItem::paint( p ); - QColor light = kasbar()->colorGroup().highlight(); - QColor dark = light.dark(); + TQColor light = kasbar()->colorGroup().highlight(); + TQColor dark = light.dark(); KPixmap pix; pix.resize( w, h ); @@ -110,13 +110,13 @@ void KasLoadItem::paint( QPainter *p ) } } -void KasLoadItem::showMenuAt( QMouseEvent *ev ) +void KasLoadItem::showMenuAt( TQMouseEvent *ev ) { hidePopup(); showMenuAt( ev->globalPos() ); } -void KasLoadItem::showMenuAt( QPoint p ) +void KasLoadItem::showMenuAt( TQPoint p ) { mouseLeave(); kasbar()->updateMouseOver(); diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h index 527a85abc..ba2fd5ff4 100644 --- a/kicker/extensions/kasbar/kasloaditem.h +++ b/kicker/extensions/kasbar/kasloaditem.h @@ -19,17 +19,17 @@ public: KasLoadItem( KasBar *parent ); virtual ~KasLoadItem(); - void paint( QPainter *p ); + void paint( TQPainter *p ); public slots: void updateDisplay(); - void showMenuAt( QMouseEvent *ev ); - void showMenuAt( QPoint p ); + void showMenuAt( TQMouseEvent *ev ); + void showMenuAt( TQPoint p ); private: - QValueList<double> valuesOne; - QValueList<double> valuesFive; - QValueList<double> valuesFifteen; + TQValueList<double> valuesOne; + TQValueList<double> valuesFive; + TQValueList<double> valuesFifteen; }; #endif // KASLOADITEM_H diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 4407f2f48..7538dfbb2 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -51,7 +51,7 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include <qapplication.h> +#include <tqapplication.h> #include "kasitem.h" #include "kasbar.h" @@ -60,7 +60,7 @@ #include "kaspopup.moc" KasPopup::KasPopup( KasItem *item, const char *name ) - : QHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), + : TQHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), item_( item ), kasbar_( item->kasbar() ) { @@ -79,17 +79,17 @@ void KasPopup::show() { emit aboutToShow(); positionSelf(); - QWidget::show(); + TQWidget::show(); emit shown(); } -QPoint KasPopup::calcPosition( KasItem *item, int w, int h ) +TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) { KasBar *kasbar = item->kasbar(); - QPoint pos = kasbar->itemPos( item ); + TQPoint pos = kasbar->itemPos( item ); if ( ( pos.x() < 0 ) && ( pos.y() < 0 ) ) - return QPoint(); + return TQPoint(); pos = kasbar->mapToGlobal( pos ); int x = pos.x(); @@ -114,7 +114,7 @@ QPoint KasPopup::calcPosition( KasItem *item, int w, int h ) y = y - h + kasbar->itemExtent(); } - return QPoint( x, y ); + return TQPoint( x, y ); } diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h index 11c024782..811202b62 100644 --- a/kicker/extensions/kasbar/kaspopup.h +++ b/kicker/extensions/kasbar/kaspopup.h @@ -56,8 +56,8 @@ #ifndef KASPOPUP_H #define KASPOPUP_H -#include <qguardedptr.h> -#include <qhbox.h> +#include <tqguardedptr.h> +#include <tqhbox.h> #include <kpixmap.h> #include "kasitem.h" @@ -81,7 +81,7 @@ public: KasItem *item() const { return item_; } KasBar *kasbar() const { return kasbar_; } - static QPoint calcPosition( KasItem *item, int w, int h ); + static TQPoint calcPosition( KasItem *item, int w, int h ); public slots: /** @@ -98,7 +98,7 @@ signals: void shown(); private: - QGuardedPtr<KasItem> item_; + TQGuardedPtr<KasItem> item_; KasBar *kasbar_; }; diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index d6f0cf39f..e81b0aacb 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -52,15 +52,15 @@ ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qgrid.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qslider.h> -#include <qspinbox.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqgrid.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqslider.h> +#include <tqspinbox.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <kcolorbutton.h> #include <kconfig.h> @@ -79,7 +79,7 @@ #define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) -KasPrefsDialog::KasPrefsDialog( KasTasker *kas, QWidget *parent ) +KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent ) : KDialogBase( KDialogBase::IconList, i18n("Kasbar Preferences"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, @@ -110,21 +110,21 @@ void KasPrefsDialog::itemSizeChanged( int sz ) void KasPrefsDialog::addLookPage() { - QVBox *lookPage = addVBoxPage( i18n("Appearance"), QString::null, Icon( "appearance" ) ); + TQVBox *lookPage = addVBoxPage( i18n("Appearance"), TQString::null, Icon( "appearance" ) ); // // Item size // - QGrid *itemSizeBox = new QGrid( 2, lookPage ); + TQGrid *itemSizeBox = new TQGrid( 2, lookPage ); itemSizeBox->setSpacing( spacingHint() ); - QWhatsThis::add( itemSizeBox, + TQWhatsThis::add( itemSizeBox, i18n( "Specifies the size of the task items." ) ); - QLabel *itemSizeLabel = new QLabel( i18n("Si&ze:"), itemSizeBox ); + TQLabel *itemSizeLabel = new TQLabel( i18n("Si&ze:"), itemSizeBox ); - itemSizeCombo = new QComboBox( itemSizeBox ); + itemSizeCombo = new TQComboBox( itemSizeBox ); itemSizeCombo->insertItem( i18n( "Enormous" ) ); itemSizeCombo->insertItem( i18n( "Huge" ) ); itemSizeCombo->insertItem( i18n( "Large" ) ); @@ -134,20 +134,20 @@ void KasPrefsDialog::addLookPage() itemSizeLabel->setBuddy( itemSizeCombo ); - connect( itemSizeCombo, SIGNAL( activated( int ) ), - kasbar, SLOT( setItemSize( int ) ) ); - connect( itemSizeCombo, SIGNAL( activated( int ) ), SLOT( itemSizeChanged( int ) ) ); + connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), + kasbar, TQT_SLOT( setItemSize( int ) ) ); + connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( itemSizeChanged( int ) ) ); - new QWidget( itemSizeBox ); + new TQWidget( itemSizeBox ); - customSize = new QSpinBox( 5, 1000, 1, itemSizeBox ); + customSize = new TQSpinBox( 5, 1000, 1, itemSizeBox ); customSize->setValue( kasbar->itemExtent() ); - connect( customSize, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( setItemExtent( int ) ) ); - connect( customSize, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( customSizeChanged( int ) ) ); + connect( customSize, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( setItemExtent( int ) ) ); + connect( customSize, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( customSizeChanged( int ) ) ); int sz = kasbar->itemSize(); itemSizeCombo->setCurrentItem( sz ); @@ -157,12 +157,12 @@ void KasPrefsDialog::addLookPage() // Boxes per line // - QHBox *maxBoxesBox = new QHBox( lookPage ); - QWhatsThis::add( maxBoxesBox, + TQHBox *maxBoxesBox = new TQHBox( lookPage ); + TQWhatsThis::add( maxBoxesBox, i18n( "Specifies the maximum number of items that should be placed in a line " "before starting a new row or column. If the value is 0 then all the " "available space will be used." ) ); - QLabel *maxBoxesLabel = new QLabel( i18n("Bo&xes per line: "), maxBoxesBox ); + TQLabel *maxBoxesLabel = new TQLabel( i18n("Bo&xes per line: "), maxBoxesBox ); KConfig *conf = kasbar->config(); if ( conf ) @@ -171,273 +171,273 @@ void KasPrefsDialog::addLookPage() conf ? conf->readNumEntry( "MaxBoxes", 0 ) : 11, 10, maxBoxesBox, "maxboxes" ); - connect( maxBoxesSpin, SIGNAL( valueChanged( int ) ), kasbar, SLOT( setMaxBoxes( int ) ) ); + connect( maxBoxesSpin, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setMaxBoxes( int ) ) ); maxBoxesLabel->setBuddy( maxBoxesSpin ); // // Mode // - detachedCheck = new QCheckBox( i18n("&Detach from screen edge"), lookPage ); - QWhatsThis::add( detachedCheck, i18n( "Detaches the bar from the screen edge and makes it draggable." ) ); + detachedCheck = new TQCheckBox( i18n("&Detach from screen edge"), lookPage ); + TQWhatsThis::add( detachedCheck, i18n( "Detaches the bar from the screen edge and makes it draggable." ) ); detachedCheck->setEnabled( !kasbar->isStandAlone() ); detachedCheck->setChecked( kasbar->isDetached() ); - connect( detachedCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setDetached(bool) ) ); + connect( detachedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setDetached(bool) ) ); - (void) new QWidget( lookPage, "spacer" ); - (void) new QWidget( lookPage, "spacer" ); - (void) new QWidget( lookPage, "spacer" ); + (void) new TQWidget( lookPage, "spacer" ); + (void) new TQWidget( lookPage, "spacer" ); + (void) new TQWidget( lookPage, "spacer" ); } void KasPrefsDialog::addBackgroundPage() { - QVBox *bgPage = addVBoxPage( i18n("Background"), QString::null, Icon( "background" ) ); + TQVBox *bgPage = addVBoxPage( i18n("Background"), TQString::null, Icon( "background" ) ); - transCheck = new QCheckBox( i18n("Trans&parent"), bgPage ); - QWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) ); + transCheck = new TQCheckBox( i18n("Trans&parent"), bgPage ); + TQWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) ); transCheck->setChecked( kasbar->isTransparent() ); - connect( transCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setTransparent(bool) ) ); + connect( transCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTransparent(bool) ) ); - tintCheck = new QCheckBox( i18n("Enable t&int"), bgPage ); - QWhatsThis::add( tintCheck, + tintCheck = new TQCheckBox( i18n("Enable t&int"), bgPage ); + TQWhatsThis::add( tintCheck, i18n( "Enables tinting the background that shows through in transparent mode." ) ); tintCheck->setChecked( kasbar->hasTint() ); - connect( tintCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setTint(bool) ) ); + connect( tintCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTint(bool) ) ); - QHBox *tintColBox = new QHBox( bgPage ); - QWhatsThis::add( tintColBox, + TQHBox *tintColBox = new TQHBox( bgPage ); + TQWhatsThis::add( tintColBox, i18n( "Specifies the color used for the background tint." ) ); - connect( tintCheck, SIGNAL( toggled(bool) ), tintColBox, SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintColBox, TQT_SLOT( setEnabled(bool) ) ); tintColBox->setEnabled( kasbar->hasTint() ); - QLabel *tintLabel = new QLabel( i18n("Tint &color:"), tintColBox ); + TQLabel *tintLabel = new TQLabel( i18n("Tint &color:"), tintColBox ); tintButton = new KColorButton( kasbar->tintColor(), tintColBox ); - connect( tintButton, SIGNAL( changed( const QColor & ) ), - kasbar, SLOT( setTintColor( const QColor & ) ) ); + connect( tintButton, TQT_SIGNAL( changed( const TQColor & ) ), + kasbar, TQT_SLOT( setTintColor( const TQColor & ) ) ); tintLabel->setBuddy( tintButton ); - QHBox *tintAmtBox = new QHBox( bgPage ); - QWhatsThis::add( tintAmtBox, + TQHBox *tintAmtBox = new TQHBox( bgPage ); + TQWhatsThis::add( tintAmtBox, i18n( "Specifies the strength of the background tint." ) ); - connect( tintCheck, SIGNAL( toggled(bool) ), tintAmtBox, SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintAmtBox, TQT_SLOT( setEnabled(bool) ) ); tintAmtBox->setEnabled( kasbar->hasTint() ); - QLabel *tintStrengthLabel = new QLabel( i18n("Tint &strength: "), tintAmtBox ); + TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox ); int percent = (int) (kasbar->tintAmount() * 100.0); - tintAmount = new QSlider( 0, 100, 1, percent, Horizontal, tintAmtBox ); + tintAmount = new TQSlider( 0, 100, 1, percent, Horizontal, tintAmtBox ); tintAmount->setTracking( true ); - connect( tintAmount, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( setTintAmount( int ) ) ); + connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( setTintAmount( int ) ) ); tintStrengthLabel->setBuddy( tintAmount ); - (void) new QWidget( bgPage, "spacer" ); - (void) new QWidget( bgPage, "spacer" ); - (void) new QWidget( bgPage, "spacer" ); + (void) new TQWidget( bgPage, "spacer" ); + (void) new TQWidget( bgPage, "spacer" ); + (void) new TQWidget( bgPage, "spacer" ); } void KasPrefsDialog::addThumbsPage() { - QVBox *thumbsPage = addVBoxPage( i18n("Thumbnails"), QString::null, Icon( "icons" ) ); + TQVBox *thumbsPage = addVBoxPage( i18n("Thumbnails"), TQString::null, Icon( "icons" ) ); - thumbsCheck = new QCheckBox( i18n("Enable thu&mbnails"), thumbsPage ); - QWhatsThis::add( thumbsCheck, + thumbsCheck = new TQCheckBox( i18n("Enable thu&mbnails"), thumbsPage ); + TQWhatsThis::add( thumbsCheck, i18n( "Enables the display of a thumbnailed image of the window when " "you move your mouse pointer over an item. The thumbnails are " "approximate, and may not reflect the current window contents.\n\n" "Using this option on a slow machine may cause performance problems." ) ); thumbsCheck->setChecked( kasbar->thumbnailsEnabled() ); - connect( thumbsCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setThumbnailsEnabled(bool) ) ); + connect( thumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setThumbnailsEnabled(bool) ) ); - embedThumbsCheck = new QCheckBox( i18n("&Embed thumbnails"), thumbsPage ); + embedThumbsCheck = new TQCheckBox( i18n("&Embed thumbnails"), thumbsPage ); embedThumbsCheck->setChecked( kasbar->embedThumbnails() ); - connect( embedThumbsCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setEmbedThumbnails(bool) ) ); + connect( embedThumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setEmbedThumbnails(bool) ) ); - QHBox *thumbSizeBox = new QHBox( thumbsPage ); - QWhatsThis::add( thumbSizeBox, + TQHBox *thumbSizeBox = new TQHBox( thumbsPage ); + TQWhatsThis::add( thumbSizeBox, i18n( "Controls the size of the window thumbnails. Using large sizes may " "cause performance problems." ) ); - QLabel *thumbSizeLabel = new QLabel( i18n("Thumbnail &size: "), thumbSizeBox ); + TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox ); int percent = (int) (kasbar->thumbnailSize() * 100.0); - thumbSizeSlider = new QSlider( 0, 100, 1, percent, Horizontal, thumbSizeBox ); - connect( thumbSizeSlider, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( setThumbnailSize( int ) ) ); + thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Horizontal, thumbSizeBox ); + connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( setThumbnailSize( int ) ) ); thumbSizeLabel->setBuddy( thumbSizeSlider ); - QHBox *thumbUpdateBox = new QHBox( thumbsPage ); + TQHBox *thumbUpdateBox = new TQHBox( thumbsPage ); thumbUpdateBox->setSpacing( spacingHint() ); - QWhatsThis::add( thumbUpdateBox, + TQWhatsThis::add( thumbUpdateBox, i18n( "Controls the frequency with which the thumbnail of the active window " "is updated. If the value is 0 then no updates will be performed.\n\n" "Using small values may cause performance problems on slow machines." ) ); - QLabel *thumbUpdateLabel = new QLabel( i18n("&Update thumbnail every: "), thumbUpdateBox ); - thumbUpdateSpin = new QSpinBox( 0, 1000, 1, thumbUpdateBox ); + TQLabel *thumbUpdateLabel = new TQLabel( i18n("&Update thumbnail every: "), thumbUpdateBox ); + thumbUpdateSpin = new TQSpinBox( 0, 1000, 1, thumbUpdateBox ); thumbUpdateSpin->setValue( kasbar->thumbnailUpdateDelay() ); - connect( thumbUpdateSpin, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( setThumbnailUpdateDelay( int ) ) ); - (void) new QLabel( i18n("seconds"), thumbUpdateBox ); + connect( thumbUpdateSpin, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( setThumbnailUpdateDelay( int ) ) ); + (void) new TQLabel( i18n("seconds"), thumbUpdateBox ); thumbUpdateLabel->setBuddy( thumbUpdateSpin ); - (void) new QWidget( thumbsPage, "spacer" ); - (void) new QWidget( thumbsPage, "spacer" ); - (void) new QWidget( thumbsPage, "spacer" ); + (void) new TQWidget( thumbsPage, "spacer" ); + (void) new TQWidget( thumbsPage, "spacer" ); + (void) new TQWidget( thumbsPage, "spacer" ); } void KasPrefsDialog::addBehavePage() { - QVBox *behavePage = addVBoxPage( i18n("Behavior"), QString::null, Icon( "window_list" ) ); + TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_list" ) ); - groupWindowsCheck = new QCheckBox( i18n("&Group windows"), behavePage ); - QWhatsThis::add( groupWindowsCheck, + groupWindowsCheck = new TQCheckBox( i18n("&Group windows"), behavePage ); + TQWhatsThis::add( groupWindowsCheck, i18n( "Enables the grouping together of related windows." ) ); groupWindowsCheck->setChecked( kasbar->groupWindows() ); - connect( groupWindowsCheck, SIGNAL( toggled(bool) ), - kasbar, SLOT( setGroupWindows(bool) ) ); + connect( groupWindowsCheck, TQT_SIGNAL( toggled(bool) ), + kasbar, TQT_SLOT( setGroupWindows(bool) ) ); - showAllWindowsCheck = new QCheckBox( i18n("Show all &windows"), behavePage ); - QWhatsThis::add( showAllWindowsCheck, + showAllWindowsCheck = new TQCheckBox( i18n("Show all &windows"), behavePage ); + TQWhatsThis::add( showAllWindowsCheck, i18n( "Enables the display of all windows, not just those on the current desktop." ) ); showAllWindowsCheck->setChecked( kasbar->showAllWindows() ); - connect( showAllWindowsCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowAllWindows(bool) ) ); + connect( showAllWindowsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAllWindows(bool) ) ); - groupInactiveCheck = new QCheckBox( i18n("&Group windows on inactive desktops"), behavePage ); - QWhatsThis::add( groupInactiveCheck, + groupInactiveCheck = new TQCheckBox( i18n("&Group windows on inactive desktops"), behavePage ); + TQWhatsThis::add( groupInactiveCheck, i18n( "Enables the grouping together of windows that are not on the current desktop." ) ); groupInactiveCheck->setChecked( kasbar->groupInactiveDesktops() ); - connect( groupInactiveCheck, SIGNAL( toggled(bool) ), - kasbar, SLOT( setGroupInactiveDesktops(bool) ) ); + connect( groupInactiveCheck, TQT_SIGNAL( toggled(bool) ), + kasbar, TQT_SLOT( setGroupInactiveDesktops(bool) ) ); - onlyShowMinimizedCheck = new QCheckBox( i18n("Only show &minimized windows"), behavePage ); - QWhatsThis::add( onlyShowMinimizedCheck, + onlyShowMinimizedCheck = new TQCheckBox( i18n("Only show &minimized windows"), behavePage ); + TQWhatsThis::add( onlyShowMinimizedCheck, i18n( "When this option is checked only minimized windows are shown in the bar. " \ "This gives Kasbar similar behavior to the icon handling in older environments " \ "like CDE or OpenLook." ) ); onlyShowMinimizedCheck->setChecked( kasbar->onlyShowMinimized() ); - connect( onlyShowMinimizedCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setOnlyShowMinimized(bool) ) ); + connect( onlyShowMinimizedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setOnlyShowMinimized(bool) ) ); - (void) new QWidget( behavePage, "spacer" ); - (void) new QWidget( behavePage, "spacer" ); + (void) new TQWidget( behavePage, "spacer" ); + (void) new TQWidget( behavePage, "spacer" ); } void KasPrefsDialog::addColorsPage() { - QVBox *colorsPage = addVBoxPage( i18n("Colors"), QString::null, Icon( "colors" ) ); + TQVBox *colorsPage = addVBoxPage( i18n("Colors"), TQString::null, Icon( "colors" ) ); // Item label colors - QGrid *group = new QGrid( 2, colorsPage ); + TQGrid *group = new TQGrid( 2, colorsPage ); - QLabel *labelPenLabel = new QLabel( i18n("Label foreground:"), group ); + TQLabel *labelPenLabel = new TQLabel( i18n("Label foreground:"), group ); labelPenButton = new KColorButton( res->labelPenColor(), group ); - connect( labelPenButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setLabelPenColor( const QColor & ) ) ); + connect( labelPenButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setLabelPenColor( const TQColor & ) ) ); labelPenLabel->setBuddy( labelPenButton ); - QLabel *labelBackgroundLabel = new QLabel( i18n("Label background:"), group ); + TQLabel *labelBackgroundLabel = new TQLabel( i18n("Label background:"), group ); labelBackgroundButton = new KColorButton( res->labelBgColor(), group ); - connect( labelBackgroundButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setLabelBgColor( const QColor & ) ) ); + connect( labelBackgroundButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setLabelBgColor( const TQColor & ) ) ); labelBackgroundLabel->setBuddy( labelBackgroundButton ); // Inactive colors - group = new QGrid( 2, colorsPage ); + group = new TQGrid( 2, colorsPage ); - QLabel *inactivePenLabel = new QLabel( i18n("Inactive foreground:"), group ); + TQLabel *inactivePenLabel = new TQLabel( i18n("Inactive foreground:"), group ); inactivePenButton = new KColorButton( res->inactivePenColor(), group ); - connect( inactivePenButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setInactivePenColor( const QColor & ) ) ); + connect( inactivePenButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setInactivePenColor( const TQColor & ) ) ); inactivePenLabel->setBuddy( inactivePenButton ); - QLabel *inactiveBgLabel = new QLabel( i18n("Inactive background:"), group ); + TQLabel *inactiveBgLabel = new TQLabel( i18n("Inactive background:"), group ); inactiveBgButton = new KColorButton( res->inactiveBgColor(), group ); - connect( inactiveBgButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setInactiveBgColor( const QColor & ) ) ); + connect( inactiveBgButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setInactiveBgColor( const TQColor & ) ) ); inactiveBgLabel->setBuddy( inactiveBgButton ); // Active colors - group = new QGrid( 2, colorsPage ); + group = new TQGrid( 2, colorsPage ); - QLabel *activePenLabel = new QLabel( i18n("Active foreground:"), group ); + TQLabel *activePenLabel = new TQLabel( i18n("Active foreground:"), group ); activePenButton = new KColorButton( res->activePenColor(), group ); - connect( activePenButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setActivePenColor( const QColor & ) ) ); + connect( activePenButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setActivePenColor( const TQColor & ) ) ); activePenLabel->setBuddy( activePenButton ); - QLabel *activeBgLabel = new QLabel( i18n("Active background:"), group ); + TQLabel *activeBgLabel = new TQLabel( i18n("Active background:"), group ); activeBgButton = new KColorButton( res->activeBgColor(), group ); - connect( activeBgButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setActiveBgColor( const QColor & ) ) ); + connect( activeBgButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setActiveBgColor( const TQColor & ) ) ); activeBgLabel->setBuddy( activeBgButton ); - group = new QGrid( 2, colorsPage ); + group = new TQGrid( 2, colorsPage ); - QLabel *progressLabel = new QLabel( i18n("&Progress color:"), group ); + TQLabel *progressLabel = new TQLabel( i18n("&Progress color:"), group ); progressButton = new KColorButton( res->progressColor(), group ); - connect( progressButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setProgressColor( const QColor & ) ) ); + connect( progressButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setProgressColor( const TQColor & ) ) ); progressLabel->setBuddy( progressButton ); - QLabel *attentionLabel = new QLabel( i18n("&Attention color:"), group ); + TQLabel *attentionLabel = new TQLabel( i18n("&Attention color:"), group ); attentionButton = new KColorButton( res->attentionColor(), group ); - connect( attentionButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setAttentionColor( const QColor & ) ) ); + connect( attentionButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setAttentionColor( const TQColor & ) ) ); attentionLabel->setBuddy( attentionButton ); - (void) new QWidget( colorsPage, "spacer" ); + (void) new TQWidget( colorsPage, "spacer" ); } void KasPrefsDialog::addIndicatorsPage() { - QVBox *indicatorsPage = addVBoxPage( i18n("Indicators"), QString::null, Icon( "bell" ) ); + TQVBox *indicatorsPage = addVBoxPage( i18n("Indicators"), TQString::null, Icon( "bell" ) ); - (void) new QWidget( indicatorsPage, "spacer" ); - (void) new QWidget( indicatorsPage, "spacer" ); + (void) new TQWidget( indicatorsPage, "spacer" ); + (void) new TQWidget( indicatorsPage, "spacer" ); } void KasPrefsDialog::addAdvancedPage() { - QVBox *advancedPage = addVBoxPage( i18n("Advanced"), QString::null, Icon( "misc" ) ); + TQVBox *advancedPage = addVBoxPage( i18n("Advanced"), TQString::null, Icon( "misc" ) ); // Startup notifier - notifierCheck = new QCheckBox( i18n("Enable &startup notifier"), advancedPage ); - QWhatsThis::add( notifierCheck, + notifierCheck = new TQCheckBox( i18n("Enable &startup notifier"), advancedPage ); + TQWhatsThis::add( notifierCheck, i18n( "Enables the display of tasks that are starting but have not yet " "created a window." ) ); notifierCheck->setChecked( kasbar->notifierEnabled() ); - connect( notifierCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setNotifierEnabled(bool) ) ); + connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) ); // Status advanced - modifiedCheck = new QCheckBox( i18n("Enable &modified indicator"), advancedPage ); - QWhatsThis::add( modifiedCheck, + modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage ); + TQWhatsThis::add( modifiedCheck, i18n( "Enables the display of a floppy disk state icon for windows containing " "a modified document." ) ); modifiedCheck->setChecked( kasbar->showModified() ); - connect( modifiedCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowModified(bool) ) ); + connect( modifiedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowModified(bool) ) ); - progressCheck = new QCheckBox( i18n("Enable &progress indicator"), advancedPage ); - QWhatsThis::add( progressCheck, + progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage ); + TQWhatsThis::add( progressCheck, i18n( "Enables the display of a progress bar in the label of windows show " "are progress indicators." ) ); progressCheck->setChecked( kasbar->showProgress() ); - connect( progressCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowProgress(bool) ) ); + connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) ); - attentionCheck = new QCheckBox( i18n("Enable &attention indicator"), advancedPage ); - QWhatsThis::add( attentionCheck, + attentionCheck = new TQCheckBox( i18n("Enable &attention indicator"), advancedPage ); + TQWhatsThis::add( attentionCheck, i18n( "Enables the display of an icon that indicates a window that needs attention." ) ); attentionCheck->setChecked( kasbar->showAttention() ); - connect( attentionCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowAttention(bool) ) ); + connect( attentionCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAttention(bool) ) ); - inactiveFramesCheck = new QCheckBox( i18n("Enable frames for inactive items"), advancedPage ); - QWhatsThis::add( inactiveFramesCheck, + inactiveFramesCheck = new TQCheckBox( i18n("Enable frames for inactive items"), advancedPage ); + TQWhatsThis::add( inactiveFramesCheck, i18n( "Enables frames around inactive items, if you want the bar to disappear into " \ "the background you should probably uncheck this option." ) ); inactiveFramesCheck->setChecked( kasbar->paintInactiveFrames() ); - connect( inactiveFramesCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setPaintInactiveFrames(bool) ) ); + connect( inactiveFramesCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setPaintInactiveFrames(bool) ) ); - (void) new QWidget( advancedPage, "spacer" ); - (void) new QWidget( advancedPage, "spacer" ); + (void) new TQWidget( advancedPage, "spacer" ); + (void) new TQWidget( advancedPage, "spacer" ); } void KasPrefsDialog::customSizeChanged ( int value ) @@ -458,11 +458,11 @@ void KasPrefsDialog::accept() conf->sync(); } - QDialog::accept(); + TQDialog::accept(); } void KasPrefsDialog::reject() { kasbar->readConfig(); - QDialog::reject(); + TQDialog::reject(); } diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h index 8c6bb3200..c8faeb317 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.h +++ b/kicker/extensions/kasbar/kasprefsdlg.h @@ -79,7 +79,7 @@ class KasPrefsDialog : public KDialogBase Q_OBJECT public: - KasPrefsDialog( KasTasker *kas, QWidget *parent=0 ); + KasPrefsDialog( KasTasker *kas, TQWidget *parent=0 ); ~KasPrefsDialog(); void addLookPage(); @@ -102,27 +102,27 @@ private slots: private: - QComboBox *itemSizeCombo; - QSpinBox *customSize; - QCheckBox *transCheck; - QCheckBox *tintCheck; + TQComboBox *itemSizeCombo; + TQSpinBox *customSize; + TQCheckBox *transCheck; + TQCheckBox *tintCheck; KColorButton *tintButton; - QSlider *tintAmount; - QCheckBox *thumbsCheck; - QCheckBox *embedThumbsCheck; - QSlider *thumbSizeSlider; - QSpinBox *thumbUpdateSpin; - QCheckBox *notifierCheck; - QCheckBox *modifiedCheck; - QCheckBox *progressCheck; - QCheckBox *showAllWindowsCheck; - QCheckBox *onlyShowMinimizedCheck; + TQSlider *tintAmount; + TQCheckBox *thumbsCheck; + TQCheckBox *embedThumbsCheck; + TQSlider *thumbSizeSlider; + TQSpinBox *thumbUpdateSpin; + TQCheckBox *notifierCheck; + TQCheckBox *modifiedCheck; + TQCheckBox *progressCheck; + TQCheckBox *showAllWindowsCheck; + TQCheckBox *onlyShowMinimizedCheck; KIntSpinBox *maxBoxesSpin; - QCheckBox *detachedCheck; - QCheckBox *groupWindowsCheck; - QCheckBox *groupInactiveCheck; - QCheckBox *attentionCheck; - QCheckBox *inactiveFramesCheck; + TQCheckBox *detachedCheck; + TQCheckBox *groupWindowsCheck; + TQCheckBox *groupInactiveCheck; + TQCheckBox *attentionCheck; + TQCheckBox *inactiveFramesCheck; KColorButton *labelPenButton; KColorButton *labelBackgroundButton; diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp index 0248642f4..78b25e8c0 100644 --- a/kicker/extensions/kasbar/kasresources.cpp +++ b/kicker/extensions/kasbar/kasresources.cpp @@ -124,7 +124,7 @@ static const char *micro_shade[]={ }; KasResources::KasResources( KasBar *parent, const char *name ) - : QObject( parent, name ? name : "kasbar_resources" ), + : TQObject( parent, name ? name : "kasbar_resources" ), kasbar( parent ), labelPenColor_( Qt::white ), labelBgColor_( Qt::black ), activePenColor_( Qt::black ), activeBgColor_( Qt::white ), @@ -138,85 +138,85 @@ KasResources::~KasResources() { } -QBitmap KasResources::minIcon() +TQBitmap KasResources::minIcon() { if ( minPix.isNull() ) { - minPix = QBitmap(8, 8, min_bits, true); + minPix = TQBitmap(8, 8, min_bits, true); minPix.setMask(minPix); } return minPix; } -QBitmap KasResources::maxIcon() +TQBitmap KasResources::maxIcon() { if ( maxPix.isNull() ) { - maxPix = QBitmap(8, 8, max_bits, true); + maxPix = TQBitmap(8, 8, max_bits, true); maxPix.setMask(maxPix); } return maxPix; } -QBitmap KasResources::shadeIcon() +TQBitmap KasResources::shadeIcon() { if ( shadePix.isNull() ) { - shadePix = QBitmap(8, 8, shade_bits, true); + shadePix = TQBitmap(8, 8, shade_bits, true); shadePix.setMask(shadePix); } return shadePix; } -QBitmap KasResources::attentionIcon() +TQBitmap KasResources::attentionIcon() { if ( attentionPix.isNull() ) { - attentionPix = QBitmap( 8, 8, attention_bits, true ); + attentionPix = TQBitmap( 8, 8, attention_bits, true ); attentionPix.setMask( attentionPix ); } return attentionPix; } -QPixmap KasResources::modifiedIcon() +TQPixmap KasResources::modifiedIcon() { if ( modifiedPix.isNull() ) - modifiedPix = QPixmap( tiny_floppy ); + modifiedPix = TQPixmap( tiny_floppy ); return modifiedPix; } -QPixmap KasResources::microShadeIcon() +TQPixmap KasResources::microShadeIcon() { if ( microShadePix.isNull() ) - microShadePix = QPixmap( micro_shade ); + microShadePix = TQPixmap( micro_shade ); return microShadePix; } -QPixmap KasResources::microMaxIcon() +TQPixmap KasResources::microMaxIcon() { if ( microMaxPix.isNull() ) - microMaxPix = QPixmap( micro_max ); + microMaxPix = TQPixmap( micro_max ); return microMaxPix; } -QPixmap KasResources::microMinIcon() +TQPixmap KasResources::microMinIcon() { if ( microMinPix.isNull() ) - microMinPix = QPixmap( micro_min ); + microMinPix = TQPixmap( micro_min ); return microMinPix; } static const int MAX_ANIMATION_FRAME=10; -QValueVector<QPixmap> KasResources::startupAnimation() +TQValueVector<TQPixmap> KasResources::startupAnimation() { if ( startupFrames_.isEmpty() ) { for ( int i = 1; i <= MAX_ANIMATION_FRAME; i++ ) { - QPixmap p( locate("data", "kicker/pics/disk" + QString::number(i) + ".png") ); + TQPixmap p( locate("data", "kicker/pics/disk" + TQString::number(i) + ".png") ); if ( !p.isNull() ) startupFrames_.append( p ); } @@ -225,7 +225,7 @@ QValueVector<QPixmap> KasResources::startupAnimation() return startupFrames_; } -void KasResources::setLabelPenColor( const QColor &color ) +void KasResources::setLabelPenColor( const TQColor &color ) { if ( labelPenColor_ == color ) return; @@ -234,7 +234,7 @@ void KasResources::setLabelPenColor( const QColor &color ) emit changed(); } -void KasResources::setLabelBgColor( const QColor &color ) +void KasResources::setLabelBgColor( const TQColor &color ) { if ( labelBgColor_ == color ) return; @@ -243,7 +243,7 @@ void KasResources::setLabelBgColor( const QColor &color ) emit changed(); } -void KasResources::setInactivePenColor( const QColor &color ) +void KasResources::setInactivePenColor( const TQColor &color ) { if ( inactivePenColor_ == color ) return; @@ -252,7 +252,7 @@ void KasResources::setInactivePenColor( const QColor &color ) emit changed(); } -void KasResources::setInactiveBgColor( const QColor &color ) +void KasResources::setInactiveBgColor( const TQColor &color ) { if ( inactiveBgColor_ == color ) return; @@ -261,7 +261,7 @@ void KasResources::setInactiveBgColor( const QColor &color ) emit changed(); } -void KasResources::setActivePenColor( const QColor &color ) +void KasResources::setActivePenColor( const TQColor &color ) { if ( activePenColor_ == color ) return; @@ -270,7 +270,7 @@ void KasResources::setActivePenColor( const QColor &color ) emit changed(); } -void KasResources::setActiveBgColor( const QColor &color ) +void KasResources::setActiveBgColor( const TQColor &color ) { if ( activeBgColor_ == color ) return; @@ -279,7 +279,7 @@ void KasResources::setActiveBgColor( const QColor &color ) emit changed(); } -void KasResources::setProgressColor( const QColor &color ) +void KasResources::setProgressColor( const TQColor &color ) { if ( progressColor_ == color ) return; @@ -288,7 +288,7 @@ void KasResources::setProgressColor( const QColor &color ) emit changed(); } -void KasResources::setAttentionColor( const QColor &color ) +void KasResources::setAttentionColor( const TQColor &color ) { if ( attentionColor_ == color ) return; diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h index 44048bcc3..cda153c30 100644 --- a/kicker/extensions/kasbar/kasresources.h +++ b/kicker/extensions/kasbar/kasresources.h @@ -57,14 +57,14 @@ #ifndef KASRESOURCES_H #define KASRESOURCES_H -#include <qbitmap.h> -#include <qcolor.h> -#include <qbrush.h> -#include <qpen.h> +#include <tqbitmap.h> +#include <tqcolor.h> +#include <tqbrush.h> +#include <tqpen.h> #include <kpixmap.h> -#include <qobject.h> -#include <qvaluevector.h> +#include <tqobject.h> +#include <tqvaluevector.h> class KasBar; @@ -81,39 +81,39 @@ public: KasResources( KasBar *parent, const char *name=0 ); virtual ~KasResources(); - QColor labelPenColor() const { return labelPenColor_; } - QColor labelBgColor() const { return labelBgColor_; } - QColor inactivePenColor() const { return inactivePenColor_; } - QColor inactiveBgColor() const { return inactiveBgColor_; } - QColor activePenColor() const { return activePenColor_; } - QColor activeBgColor() const { return activeBgColor_; } + TQColor labelPenColor() const { return labelPenColor_; } + TQColor labelBgColor() const { return labelBgColor_; } + TQColor inactivePenColor() const { return inactivePenColor_; } + TQColor inactiveBgColor() const { return inactiveBgColor_; } + TQColor activePenColor() const { return activePenColor_; } + TQColor activeBgColor() const { return activeBgColor_; } - QColor progressColor() const { return progressColor_; } - QColor attentionColor() const { return attentionColor_; } + TQColor progressColor() const { return progressColor_; } + TQColor attentionColor() const { return attentionColor_; } /** Accessor for the min icon (singleton). */ - QBitmap minIcon(); + TQBitmap minIcon(); /** Accessor for the max icon (singleton). */ - QBitmap maxIcon(); + TQBitmap maxIcon(); /** Accessor for the shade icon (singleton). */ - QBitmap shadeIcon(); + TQBitmap shadeIcon(); /** Accessor for the attention icon (singleton). */ - QBitmap attentionIcon(); + TQBitmap attentionIcon(); /** Accessor for the modified icon (singleton). */ - QPixmap modifiedIcon(); + TQPixmap modifiedIcon(); /** Accessor for the micro min icon (singleton). */ - QPixmap microMinIcon(); + TQPixmap microMinIcon(); /** Accessor for the micro max icon (singleton). */ - QPixmap microMaxIcon(); + TQPixmap microMaxIcon(); /** Accessor for the micro shade icon (singleton). */ - QPixmap microShadeIcon(); + TQPixmap microShadeIcon(); /** Accessor used by items to get the active bg fill. */ KPixmap activeBg(); @@ -121,18 +121,18 @@ public: /** Accessor used by items to get the inactive bg fill. */ KPixmap inactiveBg(); - QValueVector<QPixmap> startupAnimation(); + TQValueVector<TQPixmap> startupAnimation(); public slots: - void setLabelPenColor( const QColor &color ); - void setLabelBgColor( const QColor &color ); - void setInactivePenColor( const QColor &color ); - void setInactiveBgColor( const QColor &color ); - void setActivePenColor( const QColor &color ); - void setActiveBgColor( const QColor &color ); + void setLabelPenColor( const TQColor &color ); + void setLabelBgColor( const TQColor &color ); + void setInactivePenColor( const TQColor &color ); + void setInactiveBgColor( const TQColor &color ); + void setActivePenColor( const TQColor &color ); + void setActiveBgColor( const TQColor &color ); - void setProgressColor( const QColor &color ); - void setAttentionColor( const QColor &color ); + void setProgressColor( const TQColor &color ); + void setAttentionColor( const TQColor &color ); void itemSizeChanged(); @@ -142,29 +142,29 @@ signals: private: KasBar *kasbar; - QBitmap minPix; - QBitmap maxPix; - QBitmap shadePix; - QBitmap attentionPix; - QPixmap modifiedPix; - QPixmap microShadePix; - QPixmap microMaxPix; - QPixmap microMinPix; - - QColor labelPenColor_; - QColor labelBgColor_; - QColor activePenColor_; - QColor activeBgColor_; - QColor inactivePenColor_; - QColor inactiveBgColor_; - - QColor progressColor_; - QColor attentionColor_; + TQBitmap minPix; + TQBitmap maxPix; + TQBitmap shadePix; + TQBitmap attentionPix; + TQPixmap modifiedPix; + TQPixmap microShadePix; + TQPixmap microMaxPix; + TQPixmap microMinPix; + + TQColor labelPenColor_; + TQColor labelBgColor_; + TQColor activePenColor_; + TQColor activeBgColor_; + TQColor inactivePenColor_; + TQColor inactiveBgColor_; + + TQColor progressColor_; + TQColor attentionColor_; KPixmap actBg; KPixmap inactBg; - QValueVector<QPixmap> startupFrames_; + TQValueVector<TQPixmap> startupFrames_; }; #endif // KASRESOURCES_H diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 334edc836..53d823430 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -51,10 +51,10 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include <qpainter.h> -#include <qbitmap.h> -#include <qdrawutil.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqbitmap.h> +#include <tqdrawutil.h> +#include <tqtimer.h> #include <kdebug.h> #include <kglobal.h> @@ -79,8 +79,8 @@ KasStartupItem::KasStartupItem( KasBar *parent, Startup::Ptr startup ) setShowFrame( false ); setAnimation( resources()->startupAnimation() ); - aniTimer = new QTimer( this ); - connect( aniTimer, SIGNAL( timeout() ), SLOT( aniTimerFired() ) ); + aniTimer = new TQTimer( this ); + connect( aniTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( aniTimerFired() ) ); aniTimer->start( 100 ); } @@ -88,12 +88,12 @@ KasStartupItem::~KasStartupItem() { } -QPixmap KasStartupItem::icon() const +TQPixmap KasStartupItem::icon() const { /** * This icon stuff should all be handled by the task manager api, but isn't yet. */ - QPixmap pixmap; + TQPixmap pixmap; switch( kasbar()->itemSize() ) { case KasBar::Small: @@ -143,11 +143,11 @@ void KasStartupItem::aniTimerFired() advanceAnimation(); } -void KasStartupItem::paint( QPainter *p ) +void KasStartupItem::paint( TQPainter *p ) { p->save(); - p->setClipRect( 0, 0, extent(), extent(), QPainter::CoordPainter ); + p->setClipRect( 0, 0, extent(), extent(), TQPainter::CoordPainter ); p->translate( extent()/2, extent()/2 ); p->rotate( 9.0L * frame ); p->scale( 0.7L, 0.7L ); diff --git a/kicker/extensions/kasbar/kasstartupitem.h b/kicker/extensions/kasbar/kasstartupitem.h index b8019f337..b3de4765e 100644 --- a/kicker/extensions/kasbar/kasstartupitem.h +++ b/kicker/extensions/kasbar/kasstartupitem.h @@ -57,8 +57,8 @@ #ifndef KASSTARTUPITEM_H #define KASSTARTUPITEM_H -#include <qpixmap.h> -#include <qstring.h> +#include <tqpixmap.h> +#include <tqstring.h> #include "kasitem.h" class Startup; @@ -76,20 +76,20 @@ public: KasStartupItem( KasBar *parent, Startup::Ptr startup ); virtual ~KasStartupItem(); - QPixmap icon() const; + TQPixmap icon() const; Startup::Ptr startup() const { return startup_; } /** * Reimplemented to paint the item. */ - virtual void paint( QPainter *p ); + virtual void paint( TQPainter *p ); protected slots: void aniTimerFired(); private: Startup::Ptr startup_; - QTimer *aniTimer; + TQTimer *aniTimer; int frame; }; diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 9c93db56c..a087f40ff 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -51,8 +51,8 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include <qapplication.h> -#include <qtimer.h> +#include <tqapplication.h> +#include <tqtimer.h> #include <kactionclasses.h> #include <kconfig.h> @@ -79,7 +79,7 @@ static const int SWITCH_DESKTOPS_REGROUP_DELAY = 50; -KasTasker::KasTasker( Orientation o, QWidget* parent, const char* name, WFlags f ) +KasTasker::KasTasker( Orientation o, TQWidget* parent, const char* name, WFlags f ) : KasBar( o, parent, name, f ), menu( 0 ), conf( 0 ), @@ -102,20 +102,20 @@ KasTasker::KasTasker( Orientation o, QWidget* parent, const char* name, WFlags f loadItem(0) { setAcceptDrops( true ); - connect(TaskManager::the(), SIGNAL(taskAdded(Task::Ptr)), SLOT(addTask(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(taskRemoved(Task::Ptr)), SLOT(removeTask(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(startupAdded(Startup::Ptr)), SLOT(addStartup(Startup::Ptr))); - connect(TaskManager::the(), SIGNAL(startupRemoved(Startup::Ptr)), SLOT(removeStartup(Startup::Ptr))); - connect(TaskManager::the(), SIGNAL(desktopChanged(int)), SLOT(refreshAllLater())); -// connect( manager, SIGNAL( windowChanged( Task::Ptr ) ), SLOT( refreshAllLater() ) ); + connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), TQT_SLOT(addTask(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), TQT_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), TQT_SLOT(addStartup(Startup::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), TQT_SLOT(removeStartup(Startup::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAllLater())); +// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAllLater() ) ); - connect( this, SIGNAL( itemSizeChanged( int ) ), SLOT( refreshAll() ) ); + connect( this, TQT_SIGNAL( itemSizeChanged( int ) ), TQT_SLOT( refreshAll() ) ); - connect( this, SIGNAL( detachedPositionChanged(const QPoint &) ), SLOT( writeLayout() ) ); - connect( this, SIGNAL( directionChanged() ), SLOT( writeLayout() ) ); + connect( this, TQT_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQT_SLOT( writeLayout() ) ); + connect( this, TQT_SIGNAL( directionChanged() ), TQT_SLOT( writeLayout() ) ); } -KasTasker::KasTasker( Orientation o, KasTasker *master, QWidget* parent, const char* name, WFlags f ) +KasTasker::KasTasker( Orientation o, KasTasker *master, TQWidget* parent, const char* name, WFlags f ) : KasBar( o, master, parent, name, f ), menu( 0 ), conf( 0 ), @@ -155,27 +155,27 @@ KPopupMenu *KasTasker::contextMenu() this, "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); - connect( showAllWindowsAction, SIGNAL(toggled(bool)), SLOT(setShowAllWindows(bool)) ); - connect( this, SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, SLOT(setChecked(bool)) ); + connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); + connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); groupWindowsAction = new KToggleAction( i18n("&Group Windows"), KShortcut(), this, "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); - connect( groupWindowsAction, SIGNAL(toggled(bool)), SLOT(setGroupWindows(bool)) ); - connect( this, SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, SLOT(setChecked(bool)) ); + connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); + connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), this, "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); - connect( showClockAction, SIGNAL(toggled(bool)), SLOT(setShowClock(bool)) ); - connect( this, SIGNAL(showClockChanged(bool)), showClockAction, SLOT(setChecked(bool)) ); + connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); + connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), this, "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); - connect( showLoadAction, SIGNAL(toggled(bool)), SLOT(setShowLoad(bool)) ); - connect( this, SIGNAL(showLoadChanged(bool)), showLoadAction, SLOT(setChecked(bool)) ); + connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); + connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); menu->insertSeparator(); @@ -183,38 +183,38 @@ KPopupMenu *KasTasker::contextMenu() toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), this, "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); - connect( toggleDetachedAction, SIGNAL(toggled(bool)), SLOT(setDetached(bool)) ); - connect( this, SIGNAL(detachedChanged(bool)), toggleDetachedAction, SLOT(setChecked(bool)) ); + connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); + connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); } - rotateBarAction = new KAction( i18n("R&otate Bar"), QString("rotate"), KShortcut(), - this, SLOT( toggleOrientation() ), + rotateBarAction = new KAction( i18n("R&otate Bar"), TQString("rotate"), KShortcut(), + this, TQT_SLOT( toggleOrientation() ), this, "rotate_bar" ); rotateBarAction->plug( menu ); - connect( this, SIGNAL(detachedChanged(bool)), rotateBarAction, SLOT(setEnabled(bool)) ); - connect( rotateBarAction, SIGNAL(activated()), SLOT(writeConfigLater()) ); + connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); + connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) ); - menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, SLOT( refreshAll() ) ); + menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) ); menu->insertSeparator(); - menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, SLOT( showPreferences() ) ); + menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) ); // Help menu KPopupMenu *help = new KPopupMenu; - help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, SLOT( showAbout() ) ); + help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, SLOT( quit() ) ); + menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, TQT_SLOT( quit() ) ); } } return menu; } -KasTasker *KasTasker::createChildBar( Orientation o, QWidget *parent, const char *name ) +KasTasker *KasTasker::createChildBar( Orientation o, TQWidget *parent, const char *name ) { KasTasker *child = new KasTasker( o, this, parent, name ); child->conf = this->conf; @@ -269,9 +269,9 @@ void KasTasker::addTask( Task::Ptr t ) // // Ensure the window manager knows where we put the icon. // - QPoint p = mapToGlobal( itemPos( item ) ); - QSize s( itemExtent(), itemExtent() ); - t->publishIconGeometry( QRect( p, s ) ); + TQPoint p = mapToGlobal( itemPos( item ) ); + TQSize s( itemExtent(), itemExtent() ); + t->publishIconGeometry( TQRect( p, s ) ); } } @@ -294,7 +294,7 @@ KasGroupItem *KasTasker::convertToGroup( Task::Ptr t ) removeTask( t ); insert( i, gi ); - connect(TaskManager::the(), SIGNAL(taskRemoved(Task::Ptr)), gi, SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), gi, TQT_SLOT(removeTask(Task::Ptr))); return gi; } @@ -371,7 +371,7 @@ void KasTasker::refreshAll() void KasTasker::refreshAllLater() { - QTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, SLOT( refreshAll() ) ); + TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQT_SLOT( refreshAll() ) ); } void KasTasker::refreshIconGeometry() @@ -380,9 +380,9 @@ void KasTasker::refreshIconGeometry() if ( itemAt(i)->inherits( "KasTaskItem" ) ) { KasTaskItem *curr = static_cast<KasTaskItem *> (itemAt( i )); - QPoint p = mapToGlobal( itemPos( curr ) ); - QSize s( itemExtent(), itemExtent() ); - curr->task()->publishIconGeometry( QRect( p, s ) ); + TQPoint p = mapToGlobal( itemPos( curr ) ); + TQSize s( itemExtent(), itemExtent() ); + curr->task()->publishIconGeometry( TQRect( p, s ) ); } } } @@ -432,12 +432,12 @@ void KasTasker::setShowAllWindows( bool enable ) showAllWindows_ = enable; refreshAll(); if ( !showAllWindows_ ) { - connect(TaskManager::the(), SIGNAL(desktopChanged(int)), SLOT(refreshAll())); -// connect( manager, SIGNAL( windowChanged( Task::Ptr ) ), SLOT( refreshAll() ) ); + connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAll())); +// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAll() ) ); } else { - disconnect(TaskManager::the(), SIGNAL(desktopChanged(int)), this, SLOT(refreshAll())); -// disconnect( manager, SIGNAL( windowChanged( Task::Ptr ) ), this, SLOT( refreshAll() ) ); + disconnect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), this, TQT_SLOT(refreshAll())); +// disconnect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), this, TQT_SLOT( refreshAll() ) ); } emit showAllWindowsChanged( enable ); @@ -551,7 +551,7 @@ void KasTasker::readConfig() void KasTasker::writeConfigLater() { - QTimer::singleShot( 10, this, SLOT( writeConfig() ) ); + TQTimer::singleShot( 10, this, TQT_SLOT( writeConfig() ) ); } void KasTasker::writeConfig() @@ -634,11 +634,11 @@ void KasTasker::readConfig( KConfig *conf ) // conf->setGroup("Layout"); - setDirection( (Direction) conf->readNumEntry( "Direction", QBoxLayout::LeftToRight ) ); + setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) ); setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Horizontal ) ); setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) ); - QPoint pos(100, 100); + TQPoint pos(100, 100); setDetachedPosition( conf->readPointEntry( "DetachedPosition", &pos ) ); setDetached( conf->readBoolEntry( "Detached", false ) ); diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index 1379c8d8c..b90e4ddeb 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -91,7 +91,7 @@ class KDE_EXPORT KasTasker : public KasBar public: /** Create a KasTasker widget. */ - KasTasker( Orientation o, QWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + KasTasker( Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); /** * Create a KasTasker widget that is slaved to another KasTasker. The @@ -99,7 +99,7 @@ public: * not connect to the signals of the TaskManager. */ KasTasker( Orientation o, KasTasker *master, - QWidget *parent=0, const char *name=0, WFlags f=0 ); + TQWidget *parent=0, const char *name=0, WFlags f=0 ); /** Cleans up. */ virtual ~KasTasker(); @@ -107,7 +107,7 @@ public: /** Factory method that returns the default menu for items in the bar. */ virtual KPopupMenu *contextMenu(); - virtual KasTasker *createChildBar( Orientation o, QWidget *parent, const char *name=0 ); + virtual KasTasker *createChildBar( Orientation o, TQWidget *parent, const char *name=0 ); /** * Returns true if this is the top KasTasker. Note that it is possible for diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index d21d5ccc6..c9ec7bdd0 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -53,17 +53,17 @@ */ #include <errno.h> -#include <qbitmap.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qmetaobject.h> -#include <qpainter.h> -#include <qregexp.h> -#include <qtabwidget.h> -#include <qtextview.h> -#include <qtimer.h> -#include <qvbox.h> +#include <tqbitmap.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqmetaobject.h> +#include <tqpainter.h> +#include <tqregexp.h> +#include <tqtabwidget.h> +#include <tqtextview.h> +#include <tqtimer.h> +#include <tqvbox.h> #include <kdebug.h> #include <kdialog.h> @@ -99,17 +99,17 @@ KasTaskItem::KasTaskItem( KasTasker *parent, Task::Ptr task ) setAttention( task->demandsAttention() ); updateTask(false); - connect( task, SIGNAL( changed(bool) ), this, SLOT( updateTask(bool) ) ); - connect( task, SIGNAL( activated() ), this, SLOT( startAutoThumbnail() ) ); - connect( task, SIGNAL( deactivated() ), this, SLOT( stopAutoThumbnail() ) ); - connect( task, SIGNAL( iconChanged() ), this, SLOT( iconChanged() ) ); - connect( task, SIGNAL( thumbnailChanged() ), this, SLOT( iconChanged() ) ); + connect( task, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( updateTask(bool) ) ); + connect( task, TQT_SIGNAL( activated() ), this, TQT_SLOT( startAutoThumbnail() ) ); + connect( task, TQT_SIGNAL( deactivated() ), this, TQT_SLOT( stopAutoThumbnail() ) ); + connect( task, TQT_SIGNAL( iconChanged() ), this, TQT_SLOT( iconChanged() ) ); + connect( task, TQT_SIGNAL( thumbnailChanged() ), this, TQT_SLOT( iconChanged() ) ); - connect( this, SIGNAL(leftButtonClicked(QMouseEvent *)), SLOT(toggleActivateAction()) ); - connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showWindowMenuAt(QMouseEvent *) ) ); + connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(toggleActivateAction()) ); + connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); - attentionTimer = new QTimer( this, "attentionTimer" ); - connect( attentionTimer, SIGNAL( timeout() ), SLOT( checkAttention() ) ); + attentionTimer = new TQTimer( this, "attentionTimer" ); + connect( attentionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAttention() ) ); attentionTimer->start( CHECK_ATTENTION_DELAY ); } @@ -122,7 +122,7 @@ KasTasker *KasTaskItem::kasbar() const return static_cast<KasTasker *> (KasItem::kasbar()); } -QPixmap KasTaskItem::icon() +TQPixmap KasTaskItem::icon() { int sizes[] = { KIcon::SizeEnormous, KIcon::SizeHuge, @@ -133,11 +133,11 @@ QPixmap KasTaskItem::icon() if ( kasbar()->embedThumbnails() && task_->hasThumbnail() ) { usedIconLoader = true; - QPixmap thumb = task_->thumbnail(); - QSize sz = thumb.size(); - sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], QSize::ScaleMin ); + TQPixmap thumb = task_->thumbnail(); + TQSize sz = thumb.size(); + sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); - QImage img = thumb.convertToImage(); + TQImage img = thumb.convertToImage(); img = img.smoothScale( sz ); bool ok = thumb.convertFromImage( img ); @@ -146,7 +146,7 @@ QPixmap KasTaskItem::icon() } usedIconLoader = false; - QPixmap p = task_->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader ); + TQPixmap p = task_->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader ); if ( !p.isNull() ) return p; @@ -184,12 +184,12 @@ void KasTaskItem::updateTask(bool geometryChangeOnly) update(); } -void KasTaskItem::paint( QPainter *p ) +void KasTaskItem::paint( TQPainter *p ) { KasItem::paint( p ); KasResources *res = resources(); - QColor c = task_->isActive() ? res->activePenColor() : res->inactivePenColor(); + TQColor c = task_->isActive() ? res->activePenColor() : res->inactivePenColor(); p->setPen( c ); // @@ -203,9 +203,9 @@ void KasTaskItem::paint( QPainter *p ) && ( kas->itemSize() != KasBar::Medium ); if ( usedIconLoader && iconHasChanged && haveSpace ) { - QPixmap pix = icon(); + TQPixmap pix = icon(); int x = (extent() - 4 - pix.width()) / 2; - QPixmap overlay = task_->pixmap(); + TQPixmap overlay = task_->pixmap(); p->drawPixmap( x-4+pix.width()-overlay.width(), 18, overlay ); } @@ -226,7 +226,7 @@ void KasTaskItem::paint( QPainter *p ) // Check if we only have one desktop bool oneDesktop = (TaskManager::the()->numberOfDesktops() == 1) ? true : false; - QString deskStr; + TQString deskStr; if ( task_->isOnAllDesktops() ) deskStr = i18n( "All" ); else @@ -261,7 +261,7 @@ void KasTaskItem::toggleActivateAction() } } -void KasTaskItem::showWindowMenuAt( QMouseEvent *ev ) +void KasTaskItem::showWindowMenuAt( TQMouseEvent *ev ) { hidePopup(); showWindowMenuAt( ev->globalPos() ); @@ -294,13 +294,13 @@ void KasTaskItem::startAutoThumbnail() return; if ( kasbar()->thumbnailUpdateDelay() > 0 ) { - thumbTimer = new QTimer( this, "thumbTimer" ); - connect( thumbTimer, SIGNAL( timeout() ), SLOT( refreshThumbnail() ) ); + thumbTimer = new TQTimer( this, "thumbTimer" ); + connect( thumbTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( refreshThumbnail() ) ); thumbTimer->start( kasbar()->thumbnailUpdateDelay() * 1000 ); } - QTimer::singleShot( 200, this, SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); } void KasTaskItem::stopAutoThumbnail() @@ -322,7 +322,7 @@ void KasTaskItem::refreshThumbnail() // TODO: Check if the popup obscures the window KasItem *i = kasbar()->itemUnderMouse(); if ( i && i->isShowingPopup() ) { - QTimer::singleShot( 200, this, SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); return; } @@ -330,14 +330,14 @@ void KasTaskItem::refreshThumbnail() task_->updateThumbnail(); } -void KasTaskItem::showWindowMenuAt( QPoint p ) +void KasTaskItem::showWindowMenuAt( TQPoint p ) { TaskRMBMenu *tm = new TaskRMBMenu(task_, true, kasbar()); - tm->insertItem( i18n("To &Tray" ), this, SLOT( sendToTray() ) ); + tm->insertItem( i18n("To &Tray" ), this, TQT_SLOT( sendToTray() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); tm->insertSeparator(); - tm->insertItem( i18n("&Properties" ), this, SLOT( showPropertiesDialog() ) ); + tm->insertItem( i18n("&Properties" ), this, TQT_SLOT( showPropertiesDialog() ) ); mouseLeave(); kasbar()->updateMouseOver(); @@ -347,7 +347,7 @@ void KasTaskItem::showWindowMenuAt( QPoint p ) void KasTaskItem::sendToTray() { - QString s; + TQString s; s.setNum( task_->window() ); KProcess proc; @@ -372,7 +372,7 @@ void KasTaskItem::showPropertiesDialog() // // Create Dialog // - QDialog *dlg = new QDialog( /*kasbar()*/0L, "task_props", false ); + TQDialog *dlg = new TQDialog( /*kasbar()*/0L, "task_props", false ); // // Title @@ -385,7 +385,7 @@ void KasTaskItem::showPropertiesDialog() // // Tabbed View // - QTabWidget *tabs = new QTabWidget( dlg ); + TQTabWidget *tabs = new TQTabWidget( dlg ); tabs->addTab( createX11Props( tabs ), i18n("General") ); tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") ); @@ -399,7 +399,7 @@ void KasTaskItem::showPropertiesDialog() // // Layout Dialog // - QVBoxLayout *vbl = new QVBoxLayout( dlg, KDialog::marginHint(), KDialog::spacingHint() ); + TQVBoxLayout *vbl = new TQVBoxLayout( dlg, KDialog::marginHint(), KDialog::spacingHint() ); vbl->addWidget( title ); vbl->addWidget( tabs ); @@ -408,23 +408,23 @@ void KasTaskItem::showPropertiesDialog() } -QWidget *KasTaskItem::createTaskProps( QObject *target, QWidget *parent, bool recursive ) +TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool recursive ) { - QVBox *vb = new QVBox( parent ); + TQVBox *vb = new TQVBox( parent ); vb->setSpacing( KDialog::spacingHint() ); vb->setMargin( KDialog::marginHint() ); // Create List View KListView *taskprops = new KListView( vb, "props_view" ); - taskprops->setResizeMode( QListView::LastColumn ); + taskprops->setResizeMode( TQListView::LastColumn ); taskprops->addColumn( i18n("Property"), 0 ); taskprops->addColumn( i18n("Type"), 0 ); taskprops->addColumn( i18n("Value") ); // Create List Items - QMetaObject *mo = target->metaObject(); + TQMetaObject *mo = target->metaObject(); for ( int i = 0; i < mo->numProperties( recursive ); i++ ) { - const QMetaProperty *p = mo->property(i, recursive); + const TQMetaProperty *p = mo->property(i, recursive); (void) new KListViewItem( taskprops, p->name(), p->type(), @@ -434,17 +434,17 @@ QWidget *KasTaskItem::createTaskProps( QObject *target, QWidget *parent, bool re return vb; } -QString KasTaskItem::expandMacros( const QString &format, QObject *data ) +TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) { - QString s = format; - QRegExp re("\\$(\\w+)"); + TQString s = format; + TQRegExp re("\\$(\\w+)"); int pos = 0; while ( pos >= 0 ) { pos = re.search( s, pos ); if ( pos >= 0 ) { - QVariant val = data->property( re.cap(1).latin1() ); - QString v = val.asString(); + TQVariant val = data->property( re.cap(1).latin1() ); + TQString v = val.asString(); s.replace( pos, re.matchedLength(), v ); pos = pos + v.length(); } @@ -453,18 +453,18 @@ QString KasTaskItem::expandMacros( const QString &format, QObject *data ) return s; } -QWidget *KasTaskItem::createX11Props( QWidget *parent ) +TQWidget *KasTaskItem::createX11Props( TQWidget *parent ) { - QVBox *vb2 = new QVBox( parent ); - vb2->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Preferred ); + TQVBox *vb2 = new TQVBox( parent ); + vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); vb2->setSpacing( KDialog::spacingHint() ); vb2->setMargin( KDialog::marginHint() ); // Create View - new QLabel( i18n("General"), vb2, "view" ); - QTextView *tv = new QTextView( vb2 ); + new TQLabel( i18n("General"), vb2, "view" ); + TQTextView *tv = new TQTextView( vb2 ); - QString fmt = i18n( + TQString fmt = i18n( "<html>" "<body>" "<b>Name</b>: $name<br>" @@ -489,20 +489,20 @@ QWidget *KasTaskItem::createX11Props( QWidget *parent ) ); tv->setText( expandMacros( fmt, task_ ) ); - tv->setWordWrap( QTextEdit::WidgetWidth ); + tv->setWordWrap( TQTextEdit::WidgetWidth ); return vb2; } -QWidget *KasTaskItem::createNETProps( QWidget *parent ) +TQWidget *KasTaskItem::createNETProps( TQWidget *parent ) { - QVBox *vb3 = new QVBox( parent ); + TQVBox *vb3 = new TQVBox( parent ); vb3->setSpacing( KDialog::spacingHint() ); vb3->setMargin( KDialog::marginHint() ); // Create View - new QLabel( i18n("NET WM Specification Info"), vb3, "view" ); - new QTextView( vb3 ); + new TQLabel( i18n("NET WM Specification Info"), vb3, "view" ); + new TQTextView( vb3 ); return vb3; } diff --git a/kicker/extensions/kasbar/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h index cc7d0d188..b2b166ef5 100644 --- a/kicker/extensions/kasbar/kastaskitem.h +++ b/kicker/extensions/kasbar/kastaskitem.h @@ -57,7 +57,7 @@ #ifndef KASTASKITEM_H #define KASTASKITEM_H -#include <qpixmap.h> +#include <tqpixmap.h> #include "kasitem.h" class Task; @@ -76,10 +76,10 @@ class KasTaskItem : public KasItem KasTaskItem( KasTasker *parent, Task::Ptr task ); virtual ~KasTaskItem(); - QPixmap icon(); + TQPixmap icon(); /** Reimplemented to paint the item. */ - virtual void paint( QPainter *p ); + virtual void paint( TQPainter *p ); /** Returns the task the item is displaying. */ Task::Ptr task() const { return task_; } @@ -87,7 +87,7 @@ class KasTaskItem : public KasItem /** Returns the parent KasTasker object. */ KasTasker *kasbar() const; - QString expandMacros( const QString &format, QObject *data ); + TQString expandMacros( const TQString &format, TQObject *data ); public slots: void updateTask(bool geometryChangeOnly); @@ -101,12 +101,12 @@ public slots: void iconChanged(); void checkAttention(); - void showWindowMenuAt( QPoint pos ); + void showWindowMenuAt( TQPoint pos ); void sendToTray(); void showPropertiesDialog(); void toggleActivateAction(); - void showWindowMenuAt( QMouseEvent *ev ); + void showWindowMenuAt( TQMouseEvent *ev ); protected: /** @@ -114,9 +114,9 @@ protected: */ virtual KasPopup *createPopup(); - QWidget *createTaskProps( QObject *target, QWidget *parent=0, bool recursive=true ); - QWidget *createX11Props( QWidget *tabbed ); - QWidget *createNETProps( QWidget *tabbed ); + TQWidget *createTaskProps( TQObject *target, TQWidget *parent=0, bool recursive=true ); + TQWidget *createX11Props( TQWidget *tabbed ); + TQWidget *createNETProps( TQWidget *tabbed ); /** * Reimplemented to activate the task. @@ -125,10 +125,10 @@ protected: private: Task::Ptr task_; - QTimer *thumbTimer; + TQTimer *thumbTimer; bool usedIconLoader; bool iconHasChanged; - QTimer *attentionTimer; + TQTimer *attentionTimer; }; #endif // KASTASKITEM_H diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 91f3ecbc9..25c096a65 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -51,8 +51,8 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include <qpainter.h> -#include <qapplication.h> +#include <tqpainter.h> +#include <tqapplication.h> #include <kdebug.h> #include <kglobalsettings.h> @@ -76,7 +76,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) setFont(KGlobalSettings::generalFont()); setMouseTracking( true ); - QString text = item->task()->visibleIconicName(); + TQString text = item->task()->visibleIconicName(); if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) { titleBg.resize( width(), TITLE_HEIGHT ); @@ -94,7 +94,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) Qt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); - connect( item->task(), SIGNAL( thumbnailChanged() ), SLOT( refresh() ) ); + connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); } KasTaskPopup::~KasTaskPopup() @@ -103,7 +103,7 @@ KasTaskPopup::~KasTaskPopup() void KasTaskPopup::refresh() { - QString text = item->task()->visibleIconicName(); + TQString text = item->task()->visibleIconicName(); if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) { resize( item->task()->thumbnail().width() + 2, TITLE_HEIGHT + item->task()->thumbnail().height() + 2 ); @@ -112,12 +112,12 @@ void KasTaskPopup::refresh() update(); } -void KasTaskPopup::paintEvent( QPaintEvent * ) +void KasTaskPopup::paintEvent( TQPaintEvent * ) { - QPainter p( this ); + TQPainter p( this ); p.drawPixmap( 0, 0, titleBg ); - QString text = item->task()->visibleIconicName(); + TQString text = item->task()->visibleIconicName(); p.setPen( Qt::white ); if ( fontMetrics().width( text ) > width() - 4 ) @@ -126,7 +126,7 @@ void KasTaskPopup::paintEvent( QPaintEvent * ) else p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignCenter, text ); - QPixmap thumb = item->task()->thumbnail(); + TQPixmap thumb = item->task()->thumbnail(); if ( !thumb.isNull() ) p.drawPixmap( 1, TITLE_HEIGHT, thumb ); diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastaskpopup.h index 8118fff6c..dcdc33107 100644 --- a/kicker/extensions/kasbar/kastaskpopup.h +++ b/kicker/extensions/kasbar/kastaskpopup.h @@ -78,7 +78,7 @@ public slots: void refresh(); protected: - virtual void paintEvent( QPaintEvent * ); + virtual void paintEvent( TQPaintEvent * ); private: KasTaskItem *item; diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index a959f7f87..401c67fbd 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -22,16 +22,16 @@ #include <klocale.h> #include <kparts/part.h> #include <kparts/componentfactory.h> -#include <qlayout.h> +#include <tqlayout.h> #include <konq_historymgr.h> #include <krun.h> #include <kurl.h> -#include <qvbox.h> -#include <qcursor.h> +#include <tqvbox.h> +#include <tqcursor.h> extern "C" { - KDE_EXPORT KPanelExtension *init( QWidget *parent, const QString& configFile ) + KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue("kickersidebarextension"); KGlobal::locale()->insertCatalogue("konqueror"); @@ -42,17 +42,17 @@ extern "C" } } -SidebarExtension::SidebarExtension( const QString& configFile, +SidebarExtension::SidebarExtension( const TQString& configFile, Type type, int actions, - QWidget *parent, const char *name ) + TQWidget *parent, const char *name ) : KPanelExtension( configFile, type, actions, parent, name ),m_resizing(false),m_expandedSize(200) { kdDebug() << "SidebarExtension: Created '" << name << "', '" << configFile << "'" << endl; new KonqHistoryManager(0,"SidebarExtensionHistoryManager"); - m_layout=new QHBoxLayout(this); + m_layout=new TQHBoxLayout(this); m_layout->activate(); - m_sbWrapper=new QVBox(this); + m_sbWrapper=new TQVBox(this); KParts::ReadOnlyPart *p=KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>( "konq_sidebar", m_sbWrapper, @@ -62,19 +62,19 @@ SidebarExtension::SidebarExtension( const QString& configFile, KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p); if (be) { - connect(be,SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(be,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - m_resizeHandle=new QFrame(this); - m_resizeHandle->setFrameShape(QFrame::Panel); - m_resizeHandle->setFrameShadow(QFrame::Raised); + m_resizeHandle=new TQFrame(this); + m_resizeHandle->setFrameShape(TQFrame::Panel); + m_resizeHandle->setFrameShadow(TQFrame::Raised); m_resizeHandle->setFixedWidth(6); - m_resizeHandle->setCursor(QCursor(Qt::SizeHorCursor)); - connect(p->widget(),SIGNAL(panelHasBeenExpanded(bool)),this,SLOT(needLayoutUpdate(bool))); + m_resizeHandle->setCursor(TQCursor(Qt::SizeHorCursor)); + connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool))); needLayoutUpdate(false); m_resizeHandle->installEventFilter(this); m_resizeHandle->setMouseTracking(true); @@ -110,31 +110,31 @@ SidebarExtension::~SidebarExtension() KGlobal::locale()->removeCatalogue("konqueror"); } -bool SidebarExtension::eventFilter( QObject *, QEvent *e ) { - if (e->type()==QEvent::MouseButtonPress) { +bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { + if (e->type()==TQEvent::MouseButtonPress) { m_resizing=true; - m_x=((QMouseEvent*)e)->globalX(); + m_x=((TQMouseEvent*)e)->globalX(); return true; - } else if (e->type()==QEvent::MouseButtonRelease) { + } else if (e->type()==TQEvent::MouseButtonRelease) { m_resizing=false; m_expandedSize=topLevelWidget()->width(); needLayoutUpdate(true); return true; - } else if (e->type()==QEvent::MouseMove) { + } else if (e->type()==TQEvent::MouseMove) { if (m_resizing) { Position p=position(); if (p==Left) { - int diff=((QMouseEvent*)e)->globalX()-m_x; + int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff); - m_x=((QMouseEvent*)e)->globalX(); + m_x=((TQMouseEvent*)e)->globalX(); } } else if (p==Right) { - int diff=((QMouseEvent*)e)->globalX()-m_x; + int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff); topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y()); - m_x=((QMouseEvent*)e)->globalX(); + m_x=((TQMouseEvent*)e)->globalX(); } } return true; @@ -148,9 +148,9 @@ KPanelExtension::Position SidebarExtension::preferedPosition() const { return KPanelExtension::Left; } -QSize SidebarExtension::sizeHint(Position, QSize maxSize ) const +TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const { - return QSize(m_currentWidth,maxSize.height()); + return TQSize(m_currentWidth,maxSize.height()); } void SidebarExtension::positionChange( Position position ) { diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index a44c270ba..700f04e4a 100644 --- a/kicker/extensions/sidebar/sidebarextension.h +++ b/kicker/extensions/sidebar/sidebarextension.h @@ -29,14 +29,14 @@ class SidebarExtension : public KPanelExtension Q_OBJECT public: - SidebarExtension( const QString& configFile, + SidebarExtension( const TQString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); virtual ~SidebarExtension(); - QSize sizeHint( Position, QSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const; virtual void positionChange( Position position ); @@ -44,7 +44,7 @@ public: protected: virtual void about(); virtual void preferences(); - virtual bool eventFilter( QObject *o, QEvent *e ); + virtual bool eventFilter( TQObject *o, TQEvent *e ); protected slots: void openURLRequest( const KURL &, const KParts::URLArgs &); void needLayoutUpdate(bool); @@ -52,11 +52,11 @@ protected slots: private: int m_currentWidth; int m_x; - QFrame *m_resizeHandle; + TQFrame *m_resizeHandle; bool m_resizing; int m_expandedSize; - QHBoxLayout *m_layout; - QVBox *m_sbWrapper; + TQHBoxLayout *m_layout; + TQVBox *m_sbWrapper; }; #endif diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index a25297b39..e0deb768e 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlayout.h> -#include <qtimer.h> -#include <qwmatrix.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqwmatrix.h> #include <dcopclient.h> #include <kapplication.h> @@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelExtension* init( QWidget *parent, const QString& configFile ) + KDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue( "taskbarextension" ); return new TaskBarExtension( configFile, KPanelExtension::Stretch, @@ -50,30 +50,30 @@ extern "C" } } -TaskBarExtension::TaskBarExtension(const QString& configFile, Type type, - int actions, QWidget *parent, const char *name) +TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, + int actions, TQWidget *parent, const char *name) : KPanelExtension(configFile, type, actions, parent, name), m_bgImage(0), m_bgFilename(0), m_rootPixmap(0) { - QHBoxLayout *layout = new QHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); m_container = new TaskBarContainer(false, this); m_container->setBackgroundOrigin(AncestorOrigin); positionChange(position()); layout->addWidget(m_container); - connect(m_container, SIGNAL(containerCountChanged()), - SIGNAL(updateLayout())); + connect(m_container, TQT_SIGNAL(containerCountChanged()), + TQT_SIGNAL(updateLayout())); kapp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "configure()", false); - connect(kapp, SIGNAL(kdisplayPaletteChanged()), - SLOT(setBackgroundTheme())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + TQT_SLOT(setBackgroundTheme())); - QTimer::singleShot(0, this, SLOT(setBackgroundTheme())); + TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme())); } TaskBarExtension::~TaskBarExtension() @@ -105,7 +105,7 @@ void TaskBarExtension::positionChange( Position p ) { m_container->popupDirectionChange(KPanelApplet::Down); } - else if (QApplication::reverseLayout()) + else if (TQApplication::reverseLayout()) { m_container->popupDirectionChange(KPanelApplet::Left); } @@ -123,14 +123,14 @@ void TaskBarExtension::preferences() m_container->preferences(); } -QSize TaskBarExtension::sizeHint(Position p, QSize maxSize) const +TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const { if (p == Left || p == Right) maxSize.setWidth(sizeInPixels()); else maxSize.setHeight(sizeInPixels()); -// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, QSize )" << endl; +// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl; // kdDebug(1210) << " width: " << size.width() << endl; // kdDebug(1210) << "height: " << size.height() << endl; return m_container->sizeHint(p, maxSize); @@ -150,8 +150,8 @@ void TaskBarExtension::setBackgroundTheme() { m_rootPixmap = new KRootPixmap(this); m_rootPixmap->setCustomPainting(true); - connect(m_rootPixmap, SIGNAL(backgroundUpdated(const QPixmap&)), - SLOT(updateBackground(const QPixmap&))); + connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQT_SLOT(updateBackground(const TQPixmap&))); } else { @@ -173,7 +173,7 @@ void TaskBarExtension::setBackgroundTheme() if (KickerSettings::useBackgroundTheme()) { - QString bgFilename = locate("appdata", KickerSettings::backgroundTheme()); + TQString bgFilename = locate("appdata", KickerSettings::backgroundTheme()); if (m_bgFilename != bgFilename) { @@ -183,13 +183,13 @@ void TaskBarExtension::setBackgroundTheme() if (!m_bgImage.isNull()) { - QImage bgImage = m_bgImage; + TQImage bgImage = m_bgImage; if (orientation() == Vertical) { if (KickerSettings::rotateBackground()) { - QWMatrix matrix; + TQWMatrix matrix; matrix.rotate(position() == KPanelExtension::Left ? 90: 270); bgImage = bgImage.xForm(matrix); } @@ -201,7 +201,7 @@ void TaskBarExtension::setBackgroundTheme() if (position() == KPanelExtension::Top && KickerSettings::rotateBackground()) { - QWMatrix matrix; + TQWMatrix matrix; matrix.rotate(180); bgImage = bgImage.xForm(matrix); } @@ -220,16 +220,16 @@ void TaskBarExtension::setBackgroundTheme() m_container->setBackground(); } -void TaskBarExtension::updateBackground(const QPixmap& bgImage) +void TaskBarExtension::updateBackground(const TQPixmap& bgImage) { unsetPalette(); setPaletteBackgroundPixmap(bgImage); m_container->setBackground(); } -void TaskBarExtension::resizeEvent(QResizeEvent *e) +void TaskBarExtension::resizeEvent(TQResizeEvent *e) { - QFrame::resizeEvent(e); + TQFrame::resizeEvent(e); setBackgroundTheme(); } diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h index 021420483..2848e80c7 100644 --- a/kicker/extensions/taskbar/taskbarextension.h +++ b/kicker/extensions/taskbar/taskbarextension.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __taskbarextension_h__ #define __taskbarextension_h__ -#include <qimage.h> +#include <tqimage.h> #include <dcopobject.h> #include <kpanelextension.h> @@ -45,28 +45,28 @@ k_dcop: void configure(); public: - TaskBarExtension( const QString& configFile, Type t = Normal, - int actions = 0, QWidget *parent = 0, const char *name = 0 ); + TaskBarExtension( const TQString& configFile, Type t = Normal, + int actions = 0, TQWidget *parent = 0, const char *name = 0 ); ~TaskBarExtension(); - QSize sizeHint( Position, QSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Bottom; } protected: - void resizeEvent(QResizeEvent*); + void resizeEvent(TQResizeEvent*); void positionChange( Position ); void preferences(); private: TaskBarContainer *m_container; - QImage m_bgImage; - QString m_bgFilename; + TQImage m_bgImage; + TQString m_bgFilename; KRootPixmap *m_rootPixmap; private slots: void setBackgroundTheme(); - void updateBackground(const QPixmap&); + void updateBackground(const TQPixmap&); }; #endif diff --git a/kicker/kicker/buttons/bookmarksbutton.cpp b/kicker/kicker/buttons/bookmarksbutton.cpp index b351af263..e267848ef 100644 --- a/kicker/kicker/buttons/bookmarksbutton.cpp +++ b/kicker/kicker/buttons/bookmarksbutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <kaction.h> #include <kbookmark.h> @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "bookmarksbutton.h" #include "bookmarksbutton.moc" -BookmarksButton::BookmarksButton(QWidget* parent) +BookmarksButton::BookmarksButton(TQWidget* parent) : PanelPopupButton(parent, "BookmarksButton"), bookmarkParent(0), bookmarkMenu(0), @@ -49,7 +49,7 @@ BookmarksButton::BookmarksButton(QWidget* parent) actionCollection, true, false); setPopup(bookmarkParent); - QToolTip::add(this, i18n("Bookmarks")); + TQToolTip::add(this, i18n("Bookmarks")); setTitle(i18n("Bookmarks")); setIcon("bookmark"); } diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h index 95ffa9609..3d8518519 100644 --- a/kicker/kicker/buttons/bookmarksbutton.h +++ b/kicker/kicker/buttons/bookmarksbutton.h @@ -39,14 +39,14 @@ class BookmarksButton : public PanelPopupButton Q_OBJECT public: - BookmarksButton(QWidget* parent); + BookmarksButton(TQWidget* parent); ~BookmarksButton(); void loadConfig(const KConfigGroup& config); virtual void properties(); protected: - virtual QString tileName() { return "WindowList"; } + virtual TQString tileName() { return "WindowList"; } virtual void initPopup(); KPopupMenu* bookmarkParent; diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 9a445d218..950882696 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtimer.h> -#include <qtooltip.h> -#include <qdragobject.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqdragobject.h> #include <kconfig.h> #include <klocale.h> @@ -38,14 +38,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "browserbutton.h" #include "browserbutton.moc" -BrowserButton::BrowserButton( const QString& icon, const QString& startDir, QWidget* parent ) +BrowserButton::BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent ) : PanelPopupButton( parent, "BrowserButton" ) , topMenu( 0 ) { initialize( icon, startDir ); } -BrowserButton::BrowserButton( const KConfigGroup& config, QWidget* parent ) +BrowserButton::BrowserButton( const KConfigGroup& config, TQWidget* parent ) : PanelPopupButton( parent, "BrowserButton" ) , topMenu( 0 ) { @@ -57,7 +57,7 @@ BrowserButton::~BrowserButton() delete topMenu; } -void BrowserButton::initialize( const QString& icon, const QString& path ) +void BrowserButton::initialize( const TQString& icon, const TQString& path ) { _icon = icon; @@ -65,10 +65,10 @@ void BrowserButton::initialize( const QString& icon, const QString& path ) topMenu = new PanelBrowserMenu( path ); setPopup(topMenu); - _menuTimer = new QTimer( this ); - connect( _menuTimer, SIGNAL(timeout()), SLOT(slotDelayedPopup()) ); + _menuTimer = new TQTimer( this ); + connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) ); - QToolTip::add(this, i18n("Browse: %1").arg(path)); + TQToolTip::add(this, i18n("Browse: %1").arg(path)); setTitle( path ); setIcon ( _icon ); } @@ -79,7 +79,7 @@ void BrowserButton::saveConfig( KConfigGroup& config ) const config.writePathEntry("Path", topMenu->path()); } -void BrowserButton::dragEnterEvent( QDragEnterEvent *ev ) +void BrowserButton::dragEnterEvent( TQDragEnterEvent *ev ) { if ((ev->source() != this) && KURLDrag::canDecode(ev)) { @@ -93,17 +93,17 @@ void BrowserButton::dragEnterEvent( QDragEnterEvent *ev ) PanelButton::dragEnterEvent(ev); } -void BrowserButton::dragLeaveEvent( QDragLeaveEvent *ev ) +void BrowserButton::dragLeaveEvent( TQDragLeaveEvent *ev ) { _menuTimer->stop(); PanelButton::dragLeaveEvent(ev); } -void BrowserButton::dropEvent( QDropEvent *ev ) +void BrowserButton::dropEvent( TQDropEvent *ev ) { KURL path ( topMenu->path() ); _menuTimer->stop(); - KFileItem item( path, QString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( path, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, path, ev, this ); PanelButton::dropEvent(ev); } @@ -124,9 +124,9 @@ void BrowserButton::properties() { PanelBrowserDialog dlg( topMenu->path(), _icon, this ); - if( dlg.exec() == QDialog::Accepted ){ + if( dlg.exec() == TQDialog::Accepted ){ _icon = dlg.icon(); - QString path = dlg.path(); + TQString path = dlg.path(); if ( path != topMenu->path() ) { delete topMenu; diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h index 00ff0abea..bb08801d9 100644 --- a/kicker/kicker/buttons/browserbutton.h +++ b/kicker/kicker/buttons/browserbutton.h @@ -36,8 +36,8 @@ class BrowserButton : public PanelPopupButton Q_OBJECT public: - BrowserButton( const QString& icon, const QString& startDir, QWidget* parent ); - BrowserButton( const KConfigGroup& config, QWidget* parent ); + BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent ); + BrowserButton( const KConfigGroup& config, TQWidget* parent ); virtual ~BrowserButton(); void saveConfig( KConfigGroup& config ) const; @@ -49,17 +49,17 @@ protected slots: virtual void startDrag(); protected: - void initialize( const QString& icon, const QString& startDir ); - virtual QString tileName() { return "Browser"; } + void initialize( const TQString& icon, const TQString& startDir ); + virtual TQString tileName() { return "Browser"; } virtual void initPopup(); - virtual void dropEvent(QDropEvent *ev); - virtual void dragEnterEvent(QDragEnterEvent *ev); - virtual void dragLeaveEvent(QDragLeaveEvent *ev); - virtual QString defaultIcon() const { return "kdisknav"; }; + virtual void dropEvent(TQDropEvent *ev); + virtual void dragEnterEvent(TQDragEnterEvent *ev); + virtual void dragLeaveEvent(TQDragLeaveEvent *ev); + virtual TQString defaultIcon() const { return "kdisknav"; }; PanelBrowserMenu* topMenu; - QString _icon; - QTimer *_menuTimer; + TQString _icon; + TQTimer *_menuTimer; }; #endif diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index 3831303d7..9f23741e5 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> -#include <qdragobject.h> +#include <tqtooltip.h> +#include <tqdragobject.h> #include <klocale.h> #include <kglobalsettings.h> @@ -36,17 +36,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "desktopbutton.h" #include "desktopbutton.moc" -DesktopButton::DesktopButton( QWidget* parent ) +DesktopButton::DesktopButton( TQWidget* parent ) : PanelButton( parent, "DesktopButton" ) { setToggleButton(true); - QToolTip::add(this, i18n("Show desktop")); + TQToolTip::add(this, i18n("Show desktop")); setTitle(i18n("Desktop Access")); setIcon("desktop"); - connect( this, SIGNAL(toggled(bool)), this, SLOT(showDesktop(bool)) ); - connect( ShowDesktop::the(), SIGNAL(desktopShown(bool)), this, SLOT(toggle(bool)) ); + connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) ); + connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); setOn( ShowDesktop::the()->desktopShowing() ); } @@ -65,7 +65,7 @@ void DesktopButton::showDesktop(bool showDesktop) KickerTip::enableTipping(true); } -void DesktopButton::dragEnterEvent( QDragEnterEvent *ev ) +void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev ) { if ((ev->source() != this) && KURLDrag::canDecode(ev)) ev->accept(rect()); @@ -74,10 +74,10 @@ void DesktopButton::dragEnterEvent( QDragEnterEvent *ev ) PanelButton::dragEnterEvent(ev); } -void DesktopButton::dropEvent( QDropEvent *ev ) +void DesktopButton::dropEvent( TQDropEvent *ev ) { KURL dPath ( KGlobalSettings::desktopPath() ); - KFileItem item( dPath, QString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, dPath, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/buttons/desktopbutton.h b/kicker/kicker/buttons/desktopbutton.h index 62de4c342..c896bdf92 100644 --- a/kicker/kicker/buttons/desktopbutton.h +++ b/kicker/kicker/buttons/desktopbutton.h @@ -34,12 +34,12 @@ class DesktopButton : public PanelButton Q_OBJECT public: - DesktopButton( QWidget* parent ); + DesktopButton( TQWidget* parent ); protected: - virtual QString tileName() { return "DesktopButton"; } - virtual void dragEnterEvent(QDragEnterEvent *ev); - virtual void dropEvent(QDropEvent *ev); + virtual TQString tileName() { return "DesktopButton"; } + virtual void dragEnterEvent(TQDragEnterEvent *ev); + virtual void dropEvent(TQDropEvent *ev); protected slots: void toggle(bool); diff --git a/kicker/kicker/buttons/extensionbutton.cpp b/kicker/kicker/buttons/extensionbutton.cpp index 004e0d47b..d4590a024 100644 --- a/kicker/kicker/buttons/extensionbutton.cpp +++ b/kicker/kicker/buttons/extensionbutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <kconfig.h> #include <kpanelmenu.h> @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "extensionbutton.h" #include "extensionbutton.moc" -ExtensionButton::ExtensionButton( const QString& desktopFile, QWidget* parent ) +ExtensionButton::ExtensionButton( const TQString& desktopFile, TQWidget* parent ) : PanelPopupButton( parent, "ExtensionButton" ) , info( 0 ) , menu( 0 ) @@ -39,13 +39,13 @@ ExtensionButton::ExtensionButton( const QString& desktopFile, QWidget* parent ) initialize( desktopFile ); } -ExtensionButton::ExtensionButton( const KConfigGroup& config, QWidget* parent ) +ExtensionButton::ExtensionButton( const KConfigGroup& config, TQWidget* parent ) : PanelPopupButton( parent, "extensionbuttton" ) { initialize( config.readPathEntry("DesktopFile") ); } -void ExtensionButton::initialize( const QString& desktopFile ) +void ExtensionButton::initialize( const TQString& desktopFile ) { info = new MenuInfo(desktopFile); if (!info->isValid()) @@ -56,7 +56,7 @@ void ExtensionButton::initialize( const QString& desktopFile ) menu = info->load(this); setPopup(menu); - QToolTip::add(this, info->comment()); + TQToolTip::add(this, info->comment()); setTitle(info->name()); setIcon(info->icon()); } diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h index 0d489f706..48854323e 100644 --- a/kicker/kicker/buttons/extensionbutton.h +++ b/kicker/kicker/buttons/extensionbutton.h @@ -34,15 +34,15 @@ class ExtensionButton : public PanelPopupButton Q_OBJECT public: - ExtensionButton( const QString& desktopFile, QWidget* parent ); - ExtensionButton( const KConfigGroup& config, QWidget* parent ); + ExtensionButton( const TQString& desktopFile, TQWidget* parent ); + ExtensionButton( const KConfigGroup& config, TQWidget* parent ); ~ExtensionButton(); void saveConfig( KConfigGroup& config ) const; protected: - void initialize( const QString& desktopFile ); - virtual QString tileName() { return "URL"; } + void initialize( const TQString& desktopFile ); + virtual TQString tileName() { return "URL"; } virtual void initPopup(); MenuInfo* info; diff --git a/kicker/kicker/buttons/kbutton.cpp b/kicker/kicker/buttons/kbutton.cpp index 320a45842..73454b99f 100644 --- a/kicker/kicker/buttons/kbutton.cpp +++ b/kicker/kicker/buttons/kbutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <klocale.h> #include <kapplication.h> @@ -37,10 +37,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kbutton.h" #include "kbutton.moc" -KButton::KButton( QWidget* parent ) +KButton::KButton( TQWidget* parent ) : PanelPopupButton( parent, "KButton" ) { - QToolTip::add(this, i18n("Applications, tasks and desktop sessions")); + TQToolTip::add(this, i18n("Applications, tasks and desktop sessions")); setTitle(i18n("K Menu")); setPopup(MenuManager::the()->kmenu()); @@ -64,7 +64,7 @@ KButton::~KButton() void KButton::properties() { - KApplication::startServiceByDesktopName("kmenuedit", QStringList(), + KApplication::startServiceByDesktopName("kmenuedit", TQStringList(), 0, 0, 0, "", true); } diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h index 6de61181f..bf98e74f8 100644 --- a/kicker/kicker/buttons/kbutton.h +++ b/kicker/kicker/buttons/kbutton.h @@ -34,7 +34,7 @@ class KButton : public PanelPopupButton Q_OBJECT public: - KButton( QWidget *parent ); + KButton( TQWidget *parent ); ~KButton(); void loadConfig( const KConfigGroup& config ); @@ -42,9 +42,9 @@ public: virtual void properties(); protected: - virtual QString tileName() { return "KMenu"; } + virtual TQString tileName() { return "KMenu"; } virtual void initPopup(); - virtual QString defaultIcon() const { return "go"; } + virtual TQString defaultIcon() const { return "go"; } }; #endif diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp index 9413e8aaa..29b7ddb2e 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/kicker/kicker/buttons/nonkdeappbutton.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> -#include <qdragobject.h> +#include <tqtooltip.h> +#include <tqdragobject.h> #include <kconfig.h> #include <kdesktopfile.h> @@ -47,11 +47,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // this is one of the two constructors. gets called when creating a new button // e.g. via the "non-KDE Application" dialog, not one that was saved and then // restored. -NonKDEAppButton::NonKDEAppButton(const QString& name, - const QString& description, - const QString& filePath, const QString& icon, - const QString &cmdLine, bool inTerm, - QWidget* parent) +NonKDEAppButton::NonKDEAppButton(const TQString& name, + const TQString& description, + const TQString& filePath, const TQString& icon, + const TQString &cmdLine, bool inTerm, + TQWidget* parent) : PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor { // call the initialization method @@ -61,11 +61,11 @@ NonKDEAppButton::NonKDEAppButton(const QString& name, // to the slotExec() slot // we do this here instead of in initialize(...) since initialize(...) may // get called later, e.g after reconfiguring it - connect(this, SIGNAL(clicked()), SLOT(slotExec())); + connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); } // this constructor is used when restoring a button, usually at startup -NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, QWidget* parent ) +NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, TQWidget* parent ) : PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor { // call the initialization method, this time with values from a config file @@ -77,13 +77,13 @@ NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, QWidget* parent ) config.readBoolEntry("RunInTerminal")); // see comment on connect in above constructor - connect(this, SIGNAL(clicked()), SLOT(slotExec())); + connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); } -void NonKDEAppButton::initialize(const QString& name, - const QString& description, - const QString& filePath, const QString& icon, - const QString &cmdLine, bool inTerm ) +void NonKDEAppButton::initialize(const TQString& name, + const TQString& description, + const TQString& filePath, const TQString& icon, + const TQString &cmdLine, bool inTerm ) { // and now we actually set up most of the member variables with the // values passed in here. by doing this all in an initialize() method @@ -98,8 +98,8 @@ void NonKDEAppButton::initialize(const QString& name, // now we set the buttons tooltip, title and icon using the appropriate // set*() methods from the PanelButton class from which we subclass - // assign the name or the description to a QString called tooltip - QString tooltip = description.isEmpty() ? nameStr : descStr; + // assign the name or the description to a TQString called tooltip + TQString tooltip = description.isEmpty() ? nameStr : descStr; if (tooltip.isEmpty()) { @@ -123,7 +123,7 @@ void NonKDEAppButton::initialize(const QString& name, } // set the tooltip - QToolTip::add(this, tooltip); + TQToolTip::add(this, tooltip); // set the icon setIcon(iconStr); @@ -142,7 +142,7 @@ void NonKDEAppButton::saveConfig( KConfigGroup& config ) const config.writePathEntry("CommandLine", cmdStr); } -void NonKDEAppButton::dragEnterEvent(QDragEnterEvent *ev) +void NonKDEAppButton::dragEnterEvent(TQDragEnterEvent *ev) { // when something is dragged onto this button, we'll accept it // if we aren't dragged onto ourselves, and if it's a URL @@ -159,11 +159,11 @@ void NonKDEAppButton::dragEnterEvent(QDragEnterEvent *ev) PanelButton::dragEnterEvent(ev); } -void NonKDEAppButton::dropEvent(QDropEvent *ev) +void NonKDEAppButton::dropEvent(TQDropEvent *ev) { // something has been droped on us! KURL::List fileList; - QString execStr; + TQString execStr; if (KURLDrag::decode(ev, fileList)) { // according to KURLDrag, we've successfully retrieved @@ -205,7 +205,7 @@ void NonKDEAppButton::slotExec() runCommand(); } -void NonKDEAppButton::runCommand(const QString& execStr) +void NonKDEAppButton::runCommand(const TQString& execStr) { // run our command! this method is used both by the drag 'n drop // facilities as well as when the button is activated (usualy w/a click) @@ -225,7 +225,7 @@ void NonKDEAppButton::runCommand(const QString& execStr) // get merged into the application config automagically for us KConfig *config = KGlobal::config(); config->setGroup("misc"); - QString termStr = config->readPathEntry("Terminal", "konsole"); + TQString termStr = config->readPathEntry("Terminal", "konsole"); // and now we run the darn thing and store how we fared in result result = KRun::runCommand(termStr + " -e " + pathStr + " " + @@ -269,7 +269,7 @@ void NonKDEAppButton::properties() { // the user has requested to configure this button // this method gets called by the ButtonContainer that houses the button - // see ButtonContainer::eventFilter(QObject *o, QEvent *e), where the + // see ButtonContainer::eventFilter(TQObject *o, TQEvent *e), where the // context menu is created and dealt with. // so we create a new config dialog .... @@ -278,8 +278,8 @@ void NonKDEAppButton::properties() // ... connect the signal it emits when it has data for us to save // to our updateSettings slot (see above) ... - connect(dlg, SIGNAL(updateSettings(PanelExeDialog*)), this, - SLOT(updateSettings(PanelExeDialog*))); + connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this, + TQT_SLOT(updateSettings(PanelExeDialog*))); // ... and then show it to the user dlg->show(); diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nonkdeappbutton.h index bbb74c892..217f2c22c 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.h +++ b/kicker/kicker/buttons/nonkdeappbutton.h @@ -42,12 +42,12 @@ class NonKDEAppButton : public PanelButton public: // define our two constructors, one used for creating new buttons... - NonKDEAppButton(const QString& name, const QString& description, - const QString& filePath, const QString& icon, - const QString& cmdLine, bool inTerm, QWidget* parent); + NonKDEAppButton(const TQString& name, const TQString& description, + const TQString& filePath, const TQString& icon, + const TQString& cmdLine, bool inTerm, TQWidget* parent); // ... and once for restoring them at start up - NonKDEAppButton(const KConfigGroup& config, QWidget* parent); + NonKDEAppButton(const KConfigGroup& config, TQWidget* parent); // reimplemented from PanelButton virtual void saveConfig(KConfigGroup& config) const; @@ -63,29 +63,29 @@ protected slots: protected: // used to set up our internal state, either when creating the button // or after reconfiguration - void initialize(const QString& name, const QString& description, - const QString& filePath, const QString& icon, - const QString& cmdLine, bool inTerm); + void initialize(const TQString& name, const TQString& description, + const TQString& filePath, const TQString& icon, + const TQString& cmdLine, bool inTerm); // run the command! // the execStr parameter, which default to an empty string, // is used to provide additional command line options aside // from the ones in our config file; for instance a URL drag'd onto us - void runCommand(const QString& execStr = QString::null); + void runCommand(const TQString& execStr = TQString::null); // reimplemented from PanelButton - virtual QString tileName() { return "URL"; } - QString defaultIcon() const { return "exec"; }; + virtual TQString tileName() { return "URL"; } + TQString defaultIcon() const { return "exec"; }; // handle drag and drop actions - virtual void dropEvent(QDropEvent *ev); - virtual void dragEnterEvent(QDragEnterEvent *ev); - - QString nameStr; // the name given this button by the user - QString descStr; // the description given this button by the user - QString pathStr; // the path to the command - QString iconStr; // the path to the icon for this button - QString cmdStr; // command line flags, if any + virtual void dropEvent(TQDropEvent *ev); + virtual void dragEnterEvent(TQDragEnterEvent *ev); + + TQString nameStr; // the name given this button by the user + TQString descStr; // the description given this button by the user + TQString pathStr; // the path to the command + TQString iconStr; // the path to the icon for this button + TQString cmdStr; // command line flags, if any bool term; // whether to run this in a terminal or not }; // all done defining the class! diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index a5ec7c9a2..f7322a976 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdragobject.h> -#include <qtooltip.h> +#include <tqdragobject.h> +#include <tqtooltip.h> #include <kdesktopfile.h> #include <klocale.h> @@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "servicebutton.h" #include "servicebutton.moc" -ServiceButton::ServiceButton(const QString& desktopFile, QWidget* parent) +ServiceButton::ServiceButton(const TQString& desktopFile, TQWidget* parent) : PanelButton(parent, "ServiceButton"), _service(0) { @@ -47,25 +47,25 @@ ServiceButton::ServiceButton(const QString& desktopFile, QWidget* parent) initialize(); } -ServiceButton::ServiceButton(const KService::Ptr &service, QWidget* parent) +ServiceButton::ServiceButton(const KService::Ptr &service, TQWidget* parent) : PanelButton(parent, "ServiceButton"), _service(service), _id(service->storageId()) { if (_id.startsWith("/")) { - QString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); + TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); if (!tmp.startsWith("/")) _id = ":"+tmp; } initialize(); } -ServiceButton::ServiceButton( const KConfigGroup& config, QWidget* parent ) +ServiceButton::ServiceButton( const KConfigGroup& config, TQWidget* parent ) : PanelButton(parent, "ServiceButton"), _service(0) { - QString id; + TQString id; if (config.hasKey("StorageId")) id = config.readPathEntry("StorageId"); else @@ -78,7 +78,7 @@ ServiceButton::~ServiceButton() { } -void ServiceButton::loadServiceFromId(const QString &id) +void ServiceButton::loadServiceFromId(const TQString &id) { _id = id; /* this is a KService::Ptr @@ -112,7 +112,7 @@ void ServiceButton::loadServiceFromId(const QString &id) if (_id.startsWith("/")) { - QString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); + TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); if (!tmp.startsWith("/")) _id = ":"+tmp; } @@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const QString &id) void ServiceButton::initialize() { readDesktopFile(); - connect(this, SIGNAL(clicked()), SLOT(slotExec())); + connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); } void ServiceButton::readDesktopFile() @@ -134,15 +134,15 @@ void ServiceButton::readDesktopFile() if (!_service->genericName().isEmpty()) { - QToolTip::add(this, _service->genericName()); + TQToolTip::add(this, _service->genericName()); } else if (_service->comment().isEmpty()) { - QToolTip::add(this, _service->name()); + TQToolTip::add(this, _service->name()); } else { - QToolTip::add(this, _service->name() + " - " + _service->comment()); + TQToolTip::add(this, _service->name() + " - " + _service->comment()); } setTitle( _service->name() ); @@ -156,7 +156,7 @@ void ServiceButton::saveConfig( KConfigGroup& config ) const config.writePathEntry("DesktopFile", _service->desktopEntryPath()); } -void ServiceButton::dragEnterEvent(QDragEnterEvent *ev) +void ServiceButton::dragEnterEvent(TQDragEnterEvent *ev) { if ((ev->source() != this) && KURLDrag::canDecode(ev)) ev->accept(rect()); @@ -165,7 +165,7 @@ void ServiceButton::dragEnterEvent(QDragEnterEvent *ev) PanelButton::dragEnterEvent(ev); } -void ServiceButton::dropEvent( QDropEvent* ev ) +void ServiceButton::dropEvent( TQDropEvent* ev ) { KURL::List uriList; if( KURLDrag::decode( ev, uriList ) && _service ) { @@ -177,7 +177,7 @@ void ServiceButton::dropEvent( QDropEvent* ev ) void ServiceButton::startDrag() { - QString path = _service->desktopEntryPath(); + TQString path = _service->desktopEntryPath(); // If the path to the desktop file is relative, try to get the full // path from KStdDirs. @@ -192,7 +192,7 @@ void ServiceButton::slotExec() { // this allows the button to return to a non-pressed state // before launching - QTimer::singleShot(0, this, SLOT(performExec())); + TQTimer::singleShot(0, this, TQT_SLOT(performExec())); } void ServiceButton::performExec() @@ -211,7 +211,7 @@ void ServiceButton::properties() return; } - QString path = _service->desktopEntryPath(); + TQString path = _service->desktopEntryPath(); // If the path to the desktop file is relative, try to get the full // path from KStdDirs. @@ -223,10 +223,10 @@ void ServiceButton::properties() KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0, false, false); dialog->setFileNameReadOnly(true); - connect(dialog, SIGNAL(saveAs(const KURL &, KURL &)), - this, SLOT(slotSaveAs(const KURL &, KURL &))); - connect(dialog, SIGNAL(propertiesClosed()), - this, SLOT(slotUpdate())); + connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)), + this, TQT_SLOT(slotSaveAs(const KURL &, KURL &))); + connect(dialog, TQT_SIGNAL(propertiesClosed()), + this, TQT_SLOT(slotUpdate())); dialog->show(); } @@ -239,10 +239,10 @@ void ServiceButton::slotUpdate() void ServiceButton::slotSaveAs(const KURL &oldUrl, KURL &newUrl) { - QString oldPath = oldUrl.path(); + TQString oldPath = oldUrl.path(); if (locateLocal("appdata", oldUrl.fileName()) != oldPath) { - QString path = KickerLib::newDesktopFile(oldUrl); + TQString path = KickerLib::newDesktopFile(oldUrl); newUrl.setPath(path); _id = path; } @@ -250,7 +250,7 @@ void ServiceButton::slotSaveAs(const KURL &oldUrl, KURL &newUrl) bool ServiceButton::checkForBackingFile() { - QString id = _id; + TQString id = _id; loadServiceFromId(_id); // we need to reset the _id back to whatever it was diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h index 26f32791a..2d881d72c 100644 --- a/kicker/kicker/buttons/servicebutton.h +++ b/kicker/kicker/buttons/servicebutton.h @@ -33,9 +33,9 @@ class ServiceButton : public PanelButton Q_OBJECT public: - ServiceButton( const QString& desktopFile, QWidget* parent ); - ServiceButton( const KService::Ptr& service, QWidget* parent ); - ServiceButton( const KConfigGroup& config, QWidget* parent ); + ServiceButton( const TQString& desktopFile, TQWidget* parent ); + ServiceButton( const KService::Ptr& service, TQWidget* parent ); + ServiceButton( const KConfigGroup& config, TQWidget* parent ); ~ServiceButton(); @@ -50,17 +50,17 @@ protected slots: protected: void initialize(); - void loadServiceFromId(const QString &id); + void loadServiceFromId(const TQString &id); void readDesktopFile(); - virtual QString tileName() { return "URL"; } + virtual TQString tileName() { return "URL"; } virtual void startDrag(); - virtual void dropEvent(QDropEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); - QString defaultIcon() const { return "exec"; }; + virtual void dropEvent(TQDropEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); + TQString defaultIcon() const { return "exec"; }; bool checkForBackingFile(); KService::Ptr _service; - QString _id; + TQString _id; }; #endif diff --git a/kicker/kicker/buttons/servicemenubutton.cpp b/kicker/kicker/buttons/servicemenubutton.cpp index e3fc41185..7a036e796 100644 --- a/kicker/kicker/buttons/servicemenubutton.cpp +++ b/kicker/kicker/buttons/servicemenubutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <kconfig.h> #include <kservicegroup.h> @@ -32,21 +32,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "servicemenubutton.h" #include "servicemenubutton.moc" -ServiceMenuButton::ServiceMenuButton( const QString& relPath, QWidget* parent ) +ServiceMenuButton::ServiceMenuButton( const TQString& relPath, TQWidget* parent ) : PanelPopupButton( parent, "ServiceMenuButton" ) , topMenu( 0 ) { initialize( relPath ); } -ServiceMenuButton::ServiceMenuButton( const KConfigGroup& config, QWidget* parent ) +ServiceMenuButton::ServiceMenuButton( const KConfigGroup& config, TQWidget* parent ) : PanelPopupButton( parent, "ServiceMenuButton" ) , topMenu( 0 ) { initialize( config.readPathEntry("RelPath") ); } -void ServiceMenuButton::initialize( const QString& relPath ) +void ServiceMenuButton::initialize( const TQString& relPath ) { KServiceGroup::Ptr group = KServiceGroup::group( relPath ); @@ -56,13 +56,13 @@ void ServiceMenuButton::initialize( const QString& relPath ) return; } - QString caption = group->caption(); + TQString caption = group->caption(); if (caption.isEmpty()) { caption = i18n("Applications"); } - QString comment = group->comment(); + TQString comment = group->comment(); if (comment.isEmpty()) { comment = caption; @@ -70,7 +70,7 @@ void ServiceMenuButton::initialize( const QString& relPath ) topMenu = new PanelServiceMenu(caption, relPath); setPopup(topMenu); - QToolTip::add(this, comment); + TQToolTip::add(this, comment); setTitle(caption); setIcon(group->icon()); } diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h index 1bd9d1885..0bd05b8ee 100644 --- a/kicker/kicker/buttons/servicemenubutton.h +++ b/kicker/kicker/buttons/servicemenubutton.h @@ -36,15 +36,15 @@ class ServiceMenuButton : public PanelPopupButton Q_OBJECT public: - ServiceMenuButton( const QString& relPath, QWidget* parent ); - ServiceMenuButton( const KConfigGroup& config, QWidget* parent ); + ServiceMenuButton( const TQString& relPath, TQWidget* parent ); + ServiceMenuButton( const KConfigGroup& config, TQWidget* parent ); void saveConfig( KConfigGroup& config ) const; protected: - void initialize( const QString& relPath ); - virtual QString tileName() { return "Browser"; } - virtual QString defaultIcon() const { return "folder"; } + void initialize( const TQString& relPath ); + virtual TQString tileName() { return "Browser"; } + virtual TQString defaultIcon() const { return "folder"; } virtual void startDrag(); virtual void initPopup(); diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index 007b0cc00..a61b5d775 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> -#include <qfile.h> +#include <tqtooltip.h> +#include <tqfile.h> #include <kdesktopfile.h> #include <kfileitem.h> @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "urlbutton.h" #include "urlbutton.moc" -URLButton::URLButton( const QString& url, QWidget* parent ) +URLButton::URLButton( const TQString& url, TQWidget* parent ) : PanelButton( parent, "URLButton" ) , fileItem( 0 ) , pDlg( 0 ) @@ -52,7 +52,7 @@ URLButton::URLButton( const QString& url, QWidget* parent ) initialize( url ); } -URLButton::URLButton( const KConfigGroup& config, QWidget* parent ) +URLButton::URLButton( const KConfigGroup& config, TQWidget* parent ) : PanelButton( parent, "URLButton" ) , fileItem( 0 ) , pDlg( 0 ) @@ -65,12 +65,12 @@ URLButton::~URLButton() delete fileItem; } -void URLButton::initialize( const QString& _url ) +void URLButton::initialize( const TQString& _url ) { KURL url(_url); if (!url.isLocalFile() || !url.path().endsWith(".desktop")) { - QString file = KickerLib::newDesktopFile(url); + TQString file = KickerLib::newDesktopFile(url); KDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); @@ -90,7 +90,7 @@ void URLButton::initialize( const QString& _url ) } fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url ); setIcon( fileItem->iconName() ); - connect( this, SIGNAL(clicked()), SLOT(slotExec()) ); + connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) ); setToolTip(); if (url.isLocalFile()) @@ -113,23 +113,23 @@ void URLButton::setToolTip() if (df.readComment().isEmpty()) { - QToolTip::add(this, df.readName()); + TQToolTip::add(this, df.readName()); } else { - QToolTip::add(this, df.readName() + " - " + df.readComment()); + TQToolTip::add(this, df.readName() + " - " + df.readComment()); } setTitle(df.readName()); } else { - QToolTip::add(this, fileItem->url().prettyURL()); + TQToolTip::add(this, fileItem->url().prettyURL()); setTitle(fileItem->url().prettyURL()); } } -void URLButton::dragEnterEvent(QDragEnterEvent *ev) +void URLButton::dragEnterEvent(TQDragEnterEvent *ev) { if ((ev->source() != this) && fileItem->acceptsDrops() && KURLDrag::canDecode(ev)) ev->accept(rect()); @@ -138,7 +138,7 @@ void URLButton::dragEnterEvent(QDragEnterEvent *ev) PanelButton::dragEnterEvent(ev); } -void URLButton::dropEvent(QDropEvent *ev) +void URLButton::dropEvent(TQDropEvent *ev) { kapp->propagateSessionManager(); KURL::List execList; @@ -186,7 +186,7 @@ void URLButton::updateURL() void URLButton::properties() { - if ( (fileItem->isLocalFile() && !QFile::exists(fileItem->url().path()) ) + if ( (fileItem->isLocalFile() && !TQFile::exists(fileItem->url().path()) ) || !fileItem->url().isValid()) { KMessageBox::error( 0L, i18n("The file %1 does not exist") @@ -196,6 +196,6 @@ void URLButton::properties() pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself pDlg->setFileNameReadOnly(true); - connect(pDlg, SIGNAL(applied()), SLOT(updateURL())); + connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL())); pDlg->show(); } diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h index e6f6b12e0..c2cbd2a19 100644 --- a/kicker/kicker/buttons/urlbutton.h +++ b/kicker/kicker/buttons/urlbutton.h @@ -37,8 +37,8 @@ class URLButton : public PanelButton Q_OBJECT public: - URLButton( const QString& url, QWidget* parent ); - URLButton( const KConfigGroup& config, QWidget* parent ); + URLButton( const TQString& url, TQWidget* parent ); + URLButton( const KConfigGroup& config, TQWidget* parent ); virtual ~URLButton(); @@ -51,11 +51,11 @@ protected slots: void updateURL(); protected: - void initialize( const QString& url ); - virtual QString tileName() { return "URL"; } + void initialize( const TQString& url ); + virtual TQString tileName() { return "URL"; } virtual void startDrag(); - virtual void dropEvent(QDropEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); + virtual void dropEvent(TQDropEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); void setToolTip(); KFileItem *fileItem; diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp index 8a60ca5e8..0b413d880 100644 --- a/kicker/kicker/buttons/windowlistbutton.cpp +++ b/kicker/kicker/buttons/windowlistbutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <kwindowlistmenu.h> #include <klocale.h> @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "windowlistbutton.h" #include "windowlistbutton.moc" -WindowListButton::WindowListButton( QWidget* parent ) +WindowListButton::WindowListButton( TQWidget* parent ) : PanelPopupButton( parent, "WindowListButton" ) , topMenu( 0 ) { @@ -37,7 +37,7 @@ WindowListButton::WindowListButton( QWidget* parent ) setPopup(topMenu); setTitle(i18n("Window List")); - QToolTip::add(this, i18n("Window list")); + TQToolTip::add(this, i18n("Window list")); setIcon("window_list"); } diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h index 23dc26c19..d8b57c62e 100644 --- a/kicker/kicker/buttons/windowlistbutton.h +++ b/kicker/kicker/buttons/windowlistbutton.h @@ -36,10 +36,10 @@ class WindowListButton : public PanelPopupButton Q_OBJECT public: - WindowListButton( QWidget* parent ); + WindowListButton( TQWidget* parent ); protected: - virtual QString tileName() { return "WindowList"; } + virtual TQString tileName() { return "WindowList"; } virtual void initPopup(); KWindowListMenu* topMenu; diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index cd9de3c62..251cbc1bd 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -21,14 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcursor.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qpixmapcache.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qimage.h> +#include <tqcursor.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqpixmapcache.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqimage.h> #include <kpushbutton.h> #include <kapplication.h> @@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "applethandle.h" AppletHandle::AppletHandle(AppletContainer* parent) - : QWidget(parent), + : TQWidget(parent), m_applet(parent), m_menuButton(0), m_drawHandle(false), @@ -52,7 +52,7 @@ AppletHandle::AppletHandle(AppletContainer* parent) { setBackgroundOrigin(AncestorOrigin); setMinimumSize(widthForHeight(0), heightForWidth(0)); - m_layout = new QBoxLayout(this, QBoxLayout::BottomToTop, 0, 0); + m_layout = new TQBoxLayout(this, TQBoxLayout::BottomToTop, 0, 0); m_dragBar = new AppletHandleDrag(this); m_dragBar->installEventFilter(this); @@ -64,25 +64,25 @@ AppletHandle::AppletHandle(AppletContainer* parent) m_menuButton->installEventFilter(this); m_layout->addWidget(m_menuButton); - connect(m_menuButton, SIGNAL(pressed()), - this, SLOT(menuButtonPressed())); - QToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); + connect(m_menuButton, TQT_SIGNAL(pressed()), + this, TQT_SLOT(menuButtonPressed())); + TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); } - QToolTip::add(this, i18n("%1 applet handle").arg(parent->info().name())); + TQToolTip::add(this, i18n("%1 applet handle").arg(parent->info().name())); resetLayout(); } int AppletHandle::heightForWidth( int /* w */ ) const { - int size = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this); + int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } int AppletHandle::widthForHeight( int /* h */ ) const { - int size = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this); + int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } @@ -101,19 +101,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d) switch (m_popupDirection) { case KPanelApplet::Up: - m_layout->setDirection(QBoxLayout::BottomToTop); + m_layout->setDirection(TQBoxLayout::BottomToTop); a = Qt::UpArrow; break; case KPanelApplet::Down: - m_layout->setDirection(QBoxLayout::TopToBottom); + m_layout->setDirection(TQBoxLayout::TopToBottom); a = Qt::DownArrow; break; case KPanelApplet::Left: - m_layout->setDirection(QBoxLayout::RightToLeft); + m_layout->setDirection(TQBoxLayout::RightToLeft); a = Qt::LeftArrow; break; case KPanelApplet::Right: - m_layout->setDirection(QBoxLayout::LeftToRight); + m_layout->setDirection(TQBoxLayout::LeftToRight); a = Qt::RightArrow; break; } @@ -150,9 +150,9 @@ void AppletHandle::setFadeOutHandle(bool fadeOut) { if (!m_handleHoverTimer) { - m_handleHoverTimer = new QTimer(this); - connect(m_handleHoverTimer, SIGNAL(timeout()), - this, SLOT(checkHandleHover())); + m_handleHoverTimer = new TQTimer(this); + connect(m_handleHoverTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(checkHandleHover())); m_applet->installEventFilter(this); } } @@ -166,13 +166,13 @@ void AppletHandle::setFadeOutHandle(bool fadeOut) resetLayout(); } -bool AppletHandle::eventFilter(QObject *o, QEvent *e) +bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) { if (o == parent()) { switch (e->type()) { - case QEvent::Enter: + case TQEvent::Enter: { m_drawHandle = true; resetLayout(); @@ -184,14 +184,14 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) break; } - case QEvent::Leave: + case TQEvent::Leave: { if (m_menuButton && m_menuButton->isOn()) { break; } - QWidget* w = dynamic_cast<QWidget*>(o); + TQWidget* w = dynamic_cast<TQWidget*>(o); bool nowDrawIt = false; if (w) @@ -199,7 +199,7 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) // a hack for applets that have out-of-process // elements (e.g the systray) so that the handle // doesn't flicker when moving over those elements - if (w->rect().contains(w->mapFromGlobal(QCursor::pos()))) + if (w->rect().contains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -222,13 +222,13 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) break; } - return QWidget::eventFilter( o, e ); + return TQWidget::eventFilter( o, e ); } else if (o == m_dragBar) { - if (e->type() == QEvent::MouseButtonPress) + if (e->type() == TQEvent::MouseButtonPress) { - QMouseEvent* ev = static_cast<QMouseEvent*>(e); + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); if (ev->button() == LeftButton || ev->button() == MidButton) { emit moveApplet(m_applet->mapFromGlobal(ev->globalPos())); @@ -236,9 +236,9 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) } } - if (m_menuButton && e->type() == QEvent::MouseButtonPress) + if (m_menuButton && e->type() == TQEvent::MouseButtonPress) { - QMouseEvent* ev = static_cast<QMouseEvent*>(e); + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); if (ev->button() == RightButton) { if (!m_menuButton->isDown()) @@ -251,7 +251,7 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) } } - return QWidget::eventFilter(o, e); // standard event processing + return TQWidget::eventFilter(o, e); // standard event processing } void AppletHandle::menuButtonPressed() @@ -263,7 +263,7 @@ void AppletHandle::menuButtonPressed() emit showAppletMenu(); - if (!onMenuButton(QCursor::pos())) + if (!onMenuButton(TQCursor::pos())) { toggleMenuButtonOff(); } @@ -274,7 +274,7 @@ void AppletHandle::checkHandleHover() if (!m_handleHoverTimer || (m_menuButton && m_menuButton->isOn()) || m_applet->geometry().contains(m_applet->mapToParent( - m_applet->mapFromGlobal(QCursor::pos())))) + m_applet->mapFromGlobal(TQCursor::pos())))) { return; } @@ -284,7 +284,7 @@ void AppletHandle::checkHandleHover() resetLayout(); } -bool AppletHandle::onMenuButton(const QPoint& point) const +bool AppletHandle::onMenuButton(const TQPoint& point) const { return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton); } @@ -300,78 +300,78 @@ void AppletHandle::toggleMenuButtonOff() } AppletHandleDrag::AppletHandleDrag(AppletHandle* parent) - : QWidget(parent), + : TQWidget(parent), m_parent(parent), m_inside(false) { setBackgroundOrigin( AncestorOrigin ); } -QSize AppletHandleDrag::minimumSizeHint() const +TQSize AppletHandleDrag::minimumSizeHint() const { - int wh = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this); + int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); if (m_parent->orientation() == Horizontal) { - return QSize(wh, 0); + return TQSize(wh, 0); } - return QSize(0, wh); + return TQSize(0, wh); } -QSizePolicy AppletHandleDrag::sizePolicy() const +TQSizePolicy AppletHandleDrag::sizePolicy() const { if (m_parent->orientation() == Horizontal) { - return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred ); + return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); } - return QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ); + return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); } -void AppletHandleDrag::enterEvent( QEvent *e ) +void AppletHandleDrag::enterEvent( TQEvent *e ) { m_inside = true; - QWidget::enterEvent( e ); + TQWidget::enterEvent( e ); update(); } -void AppletHandleDrag::leaveEvent( QEvent *e ) +void AppletHandleDrag::leaveEvent( TQEvent *e ) { m_inside = false; - QWidget::enterEvent( e ); + TQWidget::enterEvent( e ); update(); } -void AppletHandleDrag::paintEvent(QPaintEvent *) +void AppletHandleDrag::paintEvent(TQPaintEvent *) { - QPainter p(this); + TQPainter p(this); if (!KickerSettings::transparent()) { if (paletteBackgroundPixmap()) { - QPoint offset = backgroundOffset(); + TQPoint offset = backgroundOffset(); int ox = offset.x(); int oy = offset.y(); p.drawTiledPixmap( 0, 0, width(), height(),*paletteBackgroundPixmap(), ox, oy); } - QStyle::SFlags flags = QStyle::Style_Default; - flags |= QStyle::Style_Enabled; + TQStyle::SFlags flags = TQStyle::Style_Default; + flags |= TQStyle::Style_Enabled; if (m_parent->orientation() == Horizontal) { - flags |= QStyle::Style_Horizontal; + flags |= TQStyle::Style_Horizontal; } - QRect r = rect(); + TQRect r = rect(); - style().drawPrimitive(QStyle::PE_DockWindowHandle, &p, r, + style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, colorGroup(), flags); } else { - KickerLib::drawBlendedRect(&p, QRect(0, 0, width(), height()), paletteForegroundColor(), m_inside ? 0x40 : 0x20); + KickerLib::drawBlendedRect(&p, TQRect(0, 0, width(), height()), paletteForegroundColor(), m_inside ? 0x40 : 0x20); } } @@ -381,22 +381,22 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent) { } -QSize AppletHandleButton::minimumSizeHint() const +TQSize AppletHandleButton::minimumSizeHint() const { - int height = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this); + int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; if (m_parent->orientation() == Horizontal) { - return QSize(width, height); + return TQSize(width, height); } - return QSize(height, width); + return TQSize(height, width); } -QSizePolicy AppletHandleButton::sizePolicy() const +TQSizePolicy AppletHandleButton::sizePolicy() const { - return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); + return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } #include "applethandle.moc" diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index 2158756cb..ab340af06 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __applethandle_h__ #define __applethandle_h__ -#include <qwidget.h> -#include <qpushbutton.h> +#include <tqwidget.h> +#include <tqpushbutton.h> #include "container_applet.h" #include "simplebutton.h" @@ -45,7 +45,7 @@ class AppletHandle : public QWidget void resetLayout(); void setFadeOutHandle(bool); - bool eventFilter (QObject *, QEvent *); + bool eventFilter (TQObject *, TQEvent *); int widthForHeight( int h ) const; int heightForWidth( int w ) const; @@ -61,10 +61,10 @@ class AppletHandle : public QWidget return m_applet->orientation(); } - bool onMenuButton(const QPoint& point) const; + bool onMenuButton(const TQPoint& point) const; signals: - void moveApplet( const QPoint& moveOffset ); + void moveApplet( const TQPoint& moveOffset ); void showAppletMenu(); public slots: @@ -76,12 +76,12 @@ class AppletHandle : public QWidget private: AppletContainer* m_applet; - QBoxLayout* m_layout; + TQBoxLayout* m_layout; AppletHandleDrag* m_dragBar; AppletHandleButton* m_menuButton; bool m_drawHandle; KPanelApplet::Direction m_popupDirection; - QTimer* m_handleHoverTimer; + TQTimer* m_handleHoverTimer; bool m_inside; }; @@ -92,15 +92,15 @@ class AppletHandleDrag : public QWidget public: AppletHandleDrag(AppletHandle* parent); - QSize minimumSizeHint() const; - QSize minimumSize() const { return minimumSizeHint(); } - QSize sizeHint() const { return minimumSize(); } - QSizePolicy sizePolicy() const; + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } + TQSizePolicy sizePolicy() const; protected: - void paintEvent( QPaintEvent* ); - void enterEvent( QEvent* ); - void leaveEvent( QEvent* ); + void paintEvent( TQPaintEvent* ); + void enterEvent( TQEvent* ); + void leaveEvent( TQEvent* ); const AppletHandle* m_parent; private: @@ -113,10 +113,10 @@ class AppletHandleButton : public SimpleArrowButton public: AppletHandleButton(AppletHandle *parent); - QSize minimumSizeHint() const; - QSize minimumSize() const { return minimumSizeHint(); } - QSize sizeHint() const { return minimumSize(); } - QSizePolicy sizePolicy() const; + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } + TQSizePolicy sizePolicy() const; private: bool m_moveMouse; diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 390b934d3..77c6d1912 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -21,14 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcursor.h> +#include <tqcursor.h> #include <qxembed.h> -#include <qframe.h> -#include <qlayout.h> -#include <qhbox.h> -#include <qfile.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <dcopclient.h> #include <kapplication.h> @@ -57,12 +57,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define APPLET_MARGIN 1 AppletContainer::AppletContainer(const AppletInfo& info, - QPopupMenu* opMenu, + TQPopupMenu* opMenu, bool immutable, - QWidget* parent ) + TQWidget* parent ) : BaseContainer(opMenu, parent, - QString(info.library() + "container").latin1()), + TQString(info.library() + "container").latin1()), _info(info), _handle(0), _layout(0), @@ -74,28 +74,28 @@ AppletContainer::AppletContainer(const AppletInfo& info, setBackgroundOrigin(AncestorOrigin); //setup appletframe - _appletframe = new QHBox(this); + _appletframe = new TQHBox(this); _appletframe->setBackgroundOrigin( AncestorOrigin ); - _appletframe->setFrameStyle(QFrame::NoFrame); + _appletframe->setFrameStyle(TQFrame::NoFrame); _appletframe->installEventFilter(this); if (orientation() == Horizontal) { - _layout = new QBoxLayout(this, QBoxLayout::LeftToRight, 0, 0); + _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); } else { - _layout = new QBoxLayout(this, QBoxLayout::TopToBottom, 0, 0); + _layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0); } - _layout->setResizeMode( QLayout::FreeResize ); + _layout->setResizeMode( TQLayout::FreeResize ); _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); _layout->addWidget(_handle, 0); - connect(_handle, SIGNAL(moveApplet(const QPoint&)), - this, SLOT(moveApplet(const QPoint&))); - connect(_handle, SIGNAL(showAppletMenu()), this, SLOT(showAppletMenu())); + connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), + this, TQT_SLOT(moveApplet(const TQPoint&))); + connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); _layout->addWidget(_appletframe, 1); _layout->activate(); @@ -124,12 +124,12 @@ AppletContainer::AppletContainer(const AppletInfo& info, setImmutable(immutable); - connect(_applet, SIGNAL(updateLayout()), SLOT(slotUpdateLayout())); - connect(_applet, SIGNAL(requestFocus()), SLOT(activateWindow())); - connect(_applet, SIGNAL(requestFocus(bool)), SLOT(focusRequested(bool))); + connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); + connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(activateWindow())); + connect(_applet, TQT_SIGNAL(requestFocus(bool)), TQT_SLOT(focusRequested(bool))); - connect(Kicker::the(), SIGNAL(configurationChanged()), - this, SLOT(slotReconfigure())); + connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), + this, TQT_SLOT(slotReconfigure())); } void AppletContainer::configure() @@ -193,17 +193,17 @@ void AppletContainer::resetLayout() if (orientation() == Horizontal) { - _layout->setDirection( QBoxLayout::LeftToRight ); + _layout->setDirection( TQBoxLayout::LeftToRight ); } else { - _layout->setDirection( QBoxLayout::TopToBottom ); + _layout->setDirection( TQBoxLayout::TopToBottom ); } _layout->activate(); } -void AppletContainer::moveApplet( const QPoint& moveOffset ) +void AppletContainer::moveApplet( const TQPoint& moveOffset ) { _moveOffset = moveOffset; emit moveme(this); @@ -221,7 +221,7 @@ void AppletContainer::showAppletMenu() return; } - QPopupMenu *menu = opMenu(); + TQPopupMenu *menu = opMenu(); Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center())); @@ -231,7 +231,7 @@ void AppletContainer::showAppletMenu() moveApplet(_handle->mapToParent(_handle->rect().center())); break; case PanelAppletOpMenu::Remove: - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); emit removeme(this); return; // Above signal will cause this to be deleted. break; @@ -251,7 +251,7 @@ void AppletContainer::showAppletMenu() break; } - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); clearOpMenu(); } @@ -270,7 +270,7 @@ void AppletContainer::slotRemoved(KConfig* config) return; } - QFile::remove(locateLocal("config", _configFile)); + TQFile::remove(locateLocal("config", _configFile)); } void AppletContainer::activateWindow() @@ -314,15 +314,15 @@ void AppletContainer::doSaveConfiguration( KConfigGroup& config, } } -QPopupMenu* AppletContainer::createOpMenu() +TQPopupMenu* AppletContainer::createOpMenu() { - QPopupMenu* opMenu = new PanelAppletOpMenu(_actions, appletOpMenu(), + TQPopupMenu* opMenu = new PanelAppletOpMenu(_actions, appletOpMenu(), appletsOwnMenu(), _info.name(), _info.icon(), this); - connect(opMenu, SIGNAL(escapePressed()), - _handle, SLOT(toggleMenuButtonOff())); + connect(opMenu, TQT_SIGNAL(escapePressed()), + _handle, TQT_SLOT(toggleMenuButtonOff())); return opMenu; } @@ -339,7 +339,7 @@ void AppletContainer::slotUpdateLayout() } -const QPopupMenu* AppletContainer::appletsOwnMenu() const +const TQPopupMenu* AppletContainer::appletsOwnMenu() const { if (!_applet) { @@ -447,8 +447,8 @@ void AppletContainer::setBackground() if (KickerSettings::transparent()) { // Trick to tell applets that they must refresh their transparent background if they need. - QMoveEvent e(_applet->pos(), _applet->pos()); - QApplication::sendEvent(_applet, &e); + TQMoveEvent e(_applet->pos(), _applet->pos()); + TQApplication::sendEvent(_applet, &e); } } @@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable) } else if (!_handle->isVisibleTo(this)) { - QToolTip::add(_handle, _info.name()); + TQToolTip::add(_handle, _info.name()); _handle->show(); setBackground(); } diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 8c364c09f..11eed1bfe 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -43,11 +43,11 @@ class AppletContainer : public BaseContainer Q_OBJECT public: - AppletContainer(const AppletInfo& info, QPopupMenu* opMenu, bool isImmutable = false, QWidget* parent = 0); + AppletContainer(const AppletInfo& info, TQPopupMenu* opMenu, bool isImmutable = false, TQWidget* parent = 0); KPanelApplet::Type type() const { return _type; } const AppletInfo& info() const { return _info; } - const QPopupMenu* appletsOwnMenu() const; + const TQPopupMenu* appletsOwnMenu() const; bool isStretch() const { return type() == KPanelApplet::Stretch; } void resetLayout(); @@ -58,9 +58,9 @@ public: virtual void reportBug(); virtual void setBackground(); virtual bool isValid() const { return _valid; } - virtual QString appletType() const { return "Applet"; } - virtual QString icon() const { return _info.icon(); } - virtual QString visibleName() const { return _info.name(); } + virtual TQString appletType() const { return "Applet"; } + virtual TQString icon() const { return _info.icon(); } + virtual TQString visibleName() const { return _info.name(); } int widthForHeight(int height) const; int heightForWidth(int width) const; @@ -76,7 +76,7 @@ public slots: virtual void setPopupDirection(KPanelApplet::Direction d); virtual void setOrientation(KPanelExtension::Orientation o); virtual void setImmutable(bool immutable); - void moveApplet( const QPoint& moveOffset ); + void moveApplet( const TQPoint& moveOffset ); void showAppletMenu(); void slotReconfigure(); void activateWindow(); @@ -86,18 +86,18 @@ protected: virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; virtual void alignmentChange(KPanelExtension::Alignment a); - virtual QPopupMenu* createOpMenu(); + virtual TQPopupMenu* createOpMenu(); AppletInfo _info; AppletHandle *_handle; - QHBox *_appletframe; - QBoxLayout *_layout; + TQHBox *_appletframe; + TQBoxLayout *_layout; KPanelApplet::Type _type; int _widthForHeightHint; int _heightForWidthHint; - QString _deskFile, _configFile; + TQString _deskFile, _configFile; bool _firstuse; - QCString _id; + TQCString _id; KPanelApplet * _applet; bool _valid; diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index cadbe592a..bb3d7d984 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kglobal.h> #include <kconfig.h> @@ -34,14 +34,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_base.h" #include "container_base.moc" -BaseContainer::BaseContainer( QPopupMenu* appletOpMenu, QWidget* parent, const char * name ) - : QWidget( parent, name ) +BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name ) + : TQWidget( parent, name ) , _dir(KPanelApplet::Up) , _orient(Horizontal) , _alignment(KPanelExtension::LeftTop) , _fspace(0) - , _moveOffset(QPoint(0,0)) - , _aid(QString::null) + , _moveOffset(TQPoint(0,0)) + , _aid(TQString::null) , _actions(0) , m_immutable(false) , _opMnu(0) @@ -53,10 +53,10 @@ BaseContainer::~BaseContainer() delete _opMnu; } -void BaseContainer::reparent(QWidget* parent, WFlags f, const QPoint& p, bool showIt) +void BaseContainer::reparent(TQWidget* parent, WFlags f, const TQPoint& p, bool showIt) { emit takeme(this); - QWidget::reparent(parent, f, p, showIt); + TQWidget::reparent(parent, f, p, showIt); } bool BaseContainer::isImmutable() const @@ -121,7 +121,7 @@ void BaseContainer::setAlignment(KPanelExtension::Alignment a) alignmentChange(a); } -QPopupMenu* BaseContainer::opMenu() +TQPopupMenu* BaseContainer::opMenu() { if (_opMnu == 0) { diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index aa3efeb98..1da1500cd 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __container_base_h__ #define __container_base_h__ -#include <qwidget.h> -#include <qpoint.h> -#include <qvaluelist.h> +#include <tqwidget.h> +#include <tqpoint.h> +#include <tqvaluelist.h> #include <kpanelextension.h> #include <kpanelapplet.h> @@ -39,14 +39,14 @@ class BaseContainer : public QWidget Q_OBJECT public: - typedef QValueList<BaseContainer*> List; - typedef QValueListIterator<BaseContainer*> Iterator; - typedef QValueListConstIterator<BaseContainer*> ConstIterator; + typedef TQValueList<BaseContainer*> List; + typedef TQValueListIterator<BaseContainer*> Iterator; + typedef TQValueListConstIterator<BaseContainer*> ConstIterator; - BaseContainer( QPopupMenu* appletOpMenu, QWidget* parent = 0, const char * name = 0 ); + BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent = 0, const char * name = 0 ); ~BaseContainer(); - virtual void reparent(QWidget * parent, WFlags f, const QPoint & p, bool showIt = false); + virtual void reparent(TQWidget * parent, WFlags f, const TQPoint & p, bool showIt = false); virtual int widthForHeight(int height) const = 0; virtual int heightForWidth(int width) const = 0; @@ -66,8 +66,8 @@ public: double freeSpace() const { return _fspace; } void setFreeSpace(double f) { _fspace = f; } - QString appletId() const { return _aid; } - void setAppletId(const QString& s) { _aid = s; } + TQString appletId() const { return _aid; } + void setAppletId(const TQString& s) { _aid = s; } virtual int actions() const { return _actions; } @@ -77,7 +77,7 @@ public: virtual void setBackground() {} - QPopupMenu* opMenu(); + TQPopupMenu* opMenu(); void clearOpMenu(); void loadConfiguration( KConfigGroup& ); @@ -86,11 +86,11 @@ public: void configure(KPanelExtension::Orientation, KPanelApplet::Direction); virtual void configure() {} - QPoint moveOffset() const { return _moveOffset; } + TQPoint moveOffset() const { return _moveOffset; } - virtual QString appletType() const = 0; - virtual QString icon() const { return "unknown"; } - virtual QString visibleName() const = 0; + virtual TQString appletType() const = 0; + virtual TQString icon() const { return "unknown"; } + virtual TQString visibleName() const = 0; public slots: virtual void slotRemoved(KConfig* config); @@ -113,21 +113,21 @@ protected: bool /* layoutOnly */ ) const {} virtual void alignmentChange(KPanelExtension::Alignment) {} - virtual QPopupMenu* createOpMenu() = 0; - QPopupMenu *appletOpMenu() const { return _appletOpMnu; } + virtual TQPopupMenu* createOpMenu() = 0; + TQPopupMenu *appletOpMenu() const { return _appletOpMnu; } KPanelApplet::Direction _dir; KPanelExtension::Orientation _orient; KPanelExtension::Alignment _alignment; double _fspace; - QPoint _moveOffset; - QString _aid; + TQPoint _moveOffset; + TQString _aid; int _actions; bool m_immutable; private: - QPopupMenu *_opMnu; - QPopupMenu *_appletOpMnu; + TQPopupMenu *_opMnu; + TQPopupMenu *_appletOpMnu; }; #endif diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index b050f371d..8ac39a47f 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <algorithm> -#include <qlayout.h> +#include <tqlayout.h> #include <kapplication.h> #include <kconfig.h> @@ -56,7 +56,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_button.h" #include "container_button.moc" -ButtonContainer::ButtonContainer(QPopupMenu* opMenu, QWidget* parent) +ButtonContainer::ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent) : BaseContainer(opMenu, parent) , _button(0) , _layout(0) @@ -145,21 +145,21 @@ void ButtonContainer::embedButton(PanelButton* b) if (!b) return; delete _layout; - _layout = new QVBoxLayout(this); + _layout = new TQVBoxLayout(this); _button = b; _button->installEventFilter(this); _layout->add(_button); - connect(_button, SIGNAL(requestSave()), SIGNAL(requestSave())); - connect(_button, SIGNAL(hideme(bool)), SLOT(hideRequested(bool))); - connect(_button, SIGNAL(removeme()), SLOT(removeRequested())); - connect(_button, SIGNAL(dragme(const QPixmap)), - SLOT(dragButton(const QPixmap))); - connect(_button, SIGNAL(dragme(const KURL::List, const QPixmap)), - SLOT(dragButton(const KURL::List, const QPixmap))); + connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave())); + connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool))); + connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested())); + connect(_button, TQT_SIGNAL(dragme(const TQPixmap)), + TQT_SLOT(dragButton(const TQPixmap))); + connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)), + TQT_SLOT(dragButton(const KURL::List, const TQPixmap))); } -QPopupMenu* ButtonContainer::createOpMenu() +TQPopupMenu* ButtonContainer::createOpMenu() { return new PanelAppletOpMenu(_actions, appletOpMenu(), 0, _button->title(), _button->icon(), this); @@ -187,7 +187,7 @@ void ButtonContainer::hideRequested(bool shouldHide) } } -void ButtonContainer::dragButton(const KURL::List urls, const QPixmap icon) +void ButtonContainer::dragButton(const KURL::List urls, const TQPixmap icon) { if (isImmutable()) { @@ -203,7 +203,7 @@ void ButtonContainer::dragButton(const KURL::List urls, const QPixmap icon) releaseKeyboard(); } -void ButtonContainer::dragButton(const QPixmap icon) +void ButtonContainer::dragButton(const TQPixmap icon) { PanelDrag* dd = new PanelDrag(this, this); dd->setPixmap(icon); @@ -212,9 +212,9 @@ void ButtonContainer::dragButton(const QPixmap icon) releaseKeyboard(); } -bool ButtonContainer::eventFilter(QObject *o, QEvent *e) +bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) { - if (o == _button && e->type() == QEvent::MouseButtonPress) + if (o == _button && e->type() == TQEvent::MouseButtonPress) { static bool sentinal = false; @@ -224,7 +224,7 @@ bool ButtonContainer::eventFilter(QObject *o, QEvent *e) } sentinal = true; - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); switch (me->button()) { case MidButton: @@ -249,11 +249,11 @@ bool ButtonContainer::eventFilter(QObject *o, QEvent *e) break; } - QPopupMenu* menu = opMenu(); - connect( menu, SIGNAL( aboutToHide() ), this, SLOT( slotMenuClosed() ) ); - QPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, + TQPopupMenu* menu = opMenu(); + connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); + TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, (orientation() == Horizontal) ? - QPoint(0, 0) : me->pos()); + TQPoint(0, 0) : me->pos()); Kicker::the()->setInsertionPoint(me->globalPos()); @@ -284,7 +284,7 @@ bool ButtonContainer::eventFilter(QObject *o, QEvent *e) } KickerTip::enableTipping(true); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); clearOpMenu(); sentinal = false; return true; @@ -322,7 +322,7 @@ void ButtonContainer::checkImmutability(const KConfigGroup& config) } // KMenuButton containerpan -KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, QPopupMenu *opMenu, QWidget* parent) +KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -330,7 +330,7 @@ KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, QPopupMen _actions = PanelAppletOpMenu::KMenuEditor; } -KMenuButtonContainer::KMenuButtonContainer(QPopupMenu *opMenu, QWidget* parent) +KMenuButtonContainer::KMenuButtonContainer(TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new KButton(this) ); @@ -346,14 +346,14 @@ int KMenuButtonContainer::heightForWidth( int width ) const } // DesktopButton container -DesktopButtonContainer::DesktopButtonContainer(QPopupMenu *opMenu, QWidget* parent) +DesktopButtonContainer::DesktopButtonContainer(TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new DesktopButton(this) ); } DesktopButtonContainer::DesktopButtonContainer(const KConfigGroup& config, - QPopupMenu *opMenu, QWidget* parent) + TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -361,8 +361,8 @@ DesktopButtonContainer::DesktopButtonContainer(const KConfigGroup& config, } // ServiceButton container -ServiceButtonContainer::ServiceButtonContainer( const QString& desktopFile, - QPopupMenu* opMenu, QWidget* parent) +ServiceButtonContainer::ServiceButtonContainer( const TQString& desktopFile, + TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new ServiceButton( desktopFile, this ) ); @@ -370,7 +370,7 @@ ServiceButtonContainer::ServiceButtonContainer( const QString& desktopFile, } ServiceButtonContainer::ServiceButtonContainer( const KService::Ptr &service, - QPopupMenu* opMenu, QWidget* parent) + TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new ServiceButton( service, this ) ); @@ -378,7 +378,7 @@ ServiceButtonContainer::ServiceButtonContainer( const KService::Ptr &service, } ServiceButtonContainer::ServiceButtonContainer( const KConfigGroup& config, - QPopupMenu* opMenu, QWidget* parent) + TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -386,25 +386,25 @@ ServiceButtonContainer::ServiceButtonContainer( const KConfigGroup& config, _actions = KPanelApplet::Preferences; } -QString ServiceButtonContainer::icon() const +TQString ServiceButtonContainer::icon() const { return button()->icon(); } -QString ServiceButtonContainer::visibleName() const +TQString ServiceButtonContainer::visibleName() const { return button()->title(); } // URLButton container -URLButtonContainer::URLButtonContainer( const QString& url, QPopupMenu* opMenu, QWidget* parent ) +URLButtonContainer::URLButtonContainer( const TQString& url, TQPopupMenu* opMenu, TQWidget* parent ) : ButtonContainer(opMenu, parent) { embedButton( new URLButton( url, this ) ); _actions = KPanelApplet::Preferences; } -URLButtonContainer::URLButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent) +URLButtonContainer::URLButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -412,25 +412,25 @@ URLButtonContainer::URLButtonContainer( const KConfigGroup& config, QPopupMenu* _actions = KPanelApplet::Preferences; } -QString URLButtonContainer::icon() const +TQString URLButtonContainer::icon() const { return button()->icon(); } -QString URLButtonContainer::visibleName() const +TQString URLButtonContainer::visibleName() const { return button()->title(); } // BrowserButton container -BrowserButtonContainer::BrowserButtonContainer(const QString &startDir, QPopupMenu* opMenu, const QString& icon, QWidget* parent) +BrowserButtonContainer::BrowserButtonContainer(const TQString &startDir, TQPopupMenu* opMenu, const TQString& icon, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new BrowserButton(icon, startDir, this) ); _actions = KPanelApplet::Preferences; } -BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent) +BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -439,45 +439,45 @@ BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, QPop } // ServiceMenuButton container -ServiceMenuButtonContainer::ServiceMenuButtonContainer(const QString& relPath, QPopupMenu* opMenu, QWidget* parent) +ServiceMenuButtonContainer::ServiceMenuButtonContainer(const TQString& relPath, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new ServiceMenuButton(relPath, this) ); } -ServiceMenuButtonContainer::ServiceMenuButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent) +ServiceMenuButtonContainer::ServiceMenuButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); embedButton( new ServiceMenuButton(config, this) ); } -QString ServiceMenuButtonContainer::icon() const +TQString ServiceMenuButtonContainer::icon() const { return button()->icon(); } -QString ServiceMenuButtonContainer::visibleName() const +TQString ServiceMenuButtonContainer::visibleName() const { return button()->title(); } // WindowListButton container -WindowListButtonContainer::WindowListButtonContainer(const KConfigGroup& config, QPopupMenu *opMenu, QWidget* parent) +WindowListButtonContainer::WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); embedButton( new WindowListButton(this) ); } -WindowListButtonContainer::WindowListButtonContainer(QPopupMenu *opMenu, QWidget* parent) +WindowListButtonContainer::WindowListButtonContainer(TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new WindowListButton(this) ); } // BookmarkButton container -BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, QPopupMenu *opMenu, QWidget* parent) +BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -485,7 +485,7 @@ BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, Q _actions = PanelAppletOpMenu::BookmarkEditor; } -BookmarksButtonContainer::BookmarksButtonContainer(QPopupMenu *opMenu, QWidget* parent) +BookmarksButtonContainer::BookmarksButtonContainer(TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new BookmarksButton(this) ); @@ -493,14 +493,14 @@ BookmarksButtonContainer::BookmarksButtonContainer(QPopupMenu *opMenu, QWidget* } // NonKDEAppButton container -NonKDEAppButtonContainer::NonKDEAppButtonContainer(const QString &name, - const QString &description, - const QString &filePath, - const QString &icon, - const QString &cmdLine, +NonKDEAppButtonContainer::NonKDEAppButtonContainer(const TQString &name, + const TQString &description, + const TQString &filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm, - QPopupMenu* opMenu, - QWidget* parent) + TQPopupMenu* opMenu, + TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton(new NonKDEAppButton(name, description, filePath, icon, cmdLine, @@ -508,7 +508,7 @@ NonKDEAppButtonContainer::NonKDEAppButtonContainer(const QString &name, _actions = KPanelApplet::Preferences; } -NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent) +NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -517,25 +517,25 @@ NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, } // ExtensionButton container -ExtensionButtonContainer::ExtensionButtonContainer(const QString& df, QPopupMenu* opMenu, QWidget *parent) +ExtensionButtonContainer::ExtensionButtonContainer(const TQString& df, TQPopupMenu* opMenu, TQWidget *parent) : ButtonContainer(opMenu, parent) { embedButton( new ExtensionButton(df, this) ); } -ExtensionButtonContainer::ExtensionButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent) +ExtensionButtonContainer::ExtensionButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); embedButton( new ExtensionButton(config, this) ); } -QString ExtensionButtonContainer::icon() const +TQString ExtensionButtonContainer::icon() const { return button()->icon(); } -QString ExtensionButtonContainer::visibleName() const +TQString ExtensionButtonContainer::visibleName() const { return button()->title(); } diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index 737271216..3d8592a6d 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -39,7 +39,7 @@ class ButtonContainer : public BaseContainer Q_OBJECT public: - ButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); + ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); virtual bool isValid() const; virtual bool isAMenu() const { return false; } @@ -51,7 +51,7 @@ public: virtual void configure(); - bool eventFilter (QObject *, QEvent *); + bool eventFilter (TQObject *, TQEvent *); virtual void completeMoveOperation(); PanelButton* button() const { return _button; } @@ -64,29 +64,29 @@ protected slots: void slotMenuClosed(); void removeRequested(); void hideRequested(bool); - void dragButton(const KURL::List urls, const QPixmap icon); - void dragButton(const QPixmap icon); + void dragButton(const KURL::List urls, const TQPixmap icon); + void dragButton(const TQPixmap icon); protected: virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; void embedButton(PanelButton* p); - QPopupMenu* createOpMenu(); + TQPopupMenu* createOpMenu(); void checkImmutability(const KConfigGroup&); protected: PanelButton *_button; - QLayout *_layout; - QPoint _oldpos; + TQLayout *_layout; + TQPoint _oldpos; }; class KMenuButtonContainer : public ButtonContainer { public: - KMenuButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - KMenuButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); - virtual QString appletType() const { return "KMenuButton"; } - virtual QString icon() const { return "kmenu"; } - virtual QString visibleName() const { return i18n("K Menu"); } + KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + KMenuButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); + virtual TQString appletType() const { return "KMenuButton"; } + virtual TQString icon() const { return "kmenu"; } + virtual TQString visibleName() const { return i18n("K Menu"); } virtual int heightForWidth( int width ) const; bool isAMenu() const { return true; } @@ -95,99 +95,99 @@ public: class DesktopButtonContainer : public ButtonContainer { public: - DesktopButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - DesktopButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "DesktopButton"; } - virtual QString icon() const { return "desktop"; } - virtual QString visibleName() const { return i18n("Desktop Access"); } + DesktopButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + DesktopButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "DesktopButton"; } + virtual TQString icon() const { return "desktop"; } + virtual TQString visibleName() const { return i18n("Desktop Access"); } }; class ServiceButtonContainer : public ButtonContainer { public: - ServiceButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - ServiceButtonContainer(const KService::Ptr & service, QPopupMenu* opMenu,QWidget* parent = 0); - ServiceButtonContainer(const QString& desktopFile, QPopupMenu* opMenu,QWidget* parent = 0); - QString appletType() const { return "ServiceButton"; } - virtual QString icon() const; - virtual QString visibleName() const; + ServiceButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + ServiceButtonContainer(const KService::Ptr & service, TQPopupMenu* opMenu,TQWidget* parent = 0); + ServiceButtonContainer(const TQString& desktopFile, TQPopupMenu* opMenu,TQWidget* parent = 0); + TQString appletType() const { return "ServiceButton"; } + virtual TQString icon() const; + virtual TQString visibleName() const; }; class URLButtonContainer : public ButtonContainer { public: - URLButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - URLButtonContainer(const QString& url, QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "URLButton"; } - virtual QString icon() const; - virtual QString visibleName() const; + URLButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + URLButtonContainer(const TQString& url, TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "URLButton"; } + virtual TQString icon() const; + virtual TQString visibleName() const; }; class BrowserButtonContainer : public ButtonContainer { public: - BrowserButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - BrowserButtonContainer(const QString& startDir, QPopupMenu* opMenu, const QString& icon = "kdisknav", QWidget* parent = 0); - QString appletType() const { return "BrowserButton"; } - virtual QString icon() const { return "kdisknav"; } - virtual QString visibleName() const { return i18n("Quick Browser"); } + BrowserButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + BrowserButtonContainer(const TQString& startDir, TQPopupMenu* opMenu, const TQString& icon = "kdisknav", TQWidget* parent = 0); + TQString appletType() const { return "BrowserButton"; } + virtual TQString icon() const { return "kdisknav"; } + virtual TQString visibleName() const { return i18n("Quick Browser"); } bool isAMenu() const { return true; } }; class ServiceMenuButtonContainer : public ButtonContainer { public: - ServiceMenuButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - ServiceMenuButtonContainer(const QString& relPath, QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "ServiceMenuButton"; } - virtual QString icon() const; - virtual QString visibleName() const; + ServiceMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + ServiceMenuButtonContainer(const TQString& relPath, TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "ServiceMenuButton"; } + virtual TQString icon() const; + virtual TQString visibleName() const; bool isAMenu() const { return true; } }; class WindowListButtonContainer : public ButtonContainer { public: - WindowListButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - WindowListButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "WindowListButton"; } - virtual QString icon() const { return "window_list"; } - virtual QString visibleName() const { return i18n("Windowlist"); } + WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + WindowListButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "WindowListButton"; } + virtual TQString icon() const { return "window_list"; } + virtual TQString visibleName() const { return i18n("Windowlist"); } bool isAMenu() const { return true; } }; class BookmarksButtonContainer : public ButtonContainer { public: - BookmarksButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - BookmarksButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "BookmarksButton"; } - virtual QString icon() const { return "bookmark"; } - virtual QString visibleName() const { return i18n("Bookmarks"); } + BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + BookmarksButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "BookmarksButton"; } + virtual TQString icon() const { return "bookmark"; } + virtual TQString visibleName() const { return i18n("Bookmarks"); } bool isAMenu() const { return true; } }; class NonKDEAppButtonContainer : public ButtonContainer { public: - NonKDEAppButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent=0); - NonKDEAppButtonContainer(const QString &name, const QString &description, - const QString &filePath, const QString &icon, - const QString &cmdLine, bool inTerm, - QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "ExecButton"; } - virtual QString icon() const { return "exec"; } - virtual QString visibleName() const { return i18n("Non-KDE Application"); } + NonKDEAppButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0); + NonKDEAppButtonContainer(const TQString &name, const TQString &description, + const TQString &filePath, const TQString &icon, + const TQString &cmdLine, bool inTerm, + TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "ExecButton"; } + virtual TQString icon() const { return "exec"; } + virtual TQString visibleName() const { return i18n("Non-KDE Application"); } }; class ExtensionButtonContainer : public ButtonContainer { public: - ExtensionButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent=0); - ExtensionButtonContainer(const QString& desktopFile, QPopupMenu* opMenu, QWidget *parent= 0); - QString appletType() const { return "ExtensionButton"; } - virtual QString icon() const; - virtual QString visibleName() const; + ExtensionButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0); + ExtensionButtonContainer(const TQString& desktopFile, TQPopupMenu* opMenu, TQWidget *parent= 0); + TQString appletType() const { return "ExtensionButton"; } + virtual TQString icon() const; + virtual TQString visibleName() const; bool isAMenu() const { return true; } }; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 694513109..7aee673f1 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -24,16 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> #include <math.h> -#include <qcursor.h> -#include <qfile.h> -#include <qlayout.h> -#include <qmovie.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvbox.h> +#include <tqcursor.h> +#include <tqfile.h> +#include <tqlayout.h> +#include <tqmovie.h> +#include <tqpainter.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvbox.h> #include <qxembed.h> -#include <qcolor.h> +#include <tqcolor.h> #include <dcopclient.h> #include <kconfig.h> @@ -66,9 +66,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define PANEL_SPEED(x, c) (int)((1.0-2.0*fabs((x)-(c)/2.0)/c)*m_settings.hideAnimationSpeed()+1.0) ExtensionContainer::ExtensionContainer(const AppletInfo& info, - const QString& extensionId, - QWidget *parent) - : QFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), + const TQString& extensionId, + TQWidget *parent) + : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), m_settings(KSharedConfig::openConfig(info.configFile())), m_hideMode(ManualHide), m_unhideTriggeredAt(UnhideTrigger::None), @@ -93,9 +93,9 @@ ExtensionContainer::ExtensionContainer(const AppletInfo& info, ExtensionContainer::ExtensionContainer(KPanelExtension* extension, const AppletInfo& info, - const QString& extensionId, - QWidget *parent) - : QFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), + const TQString& extensionId, + TQWidget *parent) + : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), m_settings(KSharedConfig::openConfig(info.configFile())), _autoHidden(false), _userHidden(Unhidden), @@ -111,7 +111,7 @@ ExtensionContainer::ExtensionContainer(KPanelExtension* extension, m_maintainFocus(0), m_panelOrder(ExtensionManager::the()->nextPanelOrder()) { - m_extension->reparent(this, QPoint(0, 0)); + m_extension->reparent(this, TQPoint(0, 0)); init(); } @@ -122,38 +122,38 @@ void ExtensionContainer::init() KWin::setState(winId(), NET::Sticky); KWin::setOnAllDesktops(winId(), true); - connect(Kicker::the()->kwinModule(), SIGNAL(strutChanged()), this, SLOT(strutChanged())); - connect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)), - this, SLOT( currentDesktopChanged(int))); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged())); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + this, TQT_SLOT( currentDesktopChanged(int))); setBackgroundOrigin(AncestorOrigin); setFrameStyle(NoFrame); setLineWidth(0); setMargin(0); - connect(UnhideTrigger::the(), SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), - this, SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); + connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), + this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); _popupWidgetFilter = new PopupWidgetFilter( this ); - connect(_popupWidgetFilter, SIGNAL(popupWidgetHiding()), SLOT(maybeStartAutoHideTimer())); + connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); // layout - _layout = new QGridLayout(this, 3, 3, 0, 0); - _layout->setResizeMode(QLayout::FreeResize); + _layout = new TQGridLayout(this, 3, 3, 0, 0); + _layout->setResizeMode(TQLayout::FreeResize); _layout->setRowStretch(1,10); _layout->setColStretch(1,10); // instantiate the autohide timer - _autohideTimer = new QTimer(this, "_autohideTimer"); - connect(_autohideTimer, SIGNAL(timeout()), SLOT(autoHideTimeout())); + _autohideTimer = new TQTimer(this, "_autohideTimer"); + connect(_autohideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoHideTimeout())); // instantiate the updateLayout event compressor timer - _updateLayoutTimer = new QTimer(this, "_updateLayoutTimer"); - connect(_updateLayoutTimer, SIGNAL(timeout()), SLOT(actuallyUpdateLayout())); + _updateLayoutTimer = new TQTimer(this, "_updateLayoutTimer"); + connect(_updateLayoutTimer, TQT_SIGNAL(timeout()), TQT_SLOT(actuallyUpdateLayout())); installEventFilter(this); // for mouse event handling - connect(Kicker::the(), SIGNAL(kdisplayPaletteChanged()), this, SLOT(updateHighlightColor())); + connect(Kicker::the(), TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! @@ -192,9 +192,9 @@ void ExtensionContainer::init() item->setDefaultValue(m_extension->customSize()); } - connect(m_extension, SIGNAL(updateLayout()), SLOT(updateLayout())); - connect(m_extension, SIGNAL(maintainFocus(bool)), - SLOT(maintainFocus(bool))); + connect(m_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(updateLayout())); + connect(m_extension, TQT_SIGNAL(maintainFocus(bool)), + TQT_SLOT(maintainFocus(bool))); _layout->addWidget(m_extension, 1, 1); } @@ -210,7 +210,7 @@ ExtensionContainer::~ExtensionContainer() { } -QSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const QSize &maxSize) const +TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const { int width = 0; int height = 0; @@ -255,7 +255,7 @@ QSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const QSize &max height += _layout->rowSpacing(0) + _layout->rowSpacing(2); } - QSize size(width, height); + TQSize size(width, height); size = size.boundedTo(maxSize); if (m_extension) @@ -342,7 +342,7 @@ void ExtensionContainer::writeConfig() m_settings.writeConfig(); } -void ExtensionContainer::showPanelMenu( const QPoint& globalPos ) +void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) { if (!kapp->authorizeKAction("kicker_rmb")) { @@ -354,7 +354,7 @@ void ExtensionContainer::showPanelMenu( const QPoint& globalPos ) // use the extenion's own custom menu Kicker::the()->setInsertionPoint(globalPos); m_extension->customMenu()->exec(globalPos); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); return; } @@ -366,7 +366,7 @@ void ExtensionContainer::showPanelMenu( const QPoint& globalPos ) this); } - QPopupMenu *menu = KickerLib::reduceMenu(_opMnu); + TQPopupMenu *menu = KickerLib::reduceMenu(_opMnu); Kicker::the()->setInsertionPoint(globalPos); @@ -390,7 +390,7 @@ void ExtensionContainer::showPanelMenu( const QPoint& globalPos ) default: break; } - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); } void ExtensionContainer::about() @@ -440,9 +440,9 @@ void ExtensionContainer::removeSessionConfigFile() return; } - if (QFile::exists(locate("config", _info.configFile()))) + if (TQFile::exists(locate("config", _info.configFile()))) { - QFile::remove(locate("config", _info.configFile())); + TQFile::remove(locate("config", _info.configFile())); } } @@ -462,7 +462,7 @@ void ExtensionContainer::moveMe() stopAutoHideTimer(); - QApplication::syncX(); + TQApplication::syncX(); UserRectSel::RectList rects; KPanelExtension::Position positions[] = { KPanelExtension::Left, @@ -473,7 +473,7 @@ void ExtensionContainer::moveMe() KPanelExtension::Center, KPanelExtension::RightBottom }; - for (int s = 0; s < QApplication::desktop()->numScreens(); s++) + for (int s = 0; s < TQApplication::desktop()->numScreens(); s++) { for (int i = 0; i < 4; i++) { @@ -552,13 +552,13 @@ void ExtensionContainer::actuallyUpdateLayout() void ExtensionContainer::enableMouseOverEffects() { KickerTip::enableTipping(true); - QPoint globalPos = QCursor::pos(); - QPoint localPos = mapFromGlobal(globalPos); - QWidget* child = childAt(localPos); + TQPoint globalPos = TQCursor::pos(); + TQPoint localPos = mapFromGlobal(globalPos); + TQWidget* child = childAt(localPos); if (child) { - QMouseEvent* e = new QMouseEvent(QEvent::Enter, localPos, globalPos, 0, 0); + TQMouseEvent* e = new TQMouseEvent(TQEvent::Enter, localPos, globalPos, 0, 0); qApp->sendEvent(child, e); } } @@ -656,11 +656,11 @@ void ExtensionContainer::unhideTriggered(UnhideTrigger::Trigger tr, int Xinerama // Otherwise hide mode is automatic. The code below is slightly // complex so as to keep the same behavior as it has always had: // only unhide when the cursor position is within the widget geometry. - // We can't just do geometry().contains(QCursor::pos()) because + // We can't just do geometry().contains(TQCursor::pos()) because // now we hide the panel completely off screen. - int x = QCursor::pos().x(); - int y = QCursor::pos().y(); + int x = TQCursor::pos().x(); + int y = TQCursor::pos().y(); int t = geometry().top(); int b = geometry().bottom(); int r = geometry().right(); @@ -700,7 +700,7 @@ void ExtensionContainer::autoHideTimeout() { // kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl; // Hack: If there is a popup open, don't autohide until it closes. - QWidget* popup = QApplication::activePopupWidget(); + TQWidget* popup = TQApplication::activePopupWidget(); if (popup) { @@ -728,8 +728,8 @@ void ExtensionContainer::autoHideTimeout() return; } - QRect r = geometry(); - QPoint p = QCursor::pos(); + TQRect r = geometry(); + TQPoint p = TQCursor::pos(); if (!r.contains(p) && (m_settings.unhideLocation() == UnhideTrigger::None || !shouldUnhideForTrigger(m_unhideTriggeredAt))) @@ -763,21 +763,21 @@ void ExtensionContainer::autoHide(bool hide) blockUserInput(true); - QPoint oldpos = pos(); - QRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden ); - QPoint newpos = newextent.topLeft(); + TQPoint oldpos = pos(); + TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden ); + TQPoint newpos = newextent.topLeft(); if (hide) { /* bail out if we are unable to hide */ - for (int s=0; s < QApplication::desktop()->numScreens(); s++) + for (int s=0; s < TQApplication::desktop()->numScreens(); s++) { /* don't let it intersect with any screen in the hidden position * that it doesn't intesect in the shown position. Should prevent * panels from hiding by sliding onto other screens, while still * letting them show reveal buttons onscreen */ - QRect desktopGeom = QApplication::desktop()->screenGeometry(s); + TQRect desktopGeom = TQApplication::desktop()->screenGeometry(s); if (desktopGeom.intersects(newextent) && !desktopGeom.intersects(geometry())) { @@ -848,11 +848,11 @@ void ExtensionContainer::autoHide(bool hide) updateLayout(); // Sometimes tooltips don't get hidden - QToolTip::hide(); + TQToolTip::hide(); _in_autohide = false; - QTimer::singleShot(100, this, SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); } void ExtensionContainer::animatedHide(bool left) @@ -875,24 +875,24 @@ void ExtensionContainer::animatedHide(bool left) newState = RightBottom; } - QPoint oldpos = pos(); - QRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState); - QPoint newpos(newextent.topLeft()); + TQPoint oldpos = pos(); + TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState); + TQPoint newpos(newextent.topLeft()); if (newState != Unhidden) { /* bail out if we are unable to hide */ - for(int s=0; s < QApplication::desktop()->numScreens(); s++) + for(int s=0; s < TQApplication::desktop()->numScreens(); s++) { /* don't let it intersect with any screen in the hidden position * that it doesn't intesect in the shown position. Should prevent * panels from hiding by sliding onto other screens, while still * letting them show reveal buttons onscreen */ - if (QApplication::desktop()->screenGeometry(s).intersects(newextent) && - !QApplication::desktop()->screenGeometry(s).intersects(geometry())) + if (TQApplication::desktop()->screenGeometry(s).intersects(newextent) && + !TQApplication::desktop()->screenGeometry(s).intersects(geometry())) { blockUserInput(false); - QTimer::singleShot(100, this, SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); return; } } @@ -955,7 +955,7 @@ void ExtensionContainer::animatedHide(bool left) config->setGroup(extensionId()); config->writeEntry("UserHidden", userHidden()); - QTimer::singleShot(100, this, SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); } bool ExtensionContainer::reserveStrut() const @@ -981,9 +981,9 @@ void ExtensionContainer::updateWindowManager() int w = 0; int h = 0; - QRect geom = initialGeometry(position(), alignment(), xineramaScreen()); - QRect virtRect(QApplication::desktop()->geometry()); - QRect screenRect(QApplication::desktop()->screenGeometry(xineramaScreen())); + TQRect geom = initialGeometry(position(), alignment(), xineramaScreen()); + TQRect virtRect(TQApplication::desktop()->geometry()); + TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen())); if (m_hideMode == ManualHide && !userHidden()) { @@ -1083,7 +1083,7 @@ void ExtensionContainer::currentDesktopChanged(int) void ExtensionContainer::strutChanged() { //kdDebug(1210) << "PanelContainer::strutChanged()" << endl; - QRect ig = currentGeometry(); + TQRect ig = currentGeometry(); if (ig != geometry()) { @@ -1265,8 +1265,8 @@ int ExtensionContainer::setupBorderSpace() } int layoutOffset = 0; - QRect r = QApplication::desktop()->screenGeometry(xineramaScreen()); - QRect h = geometry(); + TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen()); + TQRect h = geometry(); if (orientation() == Vertical) { @@ -1340,28 +1340,28 @@ void ExtensionContainer::updateHighlightColor() { KConfig *config = KGlobal::config(); config->setGroup("WM"); - QColor color = QApplication::palette().active().highlight(); + TQColor color = TQApplication::palette().active().highlight(); m_highlightColor = config->readColorEntry("activeBackground", &color); update(); } -void ExtensionContainer::paintEvent(QPaintEvent *e) +void ExtensionContainer::paintEvent(TQPaintEvent *e) { - QFrame::paintEvent(e); + TQFrame::paintEvent(e); if (needsBorder()) { // draw border - QPainter p(this); + TQPainter p(this); if (KickerSettings::useBackgroundTheme() && KickerSettings::colorizeBackground()) p.setPen(m_highlightColor); else - p.setPen(palette().color(QPalette::Active, QColorGroup::Mid)); + p.setPen(palette().color(TQPalette::Active, TQColorGroup::Mid)); p.drawRect(0, 0, width(), height()); } } -void ExtensionContainer::leaveEvent(QEvent*) +void ExtensionContainer::leaveEvent(TQEvent*) { maybeStartAutoHideTimer(); } @@ -1405,8 +1405,8 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS) if (_autoHidden) { autoHide(false); - QTimer::singleShot(showForAtLeastHowManyMS, - this, SLOT(maybeStartAutoHideTimer())); + TQTimer::singleShot(showForAtLeastHowManyMS, + this, TQT_SLOT(maybeStartAutoHideTimer())); return; } @@ -1433,19 +1433,19 @@ void ExtensionContainer::setHideButtons(bool showLeft, bool showRight) resetLayout(); } -bool ExtensionContainer::event(QEvent* e) +bool ExtensionContainer::event(TQEvent* e) { // Update the layout when we receive a LayoutHint. This way we can adjust // to changes of the layout of the main widget. - if (e->type() == QEvent::LayoutHint) + if (e->type() == TQEvent::LayoutHint) { updateLayout(); } - return QFrame::event(e); + return TQFrame::event(e); } -void ExtensionContainer::closeEvent(QCloseEvent* e) +void ExtensionContainer::closeEvent(TQCloseEvent* e) { // Prevent being closed via Alt-F4 e->ignore(); @@ -1519,7 +1519,7 @@ KPanelExtension::Position ExtensionContainer::position() const void ExtensionContainer::resetLayout() { - QRect g = initialGeometry(position(), alignment(), xineramaScreen(), + TQRect g = initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); // Disable the layout while we rearrange the panel. @@ -1547,7 +1547,7 @@ void ExtensionContainer::resetLayout() _ltHB = new HideButton(this); _ltHB->installEventFilter(this); _ltHB->setEnabled(true); - connect(_ltHB, SIGNAL(clicked()), this, SLOT(hideLeft())); + connect(_ltHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideLeft())); haveToArrangeButtons = true; } @@ -1578,7 +1578,7 @@ void ExtensionContainer::resetLayout() _rbHB = new HideButton(this); _rbHB->installEventFilter(this); _rbHB->setEnabled(true); - connect(_rbHB, SIGNAL(clicked()), this, SLOT(hideRight())); + connect(_rbHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideRight())); haveToArrangeButtons = true; } @@ -1602,27 +1602,27 @@ void ExtensionContainer::resetLayout() if (_ltHB) { - QToolTip::remove(_ltHB); + TQToolTip::remove(_ltHB); if (userHidden()) { - QToolTip::add(_ltHB, i18n("Show panel")); + TQToolTip::add(_ltHB, i18n("Show panel")); } else { - QToolTip::add(_ltHB, i18n("Hide panel")); + TQToolTip::add(_ltHB, i18n("Hide panel")); } } if (_rbHB) { - QToolTip::remove( _rbHB ); + TQToolTip::remove( _rbHB ); if (userHidden()) { - QToolTip::add(_rbHB, i18n("Show panel")); + TQToolTip::add(_rbHB, i18n("Show panel")); } else { - QToolTip::add(_rbHB, i18n("Hide panel")); + TQToolTip::add(_rbHB, i18n("Hide panel")); } } @@ -1692,13 +1692,13 @@ bool ExtensionContainer::needsBorder() const //&& !KickerSettings::useBackgroundTheme(); } -QSize ExtensionContainer::initialSize(KPanelExtension::Position p, QRect workArea) const +TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workArea) const { /*kdDebug(1210) << "initialSize() Work Area: (" << workArea.topLeft().x() << ", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() << ", " << workArea.bottomRight().y() << ")" << endl;*/ - QSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size()); + TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size()); int width = 0; int height = 0; @@ -1723,25 +1723,25 @@ QSize ExtensionContainer::initialSize(KPanelExtension::Position p, QRect workAre } } - return QSize(width, height); + return TQSize(width, height); } -QPoint ExtensionContainer::initialLocation(KPanelExtension::Position p, +TQPoint ExtensionContainer::initialLocation(KPanelExtension::Position p, KPanelExtension::Alignment a, int XineramaScreen, - const QSize &s, - QRect workArea, + const TQSize &s, + TQRect workArea, bool autohidden, UserHidden userHidden) const { - QRect wholeScreen; + TQRect wholeScreen; if (XineramaScreen == XineramaAllScreens) { - wholeScreen = QApplication::desktop()->geometry(); + wholeScreen = TQApplication::desktop()->geometry(); } else { - wholeScreen = QApplication::desktop()->screenGeometry(XineramaScreen); + wholeScreen = TQApplication::desktop()->screenGeometry(XineramaScreen); } /*kdDebug(1210) << "initialLocation() Work Area: (" << @@ -1890,7 +1890,7 @@ QPoint ExtensionContainer::initialLocation(KPanelExtension::Position p, } } - return QPoint( left, top ); + return TQPoint( left, top ); } int ExtensionContainer::xineramaScreen() const @@ -1900,14 +1900,14 @@ int ExtensionContainer::xineramaScreen() const /* -2 means all screens, -1 primary screens, the rest are valid screen numbers */ if (XineramaAllScreens <= m_settings.xineramaScreen() && - m_settings.xineramaScreen() < QApplication::desktop()->numScreens()) + m_settings.xineramaScreen() < TQApplication::desktop()->numScreens()) { return m_settings.xineramaScreen(); } else { /* force invalid screen locations onto the primary screen */ - return QApplication::desktop()->primaryScreen(); + return TQApplication::desktop()->primaryScreen(); } } @@ -1921,13 +1921,13 @@ void ExtensionContainer::setXineramaScreen(int screen) arrange(position(),alignment(), screen); } -QRect ExtensionContainer::currentGeometry() const +TQRect ExtensionContainer::currentGeometry() const { return initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); } -QRect ExtensionContainer::initialGeometry(KPanelExtension::Position p, +TQRect ExtensionContainer::initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, int XineramaScreen, bool autoHidden, @@ -1937,54 +1937,54 @@ QRect ExtensionContainer::initialGeometry(KPanelExtension::Position p, /*kdDebug(1210) << "initialGeometry() Computing geometry for " << name() << " on screen " << XineramaScreen << endl;*/ - QRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this); - QSize size = initialSize(p, workArea); - QPoint point = initialLocation(p, a, XineramaScreen, + TQRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this); + TQSize size = initialSize(p, workArea); + TQPoint point = initialLocation(p, a, XineramaScreen, size, workArea, autoHidden, userHidden); //kdDebug(1210) << "Size: " << size.width() << " x " << size.height() << endl; //kdDebug(1210) << "Pos: (" << point.x() << ", " << point.y() << ")" << endl; - return QRect(point, size); + return TQRect(point, size); } -bool ExtensionContainer::eventFilter( QObject*, QEvent * e) +bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { if (autoHidden()) { switch ( e->type() ) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: - case QEvent::KeyPress: - case QEvent::KeyRelease: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::MouseButtonDblClick: + case TQEvent::MouseMove: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: return true; // ignore; default: break; } } - QEvent::Type eventType = e->type(); + TQEvent::Type eventType = e->type(); if (_block_user_input) { - return (eventType == QEvent::MouseButtonPress || - eventType == QEvent::MouseButtonRelease || - eventType == QEvent::MouseButtonDblClick || - eventType == QEvent::MouseMove || - eventType == QEvent::KeyPress || - eventType == QEvent::KeyRelease || - eventType == QEvent::Enter || - eventType == QEvent::Leave); + return (eventType == TQEvent::MouseButtonPress || + eventType == TQEvent::MouseButtonRelease || + eventType == TQEvent::MouseButtonDblClick || + eventType == TQEvent::MouseMove || + eventType == TQEvent::KeyPress || + eventType == TQEvent::KeyRelease || + eventType == TQEvent::Enter || + eventType == TQEvent::Leave); } switch (eventType) { - case QEvent::MouseButtonPress: + case TQEvent::MouseButtonPress: { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if ( me->button() == LeftButton ) { _last_lmb_press = me->globalPos(); @@ -1998,9 +1998,9 @@ bool ExtensionContainer::eventFilter( QObject*, QEvent * e) } break; - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if ( me->button() == LeftButton ) { _is_lmb_down = false; @@ -2008,16 +2008,16 @@ bool ExtensionContainer::eventFilter( QObject*, QEvent * e) } break; - case QEvent::MouseMove: + case TQEvent::MouseMove: { - QMouseEvent* me = (QMouseEvent*) e; + TQMouseEvent* me = (TQMouseEvent*) e; if (_is_lmb_down && ((me->state() & LeftButton) == LeftButton) && !Kicker::the()->isImmutable() && !m_settings.config()->isImmutable() && !ExtensionManager::the()->isMenuBar(this)) { - QPoint p(me->globalPos() - _last_lmb_press); + TQPoint p(me->globalPos() - _last_lmb_press); int x_threshold = width(); int y_threshold = height(); @@ -2049,14 +2049,14 @@ bool ExtensionContainer::eventFilter( QObject*, QEvent * e) return false; } -PopupWidgetFilter::PopupWidgetFilter( QObject *parent ) - : QObject( parent, "PopupWidgetFilter" ) +PopupWidgetFilter::PopupWidgetFilter( TQObject *parent ) + : TQObject( parent, "PopupWidgetFilter" ) { } -bool PopupWidgetFilter::eventFilter( QObject*, QEvent* e ) +bool PopupWidgetFilter::eventFilter( TQObject*, TQEvent* e ) { - if (e->type() == QEvent::Hide) + if (e->type() == TQEvent::Hide) { emit popupWidgetHiding(); } diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index aebe048e6..cdc608392 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __container_extension_h__ #define __container_extension_h__ -#include <qframe.h> -#include <qptrlist.h> +#include <tqframe.h> +#include <tqptrlist.h> #include <kpanelextension.h> #include <dcopobject.h> @@ -58,24 +58,24 @@ public: enum HideMode { ManualHide, AutomaticHide, BackgroundHide }; ExtensionContainer(const AppletInfo& info, - const QString& extensionId, - QWidget *parent = 0); + const TQString& extensionId, + TQWidget *parent = 0); ExtensionContainer(KPanelExtension* extension, const AppletInfo& info, - const QString& extensionId, - QWidget *parent = 0); + const TQString& extensionId, + TQWidget *parent = 0); virtual ~ExtensionContainer(); - virtual QSize sizeHint(KPanelExtension::Position, const QSize &maxSize) const; + virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const; const AppletInfo& info() const { return _info; } - QString extensionId() const { return _id; } + TQString extensionId() const { return _id; } void readConfig(); void writeConfig(); - virtual QString panelId() const { return extensionId(); } + virtual TQString panelId() const { return extensionId(); } virtual void about(); virtual void help(); @@ -103,12 +103,12 @@ public: KPanelExtension::Alignment alignment() const; void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } - QRect currentGeometry() const; - QRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, + TQRect currentGeometry() const; + TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, int XineramaScreen, bool autoHidden = false, UserHidden userHidden = Unhidden) const; - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( TQObject *, TQEvent * ); int panelOrder() const { return m_panelOrder; } void setPanelOrder(int order) { m_panelOrder = order; } @@ -117,7 +117,7 @@ signals: void removeme(ExtensionContainer*); protected slots: - virtual void showPanelMenu( const QPoint& pos ); + virtual void showPanelMenu( const TQPoint& pos ); void moveMe(); void updateLayout(); void actuallyUpdateLayout(); @@ -125,10 +125,10 @@ protected slots: void updateHighlightColor(); protected: - bool event(QEvent*); - void closeEvent( QCloseEvent* e ); - void paintEvent(QPaintEvent*); - void leaveEvent(QEvent*); + bool event(TQEvent*); + void closeEvent( TQCloseEvent* e ); + void paintEvent(TQPaintEvent*); + void leaveEvent(TQEvent*); void arrange(KPanelExtension::Position p, KPanelExtension::Alignment a, int XineramaScreen); bool autoHidden() const { return _autoHidden; }; @@ -154,9 +154,9 @@ private slots: private: bool shouldUnhideForTrigger(UnhideTrigger::Trigger t) const; void init(); - QSize initialSize(KPanelExtension::Position p, QRect workArea) const; - QPoint initialLocation(KPanelExtension::Position p, KPanelExtension::Alignment a, - int XineramaScreen, const QSize &s, QRect workArea, + TQSize initialSize(KPanelExtension::Position p, TQRect workArea) const; + TQPoint initialLocation(KPanelExtension::Position p, KPanelExtension::Alignment a, + int XineramaScreen, const TQSize &s, TQRect workArea, bool autohidden = false, UserHidden userHidden = Unhidden) const; void positionChange(KPanelExtension::Position p); void alignmentChange(KPanelExtension::Alignment a); @@ -172,17 +172,17 @@ private: bool _autoHidden; UserHidden _userHidden; bool _block_user_input; - QPoint _last_lmb_press; + TQPoint _last_lmb_press; bool _is_lmb_down; bool _in_autohide; // Misc objects - QTimer *_autohideTimer; - QTimer *_updateLayoutTimer; + TQTimer *_autohideTimer; + TQTimer *_updateLayoutTimer; NETExtendedStrut _strut; PopupWidgetFilter *_popupWidgetFilter; - QString _id; + TQString _id; PanelExtensionOpMenu *_opMnu; AppletInfo _info; KPanelExtension::Type _type; @@ -190,12 +190,12 @@ private: // Widgets HideButton *_ltHB; // Left Hide Button HideButton *_rbHB; // Right Hide Button - QGridLayout *_layout; + TQGridLayout *_layout; KPanelExtension *m_extension; int m_maintainFocus; int m_panelOrder; - QColor m_highlightColor; + TQColor m_highlightColor; }; class PopupWidgetFilter : public QObject @@ -203,13 +203,13 @@ class PopupWidgetFilter : public QObject Q_OBJECT public: - PopupWidgetFilter( QObject *parent ); + PopupWidgetFilter( TQObject *parent ); ~PopupWidgetFilter() {} - bool eventFilter( QObject *obj, QEvent* e ); + bool eventFilter( TQObject *obj, TQEvent* e ); signals: void popupWidgetHiding(); }; -typedef QValueList<ExtensionContainer*> ExtensionList; +typedef TQValueList<ExtensionContainer*> ExtensionList; #endif diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 23732e684..7d63d562a 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <unistd.h> -#include <qdir.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qstyle.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qwmatrix.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqwmatrix.h> #include <kapplication.h> #include <kglobal.h> @@ -69,8 +69,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern int kicker_screen_number; ContainerArea::ContainerArea(KConfig* _c, - QWidget* parent, - QPopupMenu* opMenu, + TQWidget* parent, + TQPopupMenu* opMenu, const char* name) : Panner(parent, name), _moveAC(0), @@ -78,7 +78,7 @@ ContainerArea::ContainerArea(KConfig* _c, _config(_c), _dragIndicator(0), _dragMoveAC(0), - _dragMoveOffset(QPoint(0,0)), + _dragMoveOffset(TQPoint(0,0)), m_opMenu(opMenu), _rootPixmap(0), _useBgTheme(false), @@ -100,11 +100,11 @@ ContainerArea::ContainerArea(KConfig* _c, setBackground(); - connect(&_autoScrollTimer, SIGNAL(timeout()), SLOT(autoScroll())); - connect(kapp, SIGNAL(kdisplayPaletteChanged()), SLOT(setBackground())); - connect(Kicker::the(), SIGNAL(immutabilityChanged(bool)), - SLOT(immutabilityChanged(bool))); - connect(this, SIGNAL(contentsMoving(int, int)), SLOT(setBackground())); + connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(setBackground())); + connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), + TQT_SLOT(immutabilityChanged(bool))); + connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); } ContainerArea::~ContainerArea() @@ -139,7 +139,7 @@ void ContainerArea::initialize(bool useDefaultConfig) } setAcceptDrops(!isImmutable()); - QTimer::singleShot(0, this, SLOT(resizeContents())); + TQTimer::singleShot(0, this, TQT_SLOT(resizeContents())); } void ContainerArea::defaultContainerConfig() @@ -160,12 +160,12 @@ void ContainerArea::defaultContainerConfig() } dsize -= 560; - QStringList buttons; + TQStringList buttons; - QFile f(locate("data", "kicker/default-apps")); + TQFile f(locate("data", "kicker/default-apps")); if (f.open(IO_ReadOnly)) { - QTextStream is(&f); + TQTextStream is(&f); while (!is.eof()) buttons << is.readLine(); @@ -179,7 +179,7 @@ void ContainerArea::defaultContainerConfig() } //int size = dsize; - for (QStringList::ConstIterator it = buttons.begin(); it != buttons.end(); ++it) + for (TQStringList::ConstIterator it = buttons.begin(); it != buttons.end(); ++it) { /*size -= 42; if (size <= 0) @@ -190,9 +190,9 @@ void ContainerArea::defaultContainerConfig() if (!service) { // look for a special button - QString s = locate("appdata", *it); + TQString s = locate("appdata", *it); if (s.isEmpty()) continue; - QString itExt = (*it).section('/', 1); + TQString itExt = (*it).section('/', 1); button = new ExtensionButtonContainer(itExt, m_opMenu, m_contents); } else @@ -216,7 +216,7 @@ void ContainerArea::defaultContainerConfig() AppletContainer* a = manager->createAppletContainer( "minipagerapplet.desktop", true, - QString::null, + TQString::null, m_opMenu, m_contents); if (a) @@ -229,7 +229,7 @@ void ContainerArea::defaultContainerConfig() a = manager->createAppletContainer( "taskbarapplet.desktop", true, - QString::null, + TQString::null, m_opMenu, m_contents); if (a) @@ -242,7 +242,7 @@ void ContainerArea::defaultContainerConfig() a = manager->createAppletContainer( "systemtrayapplet.desktop", true, - QString::null, + TQString::null, m_opMenu, m_contents ); if (a) @@ -255,7 +255,7 @@ void ContainerArea::defaultContainerConfig() a = manager->createAppletContainer( "clockapplet.desktop", true, - QString::null, + TQString::null, m_opMenu, m_contents ); if (a) @@ -274,17 +274,17 @@ void ContainerArea::defaultContainerConfig() saveContainerConfig(); } -void ContainerArea::loadContainers(const QStringList& containers) +void ContainerArea::loadContainers(const TQStringList& containers) { // read applet list bool badApplets = false; // now restore the applets - QStringList::const_iterator it = containers.constBegin(); - QStringList::const_iterator itEnd = containers.constEnd(); + TQStringList::const_iterator it = containers.constBegin(); + TQStringList::const_iterator itEnd = containers.constEnd(); for (; it != itEnd; ++it) { - QString appletId(*it); + TQString appletId(*it); // is there a config group for this applet? if (!_config->hasGroup(appletId)) @@ -298,7 +298,7 @@ void ContainerArea::loadContainers(const QStringList& containers) int sep = appletId.findRev('_'); Q_ASSERT(sep != -1); - QString appletType = appletId.left(sep); + TQString appletType = appletId.left(sep); // create a matching applet container if (appletType == "KMenuButton") @@ -359,7 +359,7 @@ void ContainerArea::loadContainers(const QStringList& containers) // it gets executed too soon. we need to wait until the containers are // actually resized, but we enter the event loop prior to that happening // above. - QTimer::singleShot(0, this, SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); } void ContainerArea::saveContainerConfig(bool layoutOnly) @@ -370,8 +370,8 @@ void ContainerArea::saveContainerConfig(bool layoutOnly) } // Save the applet list - QStringList alist; - QLayoutIterator it2 = m_layout->iterator(); + TQStringList alist; + TQLayoutIterator it2 = m_layout->iterator(); for (; it2.current(); ++it2) { BaseContainer* a = dynamic_cast<BaseContainer*>(it2.current()->widget()); @@ -414,9 +414,9 @@ void ContainerArea::configure() resizeContents(); } -const QWidget* ContainerArea::addButton(const AppletInfo& info) +const TQWidget* ContainerArea::addButton(const AppletInfo& info) { - QString buttonType = info.library(); + TQString buttonType = info.library(); if (buttonType == "BookmarksButton") { @@ -453,7 +453,7 @@ const QWidget* ContainerArea::addButton(const AppletInfo& info) return 0; } -const QWidget* ContainerArea::addKMenuButton() +const TQWidget* ContainerArea::addKMenuButton() { if (!canAddContainers()) { @@ -465,7 +465,7 @@ const QWidget* ContainerArea::addKMenuButton() return b; } -const QWidget* ContainerArea::addDesktopButton() +const TQWidget* ContainerArea::addDesktopButton() { if (!canAddContainers()) { @@ -477,7 +477,7 @@ const QWidget* ContainerArea::addDesktopButton() return b; } -const QWidget* ContainerArea::addWindowListButton() +const TQWidget* ContainerArea::addWindowListButton() { if (!canAddContainers()) { @@ -489,7 +489,7 @@ const QWidget* ContainerArea::addWindowListButton() return b; } -const QWidget* ContainerArea::addBookmarksButton() +const TQWidget* ContainerArea::addBookmarksButton() { if (!canAddContainers()) { @@ -501,7 +501,7 @@ const QWidget* ContainerArea::addBookmarksButton() return b; } -const QWidget* ContainerArea::addServiceButton(const QString& desktopFile) +const TQWidget* ContainerArea::addServiceButton(const TQString& desktopFile) { if (!canAddContainers()) { @@ -514,7 +514,7 @@ const QWidget* ContainerArea::addServiceButton(const QString& desktopFile) return b; } -const QWidget* ContainerArea::addURLButton(const QString &url) +const TQWidget* ContainerArea::addURLButton(const TQString &url) { if (!canAddContainers()) { @@ -526,17 +526,17 @@ const QWidget* ContainerArea::addURLButton(const QString &url) return b; } -const QWidget* ContainerArea::addBrowserButton() +const TQWidget* ContainerArea::addBrowserButton() { if (!canAddContainers()) { return 0; } - PanelBrowserDialog *dlg = new PanelBrowserDialog(QDir::home().path(), + PanelBrowserDialog *dlg = new PanelBrowserDialog(TQDir::home().path(), "kdisknav"); - if (dlg->exec() == QDialog::Accepted) + if (dlg->exec() == TQDialog::Accepted) { return addBrowserButton(dlg->path(), dlg->icon()); } @@ -544,8 +544,8 @@ const QWidget* ContainerArea::addBrowserButton() return 0; } -const QWidget* ContainerArea::addBrowserButton(const QString &startDir, - const QString& icon) +const TQWidget* ContainerArea::addBrowserButton(const TQString &startDir, + const TQString& icon) { if (!canAddContainers()) { @@ -558,7 +558,7 @@ const QWidget* ContainerArea::addBrowserButton(const QString &startDir, return b; } -const QWidget* ContainerArea::addServiceMenuButton(const QString& relPath) +const TQWidget* ContainerArea::addServiceMenuButton(const TQString& relPath) { if (!canAddContainers()) { @@ -571,17 +571,17 @@ const QWidget* ContainerArea::addServiceMenuButton(const QString& relPath) return b; } -const QWidget* ContainerArea::addNonKDEAppButton() +const TQWidget* ContainerArea::addNonKDEAppButton() { if (!canAddContainers()) { return 0; } - PanelExeDialog dlg(QString::null, QString::null, QString::null, - QString::null, QString::null, false, 0); + PanelExeDialog dlg(TQString::null, TQString::null, TQString::null, + TQString::null, TQString::null, false, 0); - if (dlg.exec() == QDialog::Accepted) + if (dlg.exec() == TQDialog::Accepted) { return addNonKDEAppButton(dlg.title(), dlg.description(), dlg.command(), dlg.iconPath(), @@ -592,11 +592,11 @@ const QWidget* ContainerArea::addNonKDEAppButton() return 0; } -const QWidget* ContainerArea::addNonKDEAppButton(const QString &name, - const QString &description, - const QString& filePath, - const QString &icon, - const QString &cmdLine, +const TQWidget* ContainerArea::addNonKDEAppButton(const TQString &name, + const TQString &description, + const TQString& filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm) { if (!canAddContainers()) @@ -613,7 +613,7 @@ const QWidget* ContainerArea::addNonKDEAppButton(const QString &name, return b; } -const QWidget* ContainerArea::addExtensionButton(const QString& df) +const TQWidget* ContainerArea::addExtensionButton(const TQString& df) { if (!canAddContainers()) { @@ -651,7 +651,7 @@ AppletContainer* ContainerArea::addApplet(const AppletInfo& info, AppletContainer* a = PluginManager::the()->createAppletContainer( info.desktopFile(), false, // not startup - QString::null, // no config + TQString::null, // no config m_opMenu, m_contents, isImmutable); @@ -682,8 +682,8 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) if (arrange) { - QWidget* w = m_layout->widgetAt(index); - QPoint oldInsertionPoint = Kicker::the()->insertionPoint(); + TQWidget* w = m_layout->widgetAt(index); + TQPoint oldInsertionPoint = Kicker::the()->insertionPoint(); if (w) { // let's set the insertion point to where the widget asked to be @@ -693,7 +693,7 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) if (Kicker::the()->insertionPoint().isNull()) { - m_layout->insertIntoFreeSpace(a, QPoint()); + m_layout->insertIntoFreeSpace(a, TQPoint()); } else { @@ -710,20 +710,20 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) m_layout->add(a); } - connect(a, SIGNAL(moveme(BaseContainer*)), - SLOT(startContainerMove(BaseContainer*))); - connect(a, SIGNAL(removeme(BaseContainer*)), - SLOT(removeContainer(BaseContainer*))); - connect(a, SIGNAL(takeme(BaseContainer*)), - SLOT(takeContainer(BaseContainer*))); - connect(a, SIGNAL(requestSave()), - SLOT(slotSaveContainerConfig())); - connect(a, SIGNAL(maintainFocus(bool)), - this, SIGNAL(maintainFocus(bool))); + connect(a, TQT_SIGNAL(moveme(BaseContainer*)), + TQT_SLOT(startContainerMove(BaseContainer*))); + connect(a, TQT_SIGNAL(removeme(BaseContainer*)), + TQT_SLOT(removeContainer(BaseContainer*))); + connect(a, TQT_SIGNAL(takeme(BaseContainer*)), + TQT_SLOT(takeContainer(BaseContainer*))); + connect(a, TQT_SIGNAL(requestSave()), + TQT_SLOT(slotSaveContainerConfig())); + connect(a, TQT_SIGNAL(maintainFocus(bool)), + this, TQT_SIGNAL(maintainFocus(bool))); if (dynamic_cast<AppletContainer*>(a)) { - connect(a, SIGNAL(updateLayout()), SLOT(resizeContents())); + connect(a, TQT_SIGNAL(updateLayout()), TQT_SLOT(resizeContents())); } a->configure(orientation(), popupDirection()); @@ -806,16 +806,16 @@ void ContainerArea::takeContainer(BaseContainer* a) return; } - disconnect(a, SIGNAL(moveme(BaseContainer*)), - this, SLOT(startContainerMove(BaseContainer*))); - disconnect(a, SIGNAL(removeme(BaseContainer*)), - this, SLOT(removeContainer(BaseContainer*))); - disconnect(a, SIGNAL(takeme(BaseContainer*)), - this, SLOT(takeContainer(BaseContainer*))); - disconnect(a, SIGNAL(requestSave()), - this, SLOT(slotSaveContainerConfig())); - disconnect(a, SIGNAL(maintainFocus(bool)), - this, SIGNAL(maintainFocus(bool))); + disconnect(a, TQT_SIGNAL(moveme(BaseContainer*)), + this, TQT_SLOT(startContainerMove(BaseContainer*))); + disconnect(a, TQT_SIGNAL(removeme(BaseContainer*)), + this, TQT_SLOT(removeContainer(BaseContainer*))); + disconnect(a, TQT_SIGNAL(takeme(BaseContainer*)), + this, TQT_SLOT(takeContainer(BaseContainer*))); + disconnect(a, TQT_SIGNAL(requestSave()), + this, TQT_SLOT(slotSaveContainerConfig())); + disconnect(a, TQT_SIGNAL(maintainFocus(bool)), + this, TQT_SIGNAL(maintainFocus(bool))); // Just remove the group from our own config file. Leave separate config // files untouched. @@ -859,10 +859,10 @@ void ContainerArea::resizeContents() } } -QString ContainerArea::createUniqueId(const QString& appletType) const +TQString ContainerArea::createUniqueId(const TQString& appletType) const { - QString idBase = appletType + "_%1"; - QString newId; + TQString idBase = appletType + "_%1"; + TQString newId; int i = 0; bool unique = false; @@ -911,7 +911,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) a->raise(); } -void ContainerArea::mouseReleaseEvent(QMouseEvent *) +void ContainerArea::mouseReleaseEvent(TQMouseEvent *) { if (!_moveAC) { @@ -936,7 +936,7 @@ void ContainerArea::mouseReleaseEvent(QMouseEvent *) saveContainerConfig(true); } -void ContainerArea::mouseMoveEvent(QMouseEvent *ev) +void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) { if (!_moveAC) { @@ -1035,7 +1035,7 @@ bool ContainerArea::isImmutable() const return m_immutable || Kicker::the()->isImmutable(); } -void ContainerArea::dragEnterEvent(QDragEnterEvent *ev) +void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) { bool canAccept = !isImmutable() && (PanelDrag::canDecode(ev) || @@ -1066,13 +1066,13 @@ void ContainerArea::dragEnterEvent(QDragEnterEvent *ev) if (orientation() == Horizontal) { - _dragIndicator->setPreferredSize(QSize(preferedWidth, height())); + _dragIndicator->setPreferredSize(TQSize(preferedWidth, height())); } else { - _dragIndicator->setPreferredSize(QSize(width(), preferedHeight)); + _dragIndicator->setPreferredSize(TQSize(width(), preferedHeight)); } - _dragMoveOffset = QPoint(_dragIndicator->width()/2, + _dragMoveOffset = TQPoint(_dragIndicator->width()/2, _dragIndicator->height()/2); // Find the container before the position of the dragindicator. @@ -1108,7 +1108,7 @@ void ContainerArea::dragEnterEvent(QDragEnterEvent *ev) _dragIndicator->show(); } -void ContainerArea::dragMoveEvent(QDragMoveEvent* ev) +void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) { if (ev->source() == this) { @@ -1117,10 +1117,10 @@ void ContainerArea::dragMoveEvent(QDragMoveEvent* ev) // then it does work only on every second event. // Cancel the drag by faking an Escape keystroke. - QKeyEvent fakedKeyPress(QEvent::KeyPress, Key_Escape, 0, 0); - QKeyEvent fakedKeyRelease(QEvent::KeyRelease, Key_Escape, 0, 0); - QApplication::sendEvent(this, &fakedKeyPress); - QApplication::sendEvent(this, &fakedKeyRelease); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Key_Escape, 0, 0); + TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); + TQApplication::sendEvent(this, &fakedKeyPress); + TQApplication::sendEvent(this, &fakedKeyRelease); qApp->processEvents(); startContainerMove(_moveAC); @@ -1151,7 +1151,7 @@ void ContainerArea::dragMoveEvent(QDragMoveEvent* ev) } } -void ContainerArea::dragLeaveEvent(QDragLeaveEvent*) +void ContainerArea::dragLeaveEvent(TQDragLeaveEvent*) { if (_dragIndicator) { @@ -1161,7 +1161,7 @@ void ContainerArea::dragLeaveEvent(QDragLeaveEvent*) _dragMoveAC = 0; } -void ContainerArea::dropEvent(QDropEvent *ev) +void ContainerArea::dropEvent(TQDropEvent *ev) { if (!_dragIndicator) { @@ -1182,7 +1182,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) return; } - QObject *parent = ev->source() ? ev->source()->parent() : 0; + TQObject *parent = ev->source() ? ev->source()->parent() : 0; while (parent && (parent != this)) { parent = parent->parent(); @@ -1217,7 +1217,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) a->reparent(m_contents, 0, _dragIndicator->pos(), true); a->setAppletId(createUniqueId(a->appletType())); addContainer(a, true); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); m_layout->updateFreeSpaceValues(); _dragMoveAC = 0; _dragIndicator->hide(); @@ -1243,7 +1243,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) addApplet(info); } - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); return; } @@ -1269,7 +1269,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) // see if it's a executable or directory if (url.protocol() == "programs") { - QString relPath = url.path(); + TQString relPath = url.path(); if (relPath[0] == '/') { relPath = relPath.right(relPath.length() - 1); @@ -1278,7 +1278,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) } else if (url.isLocalFile()) { - QFileInfo fi(url.path()); + TQFileInfo fi(url.path()); if (fi.isDir()) { // directory switch (PanelDirDropMenu().exec(mapToGlobal(ev->pos()))) @@ -1308,15 +1308,15 @@ void ContainerArea::dropEvent(QDropEvent *ev) else if (fi.isExecutable()) { // non-KDE executable - QString pixmapFile; + TQString pixmapFile; KMimeType::pixmapForURL(url, 0, KIcon::Panel, 0, KIcon::DefaultState, &pixmapFile); - PanelExeDialog dlg(QString::null, QString::null, url.path(), - pixmapFile, QString::null, false, 0); - if (dlg.exec() == QDialog::Accepted) + PanelExeDialog dlg(TQString::null, TQString::null, url.path(), + pixmapFile, TQString::null, false, 0); + if (dlg.exec() == TQDialog::Accepted) { // KIconloader returns a full path, we only want the name - QFileInfo iconfi(dlg.iconPath()); + TQFileInfo iconfi(dlg.iconPath()); a = new NonKDEAppButtonContainer(dlg.title(), dlg.description(), dlg.command(), @@ -1340,7 +1340,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) if (!a) { _dragIndicator->hide(); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); m_layout->setStretchEnabled(true); return; } @@ -1352,11 +1352,11 @@ void ContainerArea::dropEvent(QDropEvent *ev) saveContainerConfig(); _dragMoveAC = 0; _dragIndicator->hide(); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); m_layout->setStretchEnabled(true); } -bool ContainerArea::eventFilter(QObject* o, QEvent* e) +bool ContainerArea::eventFilter(TQObject* o, TQEvent* e) { // Propagate the layout hints which m_contents receives. This way widgets // which contain a ContainerArea can react to layout changes of its @@ -1364,7 +1364,7 @@ bool ContainerArea::eventFilter(QObject* o, QEvent* e) // want to grow as well. if (o == m_contents) { - if (e->type() == QEvent::LayoutHint) + if (e->type() == TQEvent::LayoutHint) { updateGeometry(); // Posts a new layout hint to our parent. } @@ -1374,13 +1374,13 @@ bool ContainerArea::eventFilter(QObject* o, QEvent* e) return Panner::eventFilter(o, e); } -void ContainerArea::resizeEvent(QResizeEvent *ev) +void ContainerArea::resizeEvent(TQResizeEvent *ev) { Panner::resizeEvent(ev); setBackground(); } -void ContainerArea::viewportResizeEvent(QResizeEvent* ev) +void ContainerArea::viewportResizeEvent(TQResizeEvent* ev) { Panner::viewportResizeEvent(ev); if (orientation() == Horizontal) @@ -1411,8 +1411,8 @@ void ContainerArea::setBackground() { _rootPixmap = new KRootPixmap(this); _rootPixmap->setCustomPainting(true); - connect(_rootPixmap, SIGNAL(backgroundUpdated(const QPixmap&)), - SLOT(updateBackground(const QPixmap&))); + connect(_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQT_SLOT(updateBackground(const TQPixmap&))); } else { @@ -1438,9 +1438,9 @@ void ContainerArea::setBackground() // by keeping the src image static, we can share it among panels and only // reload from disk when it actually changes in the config, not every time we // get a resize or configure event - static QString bgStr; - static QImage srcImage; - QString newBgStr = locate("appdata", KickerSettings::backgroundTheme()); + static TQString bgStr; + static TQImage srcImage; + TQString newBgStr = locate("appdata", KickerSettings::backgroundTheme()); if (bgStr != newBgStr) { @@ -1454,13 +1454,13 @@ void ContainerArea::setBackground() } else { - QImage bgImage = srcImage; + TQImage bgImage = srcImage; if (orientation() == Vertical) { if (KickerSettings::rotateBackground()) { - QWMatrix matrix; + TQWMatrix matrix; matrix.rotate(position() == KPanelExtension::Left ? 90: 270); bgImage = bgImage.xForm(matrix); } @@ -1472,7 +1472,7 @@ void ContainerArea::setBackground() if (position() == KPanelExtension::Top && KickerSettings::rotateBackground()) { - QWMatrix matrix; + TQWMatrix matrix; matrix.rotate(180); bgImage = bgImage.xForm(matrix); } @@ -1484,8 +1484,8 @@ void ContainerArea::setBackground() { KickerLib::colorize(bgImage); } - setPaletteBackgroundPixmap(QPixmap(bgImage)); - QTimer::singleShot(0, this, SLOT(updateContainersBackground())); + setPaletteBackgroundPixmap(TQPixmap(bgImage)); + TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); } } @@ -1507,12 +1507,12 @@ void ContainerArea::immutabilityChanged(bool immutable) } setAcceptDrops(!isImmutable()); - QTimer::singleShot(0, this, SLOT(setBackground())); + TQTimer::singleShot(0, this, TQT_SLOT(setBackground())); } -QRect ContainerArea::availableSpaceFollowing(BaseContainer* a) +TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) { - QRect availableSpace = rect(); + TQRect availableSpace = rect(); BaseContainer* b = 0; if (a) @@ -1564,7 +1564,7 @@ QRect ContainerArea::availableSpaceFollowing(BaseContainer* a) void ContainerArea::moveDragIndicator(int pos) { - QRect availableSpace = availableSpaceFollowing(_dragMoveAC); + TQRect availableSpace = availableSpaceFollowing(_dragMoveAC); // Move _dragIndicator to position pos, restricted by availableSpace. // Resize _dragIndicator if necessary. @@ -1606,11 +1606,11 @@ void ContainerArea::moveDragIndicator(int pos) } } -void ContainerArea::updateBackground( const QPixmap& pm ) +void ContainerArea::updateBackground( const TQPixmap& pm ) { - QBrush bgBrush(colorGroup().background(), pm); - QPalette pal = kapp->palette(); - pal.setBrush(QColorGroup::Background, bgBrush); + TQBrush bgBrush(colorGroup().background(), pm); + TQPalette pal = kapp->palette(); + pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); // because the Pixmap can be smaller as the containerarea @@ -1632,7 +1632,7 @@ void ContainerArea::resizeContents(int w, int h) if (!m_updateBackgroundsCalled) { m_updateBackgroundsCalled = true; - QTimer::singleShot(0, this, SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); } } @@ -1761,8 +1761,8 @@ void ContainerArea::updateContainersBackground() // case the cached is cleared). if( !m_cachedGeometry.contains( *it )) { - m_cachedGeometry[ *it ] = QRect(); - connect( *it, SIGNAL( destroyed()), SLOT( destroyCachedGeometry())); + m_cachedGeometry[ *it ] = TQRect(); + connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry())); } if( m_cachedGeometry[ *it ] != (*it)->geometry()) { @@ -1774,10 +1774,10 @@ void ContainerArea::updateContainersBackground() void ContainerArea::destroyCachedGeometry() { - m_cachedGeometry.remove(const_cast<QWidget*>(static_cast<const QWidget*>(sender()))); + m_cachedGeometry.remove(const_cast<TQWidget*>(static_cast<const TQWidget*>(sender()))); } -BaseContainer::List ContainerArea::containers(const QString& type) const +BaseContainer::List ContainerArea::containers(const TQString& type) const { if (type.isEmpty() || type == "All") { @@ -1792,7 +1792,7 @@ BaseContainer::List ContainerArea::containers(const QString& type) const it != m_containers.constEnd(); ++it) { - QString type = (*it)->appletType(); + TQString type = (*it)->appletType(); if (type == "KMenuButton" || type == "WindowListButton" || type == "BookmarksButton" || @@ -1821,7 +1821,7 @@ BaseContainer::List ContainerArea::containers(const QString& type) const return list; } -int ContainerArea::containerCount(const QString& type) const +int ContainerArea::containerCount(const TQString& type) const { if (type.isEmpty() || type == "All") { @@ -1835,7 +1835,7 @@ int ContainerArea::containerCount(const QString& type) const it != m_containers.end(); ++it) { - QString type = (*it)->appletType(); + TQString type = (*it)->appletType(); if (type == "KMenuButton" || type == "WindowListButton" || type == "BookmarksButton" || @@ -1864,7 +1864,7 @@ int ContainerArea::containerCount(const QString& type) const return count; } -QStringList ContainerArea::listContainers() const +TQStringList ContainerArea::listContainers() const { return m_layout->listItems(); } @@ -1879,7 +1879,7 @@ void ContainerArea::showAddAppletDialog() if (!m_addAppletDialog) { m_addAppletDialog = new AddAppletDialog(this, this, 0); - connect(m_addAppletDialog, SIGNAL(finished()), this, SLOT(addAppletDialogDone())); + connect(m_addAppletDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(addAppletDialogDone())); } else { @@ -1900,7 +1900,7 @@ void ContainerArea::addAppletDialogDone() m_addAppletDialog = 0; } -const QPixmap* ContainerArea::completeBackgroundPixmap() const +const TQPixmap* ContainerArea::completeBackgroundPixmap() const { return &_completeBg; } @@ -1916,22 +1916,22 @@ int ContainerArea::heightForWidth(int w) const } -DragIndicator::DragIndicator(QWidget* parent, const char* name) - : QWidget(parent, name) +DragIndicator::DragIndicator(TQWidget* parent, const char* name) + : TQWidget(parent, name) { setBackgroundOrigin(AncestorOrigin); } -void DragIndicator::paintEvent(QPaintEvent*) +void DragIndicator::paintEvent(TQPaintEvent*) { - QPainter painter(this); - QRect rect(0, 0, width(), height()); - style().drawPrimitive( QStyle::PE_FocusRect, &painter, rect, colorGroup(), - QStyle::Style_Default, colorGroup().base() ); + TQPainter painter(this); + TQRect rect(0, 0, width(), height()); + style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), + TQStyle::Style_Default, colorGroup().base() ); } -void DragIndicator::mousePressEvent(QMouseEvent*) +void DragIndicator::mousePressEvent(TQMouseEvent*) { hide(); } diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index 8b17c8ae9..a43cd8c9c 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __containerarea_h__ #define __containerarea_h__ -#include <qpixmap.h> -#include <qptrlist.h> -#include <qtimer.h> +#include <tqpixmap.h> +#include <tqptrlist.h> +#include <tqtimer.h> #include <appletinfo.h> @@ -48,7 +48,7 @@ class ContainerArea : public Panner Q_OBJECT public: - ContainerArea( KConfig* config, QWidget* parent, QPopupMenu* opMenu, const char* name = 0 ); + ContainerArea( KConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 ); ~ContainerArea(); void initialize(bool useDefaultConfig); @@ -56,24 +56,24 @@ public: KPanelApplet::Direction popupDirection() const; bool isImmutable() const; - const QWidget* addButton(const AppletInfo& info); - const QWidget* addKMenuButton(); - const QWidget* addDesktopButton(); - const QWidget* addWindowListButton(); - const QWidget* addBookmarksButton(); - const QWidget* addServiceButton(const QString& desktopFile); - const QWidget* addURLButton(const QString &url); - const QWidget* addBrowserButton(); - const QWidget* addBrowserButton(const QString &startDir, - const QString& icon = QString("kdisknav")); - const QWidget* addServiceMenuButton(const QString& relPath); - const QWidget* addNonKDEAppButton(); - const QWidget* addNonKDEAppButton(const QString &name, - const QString &description, - const QString &filePath, - const QString &icon, - const QString &cmdLine, bool inTerm); - const QWidget* addExtensionButton(const QString& desktopFile); + const TQWidget* addButton(const AppletInfo& info); + const TQWidget* addKMenuButton(); + const TQWidget* addDesktopButton(); + const TQWidget* addWindowListButton(); + const TQWidget* addBookmarksButton(); + const TQWidget* addServiceButton(const TQString& desktopFile); + const TQWidget* addURLButton(const TQString &url); + const TQWidget* addBrowserButton(); + const TQWidget* addBrowserButton(const TQString &startDir, + const TQString& icon = TQString("kdisknav")); + const TQWidget* addServiceMenuButton(const TQString& relPath); + const TQWidget* addNonKDEAppButton(); + const TQWidget* addNonKDEAppButton(const TQString &name, + const TQString &description, + const TQString &filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm); + const TQWidget* addExtensionButton(const TQString& desktopFile); AppletContainer* addApplet(const AppletInfo& info, bool isImmutable = false, int insertionIndex = -1); @@ -84,11 +84,11 @@ public: int widthForHeight(int height) const; int heightForWidth(int width) const; - const QPixmap* completeBackgroundPixmap() const; + const TQPixmap* completeBackgroundPixmap() const; - BaseContainer::List containers(const QString& type) const; - int containerCount(const QString& type) const; - QStringList listContainers() const; + BaseContainer::List containers(const TQString& type) const; + int containerCount(const TQString& type) const; + TQStringList listContainers() const; bool canAddContainers() const; signals: @@ -108,25 +108,25 @@ public slots: void addAppletDialogDone(); protected: - QString createUniqueId(const QString& appletType) const; + TQString createUniqueId(const TQString& appletType) const; void completeContainerAddition(BaseContainer* container, int insertionIndex = -1); - bool eventFilter(QObject*, QEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent *); - void dragEnterEvent(QDragEnterEvent*); - void dragMoveEvent(QDragMoveEvent*); - void dragLeaveEvent(QDragLeaveEvent*); - void dropEvent(QDropEvent*); - void resizeEvent(QResizeEvent*); - void viewportResizeEvent(QResizeEvent*); + bool eventFilter(TQObject*, TQEvent*); + void mouseMoveEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent *); + void dragEnterEvent(TQDragEnterEvent*); + void dragMoveEvent(TQDragMoveEvent*); + void dragLeaveEvent(TQDragLeaveEvent*); + void dropEvent(TQDropEvent*); + void resizeEvent(TQResizeEvent*); + void viewportResizeEvent(TQResizeEvent*); void defaultContainerConfig(); - void loadContainers(const QStringList& containers); + void loadContainers(const TQStringList& containers); void saveContainerConfig(bool layoutOnly = false); - QRect availableSpaceFollowing(BaseContainer*); + TQRect availableSpaceFollowing(BaseContainer*); void moveDragIndicator(int pos); void scrollTo(BaseContainer*); @@ -138,7 +138,7 @@ protected: protected slots: void autoScroll(); - void updateBackground(const QPixmap&); + void updateBackground(const TQPixmap&); void setBackground(); void immutabilityChanged(bool); void updateContainersBackground(); @@ -154,21 +154,21 @@ private: DragIndicator* _dragIndicator; BaseContainer* _dragMoveAC; QPoint _dragMoveOffset; - QPopupMenu* m_opMenu; + TQPopupMenu* m_opMenu; KRootPixmap* _rootPixmap; bool _transparent; bool _useBgTheme; bool _bgSet; - QPixmap _completeBg; - QTimer _autoScrollTimer; + TQPixmap _completeBg; + TQTimer _autoScrollTimer; bool m_canAddContainers; bool m_immutable; bool m_updateBackgroundsCalled; - QWidget* m_contents; + TQWidget* m_contents; ContainerAreaLayout* m_layout; AddAppletDialog* m_addAppletDialog; - QMap< QWidget*, QRect > m_cachedGeometry; + TQMap< TQWidget*, TQRect > m_cachedGeometry; }; @@ -177,18 +177,18 @@ class DragIndicator : public QWidget Q_OBJECT public: - DragIndicator(QWidget* parent = 0, const char* name = 0); + DragIndicator(TQWidget* parent = 0, const char* name = 0); ~DragIndicator() {} - QSize preferredSize() const { return _preferredSize; } - void setPreferredSize(const QSize& size) { _preferredSize = size; } + TQSize preferredSize() const { return _preferredSize; } + void setPreferredSize(const TQSize& size) { _preferredSize = size; } protected: - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent*); + void paintEvent(TQPaintEvent*); + void mousePressEvent(TQMouseEvent*); private: - QSize _preferredSize; + TQSize _preferredSize; }; #endif diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index a865bec86..12a09c8e6 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <assert.h> #include <math.h> -#include <qapplication.h> +#include <tqapplication.h> #include <kdebug.h> #include <kglobal.h> @@ -41,20 +41,20 @@ class ContainerAreaLayoutIterator : public QGLayoutIterator { } - QLayoutItem* current() + TQLayoutItem* current() { return m_idx < int(m_list->count()) ? (*m_list->at(m_idx))->item : 0; } - QLayoutItem* next() + TQLayoutItem* next() { m_idx++; return current(); } - QLayoutItem* takeCurrent() + TQLayoutItem* takeCurrent() { - QLayoutItem* item = 0; + TQLayoutItem* item = 0; ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx); if (b != m_list->end()) { @@ -128,12 +128,12 @@ Qt::Orientation ContainerAreaLayoutItem::orientation() const return m_layout->orientation(); } -QRect ContainerAreaLayoutItem::geometryR() const +TQRect ContainerAreaLayoutItem::geometryR() const { return m_layout->transform(geometry()); } -void ContainerAreaLayoutItem::setGeometryR(const QRect& r) +void ContainerAreaLayoutItem::setGeometryR(const TQRect& r) { setGeometry(m_layout->transform(r)); } @@ -178,7 +178,7 @@ int ContainerAreaLayoutItem::leftR() const { if (orientation() == Horizontal) { - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().right(); else return geometry().left(); @@ -193,7 +193,7 @@ int ContainerAreaLayoutItem::rightR() const { if (orientation() == Horizontal) { - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().left(); else return geometry().right(); @@ -205,19 +205,19 @@ int ContainerAreaLayoutItem::rightR() const } -ContainerAreaLayout::ContainerAreaLayout(QWidget* parent) - : QLayout(parent), +ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent) + : TQLayout(parent), m_orientation(Horizontal), m_stretchEnabled(true) { } -void ContainerAreaLayout::addItem(QLayoutItem* item) +void ContainerAreaLayout::addItem(TQLayoutItem* item) { m_items.append(new ContainerAreaLayoutItem(item, this)); } -void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionPoint) +void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint) { if (!widget) { @@ -247,7 +247,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionP if (nextIt == m_items.end()) { // first item in! - item->setGeometryR(QRect(insertionPoint.x(), insertionPoint.y(), widget->width(), widget->height())); + item->setGeometryR(TQRect(insertionPoint.x(), insertionPoint.y(), widget->width(), widget->height())); updateFreeSpaceValues(); return; } @@ -311,7 +311,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionP } } - QRect geom = item->geometryR(); + TQRect geom = item->geometryR(); geom.moveLeft(insPos); item->setGeometryR(geom); widget->setGeometry(transform(geom)); // widget isn't shown, layout not active yet @@ -341,13 +341,13 @@ void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionP updateFreeSpaceValues(); } -QStringList ContainerAreaLayout::listItems() const +TQStringList ContainerAreaLayout::listItems() const { - QStringList items; + TQStringList items; for (ItemList::const_iterator it = m_items.constBegin(); it != m_items.constEnd(); ++it) { - QLayoutItem* item = (*it)->item; + TQLayoutItem* item = (*it)->item; BaseContainer* container = dynamic_cast<BaseContainer*>(item->widget()); if (!container) @@ -374,7 +374,7 @@ QStringList ContainerAreaLayout::listItems() const return items; } -QWidget* ContainerAreaLayout::widgetAt(int index) const +TQWidget* ContainerAreaLayout::widgetAt(int index) const { if (index < 0 || index >= (int)m_items.count()) { @@ -384,46 +384,46 @@ QWidget* ContainerAreaLayout::widgetAt(int index) const return m_items[index]->item->widget(); } -QSize ContainerAreaLayout::sizeHint() const +TQSize ContainerAreaLayout::sizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeNormal); if (orientation() == Horizontal) { - return QSize(widthForHeight(size), size); + return TQSize(widthForHeight(size), size); } else { - return QSize(size, heightForWidth(size)); + return TQSize(size, heightForWidth(size)); } } -QSize ContainerAreaLayout::minimumSize() const +TQSize ContainerAreaLayout::minimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); if (orientation() == Horizontal) { - return QSize(widthForHeight(size), size); + return TQSize(widthForHeight(size), size); } else { - return QSize(size, heightForWidth(size)); + return TQSize(size, heightForWidth(size)); } } -QLayoutIterator ContainerAreaLayout::iterator() +TQLayoutIterator ContainerAreaLayout::iterator() { - return QLayoutIterator(new ContainerAreaLayoutIterator(&m_items)); + return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items)); } -void ContainerAreaLayout::setGeometry(const QRect& rect) +void ContainerAreaLayout::setGeometry(const TQRect& rect) { //RESEARCH: when can we short curcuit this? // maybe a dirty flag to be set when we have containers // that needs laying out? - QLayout::setGeometry(rect); + TQLayout::setGeometry(rect); float totalFreeSpace = kMax(0, widthR() - widthForHeightR(heightR())); int occupiedSpace = 0; @@ -453,7 +453,7 @@ void ContainerAreaLayout::setGeometry(const QRect& rect) w = widthR() - pos; } } - cur->setGeometryR(QRect(pos, 0, w, heightR())); + cur->setGeometryR(TQRect(pos, 0, w, heightR())); } } @@ -520,10 +520,10 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con cur->leftR() - leftR(); } -void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) +void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) { const bool horizontal = orientation() == Horizontal; - const bool reverseLayout = QApplication::reverseLayout(); + const bool reverseLayout = TQApplication::reverseLayout(); if (horizontal && reverseLayout) distance = - distance; @@ -566,7 +566,7 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) break; // Move 'next' to the other side of 'moving'. - QRect geom = next->geometryR(); + TQRect geom = next->geometryR(); if (forward) geom.moveLeft(geom.left() - moving->widthR()); else @@ -630,7 +630,7 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) } // Move the container to its new position and prevent it from moving outside the panel. - QRect geom = moving->geometryR(); + TQRect geom = moving->geometryR(); distance = kClamp(newPos, 0, widthR() - moving->widthR()); geom.moveLeft(distance); moving->setGeometryR(geom); @@ -645,7 +645,7 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) if(AppletContainer* applet = dynamic_cast<AppletContainer*>(container)) if( applet->info().desktopFile() == "menuapplet.desktop" ) { - QRect geom = (*it)->geometryR(); + TQRect geom = (*it)->geometryR(); if( prev != m_items.constEnd()) geom.moveLeft( (*prev)->rightR() + 1 ); else @@ -657,10 +657,10 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) updateFreeSpaceValues(); } -int ContainerAreaLayout::moveContainerPush(QWidget* a, int distance) +int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance) { const bool horizontal = orientation() == Horizontal; - const bool reverseLayout = QApplication::reverseLayout(); + const bool reverseLayout = TQApplication::reverseLayout(); // Get the iterator 'it' pointing to the layoutitem representing 'a'. ItemList::const_iterator it = m_items.constBegin(); @@ -721,20 +721,20 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it, moved = forward ? kMin(distance, available) : kMax(distance, available); - QRect geom = cur->geometryR(); + TQRect geom = cur->geometryR(); geom.moveLeft(geom.left() + moved); cur->setGeometryR(geom); return moved; } -QRect ContainerAreaLayout::transform(const QRect& r) const +TQRect ContainerAreaLayout::transform(const TQRect& r) const { if (orientation() == Horizontal) { - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) { - QRect t = r; + TQRect t = r; t.moveLeft(geometry().right() - r.right()); return t; } @@ -745,7 +745,7 @@ QRect ContainerAreaLayout::transform(const QRect& r) const } else { - return QRect(r.y(), r.x(), r.height(), r.width()); + return TQRect(r.y(), r.x(), r.height(), r.width()); } } diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 4d4e0561d..995497268 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -24,14 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __containerarealayout_h__ #define __containerarealayout_h__ -#include <qlayout.h> +#include <tqlayout.h> class ContainerAreaLayout; class ContainerAreaLayoutItem : public Qt { public: - ContainerAreaLayoutItem(QLayoutItem* i, ContainerAreaLayout* layout) + ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* layout) : item(i), m_freeSpaceRatio(0.0), m_layout(layout) @@ -45,9 +45,9 @@ class ContainerAreaLayoutItem : public Qt bool isStretch() const; - QRect geometry() const + TQRect geometry() const { return item->geometry(); } - void setGeometry(const QRect& geometry) + void setGeometry(const TQRect& geometry) { item->setGeometry(geometry); } double freeSpaceRatio() const; @@ -56,15 +56,15 @@ class ContainerAreaLayoutItem : public Qt Orientation orientation() const; // Relative geometry - QRect geometryR() const; - void setGeometryR(const QRect&); + TQRect geometryR() const; + void setGeometryR(const TQRect&); int widthForHeightR(int w) const; int widthR() const; int heightR() const; int leftR() const; int rightR() const; - QLayoutItem* item; + TQLayoutItem* item; private: double m_freeSpaceRatio; @@ -75,18 +75,18 @@ class ContainerAreaLayout : public QLayout { public: typedef ContainerAreaLayoutItem Item; - typedef QValueList<Item*> ItemList; + typedef TQValueList<Item*> ItemList; - ContainerAreaLayout(QWidget* parent); + ContainerAreaLayout(TQWidget* parent); - void addItem(QLayoutItem* item); - void insertIntoFreeSpace(QWidget* item, QPoint insertionPoint); - QStringList listItems() const; - QWidget* widgetAt(int index) const; - QSize sizeHint() const; - QSize minimumSize() const; - QLayoutIterator iterator(); - void setGeometry(const QRect& rect); + void addItem(TQLayoutItem* item); + void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint); + TQStringList listItems() const; + TQWidget* widgetAt(int index) const; + TQSize sizeHint() const; + TQSize minimumSize() const; + TQLayoutIterator iterator(); + void setGeometry(const TQRect& rect); Orientation orientation() const { return m_orientation; } void setOrientation(Orientation o) { m_orientation = o; } @@ -97,11 +97,11 @@ class ContainerAreaLayout : public QLayout void setStretchEnabled(bool enable); - void moveContainerSwitch(QWidget* container, int distance); - int moveContainerPush(QWidget* container, int distance); + void moveContainerSwitch(TQWidget* container, int distance); + int moveContainerPush(TQWidget* container, int distance); // Relative geometry - QRect transform(const QRect&) const; + TQRect transform(const TQRect&) const; int widthForHeightR(int w) const; int widthR() const; int heightR() const; diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index e1c2c0c57..e0f68ce8a 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -59,7 +59,7 @@ ExtensionManager* ExtensionManager::the() } ExtensionManager::ExtensionManager() - : QObject(0, "ExtensionManager"), + : TQObject(0, "ExtensionManager"), m_menubarPanel(0), m_mainPanel(0), m_panelCounter(-1) @@ -108,7 +108,7 @@ void ExtensionManager::initialize() m_mainPanel = pm->createExtensionContainer( "childpanelextension.desktop", true, - QString(kapp->aboutData()->appName()) + "rc", + TQString(kapp->aboutData()->appName()) + "rc", "Main Panel"); } @@ -130,14 +130,14 @@ void ExtensionManager::initialize() // read extension list config->setGroup("General"); - QStringList elist = config->readListEntry("Extensions2"); + TQStringList elist = config->readListEntry("Extensions2"); // now restore the extensions - QStringList::iterator itEnd = elist.end(); - for (QStringList::iterator it = elist.begin(); it != elist.end(); ++it) + TQStringList::iterator itEnd = elist.end(); + for (TQStringList::iterator it = elist.begin(); it != elist.end(); ++it) { // extension id - QString extensionId(*it); + TQString extensionId(*it); // create a matching applet container if (extensionId.find("Extension") == -1) @@ -168,9 +168,9 @@ void ExtensionManager::initialize() } pm->clearUntrustedLists(); - connect(Kicker::the(), SIGNAL(configurationChanged()), SLOT(configurationChanged())); + connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), TQT_SLOT(configurationChanged())); DCOPRef r( "ksmserver", "ksmserver" ); - r.send( "resumeStartup", QCString( "kicker" )); + r.send( "resumeStartup", TQCString( "kicker" )); } void ExtensionManager::configureMenubar(bool duringInit) @@ -187,7 +187,7 @@ void ExtensionManager::configureMenubar(bool duringInit) if (duringInit) { - AppletInfo menubarInfo("menuapplet.desktop", QString::null, AppletInfo::Applet); + AppletInfo menubarInfo("menuapplet.desktop", TQString::null, AppletInfo::Applet); if (PluginManager::the()->hasInstance(menubarInfo)) { // it's already there, in the main panel! @@ -211,7 +211,7 @@ void ExtensionManager::configureMenubar(bool duringInit) updateMenubar(); m_menubarPanel->show(); - connect(kapp, SIGNAL(kdisplayFontChanged()), SLOT(updateMenubar())); + connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), TQT_SLOT(updateMenubar())); } else if (m_menubarPanel) { @@ -253,11 +253,11 @@ void ExtensionManager::migrateMenubar() return; } - QStringList elist = config->readListEntry("Extensions2"); - QStringList::iterator itEnd = elist.end(); - for (QStringList::iterator it = elist.begin(); it != elist.end(); ++it) + TQStringList elist = config->readListEntry("Extensions2"); + TQStringList::iterator itEnd = elist.end(); + for (TQStringList::iterator it = elist.begin(); it != elist.end(); ++it) { - QString extensionId(*it); + TQString extensionId(*it); if (extensionId.find("Extension") == -1) { @@ -271,18 +271,18 @@ void ExtensionManager::migrateMenubar() } config->setGroup(extensionId); - QString extension = config->readPathEntry("ConfigFile"); + TQString extension = config->readPathEntry("ConfigFile"); KConfig extensionConfig(locate("config", extension)); extensionConfig.setGroup("General"); if (extensionConfig.hasKey("Applets2")) { - QStringList containers = extensionConfig.readListEntry("Applets2"); - QStringList::iterator cit = containers.begin(); - QStringList::iterator citEnd = containers.end(); + TQStringList containers = extensionConfig.readListEntry("Applets2"); + TQStringList::iterator cit = containers.begin(); + TQStringList::iterator citEnd = containers.end(); for (; cit != citEnd; ++cit) { - QString appletId(*cit); + TQString appletId(*cit); // is there a config group for this applet? if (!extensionConfig.hasGroup(appletId)) @@ -291,14 +291,14 @@ void ExtensionManager::migrateMenubar() } KConfigGroup group(&extensionConfig, appletId.latin1()); - QString appletType = appletId.left(appletId.findRev('_')); + TQString appletType = appletId.left(appletId.findRev('_')); if (appletType == "Applet") { - QString appletFile = group.readPathEntry("DesktopFile"); + TQString appletFile = group.readPathEntry("DesktopFile"); if (appletFile.find("menuapplet.desktop") != -1) { - QString menubarConfig = locate("config", extension); + TQString menubarConfig = locate("config", extension); KIO::NetAccess::copy(menubarConfig, locateLocal("config", "kicker_menubarpanelrc"), 0); @@ -325,7 +325,7 @@ void ExtensionManager::saveContainerConfig() KConfig *config = KGlobal::config(); // build the extension list - QStringList elist; + TQStringList elist; ExtensionList::iterator itEnd = _containers.end(); for (ExtensionList::iterator it = _containers.begin(); it != itEnd; ++it) { @@ -378,22 +378,22 @@ void ExtensionManager::updateMenubar() m_menubarPanel->xineramaScreen()); } -bool ExtensionManager::isMainPanel(const QWidget* panel) const +bool ExtensionManager::isMainPanel(const TQWidget* panel) const { return m_mainPanel == panel; } -bool ExtensionManager::isMenuBar(const QWidget* panel) const +bool ExtensionManager::isMenuBar(const TQWidget* panel) const { return m_menubarPanel == panel; } -void ExtensionManager::addExtension( const QString& desktopFile ) +void ExtensionManager::addExtension( const TQString& desktopFile ) { PluginManager* pm = PluginManager::the(); ExtensionContainer *e = pm->createExtensionContainer(desktopFile, false, // is not startup - QString::null, // no config + TQString::null, // no config uniqueId()); @@ -422,8 +422,8 @@ void ExtensionManager::addContainer(ExtensionContainer* e) _containers.append(e); - connect(e, SIGNAL(removeme(ExtensionContainer*)), - this, SLOT(removeContainer(ExtensionContainer*))); + connect(e, TQT_SIGNAL(removeme(ExtensionContainer*)), + this, TQT_SLOT(removeContainer(ExtensionContainer*))); emit desktopIconsAreaChanged(desktopIconsArea(e->xineramaScreen()), e->xineramaScreen()); @@ -457,10 +457,10 @@ void ExtensionManager::removeAllContainers() saveContainerConfig(); } -QString ExtensionManager::uniqueId() +TQString ExtensionManager::uniqueId() { - QString idBase = "Extension_%1"; - QString newId; + TQString idBase = "Extension_%1"; + TQString newId; int i = 0; bool unique = false; @@ -621,14 +621,14 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, return true; } -QRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* extension) +TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* extension) { if (!extension) { return Kicker::the()->kwinModule()->workArea(XineramaScreen); } - QValueList<WId> list; + TQValueList<WId> list; ExtensionList::iterator itEnd = _containers.end(); ExtensionList::iterator it = _containers.begin(); @@ -672,7 +672,7 @@ QRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* e } } - QRect workArea; + TQRect workArea; if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2)) { /* special value for all screens */ @@ -681,7 +681,7 @@ QRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* e else { workArea = Kicker::the()->kwinModule()->workArea(list, XineramaScreen) - .intersect(QApplication::desktop()->screenGeometry(XineramaScreen)); + .intersect(TQApplication::desktop()->screenGeometry(XineramaScreen)); } return workArea; @@ -693,7 +693,7 @@ int ExtensionManager::nextPanelOrder() return m_panelCounter; } -void ExtensionManager::reduceArea(QRect &area, const ExtensionContainer *extension) const +void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extension) const { if (!extension || extension->hideMode() == ExtensionContainer::AutomaticHide || @@ -702,10 +702,10 @@ void ExtensionManager::reduceArea(QRect &area, const ExtensionContainer *extensi return; } - QRect geom = extension->initialGeometry(extension->position(), extension->alignment(), + TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(), extension->xineramaScreen()); - // reduce given area (QRect) to the space not covered by the given extension + // reduce given area (TQRect) to the space not covered by the given extension // As simplification: the length of the extension is not taken into account // which means that even a small extension e.g. on the left side of the desktop // will remove the available area with its with @@ -736,12 +736,12 @@ void ExtensionManager::reduceArea(QRect &area, const ExtensionContainer *extensi } } -QRect ExtensionManager::desktopIconsArea(int screen) const +TQRect ExtensionManager::desktopIconsArea(int screen) const { // This is pretty broken, mixes Xinerama and non-Xinerama multihead // and generally doesn't seem to be required anyway => ignore screen. -// QRect area = QApplication::desktop()->screenGeometry(screen); - QRect area = QApplication::desktop()->geometry(); +// TQRect area = TQApplication::desktop()->screenGeometry(screen); + TQRect area = TQApplication::desktop()->geometry(); reduceArea(area, m_mainPanel); reduceArea(area, m_menubarPanel); diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h index 2885df01f..6de7b35e1 100644 --- a/kicker/kicker/core/extensionmanager.h +++ b/kicker/kicker/core/extensionmanager.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __extensionmanager_h__ #define __extensionmanager_h__ -#include <qvaluelist.h> -#include <qobject.h> +#include <tqvaluelist.h> +#include <tqobject.h> #include "container_extension.h" @@ -39,20 +39,20 @@ public: static ExtensionManager* the(); void configureMenubar(bool duringInit); - void addExtension( const QString &desktopFile ); - bool isMainPanel(const QWidget* panel) const; - bool isMenuBar(const QWidget* panel) const; + void addExtension( const TQString &desktopFile ); + bool isMainPanel(const TQWidget* panel) const; + bool isMenuBar(const TQWidget* panel) const; void addContainer( ExtensionContainer* ); void removeAllContainers(); ExtensionList containers() const { return _containers; } KPanelExtension::Position initialPanelPosition(KPanelExtension::Position preferred); - QRect workArea(int XineramaScreen, const ExtensionContainer* container); + TQRect workArea(int XineramaScreen, const ExtensionContainer* container); int nextPanelOrder(); // return the space available for all icons on the desktop // subtracts all panels from XineramaScreen's geometry - QRect desktopIconsArea(int xineramaScreen) const; + TQRect desktopIconsArea(int xineramaScreen) const; public slots: void removeContainer( ExtensionContainer* ); @@ -60,14 +60,14 @@ public slots: void extensionSizeChanged(ExtensionContainer *); signals: - void desktopIconsAreaChanged(const QRect &, int xineramaScreen); + void desktopIconsAreaChanged(const TQRect &, int xineramaScreen); protected: friend class Kicker; ExtensionManager(); ~ExtensionManager(); - QString uniqueId(); + TQString uniqueId(); void saveContainerConfig(); bool shouldExclude(int XineramaScreen, const ExtensionContainer* container, @@ -79,7 +79,7 @@ protected slots: private: void migrateMenubar(); - void reduceArea(QRect &area, const ExtensionContainer *panel) const; + void reduceArea(TQRect &area, const ExtensionContainer *panel) const; ExtensionList _containers; ExtensionContainer* m_menubarPanel; diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 65e059c5b..de37c609e 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -24,9 +24,9 @@ #include <stdlib.h> #include <unistd.h> -#include <qfile.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <dcopclient.h> #include <kconfig.h> @@ -74,7 +74,7 @@ Kicker::Kicker() // this means we've most likely crashed once. so let's see if we // stay up for more than 2 minutes time, and if so reset the // crash handler since the crash isn't a frequent offender - QTimer::singleShot(120000, this, SLOT(setCrashHandler())); + TQTimer::singleShot(120000, this, TQT_SLOT(setCrashHandler())); } else { @@ -93,7 +93,7 @@ Kicker::Kicker() dcopClient()->setDefaultObject("Panel"); disableSessionManagement(); - QString dataPathBase = KStandardDirs::kde_default("data").append("kicker/"); + TQString dataPathBase = KStandardDirs::kde_default("data").append("kicker/"); KGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini"); KGlobal::dirs()->addResourceType("icon", dataPathBase + "pics"); KGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins"); @@ -121,19 +121,19 @@ Kicker::Kicker() // set up our global settings configure(); - connect(this, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int))); - connect(this, SIGNAL(kdisplayPaletteChanged()), SLOT(paletteChanged())); - connect(this, SIGNAL(kdisplayStyleChanged()), SLOT(slotStyleChanged())); + connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(this, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(this, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); #if (QT_VERSION-0 >= 0x030200) // XRANDR support - connect(desktop(), SIGNAL(resized(int)), SLOT(slotDesktopResized())); + connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized())); #endif // the panels, aka extensions - QTimer::singleShot(0, ExtensionManager::the(), SLOT(initialize())); + TQTimer::singleShot(0, ExtensionManager::the(), TQT_SLOT(initialize())); - connect(ExtensionManager::the(), SIGNAL(desktopIconsAreaChanged(const QRect &, int)), - this, SLOT(slotDesktopIconsAreaChanged(const QRect &, int))); + connect(ExtensionManager::the(), TQT_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), + this, TQT_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); } Kicker::~Kicker() @@ -205,7 +205,7 @@ void Kicker::slotStyleChanged() restart(); } -bool Kicker::highlightMenuItem(const QString &menuId) +bool Kicker::highlightMenuItem(const TQString &menuId) { return MenuManager::the()->kmenu()->highlightMenuItem( menuId ); } @@ -215,7 +215,7 @@ void Kicker::showKMenu() MenuManager::the()->showKMenu(); } -void Kicker::popupKMenu(const QPoint &p) +void Kicker::popupKMenu(const TQPoint &p) { MenuManager::the()->popupKMenu(p); } @@ -231,13 +231,13 @@ void Kicker::configure() KickerSettings::self()->readConfig(); - QToolTip::setGloballyEnabled(KickerSettings::showToolTips()); + TQToolTip::setGloballyEnabled(KickerSettings::showToolTips()); if (notFirstConfig) { emit configurationChanged(); { - QByteArray data; + TQByteArray data; emitDCOPSignal("configurationChanged()", data); } } @@ -254,7 +254,7 @@ void Kicker::quit() void Kicker::restart() { // do this on a timer to give us time to return true - QTimer::singleShot(0, this, SLOT(slotRestart())); + TQTimer::singleShot(0, this, TQT_SLOT(slotRestart())); } void Kicker::slotRestart() @@ -267,7 +267,7 @@ void Kicker::slotRestart() char ** o_argv = new char*[2]; o_argv[0] = strdup("kicker"); o_argv[1] = 0L; - execv(QFile::encodeName(locate("exe", "kdeinit_wrapper")), o_argv); + execv(TQFile::encodeName(locate("exe", "kdeinit_wrapper")), o_argv); exit(1); } @@ -282,14 +282,14 @@ bool Kicker::isKioskImmutable() const return config()->isImmutable(); } -void Kicker::addExtension( const QString &desktopFile ) +void Kicker::addExtension( const TQString &desktopFile ) { ExtensionManager::the()->addExtension( desktopFile ); } -QStringList Kicker::configModules(bool controlCenter) +TQStringList Kicker::configModules(bool controlCenter) { - QStringList args; + TQStringList args; if (controlCenter) { @@ -306,39 +306,39 @@ QStringList Kicker::configModules(bool controlCenter) return args; } -QPoint Kicker::insertionPoint() +TQPoint Kicker::insertionPoint() { return m_insertionPoint; } -void Kicker::setInsertionPoint(const QPoint &p) +void Kicker::setInsertionPoint(const TQPoint &p) { m_insertionPoint = p; } -void Kicker::showConfig(const QString& configPath, int page) +void Kicker::showConfig(const TQString& configPath, int page) { if (!m_configDialog) { m_configDialog = new KCMultiDialog(0); - QStringList modules = configModules(false); - QStringList::ConstIterator end(modules.end()); - for (QStringList::ConstIterator it = modules.begin(); it != end; ++it) + TQStringList modules = configModules(false); + TQStringList::ConstIterator end(modules.end()); + for (TQStringList::ConstIterator it = modules.begin(); it != end; ++it) { m_configDialog->addModule(*it); } - connect(m_configDialog, SIGNAL(finished()), SLOT(configDialogFinished())); + connect(m_configDialog, TQT_SIGNAL(finished()), TQT_SLOT(configDialogFinished())); } if (!configPath.isEmpty()) { - QByteArray data; - QDataStream stream(data, IO_WriteOnly); + TQByteArray data; + TQDataStream stream(data, IO_WriteOnly); stream << configPath; - emitDCOPSignal("configSwitchToPanel(QString)", data); + emitDCOPSignal("configSwitchToPanel(TQString)", data); } KWin::setOnDesktop(m_configDialog->winId(), KWin::currentDesktop()); @@ -352,7 +352,7 @@ void Kicker::showConfig(const QString& configPath, int page) void Kicker::showTaskBarConfig() { - showConfig(QString(), 4); + showConfig(TQString(), 4); } void Kicker::configureMenubar() @@ -386,16 +386,16 @@ KWinModule* Kicker::kwinModule() return m_kwinModule; } -QRect Kicker::desktopIconsArea(int screen) const +TQRect Kicker::desktopIconsArea(int screen) const { return ExtensionManager::the()->desktopIconsArea(screen); } -void Kicker::slotDesktopIconsAreaChanged(const QRect &area, int screen) +void Kicker::slotDesktopIconsAreaChanged(const TQRect &area, int screen) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << area; stream << screen; - emitDCOPSignal("desktopIconsAreaChanged(QRect, int)", params); + emitDCOPSignal("desktopIconsAreaChanged(TQRect, int)", params); } diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 9ac1d3eac..6bb071007 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __kicker_h__ #define __kicker_h__ -#include <qcolor.h> +#include <tqcolor.h> #include <kuniqueapplication.h> #include <kicontheme.h> @@ -49,22 +49,22 @@ k_dcop: void configure(); void quit(); void restart(); - void addExtension( const QString &desktopFile ); - void popupKMenu( const QPoint &globalPos ); + void addExtension( const TQString &desktopFile ); + void popupKMenu( const TQPoint &globalPos ); void clearQuickStartMenu(); - bool highlightMenuItem( const QString &menuId ); + bool highlightMenuItem( const TQString &menuId ); void showKMenu(); void toggleShowDesktop(); bool desktopShowing(); - void showConfig(const QString& config, int page = -1); + void showConfig(const TQString& config, int page = -1); void showTaskBarConfig(); void configureMenubar(); // return the region on the desktop, which is not covered by panels // and therefore allowed to be used by icons placed on the desktop - QRect desktopIconsArea(int screen) const; + TQRect desktopIconsArea(int screen) const; k_dcop_signals: - void desktopIconsAreaChanged(QRect area, int screen); + void desktopIconsAreaChanged(TQRect area, int screen); public: static Kicker* the(); @@ -75,12 +75,12 @@ public: bool isKioskImmutable() const; bool canAddContainers() const { return m_canAddContainers && !isImmutable(); } - static QStringList configModules(bool controlCenter); + static TQStringList configModules(bool controlCenter); /** * Global position where to insert a new item */ - QPoint insertionPoint(); + TQPoint insertionPoint(); /** * Set the global position where to insert a new item @@ -90,14 +90,14 @@ public: * * Kicker::the()->setInsertionPoint(p); * ... - * QPoint where = Kicker::the()->insertionPoint(); + * TQPoint where = Kicker::the()->insertionPoint(); * ... - * Kicker::the()->setInsertionPoint(QPoint()); + * Kicker::the()->setInsertionPoint(TQPoint()); * * this is not pretty, but it's pragmatic and does everything * that is needed */ - void setInsertionPoint(const QPoint &p); + void setInsertionPoint(const TQPoint &p); public slots: @@ -116,7 +116,7 @@ private slots: void slotStyleChanged(); void paletteChanged(); void setCrashHandler(); - void slotDesktopIconsAreaChanged(const QRect &area, int screen); + void slotDesktopIconsAreaChanged(const TQRect &area, int screen); private: static void crashHandler(int signal); @@ -125,7 +125,7 @@ private: KWinModule* m_kwinModule; KCMultiDialog* m_configDialog; bool m_canAddContainers; - QPoint m_insertionPoint; + TQPoint m_insertionPoint; }; #endif diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp index 2134fb975..bc62df231 100644 --- a/kicker/kicker/core/kickerbindings.cpp +++ b/kicker/kicker/core/kickerbindings.cpp @@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4, target, SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString::null, key3, key4, target, TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString::null, key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index aa49f90aa..16090b9af 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -51,13 +51,13 @@ static const char version[] = VERSION; static void sighandler(int) { fprintf(stderr, "kicker: sighandler called\n"); - QApplication::exit(); + TQApplication::exit(); } extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { { - QCString multiHead = getenv("KDE_MULTIHEAD"); + TQCString multiHead = getenv("KDE_MULTIHEAD"); if (multiHead.lower() == "true") { Display *dpy = XOpenDisplay(NULL); if (! dpy) { @@ -69,14 +69,14 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) int number_of_screens = ScreenCount(dpy); kicker_screen_number = DefaultScreen(dpy); int pos; - QCString display_name = XDisplayString(dpy); + TQCString display_name = XDisplayString(dpy); XCloseDisplay(dpy); dpy = 0; if ((pos = display_name.findRev('.')) != -1) display_name.remove(pos, 10); - QCString env; + TQCString env; if (number_of_screens != 1) { for (int i = 0; i < number_of_screens; i++) { if (i != kicker_screen_number && fork() == 0) { @@ -101,7 +101,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) KGlobal::locale()->setMainCatalogue("kicker"); - QCString appname; + TQCString appname; if (kicker_screen_number == 0) appname = "kicker"; else @@ -140,12 +140,12 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) signal(SIGHUP, SIG_IGN); // send it even before KApplication ctor, because ksmserver will launch another app as soon - // as QApplication registers with it + // as TQApplication registers with it DCOPClient* cl = new DCOPClient; cl->attach(); DCOPRef r( "ksmserver", "ksmserver" ); r.setDCOPClient( cl ); - r.send( "suspendStartup", QCString( "kicker" )); + r.send( "suspendStartup", TQCString( "kicker" )); delete cl; Kicker* kicker = new Kicker; int rv = kicker->exec(); diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index 9e4a91f97..908f6bdf9 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcursor.h> -#include <qpixmap.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqpixmap.h> +#include <tqtimer.h> #include <kapplication.h> #include <dcopclient.h> @@ -59,13 +59,13 @@ MenuManager* MenuManager::the() return m_self; } -MenuManager::MenuManager(QObject *parent) - : QObject(parent, "MenuManager"), DCOPObject("MenuManager") +MenuManager::MenuManager(TQObject *parent) + : TQObject(parent, "MenuManager"), DCOPObject("MenuManager") { m_kmenu = new PanelKMenu; kapp->dcopClient()->setNotifications(true); - connect(kapp->dcopClient(), SIGNAL(applicationRemoved(const QCString&)), - this, SLOT(applicationRemoved(const QCString&))); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), + this, TQT_SLOT(applicationRemoved(const TQCString&))); } MenuManager::~MenuManager() @@ -88,7 +88,7 @@ void MenuManager::showKMenu() m_kmenu->showMenu(); } -void MenuManager::popupKMenu(const QPoint &p) +void MenuManager::popupKMenu(const TQPoint &p) { // kdDebug(1210) << "popupKMenu()" << endl; if (m_kmenu->isVisible()) @@ -97,7 +97,7 @@ void MenuManager::popupKMenu(const QPoint &p) } else if (p.isNull()) { - m_kmenu->popup(QCursor::pos()); + m_kmenu->popup(TQCursor::pos()); } else { @@ -120,7 +120,7 @@ void MenuManager::unregisterKButton(PanelPopupButton *button) m_kbuttons.remove(button); } -PanelPopupButton* MenuManager::findKButtonFor(QPopupMenu* menu) +PanelPopupButton* MenuManager::findKButtonFor(TQPopupMenu* menu) { KButtonList::const_iterator itEnd = m_kbuttons.constEnd(); for (KButtonList::const_iterator it = m_kbuttons.constBegin(); it != itEnd; ++it) @@ -147,37 +147,37 @@ void MenuManager::kmenuAccelActivated() if (m_kbuttons.isEmpty()) { // no button to use, make it behave like a desktop menu - QPoint p; + TQPoint p; // Popup the K-menu at the center of the screen. - QDesktopWidget* desktop = KApplication::desktop(); - QRect r; + TQDesktopWidget* desktop = KApplication::desktop(); + TQRect r; if (desktop->numScreens() < 2) r = desktop->geometry(); else - r = desktop->screenGeometry(desktop->screenNumber(QCursor::pos())); + r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos())); // kMenu->rect() is not valid before showing, use sizeHint() - p = r.center() - QRect( QPoint( 0, 0 ), m_kmenu->sizeHint()).center(); + p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center(); m_kmenu->popup(p); // when the cursor is in the area where the menu pops up, // the item under the cursor gets selected. The single shot // avoids this from happening by allowing the item to be selected // when the event loop is enterred, and then resetting it. - QTimer::singleShot(0, this, SLOT(slotSetKMenuItemActive())); + TQTimer::singleShot(0, this, TQT_SLOT(slotSetKMenuItemActive())); } else { // We need the kmenu's size to place it at the right position. // We cannot rely on the popup menu's current size(), if it wasn't // shown before, so we resize it here according to its sizeHint(). - const QSize size = m_kmenu->sizeHint(); + const TQSize size = m_kmenu->sizeHint(); m_kmenu->resize(size.width(),size.height()); PanelPopupButton* button = findKButtonFor(m_kmenu); // let's unhide the panel while we're at it. traverse the widget // hierarchy until we find the panel, if any - QObject* menuParent = button->parent(); + TQObject* menuParent = button->parent(); while (menuParent) { ExtensionContainer* ext = dynamic_cast<ExtensionContainer*>(menuParent); @@ -198,11 +198,11 @@ void MenuManager::kmenuAccelActivated() } } -QCString MenuManager::createMenu(QPixmap icon, QString text) +TQCString MenuManager::createMenu(TQPixmap icon, TQString text) { static int menucount = 0; menucount++; - QCString name; + TQCString name; name.sprintf("kickerclientmenu-%d", menucount ); KickerClientMenu* p = new KickerClientMenu( 0, name ); clientmenus.append(p); @@ -215,7 +215,7 @@ QCString MenuManager::createMenu(QPixmap icon, QString text) return name; } -void MenuManager::removeMenu(QCString menu) +void MenuManager::removeMenu(TQCString menu) { bool iterate = true; ClientMenuList::iterator it = clientmenus.begin(); @@ -234,7 +234,7 @@ void MenuManager::removeMenu(QCString menu) } -void MenuManager::applicationRemoved(const QCString& appRemoved) +void MenuManager::applicationRemoved(const TQCString& appRemoved) { bool iterate = true; ClientMenuList::iterator it = clientmenus.begin(); @@ -252,21 +252,21 @@ void MenuManager::applicationRemoved(const QCString& appRemoved) m_kmenu->adjustSize(); } -bool MenuManager::process(const QCString &fun, const QByteArray &data, - QCString &replyType, QByteArray &replyData) +bool MenuManager::process(const TQCString &fun, const TQByteArray &data, + TQCString &replyType, TQByteArray &replyData) { - if ( fun == "createMenu(QPixmap,QString)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QPixmap icon; - QString text; + if ( fun == "createMenu(TQPixmap,TQString)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQPixmap icon; + TQString text; dataStream >> icon >> text; - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); reply << createMenu( icon, text ); - replyType = "QCString"; + replyType = "TQCString"; return true; - } else if ( fun == "removeMenu(QCString)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QCString menu; + } else if ( fun == "removeMenu(TQCString)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQCString menu; dataStream >> menu; removeMenu( menu ); replyType = "void"; diff --git a/kicker/kicker/core/menumanager.h b/kicker/kicker/core/menumanager.h index ed0e5d225..e9d7dfef4 100644 --- a/kicker/kicker/core/menumanager.h +++ b/kicker/kicker/core/menumanager.h @@ -25,38 +25,38 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define KICKER_MENU_MANAGER_H #include <dcopobject.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> class PanelKMenu; class KickerClientMenu; class PanelPopupButton; -typedef QValueList<PanelPopupButton*> KButtonList; +typedef TQValueList<PanelPopupButton*> KButtonList; /** * The factory for menus created by other applications. Also the owner of these menus. */ -class MenuManager : public QObject, DCOPObject +class MenuManager : public TQObject, DCOPObject { Q_OBJECT public: static MenuManager* the(); // dcop exported - QCString createMenu(QPixmap icon, QString text); - void removeMenu(QCString menu); + TQCString createMenu(TQPixmap icon, TQString text); + void removeMenu(TQCString menu); // dcop internal - bool process(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &reply); + bool process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &reply); // KMenu controls PanelKMenu* kmenu() { return m_kmenu; } void showKMenu(); - void popupKMenu(const QPoint &p); + void popupKMenu(const TQPoint &p); void registerKButton(PanelPopupButton *button); void unregisterKButton(PanelPopupButton *button); - PanelPopupButton* findKButtonFor(QPopupMenu* menu); + PanelPopupButton* findKButtonFor(TQPopupMenu* menu); ~MenuManager(); public slots: @@ -64,15 +64,15 @@ public slots: void kmenuAccelActivated(); protected slots: - void applicationRemoved(const QCString&); + void applicationRemoved(const TQCString&); protected: PanelKMenu* m_kmenu; - typedef QValueList<KickerClientMenu*> ClientMenuList; + typedef TQValueList<KickerClientMenu*> ClientMenuList; ClientMenuList clientmenus; private: - MenuManager(QObject *parent = 0); + MenuManager(TQObject *parent = 0); static MenuManager* m_self; KButtonList m_kbuttons; diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 70b7b407d..2bd70c82b 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qframe.h> -#include <qvalidator.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qstyle.h> +#include <tqframe.h> +#include <tqvalidator.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <kdebug.h> #include <khelpmenu.h> @@ -53,8 +53,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "panelextension.moc" // KDE4: make these say Panel_(somenumber) -PanelExtension::PanelExtension(const QString& configFile, QWidget *parent, const char *name) - : DCOPObject(QCString("ChildPanel_") + QString::number((ulong)this).latin1()), +PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, const char *name) + : DCOPObject(TQCString("ChildPanel_") + TQString::number((ulong)this).latin1()), KPanelExtension(configFile, KPanelExtension::Stretch, 0, parent, name), _opMnu(0), m_panelAddMenu(0), @@ -67,11 +67,11 @@ PanelExtension::PanelExtension(const QString& configFile, QWidget *parent, const setAcceptDrops(!Kicker::the()->isImmutable()); setCustomMenu(opMenu()); - QVBoxLayout* _layout = new QVBoxLayout(this); + TQVBoxLayout* _layout = new TQVBoxLayout(this); // container area _containerArea = new ContainerArea( config(), this, opMenu() ); - connect(_containerArea, SIGNAL(maintainFocus(bool)), this, SIGNAL(maintainFocus(bool))); + connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool))); _layout->addWidget(_containerArea); _containerArea->viewport()->installEventFilter(this); @@ -81,15 +81,15 @@ PanelExtension::PanelExtension(const QString& configFile, QWidget *parent, const // beginning. positionChange(position()); - connect(Kicker::the(), SIGNAL(configurationChanged()), - SLOT(configurationChanged())); - connect(Kicker::the(), SIGNAL(immutabilityChanged(bool)), - SLOT(immutabilityChanged(bool))); + connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), + TQT_SLOT(configurationChanged())); + connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), + TQT_SLOT(immutabilityChanged(bool))); // we wait to get back to the event loop to start up the container area so that // the main panel in ExtensionManager will be assigned and we can tell in a // relatively non-hackish way that we are (or aren't) the "main panel" - QTimer::singleShot(0, this, SLOT(populateContainerArea())); + TQTimer::singleShot(0, this, TQT_SLOT(populateContainerArea())); } PanelExtension::~PanelExtension() @@ -121,15 +121,15 @@ void PanelExtension::immutabilityChanged(bool) m_opMenuBuilt = false; } -QPopupMenu* PanelExtension::opMenu() +TQPopupMenu* PanelExtension::opMenu() { if (_opMnu) { return _opMnu; } - _opMnu = new QPopupMenu(this); - connect(_opMnu, SIGNAL(aboutToShow()), this, SLOT(slotBuildOpMenu())); + _opMnu = new TQPopupMenu(this); + connect(_opMnu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBuildOpMenu())); return _opMnu; } @@ -139,39 +139,39 @@ void PanelExtension::positionChange(Position p) _containerArea->setPosition(p); } -QSize PanelExtension::sizeHint(Position p, QSize maxSize) const +TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const { - QSize size; + TQSize size; if (p == Left || p == Right) { - size = QSize(sizeInPixels(), + size = TQSize(sizeInPixels(), _containerArea->heightForWidth(sizeInPixels())); } else { - size = QSize(_containerArea->widthForHeight(sizeInPixels()), + size = TQSize(_containerArea->widthForHeight(sizeInPixels()), sizeInPixels()); } return size.boundedTo( maxSize ); } -bool PanelExtension::eventFilter(QObject*, QEvent * e) +bool PanelExtension::eventFilter(TQObject*, TQEvent * e) { - if ( e->type() == QEvent::MouseButtonPress ) + if ( e->type() == TQEvent::MouseButtonPress ) { - QMouseEvent* me = (QMouseEvent*) e; + TQMouseEvent* me = (TQMouseEvent*) e; if ( me->button() == RightButton && kapp->authorize("action/kicker_rmb")) { Kicker::the()->setInsertionPoint(me->globalPos()); opMenu()->exec(me->globalPos()); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); return true; } } else - if ( e->type() == QEvent::Resize ) + if ( e->type() == TQEvent::Resize ) { emit updateLayout(); } @@ -211,72 +211,72 @@ void PanelExtension::addWindowListButton() _containerArea->addWindowListButton(); } -void PanelExtension::addURLButton(const QString &url) +void PanelExtension::addURLButton(const TQString &url) { _containerArea->addURLButton(url); } -void PanelExtension::addBrowserButton(const QString &startDir) +void PanelExtension::addBrowserButton(const TQString &startDir) { _containerArea->addBrowserButton(startDir); } -void PanelExtension::addServiceButton(const QString& desktopEntry) +void PanelExtension::addServiceButton(const TQString& desktopEntry) { _containerArea->addServiceButton(desktopEntry); } -void PanelExtension::addServiceMenuButton(const QString &, - const QString& relPath) +void PanelExtension::addServiceMenuButton(const TQString &, + const TQString& relPath) { _containerArea->addServiceMenuButton(relPath); } -void PanelExtension::addNonKDEAppButton(const QString &filePath, - const QString &icon, - const QString &cmdLine, bool inTerm) +void PanelExtension::addNonKDEAppButton(const TQString &filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm) { - _containerArea->addNonKDEAppButton(filePath, QString::null, filePath, icon, + _containerArea->addNonKDEAppButton(filePath, TQString::null, filePath, icon, cmdLine, inTerm); } -void PanelExtension::addNonKDEAppButton(const QString &title, - const QString &description, - const QString &filePath, - const QString &icon, - const QString &cmdLine, bool inTerm) +void PanelExtension::addNonKDEAppButton(const TQString &title, + const TQString &description, + const TQString &filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm) { _containerArea->addNonKDEAppButton(title, description, filePath, icon, cmdLine, inTerm); } -void PanelExtension::addApplet(const QString &desktopFile) +void PanelExtension::addApplet(const TQString &desktopFile) { - _containerArea->addApplet(AppletInfo(desktopFile, QString::null, AppletInfo::Applet)); + _containerArea->addApplet(AppletInfo(desktopFile, TQString::null, AppletInfo::Applet)); } -void PanelExtension::addAppletContainer(const QString &desktopFile) +void PanelExtension::addAppletContainer(const TQString &desktopFile) { // KDE4: this appears in the DCOP interface. // but it's such a bad name, can this go away? addApplet(desktopFile); } -bool PanelExtension::insertApplet(const QString& desktopFile, int index) +bool PanelExtension::insertApplet(const TQString& desktopFile, int index) { return _containerArea->addApplet(desktopFile, false, index) != 0; } -bool PanelExtension::insertImmutableApplet(const QString& desktopFile, int index) +bool PanelExtension::insertImmutableApplet(const TQString& desktopFile, int index) { return _containerArea->addApplet(desktopFile, true, index) != 0; } -QStringList PanelExtension::listApplets() +TQStringList PanelExtension::listApplets() { return _containerArea->listContainers(); BaseContainer::List containers = _containerArea->containers("All"); - QStringList names; + TQStringList names; for (BaseContainer::List::const_iterator it = containers.constBegin(); it != containers.constEnd(); @@ -330,7 +330,7 @@ void PanelExtension::slotBuildOpMenu() m_opMenuBuilt = true; bool kickerImmutable = Kicker::the()->isImmutable(); - bool isMenuBar = ExtensionManager::the()->isMenuBar(dynamic_cast<QWidget*>(parent())); + bool isMenuBar = ExtensionManager::the()->isMenuBar(dynamic_cast<TQWidget*>(parent())); if (!kickerImmutable) { @@ -339,7 +339,7 @@ void PanelExtension::slotBuildOpMenu() { _opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar...") : i18n("Add &Applet to Panel..."), - _containerArea, SLOT(showAddAppletDialog())); + _containerArea, TQT_SLOT(showAddAppletDialog())); m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this); _opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar") : i18n("Add Appli&cation to Panel"), @@ -362,7 +362,7 @@ void PanelExtension::slotBuildOpMenu() } _opMnu->insertItem(SmallIconSet("lock"), i18n("&Lock Panels"), - Kicker::the(), SLOT(toggleLock())); + Kicker::the(), TQT_SLOT(toggleLock())); } else if (!Kicker::the()->isKioskImmutable()) { @@ -370,20 +370,20 @@ void PanelExtension::slotBuildOpMenu() SmallIconSet("lock"), kickerImmutable ? i18n("Un&lock Panels") : i18n("&Lock Panels"), - Kicker::the(), SLOT(toggleLock())); + Kicker::the(), TQT_SLOT(toggleLock())); } if (!isMenuBar && !Kicker::the()->isKioskImmutable()) { _opMnu->insertItem(SmallIconSet("configure"), i18n("&Configure Panel..."), - this, SLOT(showConfig())); + this, TQT_SLOT(showConfig())); _opMnu->insertSeparator(); } _opMnu->insertItem(SmallIconSet("fork"), i18n("&Launch Process Manager..."), - this, SLOT(showProcessManager())); + this, TQT_SLOT(showProcessManager())); _opMnu->insertSeparator(); if (kapp->authorize("action/help")) @@ -441,7 +441,7 @@ void MenubarExtension::populateContainerArea() if (!m_menubar) { m_menubar = _containerArea->addApplet(AppletInfo("menuapplet.desktop", - QString::null, + TQString::null, AppletInfo::Applet)); } diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index 9f50fb9ae..5c753c316 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -44,10 +44,10 @@ class PanelExtension : public KPanelExtension, virtual public DCOPObject K_DCOP public: - PanelExtension(const QString& configFile, QWidget *parent = 0, const char *name = 0); + PanelExtension(const TQString& configFile, TQWidget *parent = 0, const char *name = 0); virtual ~PanelExtension(); - QPopupMenu* opMenu(); + TQPopupMenu* opMenu(); k_dcop: int panelSize() { return sizeInPixels(); } @@ -58,31 +58,31 @@ k_dcop: void addKMenuButton(); void addDesktopButton(); void addWindowListButton(); - void addURLButton(const QString &url); - void addBrowserButton(const QString &startDir); - void addServiceButton(const QString &desktopEntry); - void addServiceMenuButton(const QString &name, const QString& relPath); - void addNonKDEAppButton(const QString &filePath, const QString &icon, - const QString &cmdLine, bool inTerm); - void addNonKDEAppButton(const QString &title, const QString &description, - const QString &filePath, const QString &icon, - const QString &cmdLine, bool inTerm); - - void addApplet(const QString &desktopFile); - void addAppletContainer(const QString &desktopFile); // KDE4: remove, useless - - bool insertApplet(const QString& desktopFile, int index); - bool insertImmutableApplet(const QString& desktopFile, int index); - QStringList listApplets(); + void addURLButton(const TQString &url); + void addBrowserButton(const TQString &startDir); + void addServiceButton(const TQString &desktopEntry); + void addServiceMenuButton(const TQString &name, const TQString& relPath); + void addNonKDEAppButton(const TQString &filePath, const TQString &icon, + const TQString &cmdLine, bool inTerm); + void addNonKDEAppButton(const TQString &title, const TQString &description, + const TQString &filePath, const TQString &icon, + const TQString &cmdLine, bool inTerm); + + void addApplet(const TQString &desktopFile); + void addAppletContainer(const TQString &desktopFile); // KDE4: remove, useless + + bool insertApplet(const TQString& desktopFile, int index); + bool insertImmutableApplet(const TQString& desktopFile, int index); + TQStringList listApplets(); bool removeApplet(int index); void restart(); // KDE4: remove, moved to Kicker void configure(); // KDE4: remove, moved to Kikcker public: - QSize sizeHint(Position, QSize maxSize) const; + TQSize sizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Bottom; } - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( TQObject *, TQEvent * ); protected: void positionChange(Position); @@ -98,12 +98,12 @@ protected slots: virtual void populateContainerArea(); private: - QPopupMenu* _opMnu; - QPopupMenu* m_panelAddMenu; - QPopupMenu* m_removeMnu; - QPopupMenu* m_addExtensionMenu; - QPopupMenu* m_removeExtensionMenu; - QString _configFile; + TQPopupMenu* _opMnu; + TQPopupMenu* m_panelAddMenu; + TQPopupMenu* m_removeMnu; + TQPopupMenu* m_addExtensionMenu; + TQPopupMenu* m_removeExtensionMenu; + TQString _configFile; bool m_opMenuBuilt; }; diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index e392959ad..81975ccae 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qfile.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqtimer.h> #include <kapplication.h> #include <kdebug.h> @@ -54,33 +54,33 @@ PluginManager* PluginManager::the() AppletInfo::List PluginManager::applets(bool sort, AppletInfo::List* list) { - QStringList rel; + TQStringList rel; KGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::Applet, sort, list); } AppletInfo::List PluginManager::extensions(bool sort, AppletInfo::List* list) { - QStringList rel; + TQStringList rel; KGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::Extension, sort, list); } AppletInfo::List PluginManager::builtinButtons(bool sort, AppletInfo::List* list) { - QStringList rel; + TQStringList rel; KGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::BuiltinButton, sort, list); } AppletInfo::List PluginManager::specialButtons(bool sort, AppletInfo::List* list) { - QStringList rel; + TQStringList rel; KGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::SpecialButton, sort, list); } -AppletInfo::List PluginManager::plugins(const QStringList& desktopFiles, +AppletInfo::List PluginManager::plugins(const TQStringList& desktopFiles, AppletInfo::AppletType type, bool sort, AppletInfo::List* list) @@ -92,10 +92,10 @@ AppletInfo::List PluginManager::plugins(const QStringList& desktopFiles, plugins = *list; } - for (QStringList::ConstIterator it = desktopFiles.constBegin(); + for (TQStringList::ConstIterator it = desktopFiles.constBegin(); it != desktopFiles.constEnd(); ++it) { - AppletInfo info(*it, QString::null, type); + AppletInfo info(*it, TQString::null, type); if (!info.isHidden()) { @@ -123,8 +123,8 @@ PluginManager::~PluginManager() AppletInfo::Dict::const_iterator it = _dict.constBegin(); for (; it != _dict.constEnd(); ++it) { - disconnect(it.key(), SIGNAL(destroyed( QObject*)), - this, SLOT(slotPluginDestroyed(QObject*))); + disconnect(it.key(), TQT_SIGNAL(destroyed( TQObject*)), + this, TQT_SLOT(slotPluginDestroyed(TQObject*))); delete it.data(); } @@ -133,10 +133,10 @@ PluginManager::~PluginManager() } KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, - QWidget* parent ) + TQWidget* parent ) { KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library( QFile::encodeName(info.library()) ); + KLibrary* lib = loader->library( TQFile::encodeName(info.library()) ); if (!lib) { @@ -145,13 +145,13 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, return 0; } - KPanelApplet* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelApplet* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelApplet* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelApplet* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if (!init_ptr) { kdWarning() << info.library() << " is not a kicker extension!" << endl; - loader->unloadLibrary( QFile::encodeName(info.library()) ); + loader->unloadLibrary( TQFile::encodeName(info.library()) ); return 0; } @@ -160,15 +160,15 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { _dict.insert( applet, new AppletInfo( info ) ); - connect( applet, SIGNAL( destroyed( QObject* ) ), - SLOT( slotPluginDestroyed( QObject* ) ) ); + connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), + TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return applet; } KPanelExtension* PluginManager::loadExtension( - const AppletInfo& info, QWidget* parent ) + const AppletInfo& info, TQWidget* parent ) { if (info.library() == "childpanel_panelextension" /* KDE4? || info.library() == "panel" */) @@ -177,7 +177,7 @@ KPanelExtension* PluginManager::loadExtension( } KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library( QFile::encodeName(info.library()) ); + KLibrary* lib = loader->library( TQFile::encodeName(info.library()) ); if( !lib ) { kdWarning() << "cannot open extension: " << info.library() @@ -185,12 +185,12 @@ KPanelExtension* PluginManager::loadExtension( return 0; } - KPanelExtension* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelExtension* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelExtension* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if(!init_ptr){ kdWarning() << info.library() << " is not a kicker extension!" << endl; - loader->unloadLibrary( QFile::encodeName(info.library()) ); + loader->unloadLibrary( TQFile::encodeName(info.library()) ); return 0; } @@ -198,8 +198,8 @@ KPanelExtension* PluginManager::loadExtension( if( extension ) { _dict.insert( extension, new AppletInfo( info ) ); - connect( extension, SIGNAL( destroyed( QObject* ) ), - SLOT( slotPluginDestroyed( QObject* ) ) ); + connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), + TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return extension; @@ -219,7 +219,7 @@ bool PluginManager::hasInstance( const AppletInfo& info ) const return false; } -void PluginManager::slotPluginDestroyed(QObject* object) +void PluginManager::slotPluginDestroyed(TQObject* object) { AppletInfo* info = 0; AppletInfo::Dict::iterator it = _dict.begin(); @@ -243,14 +243,14 @@ void PluginManager::slotPluginDestroyed(QObject* object) } AppletContainer* PluginManager::createAppletContainer( - const QString& desktopFile, + const TQString& desktopFile, bool isStartup, - const QString& configFile, - QPopupMenu* opMenu, - QWidget* parent, + const TQString& configFile, + TQPopupMenu* opMenu, + TQWidget* parent, bool isImmutable) { - QString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile ); + TQString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile ); // KDE4: remove // support the old (KDE 2.2) nameing scheme @@ -298,17 +298,17 @@ AppletContainer* PluginManager::createAppletContainer( return container; } -ExtensionContainer* PluginManager::createExtensionContainer(const QString& desktopFile, +ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desktopFile, bool isStartup, - const QString& configFile, - const QString& extensionId) + const TQString& configFile, + const TQString& extensionId) { if (desktopFile.isEmpty()) { return 0; } - QString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile); + TQString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile); if (desktopPath.isEmpty()) { return 0; @@ -355,22 +355,22 @@ void PluginManager::clearUntrustedLists() generalGroup.sync(); } -LibUnloader::LibUnloader( const QString &libName, QObject *parent ) - : QObject( parent ), _libName( libName ) +LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) + : TQObject( parent ), _libName( libName ) { // NOTE: this doesn't work on kicker shutdown because the timer never gets // fired. - QTimer::singleShot( 0, this, SLOT( unload() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( unload() ) ); } -void LibUnloader::unload( const QString &libName ) +void LibUnloader::unload( const TQString &libName ) { (void)new LibUnloader( libName, kapp ); } void LibUnloader::unload() { - KLibLoader::self()->unloadLibrary( QFile::encodeName( _libName ) ); + KLibLoader::self()->unloadLibrary( TQFile::encodeName( _libName ) ); deleteLater(); } diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h index bbea87b30..7be94c2ac 100644 --- a/kicker/kicker/core/pluginmanager.h +++ b/kicker/kicker/core/pluginmanager.h @@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __PLUGIN_MANAGER_H__ #define __PLUGIN_MANAGER_H__ -#include <qmap.h> -#include <qobject.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqobject.h> +#include <tqstringlist.h> #include <kdemacros.h> #include <kstaticdeleter.h> @@ -49,19 +49,19 @@ public: static AppletInfo::List builtinButtons(bool sort = true, AppletInfo::List* list = 0); static AppletInfo::List specialButtons(bool sort = true, AppletInfo::List* list = 0); - AppletContainer* createAppletContainer(const QString& desktopFile, + AppletContainer* createAppletContainer(const TQString& desktopFile, bool isStartup, - const QString& configFile, - QPopupMenu* opMenu, - QWidget* parent, + const TQString& configFile, + TQPopupMenu* opMenu, + TQWidget* parent, bool isImmutable = false); - ExtensionContainer* createExtensionContainer(const QString& desktopFile, + ExtensionContainer* createExtensionContainer(const TQString& desktopFile, bool isStartup, - const QString& configFile, - const QString& extensionId); + const TQString& configFile, + const TQString& extensionId); - KPanelApplet* loadApplet(const AppletInfo& info, QWidget* parent); - KPanelExtension* loadExtension(const AppletInfo& info, QWidget* parent); + KPanelApplet* loadApplet(const AppletInfo& info, TQWidget* parent); + KPanelExtension* loadExtension(const AppletInfo& info, TQWidget* parent); bool hasInstance(const AppletInfo&) const; @@ -69,13 +69,13 @@ public slots: void clearUntrustedLists(); protected: - static AppletInfo::List plugins(const QStringList& desktopFiles, + static AppletInfo::List plugins(const TQStringList& desktopFiles, AppletInfo::AppletType, bool sort, AppletInfo::List* list); private slots: - void slotPluginDestroyed(QObject* plugin); + void slotPluginDestroyed(TQObject* plugin); private: friend class KStaticDeleter<PluginManager>; @@ -84,23 +84,23 @@ private: AppletInfo::Dict _dict; static PluginManager* m_self; - QStringList m_untrustedApplets; - QStringList m_untrustedExtensions; + TQStringList m_untrustedApplets; + TQStringList m_untrustedExtensions; }; class LibUnloader : public QObject { Q_OBJECT public: - static void unload( const QString &libName ); + static void unload( const TQString &libName ); private slots: void unload(); private: - LibUnloader( const QString &libName, QObject *parent ); + LibUnloader( const TQString &libName, TQObject *parent ); - QString _libName; + TQString _libName; }; #endif diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp index 5575b3b28..7f75ba1b9 100644 --- a/kicker/kicker/core/showdesktop.cpp +++ b/kicker/kicker/core/showdesktop.cpp @@ -40,7 +40,7 @@ ShowDesktop* ShowDesktop::the() } ShowDesktop::ShowDesktop() - : QObject(), + : TQObject(), m_showingDesktop(false) { // This feature is implemented in KWin. Keep old code in Kicker for the case @@ -49,8 +49,8 @@ ShowDesktop::ShowDesktop() m_wmSupport = i.isSupported( NET::WM2ShowingDesktop ); if( m_wmSupport ) { - connect( Kicker::the()->kwinModule(), SIGNAL( showingDesktopChanged( bool )), - SLOT( showingDesktopChanged( bool ))); + connect( Kicker::the()->kwinModule(), TQT_SIGNAL( showingDesktopChanged( bool )), + TQT_SLOT( showingDesktopChanged( bool ))); showingDesktopChanged( m_showingDesktop = Kicker::the()->kwinModule()->showingDesktop()); } } @@ -133,8 +133,8 @@ void ShowDesktop::showDesktop( bool b ) m_activeWindow = Kicker::the()->kwinModule()->activeWindow(); m_iconifiedList.clear(); - const QValueList<WId> windows = Kicker::the()->kwinModule()->windows(); - for (QValueList<WId>::ConstIterator it = windows.begin(); + const TQValueList<WId> windows = Kicker::the()->kwinModule()->windows(); + for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it) { @@ -153,7 +153,7 @@ void ShowDesktop::showDesktop( bool b ) // find first, hide later, otherwise transients may get minimized // with the window they're transient for - for (QValueVector<WId>::Iterator it = m_iconifiedList.begin(); + for (TQValueVector<WId>::Iterator it = m_iconifiedList.begin(); it != m_iconifiedList.end(); ++it) { @@ -161,23 +161,23 @@ void ShowDesktop::showDesktop( bool b ) } // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)), - SLOT(slotCurrentDesktopChanged(int))); - connect(Kicker::the()->kwinModule(), SIGNAL(windowChanged(WId,unsigned int)), - SLOT(slotWindowChanged(WId,unsigned int))); - connect(Kicker::the()->kwinModule(), SIGNAL(windowAdded(WId)), - SLOT(slotWindowAdded(WId))); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + TQT_SLOT(slotCurrentDesktopChanged(int))); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), + TQT_SLOT(slotWindowChanged(WId,unsigned int))); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)), + TQT_SLOT(slotWindowAdded(WId))); } else { - disconnect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)), - this, SLOT(slotCurrentDesktopChanged(int))); - disconnect(Kicker::the()->kwinModule(), SIGNAL(windowChanged(WId,unsigned int)), - this, SLOT(slotWindowChanged(WId,unsigned int))); - disconnect(Kicker::the()->kwinModule(), SIGNAL(windowAdded(WId)), - this, SLOT(slotWindowAdded(WId))); - - for (QValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); + disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + this, TQT_SLOT(slotCurrentDesktopChanged(int))); + disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), + this, TQT_SLOT(slotWindowChanged(WId,unsigned int))); + disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)), + this, TQT_SLOT(slotWindowAdded(WId))); + + for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); it != m_iconifiedList.end(); ++it) { diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h index bebf62007..8d4d2546c 100644 --- a/kicker/kicker/core/showdesktop.h +++ b/kicker/kicker/core/showdesktop.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KWinModule; -#include <qvaluevector.h> +#include <tqvaluevector.h> /** * Singleton class that handles desktop access (minimizing all windows) @@ -56,7 +56,7 @@ private: ShowDesktop(); bool m_showingDesktop; - QValueVector<WId> m_iconifiedList; + TQValueVector<WId> m_iconifiedList; WId m_activeWindow; bool m_wmSupport; }; diff --git a/kicker/kicker/core/unhidetrigger.cpp b/kicker/kicker/core/unhidetrigger.cpp index bd0e0a0f8..7dcf1a127 100644 --- a/kicker/kicker/core/unhidetrigger.cpp +++ b/kicker/kicker/core/unhidetrigger.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtimer.h> -#include <qcursor.h> +#include <tqtimer.h> +#include <tqcursor.h> #include <kdebug.h> #include "unhidetrigger.h" @@ -39,8 +39,8 @@ UnhideTrigger::UnhideTrigger() , _lastXineramaScreen( -1 ) , enabledCount( 0 ) { - _timer = new QTimer( this ); - connect( _timer, SIGNAL(timeout()), SLOT(pollMouse()) ); + _timer = new TQTimer( this ); + connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(pollMouse()) ); } void UnhideTrigger::setEnabled( bool enable ) @@ -65,10 +65,10 @@ bool UnhideTrigger::isEnabled() const void UnhideTrigger::pollMouse() { - QPoint pos = QCursor::pos(); - for(int s = 0; s < QApplication::desktop()->numScreens(); s++) + TQPoint pos = TQCursor::pos(); + for(int s = 0; s < TQApplication::desktop()->numScreens(); s++) { - QRect r = QApplication::desktop()->screenGeometry(s); + TQRect r = TQApplication::desktop()->screenGeometry(s); if (pos.x() == r.left()) { if (pos.y() == r.top()) diff --git a/kicker/kicker/core/unhidetrigger.h b/kicker/kicker/core/unhidetrigger.h index 7e13a0e1d..af05a43f5 100644 --- a/kicker/kicker/core/unhidetrigger.h +++ b/kicker/kicker/core/unhidetrigger.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif -#include <qobject.h> +#include <tqobject.h> class UnhideTrigger : public QObject { @@ -55,7 +55,7 @@ private: void emitTrigger( Trigger t , int XineramaScreen ); Trigger _lastTrigger; int _lastXineramaScreen; - QTimer *_timer; + TQTimer *_timer; int enabledCount; }; diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp index 5654b1eb3..d4b54f04a 100644 --- a/kicker/kicker/core/userrectsel.cpp +++ b/kicker/kicker/core/userrectsel.cpp @@ -21,14 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qpainter.h> +#include <tqapplication.h> +#include <tqpainter.h> #include "userrectsel.h" #include "userrectsel.moc" -UserRectSel::UserRectSel(const RectList& rects, const QPoint& _offset, const QColor& color) - : QWidget(0, 0, WStyle_Customize | WX11BypassWM), +UserRectSel::UserRectSel(const RectList& rects, const TQPoint& _offset, const TQColor& color) + : TQWidget(0, 0, WStyle_Customize | WX11BypassWM), rectangles(rects), offset(_offset) { @@ -44,7 +44,7 @@ UserRectSel::~UserRectSel() delete _frame[i]; } -void UserRectSel::mouseReleaseEvent(QMouseEvent * e) +void UserRectSel::mouseReleaseEvent(TQMouseEvent * e) { if (e->button() == LeftButton) { @@ -52,11 +52,11 @@ void UserRectSel::mouseReleaseEvent(QMouseEvent * e) } } -void UserRectSel::mouseMoveEvent(QMouseEvent * e) +void UserRectSel::mouseMoveEvent(TQMouseEvent * e) { PanelStrut nearest = current; int diff = -1; - QPoint p = e->globalPos(); // + offset; + TQPoint p = e->globalPos(); // + offset; for (RectList::const_iterator it = rectangles.constBegin(); it != rectangles.constEnd(); ++it) @@ -88,12 +88,12 @@ void UserRectSel::paintCurrent() { for (i = 0; i < 4; i++) { - _frame[i] = new QWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); + _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); _frame[i]->setPaletteBackgroundColor(Qt::black); } for (i = 4; i < 8; i++) { - _frame[i] = new QWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); + _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); _frame[i]->setPaletteBackgroundColor(_color); } } @@ -132,7 +132,7 @@ void UserRectSel::paintCurrent() } -UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const QPoint& offset, const QColor& color) +UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const TQPoint& offset, const TQColor& color) { UserRectSel sel(rects, offset, color); sel.show(); diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index 724f39818..63ba47fd5 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __userrectsel_h__ #define __userrectsel_h__ -#include <qwidget.h> -#include <qvaluevector.h> -#include <qcolor.h> +#include <tqwidget.h> +#include <tqvaluevector.h> +#include <tqcolor.h> #include <kpanelextension.h> @@ -47,7 +47,7 @@ class UserRectSel : public QWidget { } - PanelStrut(const QRect& rect, int XineramaScreen, + PanelStrut(const TQRect& rect, int XineramaScreen, KPanelExtension::Position pos, KPanelExtension::Alignment alignment) : m_rect(rect), @@ -69,29 +69,29 @@ class UserRectSel : public QWidget return !(*this == rhs); } - QRect m_rect; + TQRect m_rect; int m_screen; KPanelExtension::Position m_pos; KPanelExtension::Alignment m_alignment; }; - typedef QValueVector<PanelStrut> RectList; - static PanelStrut select(const RectList& rects, const QPoint& _offset, const QColor& color); + typedef TQValueVector<PanelStrut> RectList; + static PanelStrut select(const RectList& rects, const TQPoint& _offset, const TQColor& color); protected: - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); private: - UserRectSel(const RectList& rects, const QPoint& _offset, const QColor& color); + UserRectSel(const RectList& rects, const TQPoint& _offset, const TQColor& color); ~UserRectSel(); void paintCurrent(); const RectList rectangles; PanelStrut current; - QPoint offset; - QWidget *_frame[8]; - QColor _color; + TQPoint offset; + TQWidget *_frame[8]; + TQColor _color; friend class ShutUpCompiler; }; diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index bfcea5629..97a35aff6 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -1,8 +1,8 @@ -#include <qfile.h> -#include <qmap.h> -#include <qregexp.h> -#include <qstring.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqmap.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqtextstream.h> #include <kapplication.h> #include <kcmdlineargs.h> @@ -14,10 +14,10 @@ struct AppletInfo { double freeSpace; - QString configFile; - QString desktopFile; + TQString configFile; + TQString desktopFile; }; -typedef QMap<QString, AppletInfo> AppletInfoMap; +typedef TQMap<TQString, AppletInfo> AppletInfoMap; int main(int argc, char** argv) { @@ -25,20 +25,20 @@ int main(int argc, char** argv) KCmdLineArgs::init(argc, argv, "kicker", "", "", "", false); KApplication app(false, false); - QStringList stretchableApplets; + TQStringList stretchableApplets; stretchableApplets << "taskbarapplet.desktop"; - QTextStream in (stdin, IO_ReadOnly); - QTextStream out(stdout, IO_WriteOnly); + TQTextStream in (stdin, IO_ReadOnly); + TQTextStream out(stdout, IO_WriteOnly); - QStringList appletIds; + TQStringList appletIds; AppletInfoMap applets; - QRegExp rxGroup("^\\[(.+)\\]$"); - QRegExp rxKeyValue("([^=]+)=[ \t]*([^\n]+)"); - QString currentGroup; + TQRegExp rxGroup("^\\[(.+)\\]$"); + TQRegExp rxKeyValue("([^=]+)=[ \t]*([^\n]+)"); + TQString currentGroup; - QString line; + TQString line; while (!(line = in.readLine()).isNull()) { if (rxGroup.search(line) != -1) @@ -49,12 +49,12 @@ int main(int argc, char** argv) if (rxKeyValue.search(line) != -1) { - QString key = rxKeyValue.cap(1); - QString value = rxKeyValue.cap(2); + TQString key = rxKeyValue.cap(1); + TQString value = rxKeyValue.cap(2); if (key == "Applets") { - appletIds = QStringList::split(",", value); + appletIds = TQStringList::split(",", value); } else if (key == "FreeSpace") { @@ -71,11 +71,11 @@ int main(int argc, char** argv) } } - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) { // Reverse appletIds - QStringList appletIdsRev; - QStringList::ConstIterator it; + TQStringList appletIdsRev; + TQStringList::ConstIterator it; for (it = appletIds.begin(); it != appletIds.end(); ++it) { appletIdsRev.prepend(*it); @@ -108,7 +108,7 @@ int main(int argc, char** argv) { out << "[General]" << endl; out << "Applets2=" << appletIds.join(",") << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = appletIds.begin(); it != appletIds.end(); ++it) { out << "[" << *it << "]" << endl; @@ -117,9 +117,9 @@ int main(int argc, char** argv) } // Build a list of childpanel config files. - QStringList childPanelConfigFiles; + TQStringList childPanelConfigFiles; AppletInfoMap::ConstIterator it2; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it2 = applets.begin(); it2 != applets.end(); ++it2) { if (it2.data().desktopFile == "childpanelextension.desktop") @@ -131,8 +131,8 @@ int main(int argc, char** argv) if (!childPanelConfigFiles.isEmpty()) { // Create a temporary kconf_update .upd file for updating the childpanels - KTempFile tempFile(QString::null, ".upd"); - QTextStream* upd = tempFile.textStream(); + KTempFile tempFile(TQString::null, ".upd"); + TQTextStream* upd = tempFile.textStream(); for (it = childPanelConfigFiles.begin(); it != childPanelConfigFiles.end(); ++it) { *upd << "Id=kde_3.4_reverseLayout" << endl; diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index e7ac47c9c..796920ed4 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -22,17 +22,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qcombobox.h> -#include <qdir.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpalette.h> -#include <qscrollview.h> -#include <qtimer.h> -#include <qsizepolicy.h> +#include <tqapplication.h> +#include <tqcombobox.h> +#include <tqdir.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpalette.h> +#include <tqscrollview.h> +#include <tqtimer.h> +#include <tqsizepolicy.h> #include <kiconloader.h> #include <kdebug.h> @@ -55,13 +55,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "menuinfo.h" #include "pluginmanager.h" -AppletWidget::AppletWidget(const AppletInfo& info, bool odd, QWidget *parent) +AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent) : AppletItem(parent), m_appletInfo(info), m_odd(odd), m_selected(false) { - setFocusPolicy(QWidget::StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setSelected(m_selected); itemTitle->setText("<h3>" + info.name() + "</h3>"); @@ -75,16 +75,16 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, QWidget *parent) itemDescription->installEventFilter(this); KIconLoader * ldr = KGlobal::iconLoader(); - QPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge); + TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge); itemPixmap->setPixmap(icon); itemPixmap->installEventFilter(this); } -bool AppletWidget::eventFilter(QObject*, QEvent* e) +bool AppletWidget::eventFilter(TQObject*, TQEvent* e) { - if (e->type() == QEvent::MouseButtonPress) + if (e->type() == TQEvent::MouseButtonPress) { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if (me->button() & LeftButton) { m_dragStart = me->pos(); @@ -95,9 +95,9 @@ bool AppletWidget::eventFilter(QObject*, QEvent* e) return false; } - if (e->type() == QEvent::MouseMove) + if (e->type() == TQEvent::MouseMove) { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if ((me->pos() - m_dragStart).manhattanLength() > KGlobalSettings::dndEventDelay()) { @@ -113,15 +113,15 @@ bool AppletWidget::eventFilter(QObject*, QEvent* e) return true; } } - else if (e->type() == QEvent::MouseButtonRelease) + else if (e->type() == TQEvent::MouseButtonRelease) { - m_dragStart = QPoint(); + m_dragStart = TQPoint(); } return false; } -void AppletWidget::keyPressEvent(QKeyEvent *e) +void AppletWidget::keyPressEvent(TQKeyEvent *e) { if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) @@ -130,17 +130,17 @@ void AppletWidget::keyPressEvent(QKeyEvent *e) } else if (e->key() == Qt::Key_Up) { - QKeyEvent fakedKeyPress(QEvent::KeyPress, Qt::Key_BackTab, 0, 0); - QKeyEvent fakedKeyRelease(QEvent::KeyRelease, Key_BackTab, 0, 0); - QApplication::sendEvent(this, &fakedKeyPress); - QApplication::sendEvent(this, &fakedKeyRelease); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_BackTab, 0, 0); + TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0); + TQApplication::sendEvent(this, &fakedKeyPress); + TQApplication::sendEvent(this, &fakedKeyRelease); } else if (e->key() == Qt::Key_Down) { - QKeyEvent fakedKeyPress(QEvent::KeyPress, Qt::Key_Tab, 0, 0); - QKeyEvent fakedKeyRelease(QEvent::KeyRelease, Key_Escape, 0, 0); - QApplication::sendEvent(this, &fakedKeyPress); - QApplication::sendEvent(this, &fakedKeyRelease); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0); + TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); + TQApplication::sendEvent(this, &fakedKeyPress); + TQApplication::sendEvent(this, &fakedKeyRelease); } else { @@ -148,21 +148,21 @@ void AppletWidget::keyPressEvent(QKeyEvent *e) } } -void AppletWidget::mousePressEvent(QMouseEvent *e) +void AppletWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == QMouseEvent::LeftButton) + if (e->button() == TQMouseEvent::LeftButton) { emit clicked(this); m_dragStart = e->pos(); } setFocus(); - QWidget::mousePressEvent(e); + TQWidget::mousePressEvent(e); } -void AppletWidget::mouseMoveEvent(QMouseEvent *e) +void AppletWidget::mouseMoveEvent(TQMouseEvent *e) { - if (e->button() == QMouseEvent::LeftButton && + if (e->button() == TQMouseEvent::LeftButton && !m_dragStart.isNull() && (e->pos() - m_dragStart).manhattanLength() > KGlobalSettings::dndEventDelay()) @@ -178,15 +178,15 @@ void AppletWidget::mouseMoveEvent(QMouseEvent *e) } } -void AppletWidget::mouseReleaseEvent(QMouseEvent *e) +void AppletWidget::mouseReleaseEvent(TQMouseEvent *e) { - m_dragStart = QPoint(); - QWidget::mouseReleaseEvent(e); + m_dragStart = TQPoint(); + TQWidget::mouseReleaseEvent(e); } -void AppletWidget::mouseDoubleClickEvent(QMouseEvent *e) +void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e) { - if (!e->button() == QMouseEvent::LeftButton) + if (!e->button() == TQMouseEvent::LeftButton) { AppletItem::mouseDoubleClickEvent(e); return; @@ -223,24 +223,24 @@ void AppletWidget::setOdd(bool odd) setSelected(m_selected); } -void AppletWidget::focusInEvent(QFocusEvent*) +void AppletWidget::focusInEvent(TQFocusEvent*) { emit clicked(this); } AddAppletDialog::AddAppletDialog(ContainerArea* cArea, - QWidget* parent, + TQWidget* parent, const char* name) : KDialogBase(parent, name, false, i18n("Add Applet"), 0), m_selectedApplet(0), m_containerArea(cArea), m_insertionPoint(Kicker::the()->insertionPoint()), m_closing(false), - m_searchDelay(new QTimer(this)) + m_searchDelay(new TQTimer(this)) { m_mainWidget = new AppletView(this, "AddAppletDialog::m_mainWidget"); - m_mainWidget->appletScrollView->setResizePolicy(QScrollView::Manual); - m_mainWidget->appletScrollView->setHScrollBarMode(QScrollView::AlwaysOff); + m_mainWidget->appletScrollView->setResizePolicy(TQScrollView::Manual); + m_mainWidget->appletScrollView->setHScrollBarMode(TQScrollView::AlwaysOff); m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(KGlobalSettings::baseColor()); setMainWidget(m_mainWidget); @@ -254,16 +254,16 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea, m_mainWidget->appletInstall->setGuiItem(addGuiItem); m_mainWidget->closeButton->setGuiItem(KStdGuiItem::close()); - connect(m_mainWidget->appletSearch, SIGNAL(textChanged(const QString&)), this, SLOT(delayedSearch())); - connect(m_searchDelay, SIGNAL(timeout()), this, SLOT(search())); - connect(m_mainWidget->appletFilter, SIGNAL(activated(int)), this, SLOT(filter(int))); - connect(m_mainWidget->appletInstall, SIGNAL(clicked()), this, SLOT(addCurrentApplet())); - connect(m_mainWidget->closeButton, SIGNAL(clicked()), this, SLOT(close())); + connect(m_mainWidget->appletSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(delayedSearch())); + connect(m_searchDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(search())); + connect(m_mainWidget->appletFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(filter(int))); + connect(m_mainWidget->appletInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCurrentApplet())); + connect(m_mainWidget->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); m_selectedType = AppletInfo::Undefined; m_appletBox = 0; - QTimer::singleShot(0, this, SLOT(populateApplets())); + TQTimer::singleShot(0, this, TQT_SLOT(populateApplets())); } void AddAppletDialog::updateInsertionPoint() @@ -272,7 +272,7 @@ void AddAppletDialog::updateInsertionPoint() } -void AddAppletDialog::closeEvent(QCloseEvent* e) +void AddAppletDialog::closeEvent(TQCloseEvent* e) { m_closing = true; saveDialogSize("AddAppletDialog Settings"); @@ -282,7 +282,7 @@ void AddAppletDialog::closeEvent(QCloseEvent* e) void AddAppletDialog::resizeAppletView() { int w, h; - QScrollView *v = m_mainWidget->appletScrollView; + TQScrollView *v = m_mainWidget->appletScrollView; if (m_closing) return; @@ -300,21 +300,21 @@ void AddAppletDialog::resizeAppletView() } } -bool AddAppletDialog::eventFilter(QObject *o, QEvent *e) +bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) { - if (e->type() == QEvent::Resize) - QTimer::singleShot(0, this, SLOT(resizeAppletView())); + if (e->type() == TQEvent::Resize) + TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); - return QObject::eventFilter(o, e); + return TQObject::eventFilter(o, e); } void AddAppletDialog::populateApplets() { - m_appletBox = new QWidget(m_mainWidget->appletScrollView->viewport()); + m_appletBox = new TQWidget(m_mainWidget->appletScrollView->viewport()); m_appletBox->setPaletteBackgroundColor(KGlobalSettings::baseColor()); m_mainWidget->appletScrollView->addChild(m_appletBox, 0, 0); m_appletBox->show(); - QVBoxLayout* layout = new QVBoxLayout(m_appletBox); + TQVBoxLayout* layout = new TQVBoxLayout(m_appletBox); layout->setMargin(0); m_mainWidget->appletScrollView->installEventFilter(this); @@ -339,7 +339,7 @@ void AddAppletDialog::populateApplets() int i = 0; bool odd = true; - QWidget* prevTabWidget = m_mainWidget->appletFilter; + TQWidget* prevTabWidget = m_mainWidget->appletFilter; for (AppletInfo::List::iterator it = appletInfoList.begin(); !m_closing && it != appletInfoList.end(); @@ -372,10 +372,10 @@ void AddAppletDialog::populateApplets() setTabOrder(prevTabWidget, itemWidget); prevTabWidget = itemWidget; - connect(itemWidget, SIGNAL(clicked(AppletWidget*)), - this, SLOT(selectApplet(AppletWidget*))); - connect(itemWidget, SIGNAL(doubleClicked(AppletWidget*)), - this, SLOT(addApplet(AppletWidget*))); + connect(itemWidget, TQT_SIGNAL(clicked(AppletWidget*)), + this, TQT_SLOT(selectApplet(AppletWidget*))); + connect(itemWidget, TQT_SIGNAL(doubleClicked(AppletWidget*)), + this, TQT_SLOT(addApplet(AppletWidget*))); if (m_closing) { @@ -419,10 +419,10 @@ void AddAppletDialog::addApplet(AppletWidget* applet) return; } - QPoint prevInsertionPoint = Kicker::the()->insertionPoint(); + TQPoint prevInsertionPoint = Kicker::the()->insertionPoint(); Kicker::the()->setInsertionPoint(m_insertionPoint); - const QWidget* appletContainer = 0; + const TQWidget* appletContainer = 0; if (applet->info().type() == AppletInfo::Applet) { @@ -473,7 +473,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet) } bool AddAppletDialog::appletMatchesSearch(const AppletWidget* w, - const QString& s) + const TQString& s) { if (w->info().type() == AppletInfo::Applet && w->info().isUniqueApplet() && @@ -498,7 +498,7 @@ void AddAppletDialog::delayedSearch() void AddAppletDialog::search() { - QString s = m_mainWidget->appletSearch->text(); + TQString s = m_mainWidget->appletSearch->text(); bool odd = true; AppletWidget::List::const_iterator it = m_appletWidgetList.constBegin(); AppletWidget::List::const_iterator itEnd = m_appletWidgetList.constEnd(); @@ -518,7 +518,7 @@ void AddAppletDialog::search() } } - QTimer::singleShot(0, this, SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); } void AddAppletDialog::filter(int i) diff --git a/kicker/kicker/ui/addapplet.h b/kicker/kicker/ui/addapplet.h index d2ce50a00..d359d97c3 100644 --- a/kicker/kicker/ui/addapplet.h +++ b/kicker/kicker/ui/addapplet.h @@ -25,9 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __addapplet_h__ #define __addapplet_h__ -#include <qstringlist.h> -#include <qpixmap.h> -#include <qvaluelist.h> +#include <tqstringlist.h> +#include <tqpixmap.h> +#include <tqvaluelist.h> #include <klocale.h> #include <kdialogbase.h> @@ -44,12 +44,12 @@ class AddAppletDialog : public KDialogBase Q_OBJECT public: - AddAppletDialog(ContainerArea* cArea, QWidget* parent, const char* name); + AddAppletDialog(ContainerArea* cArea, TQWidget* parent, const char* name); void updateInsertionPoint(); protected: - void closeEvent(QCloseEvent*); - bool eventFilter(QObject *o, QEvent *e); + void closeEvent(TQCloseEvent*); + bool eventFilter(TQObject *o, TQEvent *e); private slots: void populateApplets(); @@ -62,21 +62,21 @@ class AddAppletDialog : public KDialogBase void resizeAppletView(); private: - bool appletMatchesSearch(const AppletWidget* w, const QString& s); + bool appletMatchesSearch(const AppletWidget* w, const TQString& s); AppletView *m_mainWidget; - QWidget *m_appletBox; + TQWidget *m_appletBox; AppletInfo::List m_applets; - QValueList<AppletWidget*> m_appletWidgetList; + TQValueList<AppletWidget*> m_appletWidgetList; AppletWidget* m_selectedApplet; ContainerArea* m_containerArea; AppletInfo::AppletType m_selectedType; - QPoint m_insertionPoint; + TQPoint m_insertionPoint; bool m_closing; - QTimer *m_searchDelay; + TQTimer *m_searchDelay; }; #endif diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp index 3c3a3db87..6d5c4482f 100644 --- a/kicker/kicker/ui/addapplet_mnu.cpp +++ b/kicker/kicker/ui/addapplet_mnu.cpp @@ -29,12 +29,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "addapplet_mnu.h" #include "addapplet_mnu.moc" -PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, QWidget *parent, const char *name) - : QPopupMenu(parent, name), containerArea(cArea) +PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, TQWidget *parent, const char *name) + : TQPopupMenu(parent, name), containerArea(cArea) { setCheckable(true); - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } void PanelAddAppletMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h index 260de26dd..caedb4fdb 100644 --- a/kicker/kicker/ui/addapplet_mnu.h +++ b/kicker/kicker/ui/addapplet_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __addapplet_mnu_h__ #define __addapplet_mnu_h__ -#include <qvaluelist.h> -#include <qpopupmenu.h> +#include <tqvaluelist.h> +#include <tqpopupmenu.h> #include "appletinfo.h" @@ -36,7 +36,7 @@ class PanelAddAppletMenu : public QPopupMenu Q_OBJECT public: - PanelAddAppletMenu(ContainerArea *cArea, QWidget *parent=0, const char *name=0); + PanelAddAppletMenu(ContainerArea *cArea, TQWidget *parent=0, const char *name=0); protected slots: virtual void slotExec(int id); diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index ce6e618a7..38b48fe8e 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -23,11 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qsimplerichtext.h> -#include <qtimer.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqsimplerichtext.h> +#include <tqtimer.h> #include <kdialog.h> #include <klocale.h> @@ -42,9 +42,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define DEFAULT_FRAMES_PER_SECOND 30 AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, - const QWidget* target, + const TQWidget* target, KPanelApplet::Direction direction) - : QWidget(0, "animtt", WX11BypassWM), + : TQWidget(0, "animtt", WX11BypassWM), m_target(target), m_direction(direction), m_icon(*widget->itemPixmap->pixmap()), @@ -55,22 +55,22 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, { setFocusPolicy(NoFocus); setBackgroundMode(NoBackground); - connect(&m_moveTimer, SIGNAL(timeout()), SLOT(swoopCloser())); + connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser())); - QString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name()); + TQString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name()); if (widget->info().name() != widget->info().comment()) { m += "</h3><p>" + widget->info().comment() + "</p></qt>"; } - m_richText = new QSimpleRichText(m, font()); + m_richText = new TQSimpleRichText(m, font()); m_richText->setWidth(400); displayInternal(); m_destination = KickerLib::popupPosition(m_direction, this, m_target); - QPoint startAt = widget->itemPixmap->geometry().topLeft(); + TQPoint startAt = widget->itemPixmap->geometry().topLeft(); startAt = widget->itemPixmap->mapToGlobal(startAt); move(startAt); @@ -85,7 +85,7 @@ AddAppletVisualFeedback::~AddAppletVisualFeedback() delete m_richText; } -void AddAppletVisualFeedback::paintEvent(QPaintEvent * e) +void AddAppletVisualFeedback::paintEvent(TQPaintEvent * e) { if (m_dirty) { @@ -93,11 +93,11 @@ void AddAppletVisualFeedback::paintEvent(QPaintEvent * e) m_dirty = false; } - QPainter p(this); + TQPainter p(this); p.drawPixmap(e->rect().topLeft(), m_pixmap, e->rect()); } -void AddAppletVisualFeedback::mousePressEvent(QMouseEvent *) +void AddAppletVisualFeedback::mousePressEvent(TQMouseEvent *) { m_moveTimer.stop(); hide(); @@ -106,7 +106,7 @@ void AddAppletVisualFeedback::mousePressEvent(QMouseEvent *) void AddAppletVisualFeedback::makeMask() { - QPainter maskPainter(&m_mask); + TQPainter maskPainter(&m_mask); m_mask.fill(Qt::black); @@ -120,7 +120,7 @@ void AddAppletVisualFeedback::makeMask() void AddAppletVisualFeedback::displayInternal() { // determine text rectangle - QRect textRect(0, 0, 0, 0); + TQRect textRect(0, 0, 0, 0); if (m_frames < 1) { @@ -154,7 +154,7 @@ void AddAppletVisualFeedback::displayInternal() makeMask(); // draw background - QPainter bufferPainter(&m_pixmap); + TQPainter bufferPainter(&m_pixmap); bufferPainter.setPen(Qt::black); bufferPainter.setBrush(colorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, @@ -174,11 +174,11 @@ void AddAppletVisualFeedback::displayInternal() int textY = (height - textRect.height()) / 2; // draw text shadow - QColorGroup cg = colorGroup(); - cg.setColor(QColorGroup::Text, cg.background().dark(115)); - int shadowOffset = QApplication::reverseLayout() ? -1 : 1; + TQColorGroup cg = colorGroup(); + cg.setColor(TQColorGroup::Text, cg.background().dark(115)); + int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, - textY + 1, QRect(), cg); + textY + 1, TQRect(), cg); // draw text cg = colorGroup(); @@ -193,7 +193,7 @@ void AddAppletVisualFeedback::swoopCloser() return; } - QPoint loc = geometry().topLeft(); + TQPoint loc = geometry().topLeft(); bool isLeft = m_destination.x() > loc.x(); if (loc.x() != m_destination.x()) { @@ -217,7 +217,7 @@ void AddAppletVisualFeedback::swoopCloser() { m_moveTimer.stop(); displayInternal(); - QTimer::singleShot(2000, this, SLOT(deleteLater())); + TQTimer::singleShot(2000, this, TQT_SLOT(deleteLater())); } } diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h index 084154704..98d2cb0fe 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.h +++ b/kicker/kicker/ui/addappletvisualfeedback.h @@ -26,10 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef ADDAPPLETVISUALFEEDBACK_H #define ADDAPPLETVISUALFEEDBACK_H -#include <qbitmap.h> -#include <qpixmap.h> -#include <qtimer.h> -#include <qwidget.h> +#include <tqbitmap.h> +#include <tqpixmap.h> +#include <tqtimer.h> +#include <tqwidget.h> #include <kpanelapplet.h> @@ -44,7 +44,7 @@ class AddAppletVisualFeedback : QWidget public: AddAppletVisualFeedback(AppletWidget* parent, - const QWidget* destination, + const TQWidget* destination, KPanelApplet::Direction direction); ~AddAppletVisualFeedback(); @@ -53,28 +53,28 @@ class AddAppletVisualFeedback : QWidget void swoopCloser(); protected: - void paintEvent(QPaintEvent * e); - void mousePressEvent(QMouseEvent * e); + void paintEvent(TQPaintEvent * e); + void mousePressEvent(TQMouseEvent * e); void makeMask(); void displayInternal(); private: - const QWidget* m_target; + const TQWidget* m_target; KPanelApplet::Direction m_direction; - QBitmap m_mask; - QPixmap m_pixmap; - QPixmap m_icon; - QSimpleRichText* m_richText; + TQBitmap m_mask; + TQPixmap m_pixmap; + TQPixmap m_icon; + TQSimpleRichText* m_richText; int m_dissolveSize; int m_dissolveDelta; int m_frames; - QTimer m_moveTimer; + TQTimer m_moveTimer; bool m_dirty; - QPoint m_destination; + TQPoint m_destination; }; #endif diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp index 65a60eea4..02c4718d4 100644 --- a/kicker/kicker/ui/addbutton_mnu.cpp +++ b/kicker/kicker/ui/addbutton_mnu.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdragobject.h> +#include <tqdragobject.h> #include <ksycocaentry.h> #include <kservice.h> @@ -33,14 +33,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "addbutton_mnu.moc" #include "containerarea.h" -PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, const QString & label, - const QString & relPath, QWidget * parent, const char * name, const QString& _inlineHeader) +PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, + const TQString & relPath, TQWidget * parent, const char * name, const TQString& _inlineHeader) : PanelServiceMenu(label, relPath, parent, name, true, _inlineHeader), containerArea(cArea) { } -PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, QWidget * parent, const char * name, const QString& _inlineHeader) - : PanelServiceMenu(QString::null, QString::null, parent, name, true, _inlineHeader), containerArea(cArea) +PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent, const char * name, const TQString& _inlineHeader) + : PanelServiceMenu(TQString::null, TQString::null, parent, name, true, _inlineHeader), containerArea(cArea) { } @@ -60,8 +60,8 @@ void PanelAddButtonMenu::slotExec(int id) } } -PanelServiceMenu * PanelAddButtonMenu::newSubMenu(const QString & label, const QString & relPath, - QWidget * parent, const char * name, const QString& _inlineHeader) +PanelServiceMenu * PanelAddButtonMenu::newSubMenu(const TQString & label, const TQString & relPath, + TQWidget * parent, const char * name, const TQString& _inlineHeader) { return new PanelAddButtonMenu(containerArea, label, relPath, parent, name, _inlineHeader); } diff --git a/kicker/kicker/ui/addbutton_mnu.h b/kicker/kicker/ui/addbutton_mnu.h index 8a9a7e348..209e7e9a3 100644 --- a/kicker/kicker/ui/addbutton_mnu.h +++ b/kicker/kicker/ui/addbutton_mnu.h @@ -33,17 +33,17 @@ class PanelAddButtonMenu : public PanelServiceMenu Q_OBJECT public: - PanelAddButtonMenu(ContainerArea* cArea, const QString & label, const QString & relPath, - QWidget * parent = 0, const char * name = 0,const QString& _inlineHeader= QString::null); - PanelAddButtonMenu(ContainerArea* cArea, QWidget * parent = 0, const char * name = 0, const QString& _inlineHeader= QString::null); + PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, const TQString & relPath, + TQWidget * parent = 0, const char * name = 0,const TQString& _inlineHeader= TQString::null); + PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent = 0, const char * name = 0, const TQString& _inlineHeader= TQString::null); protected slots: virtual void slotExec(int id); virtual void addNonKDEApp(); protected: - virtual PanelServiceMenu * newSubMenu(const QString & label, const QString & relPath, - QWidget * parent, const char * name, const QString & _inlineHeader=QString::null); + virtual PanelServiceMenu * newSubMenu(const TQString & label, const TQString & relPath, + TQWidget * parent, const char * name, const TQString & _inlineHeader=TQString::null); private: ContainerArea *containerArea; }; diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp index 4ca467f46..b22187443 100644 --- a/kicker/kicker/ui/addextension_mnu.cpp +++ b/kicker/kicker/ui/addextension_mnu.cpp @@ -27,12 +27,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "addextension_mnu.h" #include "addextension_mnu.moc" -PanelAddExtensionMenu::PanelAddExtensionMenu(QWidget *parent, const char *name) - : QPopupMenu(parent, name) +PanelAddExtensionMenu::PanelAddExtensionMenu(TQWidget *parent, const char *name) + : TQPopupMenu(parent, name) { setCheckable(true); - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } void PanelAddExtensionMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h index 60db0c201..a91986e19 100644 --- a/kicker/kicker/ui/addextension_mnu.h +++ b/kicker/kicker/ui/addextension_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __addextension_mnu_h__ #define __addextension_mnu_h__ -#include <qvaluelist.h> -#include <qpopupmenu.h> +#include <tqvaluelist.h> +#include <tqpopupmenu.h> #include "appletinfo.h" @@ -34,7 +34,7 @@ class PanelAddExtensionMenu : public QPopupMenu Q_OBJECT public: - PanelAddExtensionMenu(QWidget *parent=0, const char *name=0); + PanelAddExtensionMenu(TQWidget *parent=0, const char *name=0); protected slots: virtual void slotExec(int id); diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index 435911bbe..59ca9c89e 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -31,15 +31,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_button.h" #include "containerarea.h" -PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPopupMenu* appletsMenu, - const QString & title, const QString &icon, - QWidget *parent, const char *name) - : QPopupMenu(parent, name) +PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQPopupMenu* appletsMenu, + const TQString & title, const TQString &icon, + TQWidget *parent, const char *name) + : TQPopupMenu(parent, name) { bool needSeparator = false; bool isButton = (parent && parent->inherits("ButtonContainer")); bool isMenu = false; - QString titleText = title; + TQString titleText = title; titleText = titleText.replace('&', "&&"); if (isButton) { @@ -48,7 +48,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop if (!Kicker::the()->isImmutable()) { - QString text = isButton ? (isMenu ? i18n("&Move %1 Menu") : + TQString text = isButton ? (isMenu ? i18n("&Move %1 Menu") : i18n("&Move %1 Button")) : i18n("&Move %1"); insertItem(SmallIcon("move"), text.arg(titleText), Move); @@ -57,7 +57,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop // this is part of the kiosk support in kicker, allowing // one to block users from adding new containers ContainerArea* area = 0; - QObject* findTheArea = parent ? parent->parent() : 0; + TQObject* findTheArea = parent ? parent->parent() : 0; while (findTheArea) { area = dynamic_cast<ContainerArea*>(findTheArea); @@ -98,7 +98,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop insertSeparator(); } - QPixmap iconPix(kapp->iconLoader()->loadIcon(icon, + TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon, KIcon::Small, 0, KIcon::DefaultState, 0, true)); @@ -140,22 +140,22 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop needSeparator = false; } - QString text = title.isEmpty() ? i18n("Applet Menu") : + TQString text = title.isEmpty() ? i18n("Applet Menu") : i18n("%1 Menu").arg(titleText); // the 2 const_cast's below prevents const_cast'ing in multiple places // elsewhere in the kicker code base. it's ugly, but unavoidable - // unless either QPopupMenu one day allows inserting const + // unless either TQPopupMenu one day allows inserting const // QPopupMenu's or we uglify other bits of kicker's API, // notably KPanelApplet::customMeu() if (icon.isEmpty()) { - insertItem(text, const_cast<QPopupMenu*>(appletsMenu)); + insertItem(text, const_cast<TQPopupMenu*>(appletsMenu)); } else { insertItem(SmallIcon(icon), text, - const_cast<QPopupMenu*>(appletsMenu)); + const_cast<TQPopupMenu*>(appletsMenu)); } } @@ -195,14 +195,14 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop adjustSize(); } -void PanelAppletOpMenu::keyPressEvent(QKeyEvent* e) +void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e) { if (e->key() == Qt::Key_Escape) { emit escapePressed(); } - QPopupMenu::keyPressEvent(e); + TQPopupMenu::keyPressEvent(e); } #include "appletop_mnu.moc" diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h index 25f03ada6..e0b219552 100644 --- a/kicker/kicker/ui/appletop_mnu.h +++ b/kicker/kicker/ui/appletop_mnu.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PANEL_APPLET_OP_MENU_H #define PANEL_APPLET_OP_MENU_H -#include <qpopupmenu.h> +#include <tqpopupmenu.h> class AppletInfo; @@ -40,15 +40,15 @@ public: // they also are treated just like KPanelApplet::Preferences on selection // KDE4: look at merging them there? perhaps under a generic "Editor" option? enum { KMenuEditor = 1048576, BookmarkEditor = 2097152 }; - PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPopupMenu* appletsMenu = 0, - const QString &title = 0, const QString &icon = 0, - QWidget *parent=0, const char *name=0); + PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQPopupMenu* appletsMenu = 0, + const TQString &title = 0, const TQString &icon = 0, + TQWidget *parent=0, const char *name=0); signals: void escapePressed(); protected: - void keyPressEvent(QKeyEvent* e); + void keyPressEvent(TQKeyEvent* e); }; diff --git a/kicker/kicker/ui/appletwidget.h b/kicker/kicker/ui/appletwidget.h index 77d05c2b3..6323f538e 100644 --- a/kicker/kicker/ui/appletwidget.h +++ b/kicker/kicker/ui/appletwidget.h @@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _appletwidget_h_ #define _appletwidget_h_ -#include <qpoint.h> -#include <qvaluelist.h> +#include <tqpoint.h> +#include <tqvaluelist.h> #include <klocale.h> #include <kdialogbase.h> @@ -39,11 +39,11 @@ class AppletWidget: public AppletItem Q_OBJECT public: - typedef QValueList<AppletWidget*> List; + typedef TQValueList<AppletWidget*> List; - AppletWidget(const AppletInfo& info, bool odd, QWidget *parent); + AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent); const AppletInfo& info() const { return m_appletInfo; } - virtual bool eventFilter(QObject* watched, QEvent* e); + virtual bool eventFilter(TQObject* watched, TQEvent* e); void setSelected(bool selected); void setOdd(bool odd); @@ -54,18 +54,18 @@ class AppletWidget: public AppletItem void doubleClicked(AppletWidget*); protected: - void keyPressEvent(QKeyEvent *e); - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - void mouseDoubleClickEvent(QMouseEvent *e); - void focusInEvent(QFocusEvent* e); + void keyPressEvent(TQKeyEvent *e); + void mousePressEvent(TQMouseEvent *e); + void mouseMoveEvent(TQMouseEvent *e); + void mouseReleaseEvent(TQMouseEvent *e); + void mouseDoubleClickEvent(TQMouseEvent *e); + void focusInEvent(TQFocusEvent* e); private: AppletInfo m_appletInfo; bool m_odd; bool m_selected; - QPoint m_dragStart; + TQPoint m_dragStart; }; #endif diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp index 1fd5d47f6..01e72d9ee 100644 --- a/kicker/kicker/ui/browser_dlg.cpp +++ b/kicker/kicker/ui/browser_dlg.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlabel.h> -#include <qlayout.h> -#include <qvbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqvbox.h> #include <kglobal.h> #include <klocale.h> @@ -35,32 +35,32 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "browser_dlg.h" #include "browser_dlg.moc" -PanelBrowserDialog::PanelBrowserDialog( const QString& path, const QString &icon, QWidget *parent, const char *name ) +PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &icon, TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Quick Browser Configuration" ), Ok|Cancel, Ok, true ) { setMinimumWidth( 300 ); - QVBox *page = makeVBoxMainWidget(); + TQVBox *page = makeVBoxMainWidget(); - QHBox *hbox2 = new QHBox( page ); + TQHBox *hbox2 = new TQHBox( page ); hbox2->setSpacing( KDialog::spacingHint() ); - QLabel *label1 = new QLabel( i18n( "Button icon:" ), hbox2 ); + TQLabel *label1 = new TQLabel( i18n( "Button icon:" ), hbox2 ); iconBtn = new KIconButton( hbox2 ); iconBtn->setFixedSize( 50, 50 ); iconBtn->setIconType( KIcon::Panel, KIcon::FileSystem ); label1->setBuddy( iconBtn ); - QHBox *hbox1 = new QHBox( page ); + TQHBox *hbox1 = new TQHBox( page ); hbox1->setSpacing( KDialog::spacingHint() ); - QLabel *label2 = new QLabel( i18n ( "Path:" ), hbox1 ); + TQLabel *label2 = new TQLabel( i18n ( "Path:" ), hbox1 ); pathInput = new KLineEdit( hbox1 ); - connect( pathInput, SIGNAL( textChanged ( const QString & )), this, SLOT( slotPathChanged( const QString & ))); + connect( pathInput, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotPathChanged( const TQString & ))); pathInput->setText( path ); pathInput->setFocus(); label2->setBuddy( pathInput ); - browseBtn = new QPushButton( i18n( "&Browse..." ), hbox1 ); + browseBtn = new TQPushButton( i18n( "&Browse..." ), hbox1 ); if ( icon.isEmpty() ) { KURL u; u.setPath( path ); @@ -69,7 +69,7 @@ PanelBrowserDialog::PanelBrowserDialog( const QString& path, const QString &icon else iconBtn->setIcon( icon ); - connect( browseBtn, SIGNAL( clicked() ), this, SLOT( browse() ) ); + connect( browseBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( browse() ) ); } PanelBrowserDialog::~PanelBrowserDialog() @@ -77,14 +77,14 @@ PanelBrowserDialog::~PanelBrowserDialog() } -void PanelBrowserDialog::slotPathChanged( const QString &_text ) +void PanelBrowserDialog::slotPathChanged( const TQString &_text ) { enableButtonOK( !_text.isEmpty() ); } void PanelBrowserDialog::browse() { - QString dir = KFileDialog::getExistingDirectory( pathInput->text(), 0, i18n( "Select Folder" ) ); + TQString dir = KFileDialog::getExistingDirectory( pathInput->text(), 0, i18n( "Select Folder" ) ); if ( !dir.isEmpty() ) { pathInput->setText( dir ); KURL u; @@ -95,7 +95,7 @@ void PanelBrowserDialog::browse() void PanelBrowserDialog::slotOk() { - QDir dir(path()); + TQDir dir(path()); if( !dir.exists() ) { KMessageBox::sorry( this, i18n("'%1' is not a valid folder.").arg(path()) ); return; @@ -103,12 +103,12 @@ void PanelBrowserDialog::slotOk() KDialogBase::slotOk(); } -const QString PanelBrowserDialog::icon() +const TQString PanelBrowserDialog::icon() { return iconBtn->icon(); } -QString PanelBrowserDialog::path() +TQString PanelBrowserDialog::path() { return pathInput->text(); } diff --git a/kicker/kicker/ui/browser_dlg.h b/kicker/kicker/ui/browser_dlg.h index dc675c11c..113a7b83a 100644 --- a/kicker/kicker/ui/browser_dlg.h +++ b/kicker/kicker/ui/browser_dlg.h @@ -34,20 +34,20 @@ class PanelBrowserDialog : public KDialogBase Q_OBJECT public: - PanelBrowserDialog( const QString &path = QString::null, const QString &icon = QString::null, QWidget *parent = 0, const char *name = 0 ); + PanelBrowserDialog( const TQString &path = TQString::null, const TQString &icon = TQString::null, TQWidget *parent = 0, const char *name = 0 ); ~PanelBrowserDialog(); - const QString icon(); - QString path(); + const TQString icon(); + TQString path(); protected slots: void browse(); virtual void slotOk(); - void slotPathChanged( const QString &_text ); + void slotPathChanged( const TQString &_text ); protected: KIconButton *iconBtn; KLineEdit *pathInput; - QPushButton *browseBtn; + TQPushButton *browseBtn; }; #endif diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 9561881eb..6802e6388 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdir.h> -#include <qpixmap.h> +#include <tqdir.h> +#include <tqpixmap.h> #include <kapplication.h> #include <kdebug.h> @@ -49,26 +49,26 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define CICON(a) (*_icons)[a] -QMap<QString, QPixmap> *PanelBrowserMenu::_icons = 0; +TQMap<TQString, TQPixmap> *PanelBrowserMenu::_icons = 0; -PanelBrowserMenu::PanelBrowserMenu(QString path, QWidget *parent, const char *name, int startid) +PanelBrowserMenu::PanelBrowserMenu(TQString path, TQWidget *parent, const char *name, int startid) : KPanelMenu(path, parent, name) , _mimecheckTimer(0) , _startid(startid) , _dirty(false) , _filesOnly(false) { - _lastpress = QPoint(-1, -1); + _lastpress = TQPoint(-1, -1); setAcceptDrops(true); // Should depend on permissions of path. // we are not interested for dirty events on files inside the // directory (see slotClearIfNeeded) - connect( &_dirWatch, SIGNAL(dirty(const QString&)), - this, SLOT(slotClearIfNeeded(const QString&)) ); - connect( &_dirWatch, SIGNAL(created(const QString&)), - this, SLOT(slotClear()) ); - connect( &_dirWatch, SIGNAL(deleted(const QString&)), - this, SLOT(slotClear()) ); + connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)), + this, TQT_SLOT(slotClearIfNeeded(const TQString&)) ); + connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)), + this, TQT_SLOT(slotClear()) ); + connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)), + this, TQT_SLOT(slotClear()) ); kdDebug() << "PanelBrowserMenu Constructor " << path << endl; } @@ -78,7 +78,7 @@ PanelBrowserMenu::~PanelBrowserMenu() kdDebug() << "PanelBrowserMenu Destructor " << path() << endl; } -void PanelBrowserMenu::slotClearIfNeeded(const QString& p) +void PanelBrowserMenu::slotClearIfNeeded(const TQString& p) { if (p == path()) slotClear(); @@ -86,7 +86,7 @@ void PanelBrowserMenu::slotClearIfNeeded(const QString& p) void PanelBrowserMenu::initialize() { - _lastpress = QPoint(-1, -1); + _lastpress = TQPoint(-1, -1); // don't change menu if already visible if (isVisible()) @@ -113,13 +113,13 @@ void PanelBrowserMenu::initialize() _filemap.clear(); _mimemap.clear(); - int filter = QDir::Dirs | QDir::Files; + int filter = TQDir::Dirs | TQDir::Files; if (KickerSettings::showHiddenFiles()) { - filter |= QDir::Hidden; + filter |= TQDir::Hidden; } - QDir dir(path(), QString::null, QDir::DirsFirst | QDir::Name | QDir::IgnoreCase, filter); + TQDir dir(path(), TQString::null, TQDir::DirsFirst | TQDir::Name | TQDir::IgnoreCase, filter); // does the directory exist? if (!dir.exists()) { @@ -148,9 +148,9 @@ void PanelBrowserMenu::initialize() // only the first part menu got them if(_startid == 0 && !_filesOnly) { insertTitle(path()); - insertItem(CICON("kfm"), i18n("Open in File Manager"), this, SLOT(slotOpenFileManager())); + insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager())); if (kapp->authorize("shell_access")) - insertItem(CICON("terminal"), i18n("Open in Terminal"), this, SLOT(slotOpenTerminal())); + insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal())); } @@ -171,24 +171,24 @@ void PanelBrowserMenu::initialize() // bump id run_id++; - QFileInfo *fi = it.current(); + TQFileInfo *fi = it.current(); // handle directories if (fi->isDir()) { - QString name = fi->fileName(); + TQString name = fi->fileName(); // ignore . and .. entries if (name == "." || name == "..") continue; - QPixmap icon; - QString path = fi->absFilePath(); + TQPixmap icon; + TQString path = fi->absFilePath(); // parse .directory if it does exist - if (QFile::exists(path + "/.directory")) { + if (TQFile::exists(path + "/.directory")) { KSimpleConfig c(path + "/.directory", true); c.setDesktopGroup(); - QString iconPath = c.readEntry("Icon"); + TQString iconPath = c.readEntry("Icon"); if ( iconPath.startsWith("./") ) iconPath = path + '/' + iconPath.mid(2); @@ -225,11 +225,11 @@ void PanelBrowserMenu::initialize() // handle files else if(fi->isFile()) { - QString name = fi->fileName(); - QString title = KIO::decodeFileName(name); + TQString name = fi->fileName(); + TQString title = KIO::decodeFileName(name); - QPixmap icon; - QString path = fi->absFilePath(); + TQPixmap icon; + TQString path = fi->absFilePath(); bool mimecheck = false; @@ -240,13 +240,13 @@ void PanelBrowserMenu::initialize() c.setDesktopGroup(); title = c.readEntry("Name", title); - QString s = c.readEntry("Icon"); + TQString s = c.readEntry("Icon"); if(!_icons->contains(s)) { icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); if(icon.isNull()) { - QString type = c.readEntry("Type", "Application"); + TQString type = c.readEntry("Type", "Application"); if (type == "Directory") icon = CICON("folder"); else if (type == "Mimetype") @@ -312,7 +312,7 @@ void PanelBrowserMenu::initialize() adjustSize(); - QString dirname = path(); + TQString dirname = path(); int maxlen = contentsRect().width() - 40; if(item_count == 0) @@ -329,17 +329,17 @@ void PanelBrowserMenu::initialize() if(_mimemap.count() > 0) { if(!_mimecheckTimer) - _mimecheckTimer = new QTimer(this); + _mimecheckTimer = new TQTimer(this); - connect(_mimecheckTimer, SIGNAL(timeout()), SLOT(slotMimeCheck())); + connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck())); _mimecheckTimer->start(0); } } -void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, const QString &file, bool mimecheck) +void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, const TQString &file, bool mimecheck) { // avoid &'s being converted to accelerators - QString newTitle = title; + TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); newTitle.replace("&", "&&"); @@ -354,10 +354,10 @@ void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, const _mimemap.insert(id, true); } -void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, PanelBrowserMenu *subMenu) +void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, PanelBrowserMenu *subMenu) { // avoid &'s being converted to accelerators - QString newTitle = title; + TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); newTitle.replace("&", "&&"); @@ -367,18 +367,18 @@ void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, Panel _subMenus.append(subMenu); } -void PanelBrowserMenu::mousePressEvent(QMouseEvent *e) +void PanelBrowserMenu::mousePressEvent(TQMouseEvent *e) { - QPopupMenu::mousePressEvent(e); + TQPopupMenu::mousePressEvent(e); _lastpress = e->pos(); } -void PanelBrowserMenu::mouseMoveEvent(QMouseEvent *e) +void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) { - QPopupMenu::mouseMoveEvent(e); + TQPopupMenu::mouseMoveEvent(e); if (!(e->state() & LeftButton)) return; - if(_lastpress == QPoint(-1, -1)) return; + if(_lastpress == TQPoint(-1, -1)) return; // DND delay if((_lastpress - e->pos()).manhattanLength() < 12) return; @@ -388,14 +388,14 @@ void PanelBrowserMenu::mouseMoveEvent(QMouseEvent *e) if(!_filemap.contains(id)) return; // reset _lastpress - _lastpress = QPoint(-1, -1); + _lastpress = TQPoint(-1, -1); // start drag KURL url; url.setPath(path() + "/" + _filemap[id]); KURL::List files(url); KURLDrag *d = new KURLDrag(files, this); - connect(d, SIGNAL(destroyed()), this, SLOT(slotDragObjectDestroyed())); + connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); d->setPixmap(iconSet(id)->pixmap()); d->drag(); } @@ -408,7 +408,7 @@ void PanelBrowserMenu::slotDragObjectDestroyed() } } -void PanelBrowserMenu::dragEnterEvent( QDragEnterEvent *ev ) +void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev ) { if (KURLDrag::canDecode(ev)) { @@ -417,16 +417,16 @@ void PanelBrowserMenu::dragEnterEvent( QDragEnterEvent *ev ) KPanelMenu::dragEnterEvent(ev); } -void PanelBrowserMenu::dragMoveEvent(QDragMoveEvent *ev) +void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev) { - QMouseEvent mev(QEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton); - QPopupMenu::mouseMoveEvent(&mev); + TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton); + TQPopupMenu::mouseMoveEvent(&mev); } -void PanelBrowserMenu::dropEvent( QDropEvent *ev ) +void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) { KURL u( path() ); - KFileItem item( u, QString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( u, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, u, ev, this ); KPanelMenu::dropEvent(ev); // ### TODO: Update list @@ -441,14 +441,14 @@ void PanelBrowserMenu::slotExec(int id) KURL url; url.setPath(path() + "/" + _filemap[id]); new KRun(url, 0, true); // will delete itself - _lastpress = QPoint(-1, -1); + _lastpress = TQPoint(-1, -1); } void PanelBrowserMenu::slotOpenTerminal() { KConfig * config = kapp->config(); config->setGroup("General"); - QString term = config->readPathEntry("TerminalApplication", "konsole"); + TQString term = config->readPathEntry("TerminalApplication", "konsole"); KProcess proc; proc << term; @@ -467,7 +467,7 @@ void PanelBrowserMenu::slotOpenFileManager() void PanelBrowserMenu::slotMimeCheck() { // get the first map entry - QMap<int, bool>::Iterator it = _mimemap.begin(); + TQMap<int, bool>::Iterator it = _mimemap.begin(); // no mime types left to check -> stop timer if(it == _mimemap.end()) { @@ -478,7 +478,7 @@ void PanelBrowserMenu::slotMimeCheck() } int id = it.key(); - QString file = _filemap[id]; + TQString file = _filemap[id]; _mimemap.remove(it); @@ -486,18 +486,18 @@ void PanelBrowserMenu::slotMimeCheck() url.setPath( path() + '/' + file ); // KMimeType::Ptr mt = KMimeType::findByURL(url, 0, true, false); -// QString icon(mt->icon(url, true)); - QString icon = KMimeType::iconForURL( url ); +// TQString icon(mt->icon(url, true)); + TQString icon = KMimeType::iconForURL( url ); // kdDebug() << url.url() << ": " << icon << endl; file = KStringHandler::cEmSqueeze( file, fontMetrics(), 20 ); file.replace("&", "&&"); if(!_icons->contains(icon)) { - QPixmap pm = SmallIcon(icon); + TQPixmap pm = SmallIcon(icon); if( pm.height() > 16 ) { - QPixmap cropped( 16, 16 ); + TQPixmap cropped( 16, 16 ); copyBlt( &cropped, 0, 0, &pm, 0, 0, 16, 16 ); pm = cropped; } @@ -521,7 +521,7 @@ void PanelBrowserMenu::slotClear() } KPanelMenu::slotClear(); - for (QValueVector<PanelBrowserMenu*>::iterator it = _subMenus.begin(); + for (TQValueVector<PanelBrowserMenu*>::iterator it = _subMenus.begin(); it != _subMenus.end(); ++it) { @@ -536,7 +536,7 @@ void PanelBrowserMenu::initIconMap() // kdDebug() << "PanelBrowserMenu::initIconMap" << endl; - _icons = new QMap<QString, QPixmap>; + _icons = new TQMap<TQString, TQPixmap>; _icons->insert("folder", SmallIcon("folder")); _icons->insert("unknown", SmallIcon("mime_empty")); diff --git a/kicker/kicker/ui/browser_mnu.h b/kicker/kicker/ui/browser_mnu.h index 5999db2cb..38f9b9690 100644 --- a/kicker/kicker/ui/browser_mnu.h +++ b/kicker/kicker/ui/browser_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __browser_mnu_h__ #define __browser_mnu_h__ -#include <qmap.h> -#include <qvaluevector.h> +#include <tqmap.h> +#include <tqvaluevector.h> #include <kpanelmenu.h> #include <kdirwatch.h> @@ -34,11 +34,11 @@ class PanelBrowserMenu : public KPanelMenu Q_OBJECT public: - PanelBrowserMenu(QString path, QWidget *parent = 0, const char *name = 0, int startid = 0); + PanelBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0); ~PanelBrowserMenu(); - void append(const QPixmap &pixmap, const QString &title, const QString &filename, bool mimecheck); - void append(const QPixmap &pixmap, const QString &title, PanelBrowserMenu *subMenu); + void append(const TQPixmap &pixmap, const TQString &title, const TQString &filename, bool mimecheck); + void append(const TQPixmap &pixmap, const TQString &title, PanelBrowserMenu *subMenu); public slots: void initialize(); @@ -48,24 +48,24 @@ protected slots: void slotOpenTerminal(); void slotOpenFileManager(); void slotMimeCheck(); - void slotClearIfNeeded(const QString&); + void slotClearIfNeeded(const TQString&); void slotClear(); void slotDragObjectDestroyed(); protected: - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void dropEvent(QDropEvent *ev); - void dragEnterEvent(QDragEnterEvent *ev); - void dragMoveEvent(QDragMoveEvent *); + void mousePressEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); + void dropEvent(TQDropEvent *ev); + void dragEnterEvent(TQDragEnterEvent *ev); + void dragMoveEvent(TQDragMoveEvent *); void initIconMap(); - QPoint _lastpress; - QMap<int, QString> _filemap; - QMap<int, bool> _mimemap; - QTimer *_mimecheckTimer; + TQPoint _lastpress; + TQMap<int, TQString> _filemap; + TQMap<int, bool> _mimemap; + TQTimer *_mimecheckTimer; KDirWatch _dirWatch; - QValueVector<PanelBrowserMenu*> _subMenus; + TQValueVector<PanelBrowserMenu*> _subMenus; int _startid; bool _dirty; @@ -75,7 +75,7 @@ protected: // entries are not inserted in the menu and its submenus. bool _filesOnly; - static QMap<QString, QPixmap> *_icons; + static TQMap<TQString, TQPixmap> *_icons; }; #endif diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index f098e40d4..9736351e1 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qpixmap.h> +#include <tqpixmap.h> #include <kapplication.h> #include <kdebug.h> @@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "client_mnu.h" #include "client_mnu.moc" -KickerClientMenu::KickerClientMenu( QWidget * parent, const char *name ) - : QPopupMenu( parent, name), DCOPObject( name ) +KickerClientMenu::KickerClientMenu( TQWidget * parent, const char *name ) + : TQPopupMenu( parent, name), DCOPObject( name ) { } @@ -41,33 +41,33 @@ KickerClientMenu::~KickerClientMenu() void KickerClientMenu::clear() { - QPopupMenu::clear(); + TQPopupMenu::clear(); } -void KickerClientMenu::insertItem( QPixmap icon, QString text, int id ) +void KickerClientMenu::insertItem( TQPixmap icon, TQString text, int id ) { - int globalid = QPopupMenu::insertItem( icon, text, this, SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( icon, text, this, TQT_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } -void KickerClientMenu::insertItem( QString text, int id ) +void KickerClientMenu::insertItem( TQString text, int id ) { - int globalid = QPopupMenu::insertItem( text, this, SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( text, this, TQT_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } -QCString KickerClientMenu::insertMenu( QPixmap icon, QString text, int id ) +TQCString KickerClientMenu::insertMenu( TQPixmap icon, TQString text, int id ) { - QString subname("%1-submenu%2"); - QCString subid = subname.arg(objId()).arg(id).local8Bit(); + TQString subname("%1-submenu%2"); + TQCString subid = subname.arg(objId()).arg(id).local8Bit(); KickerClientMenu *sub = new KickerClientMenu(this, subid); - int globalid = QPopupMenu::insertItem( icon, text, sub, id); + int globalid = TQPopupMenu::insertItem( icon, text, sub, id); setItemParameter( globalid, id ); return subid; } -void KickerClientMenu::connectDCOPSignal( QCString signal, QCString appId, QCString objId ) +void KickerClientMenu::connectDCOPSignal( TQCString signal, TQCString appId, TQCString objId ) { // very primitive right now if ( signal == "activated(int)" ) { @@ -78,48 +78,48 @@ void KickerClientMenu::connectDCOPSignal( QCString signal, QCString appId, QCStr } } -bool KickerClientMenu::process(const QCString &fun, const QByteArray &data, - QCString &replyType, QByteArray &replyData) +bool KickerClientMenu::process(const TQCString &fun, const TQByteArray &data, + TQCString &replyType, TQByteArray &replyData) { if ( fun == "clear()" ) { clear(); replyType = "void"; return true; } - else if ( fun == "insertItem(QPixmap,QString,int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QPixmap icon; - QString text; + else if ( fun == "insertItem(TQPixmap,TQString,int)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQPixmap icon; + TQString text; int id; dataStream >> icon >> text >> id; insertItem( icon, text, id ); replyType = "void"; return true; } - else if ( fun == "insertMenu(QPixmap,QString,int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QPixmap icon; - QString text; + else if ( fun == "insertMenu(TQPixmap,TQString,int)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQPixmap icon; + TQString text; int id; dataStream >> icon >> text >> id; - QCString ref = insertMenu( icon, text, id ); - replyType = "QCString"; - QDataStream replyStream( replyData, IO_WriteOnly ); + TQCString ref = insertMenu( icon, text, id ); + replyType = "TQCString"; + TQDataStream replyStream( replyData, IO_WriteOnly ); replyStream << ref; return true; } - else if ( fun == "insertItem(QString,int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QString text; + else if ( fun == "insertItem(TQString,int)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQString text; int id; dataStream >> text >> id; insertItem( text, id ); replyType = "void"; return true; } - else if ( fun == "connectDCOPSignal(QCString,QCString,QCString)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QCString signal, appId, objId; + else if ( fun == "connectDCOPSignal(TQCString,TQCString,TQCString)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQCString signal, appId, objId; dataStream >> signal >> appId >> objId; connectDCOPSignal( signal, appId, objId ); replyType = "void"; @@ -131,8 +131,8 @@ bool KickerClientMenu::process(const QCString &fun, const QByteArray &data, void KickerClientMenu::slotActivated(int id) { if ( !app.isEmpty() ) { - QByteArray data; - QDataStream dataStream( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream dataStream( data, IO_WriteOnly ); dataStream << id; kapp->dcopClient()->send( app, obj, "activated(int)", data ); } diff --git a/kicker/kicker/ui/client_mnu.h b/kicker/kicker/ui/client_mnu.h index fe8e4a113..272f6364f 100644 --- a/kicker/kicker/ui/client_mnu.h +++ b/kicker/kicker/ui/client_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PANEL_CLIENTMENU_H #define PANEL_CLIENTMENU_H -#include <qstringlist.h> -#include <qpopupmenu.h> +#include <tqstringlist.h> +#include <tqpopupmenu.h> #include <dcopobject.h> @@ -36,46 +36,46 @@ class PanelKMenu; // also manages the toplevel K Button Menu. /** - * Small additions to QPopupMenu to contain data we need for DCop handling + * Small additions to TQPopupMenu to contain data we need for DCop handling */ -class KickerClientMenu : public QPopupMenu, DCOPObject +class KickerClientMenu : public TQPopupMenu, DCOPObject { Q_OBJECT public: - KickerClientMenu( QWidget *parent=0, const char *name=0); + KickerClientMenu( TQWidget *parent=0, const char *name=0); ~KickerClientMenu(); // dcop exported void clear(); - void insertItem( QPixmap icon, QString text, int id ); - void insertItem( QString text, int id ); + void insertItem( TQPixmap icon, TQString text, int id ); + void insertItem( TQString text, int id ); - QCString insertMenu( QPixmap icon, QString test, int id ); + TQCString insertMenu( TQPixmap icon, TQString test, int id ); // dcop signals: // void activated(int) - void connectDCOPSignal( QCString signal, QCString appId, QCString objId ); + void connectDCOPSignal( TQCString signal, TQCString appId, TQCString objId ); // dcop internal - virtual bool process(const QCString &fun, const QByteArray &data, - QCString &replyType, QByteArray &reply); + virtual bool process(const TQCString &fun, const TQByteArray &data, + TQCString &replyType, TQByteArray &reply); protected slots: void slotActivated(int id); private: - QCString app, obj; // for the signal + TQCString app, obj; // for the signal // for the panel menu, internal friend class PanelKMenu; - QString text; - QPixmap icon; + TQString text; + TQPixmap icon; // for the KickerClientMenu, internal friend class MenuManager; int idInParentMenu; - QCString createdBy; + TQCString createdBy; }; #endif diff --git a/kicker/kicker/ui/dirdrop_mnu.cpp b/kicker/kicker/ui/dirdrop_mnu.cpp index 2f64fdd12..cd814f42b 100644 --- a/kicker/kicker/ui/dirdrop_mnu.cpp +++ b/kicker/kicker/ui/dirdrop_mnu.cpp @@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "dirdrop_mnu.h" -PanelDirDropMenu::PanelDirDropMenu(QWidget *parent, const char *name) - :QPopupMenu(parent, name) +PanelDirDropMenu::PanelDirDropMenu(TQWidget *parent, const char *name) + :TQPopupMenu(parent, name) { insertItem(SmallIconSet("folder"), i18n("Add as &File Manager URL"), Url); setAccel(CTRL+Key_F, Url); diff --git a/kicker/kicker/ui/dirdrop_mnu.h b/kicker/kicker/ui/dirdrop_mnu.h index 15fa799c2..d05187400 100644 --- a/kicker/kicker/ui/dirdrop_mnu.h +++ b/kicker/kicker/ui/dirdrop_mnu.h @@ -24,14 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __dirdrop_mnu_h__ #define __dirdrop_mnu_h__ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> // The directory dropped menu class PanelDirDropMenu : public QPopupMenu { public: enum OpButton{Url=1, Browser}; - PanelDirDropMenu(QWidget *parent=0, const char *name=0); + PanelDirDropMenu(TQWidget *parent=0, const char *name=0); }; #endif diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index 19583444e..cb0d42c56 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -21,16 +21,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <klocale.h> #include <kiconloader.h> -#include <qcheckbox.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qlineedit.h> -#include <qvbox.h> +#include <tqcheckbox.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqlineedit.h> +#include <tqvbox.h> #include <kicondialog.h> #include <kmessagebox.h> @@ -45,16 +45,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "exe_dlg.h" #include "nonKDEButtonSettings.h" -PanelExeDialog::PanelExeDialog(const QString& title, const QString& description, - const QString &path, const QString &icon, - const QString &cmd, bool inTerm, - QWidget *parent, const char *name) +PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& description, + const TQString &path, const TQString &icon, + const TQString &cmd, bool inTerm, + TQWidget *parent, const char *name) : KDialogBase(parent, name, false, i18n("Non-KDE Application Configuration"), Ok|Cancel, Ok, true), m_icon(icon.isEmpty() ? "exec" : icon), m_iconChanged(false) { setCaption(i18n("Non-KDE Application Configuration")); - QFileInfo fi(path); + TQFileInfo fi(path); ui = new NonKDEButtonSettings(makeVBoxMainWidget()); fillCompletion(); @@ -68,14 +68,14 @@ PanelExeDialog::PanelExeDialog(const QString& title, const QString& description, updateIcon(); - connect(ui->m_exec, SIGNAL(urlSelected(const QString &)), - this, SLOT(slotSelect(const QString &))); - connect(ui->m_exec, SIGNAL(textChanged(const QString &)), - this, SLOT(slotTextChanged(const QString &))); - connect(ui->m_exec, SIGNAL(returnPressed()), - this, SLOT(slotReturnPressed())); - connect(ui->m_icon, SIGNAL(iconChanged(QString)), - this, SLOT(slotIconChanged(QString))); + connect(ui->m_exec, TQT_SIGNAL(urlSelected(const TQString &)), + this, TQT_SLOT(slotSelect(const TQString &))); + connect(ui->m_exec, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SLOT(slotTextChanged(const TQString &))); + connect(ui->m_exec, TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(slotReturnPressed())); + connect(ui->m_icon, TQT_SIGNAL(iconChanged(TQString)), + this, TQT_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline resize(sizeHint().width() > 300 ? sizeHint().width() : 300, @@ -94,27 +94,27 @@ bool PanelExeDialog::useTerminal() const return ui->m_inTerm->isChecked(); } -QString PanelExeDialog::title() const +TQString PanelExeDialog::title() const { return ui->m_title->text(); } -QString PanelExeDialog::description() const +TQString PanelExeDialog::description() const { return ui->m_description->text(); } -QString PanelExeDialog::commandLine() const +TQString PanelExeDialog::commandLine() const { return ui->m_commandLine->text(); } -QString PanelExeDialog::iconPath() const +TQString PanelExeDialog::iconPath() const { return ui->m_icon->icon(); } -QString PanelExeDialog::command() const +TQString PanelExeDialog::command() const { return ui->m_exec->url(); } @@ -128,19 +128,19 @@ void PanelExeDialog::updateIcon() void PanelExeDialog::fillCompletion() { KCompletion *comp = ui->m_exec->completionObject(); - QStringList exePaths = KStandardDirs::systemPaths(); + TQStringList exePaths = KStandardDirs::systemPaths(); - for (QStringList::ConstIterator it = exePaths.begin(); it != exePaths.end(); it++) + for (TQStringList::ConstIterator it = exePaths.begin(); it != exePaths.end(); it++) { - QDir d( (*it) ); - d.setFilter( QDir::Files | QDir::Executable ); + TQDir d( (*it) ); + d.setFilter( TQDir::Files | TQDir::Executable ); const QFileInfoList *list = d.entryInfoList(); if (!list) continue; QFileInfoListIterator it2( *list ); - QFileInfo *fi; + TQFileInfo *fi; while ( (fi = it2.current()) != 0 ) { m_partialPath2full.insert(fi->fileName(), fi->filePath(), false); @@ -151,20 +151,20 @@ void PanelExeDialog::fillCompletion() } } -void PanelExeDialog::slotIconChanged(QString) +void PanelExeDialog::slotIconChanged(TQString) { m_iconChanged = true; } -void PanelExeDialog::slotTextChanged(const QString &str) +void PanelExeDialog::slotTextChanged(const TQString &str) { if (m_iconChanged) { return; } - QString exeLocation = str; - QMap<QString, QString>::iterator it = m_partialPath2full.find(str); + TQString exeLocation = str; + TQMap<TQString, TQString>::iterator it = m_partialPath2full.find(str); if (it != m_partialPath2full.end()) exeLocation = it.data(); @@ -178,12 +178,12 @@ void PanelExeDialog::slotReturnPressed() ui->m_exec->setURL(m_partialPath2full[ui->m_exec->url()]); } -void PanelExeDialog::slotSelect(const QString& exec) +void PanelExeDialog::slotSelect(const TQString& exec) { if ( exec.isEmpty() ) return; - QFileInfo fi(exec); + TQFileInfo fi(exec); if (!fi.isExecutable()) { if(KMessageBox::warningYesNo(0, i18n("The selected file is not executable.\n" diff --git a/kicker/kicker/ui/exe_dlg.h b/kicker/kicker/ui/exe_dlg.h index f7624fa35..ef96fe9d0 100644 --- a/kicker/kicker/ui/exe_dlg.h +++ b/kicker/kicker/ui/exe_dlg.h @@ -31,25 +31,25 @@ class PanelExeDialog : public KDialogBase { Q_OBJECT public: - PanelExeDialog(const QString& title, const QString& description, - const QString &path, const QString &pixmap=QString::null, - const QString &cmd=QString::null, bool inTerm=false, - QWidget *parent=0, const char *name=0); - QString iconPath() const; - QString command() const; - QString commandLine() const; - QString title() const; - QString description() const; + PanelExeDialog(const TQString& title, const TQString& description, + const TQString &path, const TQString &pixmap=TQString::null, + const TQString &cmd=TQString::null, bool inTerm=false, + TQWidget *parent=0, const char *name=0); + TQString iconPath() const; + TQString command() const; + TQString commandLine() const; + TQString title() const; + TQString description() const; bool useTerminal() const; signals: void updateSettings(PanelExeDialog*); protected slots: - void slotSelect(const QString& exec); - void slotTextChanged(const QString &); + void slotSelect(const TQString& exec); + void slotTextChanged(const TQString &); void slotReturnPressed(); - void slotIconChanged(QString); + void slotIconChanged(TQString); void slotOk(); protected: @@ -57,8 +57,8 @@ protected: void updateIcon(); NonKDEButtonSettings* ui; - QString m_icon; - QMap<QString, QString> m_partialPath2full; + TQString m_icon; + TQMap<TQString, TQString> m_partialPath2full; bool m_iconChanged; }; diff --git a/kicker/kicker/ui/extensionop_mnu.cpp b/kicker/kicker/ui/extensionop_mnu.cpp index 9389f9cd4..a30434a48 100644 --- a/kicker/kicker/ui/extensionop_mnu.cpp +++ b/kicker/kicker/ui/extensionop_mnu.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kicker.h" #include "extensionop_mnu.h" -PanelExtensionOpMenu::PanelExtensionOpMenu(const QString& extension, int actions, QWidget *parent, const char *name) - : QPopupMenu(parent, name) +PanelExtensionOpMenu::PanelExtensionOpMenu(const TQString& extension, int actions, TQWidget *parent, const char *name) + : TQPopupMenu(parent, name) { if (!Kicker::the()->isImmutable()) { diff --git a/kicker/kicker/ui/extensionop_mnu.h b/kicker/kicker/ui/extensionop_mnu.h index 85bf914af..01bda4340 100644 --- a/kicker/kicker/ui/extensionop_mnu.h +++ b/kicker/kicker/ui/extensionop_mnu.h @@ -24,13 +24,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __extensionop_mnu_h__ #define __extensionop_mnu_h__ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> class PanelExtensionOpMenu : public QPopupMenu { public: enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905, Shade = 9906 }; - PanelExtensionOpMenu(const QString& extension, int actions, QWidget *parent=0, const char *name=0); + PanelExtensionOpMenu(const TQString& extension, int actions, TQWidget *parent=0, const char *name=0); }; #endif diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 31d614006..a73e0a48d 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -20,7 +20,7 @@ #include "hidebutton.h" -#include <qpainter.h> +#include <tqpainter.h> #include <kapplication.h> #include <kcursor.h> @@ -31,15 +31,15 @@ #include <kipc.h> #include <kstandarddirs.h> -HideButton::HideButton(QWidget *parent, const char *name) - : QButton(parent, name), +HideButton::HideButton(TQWidget *parent, const char *name) + : TQButton(parent, name), m_highlight(false), m_arrow(Qt::LeftArrow) { setBackgroundOrigin(AncestorOrigin); - connect(kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int))); - connect(kapp, SIGNAL(iconChanged(int)), SLOT(slotIconChanged(int))); + connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int))); kapp->addKipcEventMask(KIPC::SettingsChanged); kapp->addKipcEventMask(KIPC::IconChanged); @@ -47,7 +47,7 @@ HideButton::HideButton(QWidget *parent, const char *name) slotSettingsChanged(KApplication::SETTINGS_MOUSE); } -void HideButton::drawButton(QPainter *p) +void HideButton::drawButton(TQPainter *p) { if (m_arrow == Qt::LeftArrow) { @@ -73,18 +73,18 @@ void HideButton::drawButton(QPainter *p) drawButtonLabel(p); } -void HideButton::drawButtonLabel(QPainter *p) +void HideButton::drawButtonLabel(TQPainter *p) { if (pixmap()) { - QPixmap pix = m_highlight? m_activeIcon : m_normalIcon; + TQPixmap pix = m_highlight? m_activeIcon : m_normalIcon; if (isOn() || isDown()) { p->translate(2, 2); } - QPoint origin(2, 2); + TQPoint origin(2, 2); if (pix.height() < (height() - 4)) { @@ -100,9 +100,9 @@ void HideButton::drawButtonLabel(QPainter *p) } } -void HideButton::setPixmap(const QPixmap &pix) +void HideButton::setPixmap(const TQPixmap &pix) { - QButton::setPixmap(pix); + TQButton::setPixmap(pix); generateIcons(); } @@ -137,8 +137,8 @@ void HideButton::generateIcons() return; } - QImage image = pixmap()->convertToImage(); - image = image.smoothScale(size() - QSize(4, 4), QImage::ScaleMin); + TQImage image = pixmap()->convertToImage(); + image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin); KIconEffect effect; @@ -176,23 +176,23 @@ void HideButton::slotIconChanged(int group) repaint(false); } -void HideButton::enterEvent(QEvent *e) +void HideButton::enterEvent(TQEvent *e) { m_highlight = true; repaint(false); - QButton::enterEvent(e); + TQButton::enterEvent(e); } -void HideButton::leaveEvent(QEvent *e) +void HideButton::leaveEvent(TQEvent *e) { m_highlight = false; repaint(false); - QButton::enterEvent(e); + TQButton::enterEvent(e); } -void HideButton::resizeEvent(QResizeEvent *) +void HideButton::resizeEvent(TQResizeEvent *) { generateIcons(); } diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h index da387cde7..9a6c4612e 100644 --- a/kicker/kicker/ui/hidebutton.h +++ b/kicker/kicker/ui/hidebutton.h @@ -20,30 +20,30 @@ #ifndef HIDEBUTTON_H #define HIDEBUTTON_H -#include <qbutton.h> -#include <qpixmap.h> +#include <tqbutton.h> +#include <tqpixmap.h> class HideButton : public QButton { Q_OBJECT public: - HideButton(QWidget *parent, const char *name = 0); + HideButton(TQWidget *parent, const char *name = 0); void setArrowType(Qt::ArrowType arrow); - void setPixmap(const QPixmap &pix); + void setPixmap(const TQPixmap &pix); protected: - void drawButton(QPainter *p); - void drawButtonLabel(QPainter *p); + void drawButton(TQPainter *p); + void drawButtonLabel(TQPainter *p); void generateIcons(); - void enterEvent(QEvent *e); - void leaveEvent( QEvent *e ); - void resizeEvent(QResizeEvent *e); + void enterEvent(TQEvent *e); + void leaveEvent( TQEvent *e ); + void resizeEvent(TQResizeEvent *e); bool m_highlight; - QPixmap m_normalIcon; - QPixmap m_activeIcon; + TQPixmap m_normalIcon; + TQPixmap m_activeIcon; Qt::ArrowType m_arrow; protected slots: diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 609ce84be..b2e3d59bb 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <unistd.h> #include <dmctl.h> -#include <qimage.h> -#include <qpainter.h> -#include <qstyle.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <dcopclient.h> #include <kapplication.h> @@ -62,11 +62,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "k_mnu.moc" PanelKMenu::PanelKMenu() - : PanelServiceMenu(QString::null, QString::null, 0, "KMenu") + : PanelServiceMenu(TQString::null, TQString::null, 0, "KMenu") , bookmarkMenu(0) , bookmarkOwner(0) { - static const QCString dcopObjId("KMenu"); + static const TQCString dcopObjId("KMenu"); DCOPObject::setObjId(dcopObjId); // set the first client id to some arbitrarily large value. client_id = 10000; @@ -74,13 +74,13 @@ PanelKMenu::PanelKMenu() disableAutoClear(); actionCollection = new KActionCollection(this); setCaption(i18n("K Menu")); - connect(Kicker::the(), SIGNAL(configurationChanged()), - this, SLOT(configChanged())); + connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), + this, TQT_SLOT(configChanged())); DCOPClient *dcopClient = KApplication::dcopClient(); dcopClient->connectDCOPSignal(0, "appLauncher", - "serviceStartedByStorageId(QString,QString)", + "serviceStartedByStorageId(TQString,TQString)", dcopObjId, - "slotServiceStartedByStorageId(QString,QString)", + "slotServiceStartedByStorageId(TQString,TQString)", false); } @@ -91,8 +91,8 @@ PanelKMenu::~PanelKMenu() delete bookmarkOwner; } -void PanelKMenu::slotServiceStartedByStorageId(QString starter, - QString storageId) +void PanelKMenu::slotServiceStartedByStorageId(TQString starter, + TQString storageId) { if (starter != "kmenu") { @@ -111,10 +111,10 @@ bool PanelKMenu::loadSidePixmap() return false; } - QString sideName = KickerSettings::sidePixmapName(); - QString sideTileName = KickerSettings::sideTileName(); + TQString sideName = KickerSettings::sidePixmapName(); + TQString sideTileName = KickerSettings::sideTileName(); - QImage image; + TQImage image; image.load(locate("data", "kicker/pics/" + sideName)); if (image.isNull()) @@ -147,8 +147,8 @@ bool PanelKMenu::loadSidePixmap() if (sideTilePixmap.height() < 100) { int tiles = (int)(100 / sideTilePixmap.height()) + 1; - QPixmap preTiledPixmap(sideTilePixmap.width(), sideTilePixmap.height() * tiles); - QPainter p(&preTiledPixmap); + TQPixmap preTiledPixmap(sideTilePixmap.width(), sideTilePixmap.height() * tiles); + TQPainter p(&preTiledPixmap); p.drawTiledPixmap(preTiledPixmap.rect(), sideTilePixmap); sideTilePixmap = preTiledPixmap; } @@ -160,7 +160,7 @@ void PanelKMenu::paletteChanged() { if (!loadSidePixmap()) { - sidePixmap = sideTilePixmap = QPixmap(); + sidePixmap = sideTilePixmap = TQPixmap(); setMinimumSize( sizeHint() ); } } @@ -178,14 +178,14 @@ void PanelKMenu::initialize() if (loadSidePixmap()) { // in case we've been through here before, let's disconnect - disconnect(kapp, SIGNAL(kdisplayPaletteChanged()), - this, SLOT(paletteChanged())); - connect(kapp, SIGNAL(kdisplayPaletteChanged()), - this, SLOT(paletteChanged())); + disconnect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + this, TQT_SLOT(paletteChanged())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + this, TQT_SLOT(paletteChanged())); } else { - sidePixmap = sideTilePixmap = QPixmap(); + sidePixmap = sideTilePixmap = TQPixmap(); } // add services @@ -235,10 +235,10 @@ void PanelKMenu::initialize() } // insert dynamic menus - QStringList menu_ext = KickerSettings::menuExtensions(); + TQStringList menu_ext = KickerSettings::menuExtensions(); if (!menu_ext.isEmpty()) { - for (QStringList::ConstIterator it=menu_ext.begin(); it!=menu_ext.end(); ++it) + for (TQStringList::ConstIterator it=menu_ext.begin(); it!=menu_ext.end(); ++it) { MenuInfo info(*it); if (!info.isValid()) @@ -259,7 +259,7 @@ void PanelKMenu::initialize() // insert client menus, if any if (clients.count() > 0) { - QIntDictIterator<KickerClientMenu> it(clients); + TQIntDictIterator<KickerClientMenu> it(clients); while (it){ if (it.current()->text.at(0) != '.') insertItem( @@ -279,16 +279,16 @@ void PanelKMenu::initialize() insertItem(KickerLib::menuIconSet("run"), i18n("Run Command..."), this, - SLOT( slotRunCommand())); + TQT_SLOT( slotRunCommand())); insertSeparator(); } if (DM().isSwitchable() && kapp->authorize("switch_user")) { - sessionsMenu = new QPopupMenu( this ); + sessionsMenu = new TQPopupMenu( this ); insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu); - connect( sessionsMenu, SIGNAL(aboutToShow()), SLOT(slotPopulateSessions()) ); - connect( sessionsMenu, SIGNAL(activated(int)), SLOT(slotSessionActivated(int)) ); + connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) ); + connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) ); } /* @@ -298,17 +298,17 @@ void PanelKMenu::initialize() ksmserver.setGroup("General"); if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession") { - insertItem(KickerLib::menuIconSet("filesave"), i18n("Save Session"), this, SLOT(slotSaveSession())); + insertItem(KickerLib::menuIconSet("filesave"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession())); } if (kapp->authorize("lock_screen")) { - insertItem(KickerLib::menuIconSet("lock"), i18n("Lock Session"), this, SLOT(slotLock())); + insertItem(KickerLib::menuIconSet("lock"), i18n("Lock Session"), this, TQT_SLOT(slotLock())); } if (kapp->authorize("logout")) { - insertItem(KickerLib::menuIconSet("exit"), i18n("Log Out..."), this, SLOT(slotLogout())); + insertItem(KickerLib::menuIconSet("exit"), i18n("Log Out..."), this, TQT_SLOT(slotLogout())); } #if 0 @@ -341,7 +341,7 @@ extern int kicker_screen_number; void PanelKMenu::slotLock() { - QCString appname( "kdesktop" ); + TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); @@ -421,15 +421,15 @@ void PanelKMenu::doNewSession( bool lock ) void PanelKMenu::slotSaveSession() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( "ksmserver", "default", "saveCurrentSession()", data ); } void PanelKMenu::slotRunCommand() { - QByteArray data; - QCString appname( "kdesktop" ); + TQByteArray data; + TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); @@ -442,12 +442,12 @@ void PanelKMenu::slotEditUserContact() { } -void PanelKMenu::setMinimumSize(const QSize & s) +void PanelKMenu::setMinimumSize(const TQSize & s) { KPanelMenu::setMinimumSize(s.width() + sidePixmap.width(), s.height()); } -void PanelKMenu::setMaximumSize(const QSize & s) +void PanelKMenu::setMaximumSize(const TQSize & s) { KPanelMenu::setMaximumSize(s.width() + sidePixmap.width(), s.height()); } @@ -477,20 +477,20 @@ void PanelKMenu::showMenu() } } -QRect PanelKMenu::sideImageRect() +TQRect PanelKMenu::sideImageRect() { - return QStyle::visualRect( QRect( frameWidth(), frameWidth(), sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), height() - 2*frameWidth() ), this ); } -void PanelKMenu::resizeEvent(QResizeEvent * e) +void PanelKMenu::resizeEvent(TQResizeEvent * e) { // kdDebug(1210) << "PanelKMenu::resizeEvent():" << endl; // kdDebug(1210) << geometry().width() << ", " << geometry().height() << endl; PanelServiceMenu::resizeEvent(e); - setFrameRect( QStyle::visualRect( QRect( sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0, width() - sidePixmap.width(), height() ), this ) ); } @@ -501,30 +501,30 @@ void PanelKMenu::resize(int width, int height) PanelServiceMenu::resize(width, height); } -QSize PanelKMenu::sizeHint() const +TQSize PanelKMenu::sizeHint() const { - QSize s = PanelServiceMenu::sizeHint(); + TQSize s = PanelServiceMenu::sizeHint(); // kdDebug(1210) << "PanelKMenu::sizeHint()" << endl; // kdDebug(1210) << s.width() << ", " << s.height() << endl; return s; } -void PanelKMenu::paintEvent(QPaintEvent * e) +void PanelKMenu::paintEvent(TQPaintEvent * e) { if (sidePixmap.isNull()) { PanelServiceMenu::paintEvent(e); return; } - QPainter p(this); + TQPainter p(this); p.setClipRegion(e->region()); - style().drawPrimitive( QStyle::PE_PanelPopup, &p, - QRect( 0, 0, width(), height() ), - colorGroup(), QStyle::Style_Default, - QStyleOption( frameWidth(), 0 ) ); + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, + TQRect( 0, 0, width(), height() ), + colorGroup(), TQStyle::Style_Default, + TQStyleOption( frameWidth(), 0 ) ); - QRect r = sideImageRect(); + TQRect r = sideImageRect(); r.setBottom( r.bottom() - sidePixmap.height() ); if ( r.intersects( e->rect() ) ) { @@ -535,8 +535,8 @@ void PanelKMenu::paintEvent(QPaintEvent * e) r.setTop( r.bottom() - sidePixmap.height() ); if ( r.intersects( e->rect() ) ) { - QRect drawRect = r.intersect( e->rect() ); - QRect pixRect = drawRect; + TQRect drawRect = r.intersect( e->rect() ); + TQRect pixRect = drawRect; pixRect.moveBy( -r.left(), -r.top() ); p.drawPixmap( drawRect.topLeft(), sidePixmap, pixRect ); } @@ -544,40 +544,40 @@ void PanelKMenu::paintEvent(QPaintEvent * e) drawContents( &p ); } -QMouseEvent PanelKMenu::translateMouseEvent( QMouseEvent* e ) +TQMouseEvent PanelKMenu::translateMouseEvent( TQMouseEvent* e ) { - QRect side = sideImageRect(); + TQRect side = sideImageRect(); if ( !side.contains( e->pos() ) ) return *e; - QPoint newpos( e->pos() ); - QApplication::reverseLayout() ? + TQPoint newpos( e->pos() ); + TQApplication::reverseLayout() ? newpos.setX( newpos.x() - side.width() ) : newpos.setX( newpos.x() + side.width() ); - QPoint newglobal( e->globalPos() ); - QApplication::reverseLayout() ? + TQPoint newglobal( e->globalPos() ); + TQApplication::reverseLayout() ? newglobal.setX( newpos.x() - side.width() ) : newglobal.setX( newpos.x() + side.width() ); - return QMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() ); + return TQMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() ); } -void PanelKMenu::mousePressEvent(QMouseEvent * e) +void PanelKMenu::mousePressEvent(TQMouseEvent * e) { - QMouseEvent newEvent = translateMouseEvent(e); + TQMouseEvent newEvent = translateMouseEvent(e); PanelServiceMenu::mousePressEvent( &newEvent ); } -void PanelKMenu::mouseReleaseEvent(QMouseEvent *e) +void PanelKMenu::mouseReleaseEvent(TQMouseEvent *e) { - QMouseEvent newEvent = translateMouseEvent(e); + TQMouseEvent newEvent = translateMouseEvent(e); PanelServiceMenu::mouseReleaseEvent( &newEvent ); } -void PanelKMenu::mouseMoveEvent(QMouseEvent *e) +void PanelKMenu::mouseMoveEvent(TQMouseEvent *e) { - QMouseEvent newEvent = translateMouseEvent(e); + TQMouseEvent newEvent = translateMouseEvent(e); PanelServiceMenu::mouseMoveEvent( &newEvent ); } @@ -593,7 +593,7 @@ void PanelKMenu::createRecentMenuItems() { RecentlyLaunchedApps::the().m_nNumMenuItems = 0; - QStringList RecentApps; + TQStringList RecentApps; RecentlyLaunchedApps::the().getRecentApps(RecentApps); if (RecentApps.count() > 0) @@ -602,7 +602,7 @@ void PanelKMenu::createRecentMenuItems() int nId = serviceMenuEndId() + 1; int nIndex = KickerSettings::showMenuTitles() ? 1 : 0; - for (QValueList<QString>::ConstIterator it = + for (TQValueList<TQString>::ConstIterator it = RecentApps.fromLast(); /*nop*/; --it) { KService::Ptr s = KService::serviceByDesktopPath(*it); @@ -642,7 +642,7 @@ void PanelKMenu::clearSubmenus() { // we don't need to delete these on the way out since the libloader // handles them for us - if (QApplication::closingDown()) + if (TQApplication::closingDown()) { return; } @@ -688,13 +688,13 @@ void PanelKMenu::updateRecent() } // insert new items - QStringList RecentApps; + TQStringList RecentApps; RecentlyLaunchedApps::the().getRecentApps(RecentApps); if (RecentApps.count() > 0) { bool bNeedSeparator = KickerSettings::showMenuTitles(); - for (QValueList<QString>::ConstIterator it = RecentApps.fromLast(); + for (TQValueList<TQString>::ConstIterator it = RecentApps.fromLast(); /*nop*/; --it) { KService::Ptr s = KService::serviceByDesktopPath(*it); diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index f20cde06d..412648f1b 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __k_mnu_h__ #include <dcopobject.h> -#include <qintdict.h> -#include <qpixmap.h> +#include <tqintdict.h> +#include <tqpixmap.h> #include "service_mnu.h" @@ -42,7 +42,7 @@ class PanelKMenu : public PanelServiceMenu, public DCOPObject K_DCOP k_dcop: - void slotServiceStartedByStorageId(QString starter, QString desktopPath); + void slotServiceStartedByStorageId(TQString starter, TQString desktopPath); public: PanelKMenu(); @@ -51,9 +51,9 @@ public: int insertClientMenu(KickerClientMenu *p); void removeClientMenu(int id); - virtual QSize sizeHint() const; - virtual void setMinimumSize(const QSize &); - virtual void setMaximumSize(const QSize &); + virtual TQSize sizeHint() const; + virtual void setMinimumSize(const TQSize &); + virtual void setMaximumSize(const TQSize &); virtual void setMinimumSize(int, int); virtual void setMaximumSize(int, int); virtual void showMenu(); @@ -78,25 +78,25 @@ protected slots: void updateRecent(); protected: - QRect sideImageRect(); - QMouseEvent translateMouseEvent(QMouseEvent* e); - void resizeEvent(QResizeEvent *); - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + TQRect sideImageRect(); + TQMouseEvent translateMouseEvent(TQMouseEvent* e); + void resizeEvent(TQResizeEvent *); + void paintEvent(TQPaintEvent *); + void mousePressEvent(TQMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); bool loadSidePixmap(); void doNewSession(bool lock); void createRecentMenuItems(); virtual void clearSubmenus(); private: - QPopupMenu *sessionsMenu; - QPixmap sidePixmap; - QPixmap sideTilePixmap; + TQPopupMenu *sessionsMenu; + TQPixmap sidePixmap; + TQPixmap sideTilePixmap; int client_id; bool delay_init; - QIntDict<KickerClientMenu> clients; + TQIntDict<KickerClientMenu> clients; KBookmarkMenu *bookmarkMenu; KActionCollection *actionCollection; KBookmarkOwner *bookmarkOwner; diff --git a/kicker/kicker/ui/panelmenuiteminfo.h b/kicker/kicker/ui/panelmenuiteminfo.h index 29faca50f..66d0f7d9c 100644 --- a/kicker/kicker/ui/panelmenuiteminfo.h +++ b/kicker/kicker/ui/panelmenuiteminfo.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PANELMENUITEMINFO_H #define PANELMENUITEMINFO_H -#include <qpopupmenu.h> -#include <qstring.h> +#include <tqpopupmenu.h> +#include <tqstring.h> #include <kiconloader.h> @@ -38,10 +38,10 @@ class PanelMenuItemInfo PanelMenuItemInfo() : m_recvr(0), m_id(-1) {} - PanelMenuItemInfo(const QString& iconName, const QString& visibleName, const QObject* recvr, const QCString& slot, int id = -1) + PanelMenuItemInfo(const TQString& iconName, const TQString& visibleName, const TQObject* recvr, const TQCString& slot, int id = -1) : m_icon(iconName), m_name(visibleName), m_slot_(slot), m_recvr(recvr), m_id(id) {} - PanelMenuItemInfo(const QString& iconName, const QString& visibleName, int id = -1) + PanelMenuItemInfo(const TQString& iconName, const TQString& visibleName, int id = -1) : m_icon(iconName), m_name(visibleName), m_recvr(0), m_id(id) {} PanelMenuItemInfo(const PanelMenuItemInfo& c) @@ -72,7 +72,7 @@ class PanelMenuItemInfo return m_name.lower() > rh.m_name.lower(); } - int plug(QPopupMenu* menu) + int plug(TQPopupMenu* menu) { if (!m_icon.isEmpty() && m_icon != "unknown") { @@ -92,10 +92,10 @@ class PanelMenuItemInfo } private: - QString m_icon; - QString m_name; - QCString m_slot_; // HPUX namespace is polluted with m_slot - const QObject* m_recvr; + TQString m_icon; + TQString m_name; + TQCString m_slot_; // HPUX namespace is polluted with m_slot + const TQObject* m_recvr; int m_id; }; diff --git a/kicker/kicker/ui/popupmenutitle.cpp b/kicker/kicker/ui/popupmenutitle.cpp index adf44b802..3ea63f2be 100644 --- a/kicker/kicker/ui/popupmenutitle.cpp +++ b/kicker/kicker/ui/popupmenutitle.cpp @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "popupmenutitle.h" -PopupMenuTitle::PopupMenuTitle(const QString &name, const QFont &font) : - QCustomMenuItem(), +PopupMenuTitle::PopupMenuTitle(const TQString &name, const TQFont &font) : + TQCustomMenuItem(), m_desktopName(name), m_font(font) { diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index 4724c88c7..439fc195f 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -25,28 +25,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef POPUPMENUTITLE_H #define POPUPMENUTITLE_H -#include <qfont.h> -#include <qstring.h> -#include <qstyle.h> -#include <qpainter.h> -#include <qmenudata.h> +#include <tqfont.h> +#include <tqstring.h> +#include <tqstyle.h> +#include <tqpainter.h> +#include <tqmenudata.h> #include <kapplication.h> class PopupMenuTitle : public QCustomMenuItem { public: - PopupMenuTitle(const QString &name, const QFont &font); + PopupMenuTitle(const TQString &name, const TQFont &font); bool fullSpan () const { return true; } - void paint(QPainter* p, const QColorGroup& cg, + void paint(TQPainter* p, const TQColorGroup& cg, bool /* act */, bool /*enabled*/, int x, int y, int w, int h) { p->save(); - QRect r(x, y, w, h); - kapp->style().drawPrimitive(QStyle::PE_HeaderSection, + TQRect r(x, y, w, h); + kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, p, r, cg); if (!m_desktopName.isEmpty()) @@ -63,23 +63,23 @@ public: p->restore(); } - void setFont(const QFont &font) + void setFont(const TQFont &font) { m_font = font; m_font.setBold(true); } - QSize sizeHint() + TQSize sizeHint() { - QSize size = QFontMetrics(m_font).size(AlignHCenter, m_desktopName); + TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->style().pixelMetric(QStyle::PM_DefaultFrameWidth) * 2 + 1)); + (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } private: - QString m_desktopName; - QFont m_font; + TQString m_desktopName; + TQFont m_font; }; #endif diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp index 583fc1deb..1776f4876 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.cpp +++ b/kicker/kicker/ui/quickbrowser_mnu.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdir.h> +#include <tqdir.h> #include <kapplication.h> #include <klocale.h> @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "quickbrowser_mnu.h" #include "quickbrowser_mnu.moc" -PanelQuickBrowser::PanelQuickBrowser(QWidget *parent, const char *name) +PanelQuickBrowser::PanelQuickBrowser(TQWidget *parent, const char *name) : KPanelMenu("", parent, name) {} void PanelQuickBrowser::initialize() @@ -43,17 +43,17 @@ void PanelQuickBrowser::initialize() KURL url; - url.setPath(QDir::homeDirPath()); + url.setPath(TQDir::homeDirPath()); if (kapp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("kfm_home"), i18n("&Home Folder"), new PanelBrowserMenu(url.path(), this)); - url.setPath(QDir::rootDirPath()); + url.setPath(TQDir::rootDirPath()); if (kapp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_red"), i18n("&Root Folder"), new PanelBrowserMenu(url.path(), this)); - url.setPath(QDir::rootDirPath() + "etc"); + url.setPath(TQDir::rootDirPath() + "etc"); if (kapp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_yellow"), i18n("System &Configuration"), new PanelBrowserMenu(url.path(), this)); diff --git a/kicker/kicker/ui/quickbrowser_mnu.h b/kicker/kicker/ui/quickbrowser_mnu.h index 9d9582a8b..01b12d09d 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.h +++ b/kicker/kicker/ui/quickbrowser_mnu.h @@ -31,7 +31,7 @@ class PanelQuickBrowser : public KPanelMenu Q_OBJECT public: - PanelQuickBrowser(QWidget *parent=0, const char *name=0); + PanelQuickBrowser(TQWidget *parent=0, const char *name=0); public slots: virtual void initialize(); diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp index 54241cb29..473b0cdf2 100644 --- a/kicker/kicker/ui/recentapps.cpp +++ b/kicker/kicker/ui/recentapps.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <time.h> -#include <qregexp.h> -#include <qstringlist.h> +#include <tqregexp.h> +#include <tqstringlist.h> #include <dcopclient.h> #include <kapplication.h> @@ -63,17 +63,17 @@ void RecentlyLaunchedApps::init() configChanged(); - QStringList recentApps = KickerSettings::recentAppsStat(); + TQStringList recentApps = KickerSettings::recentAppsStat(); - for (QStringList::ConstIterator it = recentApps.begin(); + for (TQStringList::ConstIterator it = recentApps.begin(); it != recentApps.end(); ++it ) { - QRegExp re( "(\\d*) (\\d*) (.*)" ); + TQRegExp re( "(\\d*) (\\d*) (.*)" ); if (re.search(*it) != -1) { int nCount = re.cap(1).toInt(); long lTime = re.cap(2).toLong(); - QString szPath = re.cap(3); + TQString szPath = re.cap(3); m_appInfos.append(RecentlyLaunchedAppInfo( szPath, nCount, time_t(lTime))); } @@ -91,12 +91,12 @@ void RecentlyLaunchedApps::configChanged() void RecentlyLaunchedApps::save() { - QStringList recentApps; + TQStringList recentApps; - for (QValueList<RecentlyLaunchedAppInfo>::const_iterator it = + for (TQValueList<RecentlyLaunchedAppInfo>::const_iterator it = m_appInfos.constBegin(); it != m_appInfos.constEnd(); ++it) { - recentApps.append(QString("%1 %2 %3").arg((*it).getLaunchCount()) + recentApps.append(TQString("%1 %2 %3").arg((*it).getLaunchCount()) .arg((*it).getLastLaunchTime()) .arg((*it).getDesktopPath())); } @@ -105,17 +105,17 @@ void RecentlyLaunchedApps::save() KickerSettings::writeConfig(); } -void RecentlyLaunchedApps::appLaunched(const QString& strApp) +void RecentlyLaunchedApps::appLaunched(const TQString& strApp) { // Inform other applications (like the quickstarter applet) // that an application was started - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << launchDCOPSignalSource() << strApp; KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", - "serviceStartedByStorageId(QString,QString)", params); + "serviceStartedByStorageId(TQString,TQString)", params); - for (QValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); + for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); it != m_appInfos.end(); ++it) { if ((*it).getDesktopPath() == strApp) @@ -131,13 +131,13 @@ void RecentlyLaunchedApps::appLaunched(const QString& strApp) qHeapSort(m_appInfos); } -void RecentlyLaunchedApps::getRecentApps(QStringList& recentApps) +void RecentlyLaunchedApps::getRecentApps(TQStringList& recentApps) { recentApps.clear(); int maximumNum = KickerSettings::numVisibleEntries(); int i = 0; - for (QValueList<RecentlyLaunchedAppInfo>::const_iterator it = + for (TQValueList<RecentlyLaunchedAppInfo>::const_iterator it = m_appInfos.constBegin(); it != m_appInfos.constEnd() && i < maximumNum; ++it, ++i) @@ -146,9 +146,9 @@ void RecentlyLaunchedApps::getRecentApps(QStringList& recentApps) } } -void RecentlyLaunchedApps::removeItem( const QString& strName ) +void RecentlyLaunchedApps::removeItem( const TQString& strName ) { - for (QValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); + for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); it != m_appInfos.end(); ++it) { if ((*it).getDesktopPath() == strName) @@ -164,7 +164,7 @@ void RecentlyLaunchedApps::clearRecentApps() m_appInfos.clear(); } -QString RecentlyLaunchedApps::caption() const +TQString RecentlyLaunchedApps::caption() const { return KickerSettings::recentVsOften() ? i18n("Recently Used Applications") : diff --git a/kicker/kicker/ui/recentapps.h b/kicker/kicker/ui/recentapps.h index 0582cc166..4539d86a4 100644 --- a/kicker/kicker/ui/recentapps.h +++ b/kicker/kicker/ui/recentapps.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __recentapps_h__ #define __recentapps_h__ -#include <qvaluelist.h> +#include <tqvaluelist.h> class RecentlyLaunchedApps; @@ -37,7 +37,7 @@ public: m_lastLaunchTime = 0; } - RecentlyLaunchedAppInfo(const QString& desktopPath, int nLaunchCount, time_t lastLaunchTime) + RecentlyLaunchedAppInfo(const TQString& desktopPath, int nLaunchCount, time_t lastLaunchTime) { m_desktopPath = desktopPath; m_launchCount = nLaunchCount; @@ -59,7 +59,7 @@ public: m_launchCount > rhs.m_launchCount; } - QString getDesktopPath() const { return m_desktopPath; } + TQString getDesktopPath() const { return m_desktopPath; } int getLaunchCount() const { return m_launchCount; }; time_t getLastLaunchTime() const { return m_lastLaunchTime; }; void increaseLaunchCount() { m_launchCount++; }; @@ -67,7 +67,7 @@ public: void setLastLaunchTime(time_t lastLaunch) { m_lastLaunchTime = lastLaunch; }; private: - QString m_desktopPath; + TQString m_desktopPath; int m_launchCount; time_t m_lastLaunchTime; }; @@ -80,19 +80,19 @@ public: void configChanged(); void save(); void clearRecentApps(); - void appLaunched(const QString & strApp); - void getRecentApps(QStringList & RecentApps); - void removeItem(const QString &strName); - QString caption() const; + void appLaunched(const TQString & strApp); + void getRecentApps(TQStringList & RecentApps); + void removeItem(const TQString &strName); + TQString caption() const; int m_nNumMenuItems; bool m_bNeedToUpdate; private: - QString launchDCOPSignalSource() { return "kmenu"; } + TQString launchDCOPSignalSource() { return "kmenu"; } RecentlyLaunchedApps(); - QValueList<RecentlyLaunchedAppInfo> m_appInfos; + TQValueList<RecentlyLaunchedAppInfo> m_appInfos; bool m_bInitialised; }; diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index fce885f39..2e0543dae 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -33,12 +33,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "removeapplet_mnu.moc" PanelRemoveAppletMenu::PanelRemoveAppletMenu(ContainerArea* cArea, - QWidget *parent, + TQWidget *parent, const char *name) - : QPopupMenu(parent, name), m_containerArea(cArea) + : TQPopupMenu(parent, name), m_containerArea(cArea) { - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } void PanelRemoveAppletMenu::slotAboutToShow() @@ -49,7 +49,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() m_containers = m_containerArea->containers("Applet") + m_containerArea->containers("Special Button"); - QValueList<PanelMenuItemInfo> items; + TQValueList<PanelMenuItemInfo> items; for (BaseContainer::List::const_iterator it = m_containers.constBegin(); it != m_containers.constEnd();) @@ -71,7 +71,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() qHeapSort(items); - for (QValueList<PanelMenuItemInfo>::iterator it = items.begin(); + for (TQValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != items.end(); ++it) { @@ -81,7 +81,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() if (m_containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h index 455a93afd..b444b8540 100644 --- a/kicker/kicker/ui/removeapplet_mnu.h +++ b/kicker/kicker/ui/removeapplet_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __removeapplet_mnu_h__ #define __removeapplet_mnu_h__ -#include <qptrlist.h> -#include <qpopupmenu.h> +#include <tqptrlist.h> +#include <tqpopupmenu.h> #include "appletinfo.h" #include "container_base.h" @@ -37,7 +37,7 @@ class PanelRemoveAppletMenu : public QPopupMenu Q_OBJECT public: - PanelRemoveAppletMenu(ContainerArea* cArea, QWidget* parent = 0, const char* name = 0); + PanelRemoveAppletMenu(ContainerArea* cArea, TQWidget* parent = 0, const char* name = 0); protected slots: void slotExec( int id ); diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 33dc48e14..8f02abd67 100644 --- a/kicker/kicker/ui/removebutton_mnu.cpp +++ b/kicker/kicker/ui/removebutton_mnu.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qregexp.h> +#include <tqregexp.h> #include <kiconloader.h> #include <klocale.h> #include <kglobal.h> @@ -37,14 +37,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "removebutton_mnu.moc" PanelRemoveButtonMenu::PanelRemoveButtonMenu( ContainerArea* cArea, - QWidget *parent, const char *name ) - : QPopupMenu( parent, name ), containerArea( cArea ) + TQWidget *parent, const char *name ) + : TQPopupMenu( parent, name ), containerArea( cArea ) { - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } -void PanelRemoveButtonMenu::addToContainers(const QString& type) +void PanelRemoveButtonMenu::addToContainers(const TQString& type) { BaseContainer::List list = containerArea->containers(type); for (BaseContainer::Iterator it = list.begin(); @@ -70,7 +70,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() addToContainers("ExecButton"); int id = 0; - QValueList<PanelMenuItemInfo> items; + TQValueList<PanelMenuItemInfo> items; for (BaseContainer::Iterator it = containers.begin(); it != containers.end(); ++it) { items.append(PanelMenuItemInfo((*it)->icon(), (*it)->visibleName(), id)); @@ -79,7 +79,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() qHeapSort(items); - for (QValueList<PanelMenuItemInfo>::iterator it = items.begin(); + for (TQValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != items.end(); ++it) { @@ -89,7 +89,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() if (containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h index 20d29c171..d326a2f62 100644 --- a/kicker/kicker/ui/removebutton_mnu.h +++ b/kicker/kicker/ui/removebutton_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __removebutton_mnu_h__ #define __removebutton_mnu_h__ -#include <qptrlist.h> -#include <qpopupmenu.h> +#include <tqptrlist.h> +#include <tqpopupmenu.h> #include "appletinfo.h" #include "container_base.h" @@ -37,7 +37,7 @@ class PanelRemoveButtonMenu : public QPopupMenu Q_OBJECT public: - PanelRemoveButtonMenu( ContainerArea *cArea, QWidget *parent=0, const char *name=0 ); + PanelRemoveButtonMenu( ContainerArea *cArea, TQWidget *parent=0, const char *name=0 ); ~PanelRemoveButtonMenu(); protected slots: @@ -46,7 +46,7 @@ protected slots: void slotRemoveAll(); private: - void addToContainers(const QString& type); + void addToContainers(const TQString& type); BaseContainer::List containers; ContainerArea* containerArea; diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp index ddce1f2df..9d6d19eaf 100644 --- a/kicker/kicker/ui/removecontainer_mnu.cpp +++ b/kicker/kicker/ui/removecontainer_mnu.cpp @@ -36,15 +36,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "containerarea.h" RemoveContainerMenu::RemoveContainerMenu( ContainerArea* cArea, - QWidget *parent, const char *name) - : QPopupMenu( parent, name ), containerArea( cArea ) + TQWidget *parent, const char *name) + : TQPopupMenu( parent, name ), containerArea( cArea ) { appletId = insertItem(i18n("&Applet"), new PanelRemoveAppletMenu(containerArea, this)); buttonId = insertItem(i18n("Appli&cation"), new PanelRemoveButtonMenu( containerArea, this ) ); adjustSize(); - connect( this, SIGNAL( aboutToShow() ), SLOT( slotAboutToShow() ) ); + connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); } RemoveContainerMenu::~RemoveContainerMenu() diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h index 9d7142671..6dd28dc30 100644 --- a/kicker/kicker/ui/removecontainer_mnu.h +++ b/kicker/kicker/ui/removecontainer_mnu.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __removecontainer_mnu_h__ #define __removecontainer_mnu_h__ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> class ContainerArea; @@ -33,7 +33,7 @@ class RemoveContainerMenu : public QPopupMenu Q_OBJECT public: - RemoveContainerMenu(ContainerArea* cArea, QWidget *parent=0, const char *name=0); + RemoveContainerMenu(ContainerArea* cArea, TQWidget *parent=0, const char *name=0); ~RemoveContainerMenu(); protected slots: diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 7f7d09075..9d5d80d2b 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -34,11 +34,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. static const int REMOVEALLID = 1000; -PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( QWidget *parent, const char *name ) - : QPopupMenu( parent, name ) +PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( TQWidget *parent, const char *name ) + : TQPopupMenu( parent, name ) { - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } PanelRemoveExtensionMenu::PanelRemoveExtensionMenu() @@ -51,13 +51,13 @@ void PanelRemoveExtensionMenu::slotAboutToShow() clear(); m_containers = ExtensionManager::the()->containers(); - QValueList<PanelMenuItemInfo> items; + TQValueList<PanelMenuItemInfo> items; ExtensionList::iterator itEnd = m_containers.end(); for (ExtensionList::iterator it = m_containers.begin(); it != itEnd; ++it) { const AppletInfo info = (*it)->info(); - QString name = info.name().replace("&", "&&"); + TQString name = info.name().replace("&", "&&"); switch ((*it)->position()) { case KPanelExtension::Top: @@ -76,13 +76,13 @@ void PanelRemoveExtensionMenu::slotAboutToShow() name = i18n("%1 (Floating)").arg(name); break; } - items.append(PanelMenuItemInfo(QString::null, name, id)); + items.append(PanelMenuItemInfo(TQString::null, name, id)); ++id; } qHeapSort(items); - QValueList<PanelMenuItemInfo>::iterator itEnd2 = items.end(); - for (QValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != itEnd2; ++it) + TQValueList<PanelMenuItemInfo>::iterator itEnd2 = items.end(); + for (TQValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != itEnd2; ++it) { (*it).plug(this); } diff --git a/kicker/kicker/ui/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h index bc0e08b00..2fc83008a 100644 --- a/kicker/kicker/ui/removeextension_mnu.h +++ b/kicker/kicker/ui/removeextension_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __removeextension_mnu_h__ #define __removeextension_mnu_h__ -#include <qptrlist.h> -#include <qpopupmenu.h> +#include <tqptrlist.h> +#include <tqpopupmenu.h> #include "container_extension.h" @@ -34,7 +34,7 @@ class PanelRemoveExtensionMenu : public QPopupMenu Q_OBJECT public: - PanelRemoveExtensionMenu( QWidget *parent=0, const char *name=0 ); + PanelRemoveExtensionMenu( TQWidget *parent=0, const char *name=0 ); PanelRemoveExtensionMenu(); protected slots: diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index a59c14ce8..9b46b2396 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -22,10 +22,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <typeinfo> -#include <qcursor.h> -#include <qbitmap.h> -#include <qpixmap.h> -#include <qimage.h> +#include <tqcursor.h> +#include <tqbitmap.h> +#include <tqpixmap.h> +#include <tqimage.h> #include <dcopclient.h> #include <kapplication.h> @@ -55,8 +55,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "service_mnu.h" #include "service_mnu.moc" -PanelServiceMenu::PanelServiceMenu(const QString & label, const QString & relPath, QWidget * parent, - const char * name, bool addmenumode, const QString & insertInlineHeader) +PanelServiceMenu::PanelServiceMenu(const TQString & label, const TQString & relPath, TQWidget * parent, + const char * name, bool addmenumode, const TQString & insertInlineHeader) : KPanelMenu(label, parent, name), relPath_(relPath), insertInlineHeader_( insertInlineHeader ), @@ -66,9 +66,9 @@ PanelServiceMenu::PanelServiceMenu(const QString & label, const QString & relPat { excludeNoDisplay_=true; - connect(KSycoca::self(), SIGNAL(databaseChanged()), - SLOT(slotClearOnClose())); - connect(this, SIGNAL(aboutToHide()), this, SLOT(slotClose())); + connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), + TQT_SLOT(slotClearOnClose())); + connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose())); } PanelServiceMenu::~PanelServiceMenu() @@ -84,7 +84,7 @@ void PanelServiceMenu::setExcludeNoDisplay( bool flag ) void PanelServiceMenu::showMenu() { - activateParent(QString::null); + activateParent(TQString::null); } // the initialization is split in initialize() and @@ -105,10 +105,10 @@ void PanelServiceMenu::initialize() void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, KServiceGroup::List& _list, - const QString& /* _relPath */, + const TQString& /* _relPath */, int& id) { - QStringList suppressGenericNames = _root->suppressGenericNames(); + TQStringList suppressGenericNames = _root->suppressGenericNames(); KServiceGroup::List::ConstIterator it = _list.begin(); bool separatorNeeded = false; @@ -120,7 +120,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, { KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e)); - QString groupCaption = g->caption(); + TQString groupCaption = g->caption(); // Avoid adding empty groups. KServiceGroup::Ptr subMenuRoot = KServiceGroup::group(g->relPath()); @@ -131,7 +131,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, continue; } - QString inlineHeaderName = g->showInlineHeader() ? groupCaption : ""; + TQString inlineHeaderName = g->showInlineHeader() ? groupCaption : ""; // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. groupCaption.replace("&", "&&"); @@ -192,7 +192,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, newSubMenu(g->name(), g->relPath(), this, g->name().utf8(), inlineHeaderName); m->setCaption(groupCaption); - QIconSet iconset = KickerLib::menuIconSet(g->icon()); + TQIconSet iconset = KickerLib::menuIconSet(g->icon()); if (separatorNeeded) { @@ -248,7 +248,7 @@ void PanelServiceMenu::doInitialize() // Set the startposition outside the panel, so there is no drag initiated // when we use drag and click to select items. A drag is only initiated when // you click to open the menu, and then press and drag an item. - startPos_ = QPoint(-1,-1); + startPos_ = TQPoint(-1,-1); // We ask KSycoca to give us all services (sorted). KServiceGroup::Ptr root = KServiceGroup::group(relPath_); @@ -272,7 +272,7 @@ void PanelServiceMenu::doInitialize() if (relPath_ == "") { insertItem(KickerLib::menuIconSet("exec"), i18n("Add Non-KDE Application"), - this, SLOT(addNonKDEApp())); + this, TQT_SLOT(addNonKDEApp())); } if (list.count() > 0) { @@ -295,11 +295,11 @@ void PanelServiceMenu::configChanged() void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/, - const QStringList *suppressGenericNames /* = 0 */, - const QString & aliasname) + const TQStringList *suppressGenericNames /* = 0 */, + const TQString & aliasname) { - QString serviceName = (aliasname.isEmpty() ? s->name() : aliasname).simplifyWhiteSpace(); - QString comment = s->genericName().simplifyWhiteSpace(); + TQString serviceName = (aliasname.isEmpty() ? s->name() : aliasname).simplifyWhiteSpace(); + TQString comment = s->genericName().simplifyWhiteSpace(); if (!comment.isEmpty()) { @@ -351,7 +351,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, entryMap_.insert(newId, static_cast<KSycocaEntry*>(s)); } -void PanelServiceMenu::activateParent(const QString &child) +void PanelServiceMenu::activateParent(const TQString &child) { PanelServiceMenu *parentMenu = dynamic_cast<PanelServiceMenu*>(parent()); if (parentMenu) @@ -389,7 +389,7 @@ void PanelServiceMenu::activateParent(const QString &child) } } -bool PanelServiceMenu::highlightMenuItem( const QString &menuItemId ) +bool PanelServiceMenu::highlightMenuItem( const TQString &menuItemId ) { initialize(); @@ -406,13 +406,13 @@ bool PanelServiceMenu::highlightMenuItem( const QString &menuItemId ) static_cast<KSycocaEntry*>(mapIt.data())); if (s && (s->menuId() == menuItemId)) { - activateParent(QString::null); + activateParent(TQString::null); int index = indexOf(mapIt.key()); setActiveItem(index); // Warp mouse pointer to location of active item - QRect r = itemGeometry(index); - QCursor::setPos(mapToGlobal(QPoint(r.x()+ r.width() - 15, + TQRect r = itemGeometry(index); + TQCursor::setPos(mapToGlobal(TQPoint(r.x()+ r.width() - 15, r.y() + r.height() - 5))); return true; } @@ -442,19 +442,19 @@ void PanelServiceMenu::slotExec(int id) KService::Ptr service = static_cast<KService *>(e); KApplication::startServiceByDesktopPath(service->desktopEntryPath(), - QStringList(), 0, 0, 0, "", true); + TQStringList(), 0, 0, 0, "", true); updateRecentlyUsedApps(service); - startPos_ = QPoint(-1,-1); + startPos_ = TQPoint(-1,-1); } -void PanelServiceMenu::mousePressEvent(QMouseEvent * ev) +void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev) { startPos_ = ev->pos(); KPanelMenu::mousePressEvent(ev); } -void PanelServiceMenu::mouseReleaseEvent(QMouseEvent * ev) +void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) { if (ev->button() == RightButton && !Kicker::the()->isKioskImmutable()) { @@ -475,7 +475,7 @@ void PanelServiceMenu::mouseReleaseEvent(QMouseEvent * ev) delete popupMenu_; popupMenu_ = new KPopupMenu(this); - connect(popupMenu_, SIGNAL(activated(int)), SLOT(slotContextMenu(int))); + connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); bool hasEntries = false; switch (contextKSycocaEntry_->sycocaType()) @@ -552,8 +552,8 @@ void PanelServiceMenu::slotContextMenu(int selected) KProcess *proc; KService::Ptr service; KServiceGroup::Ptr g; - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); KURL src,dest; KIO::CopyJob *job; @@ -572,29 +572,29 @@ void PanelServiceMenu::slotContextMenu(int selected) break; case AddItemToPanel: { - QCString appname = "kicker"; + TQCString appname = "kicker"; if ( kicker_screen_number ) appname.sprintf("kicker-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); - kapp->dcopClient()->send(appname, "Panel", "addServiceButton(QString)", service->desktopEntryPath()); + kapp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath()); break; } case EditItem: proc = new KProcess(this); - *proc << KStandardDirs::findExe(QString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); break; case PutIntoRunDialog: { close(); - QCString appname = "kdesktop"; + TQCString appname = "kdesktop"; if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(QString)", service->exec()); + kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec()); break; } @@ -614,19 +614,19 @@ void PanelServiceMenu::slotContextMenu(int selected) break; case AddMenuToPanel: { - QCString appname = "kicker"; + TQCString appname = "kicker"; if ( kicker_screen_number ) appname.sprintf("kicker-screen-%d", kicker_screen_number); g = static_cast<KServiceGroup *>(contextKSycocaEntry_); ds << "foo" << g->relPath(); - kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(QString,QString)", ba); + kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); break; } case EditMenu: proc = new KProcess(this); - *proc << KStandardDirs::findExe(QString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); break; @@ -636,7 +636,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } } -void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) +void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) { KPanelMenu::mouseMoveEvent(ev); @@ -646,8 +646,8 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) if ( (ev->state() & LeftButton ) != LeftButton ) return; - QPoint p = ev->pos() - startPos_; - if (p.manhattanLength() <= QApplication::startDragDistance() ) + TQPoint p = ev->pos() - startPos_; + if (p.manhattanLength() <= TQApplication::startDragDistance() ) return; int id = idAt(startPos_); @@ -663,7 +663,7 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) KSycocaEntry * e = entryMap_[id]; - QPixmap icon; + TQPixmap icon; KURL url; switch (e->sycocaType()) { @@ -671,7 +671,7 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) case KST_KService: { icon = static_cast<KService *>(e)->pixmap(KIcon::Small); - QString filePath = static_cast<KService *>(e)->desktopEntryPath(); + TQString filePath = static_cast<KService *>(e)->desktopEntryPath(); if (filePath[0] != '/') { filePath = locate("apps", filePath); @@ -699,17 +699,17 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, SIGNAL(destroyed()), this, SLOT(slotDragObjectDestroyed())); + connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); // Set the startposition outside the panel, so there is no drag initiated // when we use drag and click to select items. A drag is only initiated when // you click to open the menu, and then press and drag an item. - startPos_ = QPoint(-1,-1); + startPos_ = TQPoint(-1,-1); } -void PanelServiceMenu::dragEnterEvent(QDragEnterEvent *event) +void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event) { // Set the DragObject's target to this widget. This is needed because the // widget doesn't accept drops, but we want to determine if the drag object @@ -722,10 +722,10 @@ void PanelServiceMenu::dragEnterEvent(QDragEnterEvent *event) event->ignore(); } -void PanelServiceMenu::dragLeaveEvent(QDragLeaveEvent *) +void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *) { // see PanelServiceMenu::dragEnterEvent why this is nescessary - if (!frameGeometry().contains(QCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -742,12 +742,12 @@ void PanelServiceMenu::slotDragObjectDestroyed() // the execution of any code after the original exec() statement // though the panels themselves continue on otherwise normally // (we just have some sort of nested event loop) - QTimer::singleShot(0, this, SLOT(close())); + TQTimer::singleShot(0, this, TQT_SLOT(close())); } } -PanelServiceMenu *PanelServiceMenu::newSubMenu(const QString & label, const QString & relPath, - QWidget * parent, const char * name, const QString& _inlineHeader) +PanelServiceMenu *PanelServiceMenu::newSubMenu(const TQString & label, const TQString & relPath, + TQWidget * parent, const char * name, const TQString& _inlineHeader) { return new PanelServiceMenu(label, relPath, parent, name, false,_inlineHeader); } @@ -783,7 +783,7 @@ void PanelServiceMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - QTimer::singleShot(100, this, SLOT(slotClear())); + TQTimer::singleShot(100, this, TQT_SLOT(slotClear())); return; } @@ -807,7 +807,7 @@ void PanelServiceMenu::selectFirstItem() // updates "recent" section of KMenu void PanelServiceMenu::updateRecentlyUsedApps(KService::Ptr &service) { - QString strItem(service->desktopEntryPath()); + TQString strItem(service->desktopEntryPath()); // don't add an item from root kmenu level if (!strItem.contains('/')) diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h index 9e28acd3f..3bc112348 100644 --- a/kicker/kicker/ui/service_mnu.h +++ b/kicker/kicker/ui/service_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef SERVICE_MENU_H #define SERVICE_MENU_H -#include <qmap.h> -#include <qvaluevector.h> +#include <tqmap.h> +#include <tqvaluevector.h> #include <ksycocaentry.h> #include <kservice.h> @@ -41,32 +41,32 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * @author Rik Hemsley <rik@kde.org> */ -typedef QMap<int, KSycocaEntry::Ptr> EntryMap; -typedef QValueVector<QPopupMenu*> PopupMenuList; +typedef TQMap<int, KSycocaEntry::Ptr> EntryMap; +typedef TQValueVector<TQPopupMenu*> PopupMenuList; class KDE_EXPORT PanelServiceMenu : public KPanelMenu { Q_OBJECT public: - PanelServiceMenu(const QString & label, const QString & relPath, - QWidget* parent = 0, const char* name = 0, + PanelServiceMenu(const TQString & label, const TQString & relPath, + TQWidget* parent = 0, const char* name = 0, bool addmenumode = false, - const QString &insertInlineHeader = QString::null); + const TQString &insertInlineHeader = TQString::null); virtual ~PanelServiceMenu(); - QString relPath() { return relPath_; } + TQString relPath() { return relPath_; } void setExcludeNoDisplay( bool flag ); virtual void showMenu(); - bool highlightMenuItem( const QString &menuId ); + bool highlightMenuItem( const TQString &menuId ); void selectFirstItem(); private: void fillMenu( KServiceGroup::Ptr &_root, KServiceGroup::List &_list, - const QString &_relPath, int & id ); + const TQString &_relPath, int & id ); protected slots: virtual void initialize(); @@ -82,37 +82,37 @@ protected slots: protected: void insertMenuItem(KService::Ptr & s, int nId, int nIndex = -1, - const QStringList *suppressGenericNames=0, - const QString &aliasname = QString::null); - virtual PanelServiceMenu * newSubMenu(const QString & label, - const QString & relPath, - QWidget * parent, const char * name, - const QString & _inlineHeader = - QString::null); - - virtual void mousePressEvent(QMouseEvent *); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void mouseMoveEvent(QMouseEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); - virtual void dragLeaveEvent(QDragLeaveEvent *); + const TQStringList *suppressGenericNames=0, + const TQString &aliasname = TQString::null); + virtual PanelServiceMenu * newSubMenu(const TQString & label, + const TQString & relPath, + TQWidget * parent, const char * name, + const TQString & _inlineHeader = + TQString::null); + + virtual void mousePressEvent(TQMouseEvent *); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void mouseMoveEvent(TQMouseEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); + virtual void dragLeaveEvent(TQDragLeaveEvent *); virtual void updateRecentlyUsedApps(KService::Ptr &s); - void activateParent(const QString &child); + void activateParent(const TQString &child); int serviceMenuStartId() { return 4242; } int serviceMenuEndId() { return 5242; } virtual void clearSubmenus(); void doInitialize(); - QString relPath_; + TQString relPath_; EntryMap entryMap_; bool loaded_; bool excludeNoDisplay_; - QString insertInlineHeader_; - QPopupMenu * opPopup_; + TQString insertInlineHeader_; + TQPopupMenu * opPopup_; bool clearOnClose_; bool addmenumode_; - QPoint startPos_; + TQPoint startPos_; PopupMenuList subMenus; private slots: diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp index cfb626fac..b0d36ba61 100644 --- a/kicker/libkicker/appletinfo.cpp +++ b/kicker/libkicker/appletinfo.cpp @@ -21,18 +21,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <kdesktopfile.h> #include <kapplication.h> #include "appletinfo.h" -AppletInfo::AppletInfo( const QString& deskFile, const QString& configFile, const AppletInfo::AppletType type) +AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, const AppletInfo::AppletType type) : m_type (type), m_unique(true), m_hidden(false) { - QFileInfo fi(deskFile); + TQFileInfo fi(deskFile); m_desktopFile = fi.fileName(); const char* resource = "applets"; @@ -98,15 +98,15 @@ bool AppletInfo::operator!=( const AppletInfo& rhs) const bool AppletInfo::operator<( const AppletInfo& rhs ) const { - return ( QString::localeAwareCompare( name(), rhs.name() ) < 0 ); + return ( TQString::localeAwareCompare( name(), rhs.name() ) < 0 ); } bool AppletInfo::operator> ( const AppletInfo& rhs ) const { - return ( QString::localeAwareCompare( name(), rhs.name() ) > 0 ); + return ( TQString::localeAwareCompare( name(), rhs.name() ) > 0 ); } bool AppletInfo::operator<= ( const AppletInfo& rhs ) const { - return ( QString::localeAwareCompare( name(), rhs.name() ) <= 0 ); + return ( TQString::localeAwareCompare( name(), rhs.name() ) <= 0 ); } diff --git a/kicker/libkicker/appletinfo.h b/kicker/libkicker/appletinfo.h index b9ab187ba..f89bb6aea 100644 --- a/kicker/libkicker/appletinfo.h +++ b/kicker/libkicker/appletinfo.h @@ -24,18 +24,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __appletinfo_h__ #define __appletinfo_h__ -#include <qmap.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qvaluevector.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqvaluevector.h> #include <kdemacros.h> class KDE_EXPORT AppletInfo { public: - typedef QValueVector<AppletInfo> List; - typedef QMap<QObject*, AppletInfo*> Dict; + typedef TQValueVector<AppletInfo> List; + typedef TQMap<TQObject*, AppletInfo*> Dict; enum AppletType { Undefined = 0, Applet = 1, @@ -44,24 +44,24 @@ class KDE_EXPORT AppletInfo Extension = 8, Button = BuiltinButton | SpecialButton }; - AppletInfo(const QString& desktopFile = QString::null, - const QString& configFile = QString::null, + AppletInfo(const TQString& desktopFile = TQString::null, + const TQString& configFile = TQString::null, const AppletType type = Undefined); - QString name() const { return m_name; } - QString comment() const { return m_comment; } - QString icon() const { return m_icon; } + TQString name() const { return m_name; } + TQString comment() const { return m_comment; } + TQString icon() const { return m_icon; } AppletType type() const { return m_type; } - QString library() const { return m_lib; } - QString desktopFile() const { return m_desktopFile; } - QString configFile() const { return m_configFile; } + TQString library() const { return m_lib; } + TQString desktopFile() const { return m_desktopFile; } + TQString configFile() const { return m_configFile; } bool isUniqueApplet() const { return m_unique; } bool isHidden() const { return m_hidden; } - void setConfigFile(QString cf) { m_configFile = cf; } + void setConfigFile(TQString cf) { m_configFile = cf; } bool operator<(const AppletInfo& rhs) const; bool operator>(const AppletInfo& rhs) const; @@ -71,19 +71,19 @@ class KDE_EXPORT AppletInfo void setType(AppletType type) { m_type = type; } protected: - void setName(QString name) { m_name = name; } - void setComment(QString comment) { m_comment = comment; } - void setIcon(QString icon) { m_icon = icon; } - void setLibrary(QString lib) { m_lib = lib; } + void setName(TQString name) { m_name = name; } + void setComment(TQString comment) { m_comment = comment; } + void setIcon(TQString icon) { m_icon = icon; } + void setLibrary(TQString lib) { m_lib = lib; } void setIsUnique(bool u) { m_unique = u; } private: - QString m_name; - QString m_comment; - QString m_icon; - QString m_lib; - QString m_desktopFile; - QString m_configFile; + TQString m_name; + TQString m_comment; + TQString m_icon; + TQString m_lib; + TQString m_desktopFile; + TQString m_configFile; AppletType m_type; bool m_unique; bool m_hidden; diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index a0915bcd1..1e9025e5a 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -21,12 +21,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qbitmap.h> -#include <qfile.h> -#include <qpopupmenu.h> -#include <qregexp.h> -#include <qpainter.h> +#include <tqapplication.h> +#include <tqbitmap.h> +#include <tqfile.h> +#include <tqpopupmenu.h> +#include <tqregexp.h> +#include <tqpainter.h> #include <kiconeffect.h> #include <kiconloader.h> @@ -161,53 +161,53 @@ int maxButtonDim() int maxDim; //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; - KSimpleConfig *kickerconfig = new KSimpleConfig( QString::fromLatin1( "kickerrc" )); + KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; delete kickerconfig; return maxDim; } -QString newDesktopFile(const KURL& url) +TQString newDesktopFile(const KURL& url) { - QString base = url.fileName(); + TQString base = url.fileName(); if (base.endsWith(".desktop")) base.truncate(base.length()-8); - QRegExp r("(.*)(?=-\\d+)"); + TQRegExp r("(.*)(?=-\\d+)"); if (r.search(base) > -1) base = r.cap(1); - QString file = base + ".desktop"; + TQString file = base + ".desktop"; for(int n = 1; ++n; ) { - QString path = locate("appdata", file); + TQString path = locate("appdata", file); if (path.isEmpty()) break; - file = QString("%2-%1.desktop").arg(n).arg(base); + file = TQString("%2-%1.desktop").arg(n).arg(base); } file = locateLocal("appdata", file); return file; } -QString copyDesktopFile(const KURL& url) +TQString copyDesktopFile(const KURL& url) { - QString file = newDesktopFile(url); + TQString file = newDesktopFile(url); KURL dest; dest.setPath(file); KIO::NetAccess::upload(url.path(), dest, 0); return file; } -QPopupMenu* reduceMenu(QPopupMenu *menu) +TQPopupMenu* reduceMenu(TQPopupMenu *menu) { if (menu->count() != 1) { return menu; } - QMenuItem *item = menu->findItem(menu->idAt(0)); + TQMenuItem *item = menu->findItem(menu->idAt(0)); if (item->popup()) { @@ -217,20 +217,20 @@ QPopupMenu* reduceMenu(QPopupMenu *menu) return menu; } -QPoint popupPosition(KPanelApplet::Direction d, - const QWidget* popup, - const QWidget* source, - const QPoint& offset) +TQPoint popupPosition(KPanelApplet::Direction d, + const TQWidget* popup, + const TQWidget* source, + const TQPoint& offset) { - QRect r; + TQRect r; if (source->isTopLevel()) { r = source->geometry(); } else { - r = QRect(source->mapToGlobal(QPoint(0, 0)), - source->mapToGlobal(QPoint(source->width(), source->height()))); + r = TQRect(source->mapToGlobal(TQPoint(0, 0)), + source->mapToGlobal(TQPoint(source->width(), source->height()))); switch (d) { @@ -252,8 +252,8 @@ QPoint popupPosition(KPanelApplet::Direction d, case KPanelApplet::Left: case KPanelApplet::Right: { - QDesktopWidget* desktop = QApplication::desktop(); - QRect screen = desktop->screenGeometry(desktop->screenNumber(const_cast<QWidget*>(source))); + TQDesktopWidget* desktop = TQApplication::desktop(); + TQRect screen = desktop->screenGeometry(desktop->screenNumber(const_cast<TQWidget*>(source))); int x = (d == KPanelApplet::Left) ? r.left() - popup->width() : r.right() + 1; int y = r.top() + offset.y(); @@ -274,7 +274,7 @@ QPoint popupPosition(KPanelApplet::Direction d, } } - return QPoint(x, y); + return TQPoint(x, y); } case KPanelApplet::Up: case KPanelApplet::Down: @@ -284,7 +284,7 @@ QPoint popupPosition(KPanelApplet::Direction d, int y = (d == KPanelApplet::Up) ? r.top() - popup->height() : r.bottom() + 1; - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) { x = r.right() - popup->width() + 1; @@ -299,12 +299,12 @@ QPoint popupPosition(KPanelApplet::Direction d, x = r.left(); } - return QPoint(x, y); + return TQPoint(x, y); } else { - QDesktopWidget* desktop = QApplication::desktop(); - QRect screen = desktop->screenGeometry(desktop->screenNumber(const_cast<QWidget*>(source))); + TQDesktopWidget* desktop = TQApplication::desktop(); + TQRect screen = desktop->screenGeometry(desktop->screenNumber(const_cast<TQWidget*>(source))); x = r.left() + offset.x(); // try to keep this on the screen @@ -319,24 +319,24 @@ QPoint popupPosition(KPanelApplet::Direction d, } } - return QPoint(x, y); + return TQPoint(x, y); } } } -void colorize(QImage& image) +void colorize(TQImage& image) { KConfig *config = KGlobal::config(); config->setGroup("WM"); - QColor color = QApplication::palette().active().highlight(); - QColor activeTitle = config->readColorEntry("activeBackground", &color); - QColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); + TQColor color = TQApplication::palette().active().highlight(); + TQColor activeTitle = config->readColorEntry("activeBackground", &color); + TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); // figure out which color is most suitable for recoloring to int h1, s1, v1, h2, s2, v2, h3, s3, v3; activeTitle.hsv(&h1, &s1, &v1); inactiveTitle.hsv(&h2, &s2, &v2); - QApplication::palette().active().background().hsv(&h3, &s3, &v3); + TQApplication::palette().active().background().hsv(&h3, &s3, &v3); if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) && ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1)) @@ -361,7 +361,7 @@ void colorize(QImage& image) KIconEffect::colorize(image, color, 1.0); } -QColor blendColors(const QColor& c1, const QColor& c2) +TQColor blendColors(const TQColor& c1, const TQColor& c2) { int r1, g1, b1; int r2, g2, b2; @@ -373,10 +373,10 @@ QColor blendColors(const QColor& c1, const QColor& c2) g1 += (int) (.5 * (g2 - g1)); b1 += (int) (.5 * (b2 - b1)); - return QColor(r1, g1, b1); + return TQColor(r1, g1, b1); } -QColor shadowColor(const QColor& c) +TQColor shadowColor(const TQColor& c) { int r = c.red(); int g = c.green(); @@ -397,12 +397,12 @@ QColor shadowColor(const QColor& c) else b = 0; - return QColor( r, g, b ); + return TQColor( r, g, b ); } -QIconSet menuIconSet(const QString& icon) +TQIconSet menuIconSet(const TQString& icon) { - QIconSet iconset; + TQIconSet iconset; int iconSize = KickerSettings::menuEntryHeight(); if (iconSize < 0) @@ -420,14 +420,14 @@ QIconSet menuIconSet(const QString& icon) } else if (iconSize == 0) { - QPixmap normal = KGlobal::iconLoader()->loadIcon(icon, + TQPixmap normal = KGlobal::iconLoader()->loadIcon(icon, KIcon::Small, 0, KIcon::DefaultState, 0, true); - QPixmap active = KGlobal::iconLoader()->loadIcon(icon, + TQPixmap active = KGlobal::iconLoader()->loadIcon(icon, KIcon::Small, 0, KIcon::ActiveState, @@ -445,31 +445,31 @@ QIconSet menuIconSet(const QString& icon) active.convertFromImage(active.convertToImage().smoothScale(20,20)); } - iconset.setPixmap(normal, QIconSet::Small, QIconSet::Normal); - iconset.setPixmap(active, QIconSet::Small, QIconSet::Active); + iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal); + iconset.setPixmap(active, TQIconSet::Small, TQIconSet::Active); } } if (iconset.isNull()) { - QPixmap pix(iconSize, iconSize); - QBitmap map(iconSize, iconSize, true); + TQPixmap pix(iconSize, iconSize); + TQBitmap map(iconSize, iconSize, true); pix.setMask(map); - iconset = QIconSet(pix, pix); + iconset = TQIconSet(pix, pix); } return iconset; } -void drawBlendedRect(QPainter *p, const QRect &r, const QColor &color, int alpha) +void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int alpha) { - static QPixmap pix; - static QColor last_color = Qt::black; + static TQPixmap pix; + static TQColor last_color = Qt::black; static int last_alpha = 0; if (pix.isNull() || last_color != color || last_alpha != alpha) { - QImage img(16, 16, 32); + TQImage img(16, 16, 32); img.setAlphaBuffer(false); img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); img.setAlphaBuffer(true); diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h index 2b9449584..0a4677914 100644 --- a/kicker/libkicker/global.h +++ b/kicker/libkicker/global.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __pglobal_h__ #define __pglobal_h__ -#include <qiconset.h> -#include <qmap.h> +#include <tqiconset.h> +#include <tqmap.h> #include <kpanelapplet.h> #include <kpanelextension.h> @@ -52,23 +52,23 @@ KDE_EXPORT int maxButtonDim(); * Tint the image to reflect the current color scheme * Used, for instance, by KMenu side bar */ -KDE_EXPORT void colorize(QImage& image); +KDE_EXPORT void colorize(TQImage& image); /** * Blend a color rectangle on a painter */ -KDE_EXPORT void drawBlendedRect(QPainter *p, const QRect &r, const QColor &color = Qt::black, int alpha = 0x40); +KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = Qt::black, int alpha = 0x40); /** * Blend two colours together to get a colour halfway in between */ -KDE_EXPORT QColor blendColors(const QColor& c1, const QColor& c2); +KDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2); /** * Create or copy .desktop files for use in kicker safely and easily */ -KDE_EXPORT QString copyDesktopFile(const KURL&url); -KDE_EXPORT QString newDesktopFile(const KURL&url); +KDE_EXPORT TQString copyDesktopFile(const KURL&url); +KDE_EXPORT TQString newDesktopFile(const KURL&url); /** @@ -80,7 +80,7 @@ KDE_EXPORT QString newDesktopFile(const KURL&url); * This function checks whether that is the case and returns either the * original menu or the sub-menu when appropriate. */ -KDE_EXPORT QPopupMenu *reduceMenu(QPopupMenu *); +KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); /** @@ -88,16 +88,16 @@ KDE_EXPORT QPopupMenu *reduceMenu(QPopupMenu *); * direction, the size of the menu, the widget geometry, and a optional * point in the local coordinates of the widget. */ -KDE_EXPORT QPoint popupPosition(KPanelApplet::Direction d, - const QWidget* popup, - const QWidget* source, - const QPoint& offset = QPoint(0, 0)); +KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, + const TQWidget* popup, + const TQWidget* source, + const TQPoint& offset = TQPoint(0, 0)); /** * Calculate an acceptable inverse of the given color wich will be used * as the shadow color. */ -KDE_EXPORT QColor shadowColor(const QColor& c); +KDE_EXPORT TQColor shadowColor(const TQColor& c); /** * Get an appropriate for a menu in Plasma. As the user may set this size @@ -105,7 +105,7 @@ KDE_EXPORT QColor shadowColor(const QColor& c); * @param icon the name of icon requested * @return the icon set for the requested icon */ -KDE_EXPORT QIconSet menuIconSet(const QString& icon); +KDE_EXPORT TQIconSet menuIconSet(const TQString& icon); } diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 403641443..34cf65c56 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -23,11 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qpainter.h> -#include <qsimplerichtext.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqapplication.h> +#include <tqpainter.h> +#include <tqsimplerichtext.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <kdialog.h> @@ -46,7 +46,7 @@ int KickerTip::m_tippingEnabled = 1; void KickerTip::Client::updateKickerTip() const { - if (KickerTip::the()->isTippingFor(dynamic_cast<const QWidget*>(this)) && + if (KickerTip::the()->isTippingFor(dynamic_cast<const TQWidget*>(this)) && KickerTip::the()->isVisible()) { KickerTip::the()->display(); @@ -63,8 +63,8 @@ KickerTip* KickerTip::the() return m_self; } -KickerTip::KickerTip(QWidget * parent) - : QWidget(parent, "animtt",WX11BypassWM), +KickerTip::KickerTip(TQWidget * parent) + : TQWidget(parent, "animtt",WX11BypassWM), m_richText(0), m_mimeFactory(0), m_dissolveSize(0), @@ -78,7 +78,7 @@ KickerTip::KickerTip(QWidget * parent) setBackgroundMode(NoBackground); resize(0, 0); hide(); - connect(&m_frameTimer, SIGNAL(timeout()), SLOT(internalUpdate())); + connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate())); } KickerTip::~KickerTip() @@ -104,7 +104,7 @@ void KickerTip::display() } } - QWidget *widget = const_cast<QWidget*>(m_tippingFor); + TQWidget *widget = const_cast<TQWidget*>(m_tippingFor); KickerTip::Client *client = dynamic_cast<KickerTip::Client*>(widget); if (!client) @@ -116,7 +116,7 @@ void KickerTip::display() // richtext area are freed but the mimefactory is ready to be added to in // the call to updateKickerTip delete m_mimeFactory; - m_mimeFactory = new QMimeSourceFactory(); + m_mimeFactory = new TQMimeSourceFactory(); // Declare interchange object and define defaults. Data data; @@ -136,8 +136,8 @@ void KickerTip::display() } delete m_richText; - m_richText = new QSimpleRichText("<qt><h3>" + data.message + "</h3><p>" + - data.subtext + "</p></qt>", font(), QString::null, 0, + m_richText = new TQSimpleRichText("<qt><h3>" + data.message + "</h3><p>" + + data.subtext + "</p></qt>", font(), TQString::null, 0, m_mimeFactory); m_richText->setWidth(640); m_direction = data.direction; @@ -148,7 +148,7 @@ void KickerTip::display() } else if (KickerSettings::mouseOversShowText()) { - m_icon = QPixmap(); + m_icon = TQPixmap(); } else { @@ -167,8 +167,8 @@ void KickerTip::display() // close the message window after given mS if (data.duration > 0) { - disconnect(&m_timer, SIGNAL(timeout()), 0, 0); - connect(&m_timer, SIGNAL(timeout()), SLOT(hide())); + disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); m_timer.start(data.duration, true); } else @@ -180,7 +180,7 @@ void KickerTip::display() show(); } -void KickerTip::paintEvent(QPaintEvent * e) +void KickerTip::paintEvent(TQPaintEvent * e) { if (m_dirty) { @@ -188,23 +188,23 @@ void KickerTip::paintEvent(QPaintEvent * e) m_dirty = false; } - QPainter p(this); + TQPainter p(this); p.drawPixmap(e->rect().topLeft(), m_pixmap, e->rect()); } -void KickerTip::mousePressEvent(QMouseEvent * /*e*/) +void KickerTip::mousePressEvent(TQMouseEvent * /*e*/) { - QToolTip::setGloballyEnabled(m_toolTipsEnabled); + TQToolTip::setGloballyEnabled(m_toolTipsEnabled); hide(); } -static void drawRoundRect(QPainter &p, const QRect &r) +static void drawRoundRect(TQPainter &p, const TQRect &r) { static int line[8] = { 1, 3, 4, 5, 6, 7, 7, 8 }; static int border[8] = { 1, 2, 1, 1, 1, 1, 1, 1 }; int xl, xr, y1, y2; - QPen pen = p.pen(); - bool drawBorder = pen.style() != QPen::NoPen; + TQPen pen = p.pen(); + bool drawBorder = pen.style() != TQPen::NoPen; if (r.width() < 16 || r.height() < 16) { @@ -272,7 +272,7 @@ static void drawRoundRect(QPainter &p, const QRect &r) void KickerTip::plainMask() { - QPainter maskPainter(&m_mask); + TQPainter maskPainter(&m_mask); m_mask.fill(Qt::black); @@ -286,7 +286,7 @@ void KickerTip::plainMask() void KickerTip::dissolveMask() { - QPainter maskPainter(&m_mask); + TQPainter maskPainter(&m_mask); m_mask.fill(Qt::black); @@ -339,7 +339,7 @@ void KickerTip::displayInternal() } // determine text rectangle - QRect textRect(0, 0, 0, 0); + TQRect textRect(0, 0, 0, 0); if (KickerSettings::mouseOversShowText()) { textRect.setWidth(m_richText->widthUsed()); @@ -382,11 +382,11 @@ void KickerTip::displayInternal() } // draw background - QPainter bufferPainter(&m_pixmap); + TQPainter bufferPainter(&m_pixmap); bufferPainter.setPen(colorGroup().foreground()); bufferPainter.setBrush(colorGroup().background()); //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); - drawRoundRect(bufferPainter, QRect(0, 0, width, height)); + drawRoundRect(bufferPainter, TQRect(0, 0, width, height)); // draw icon if present if (!m_icon.isNull()) @@ -400,10 +400,10 @@ void KickerTip::displayInternal() if (KickerSettings::mouseOversShowText()) { // draw text shadow - QColorGroup cg = colorGroup(); - cg.setColor(QColorGroup::Text, cg.background().dark(115)); - int shadowOffset = QApplication::reverseLayout() ? -1 : 1; - m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, QRect(), cg); + TQColorGroup cg = colorGroup(); + cg.setColor(TQColorGroup::Text, cg.background().dark(115)); + int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; + m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg); // draw text cg = colorGroup(); @@ -411,39 +411,39 @@ void KickerTip::displayInternal() } } -void KickerTip::tipFor(const QWidget* w) +void KickerTip::tipFor(const TQWidget* w) { if (m_tippingFor) { - disconnect(m_tippingFor, SIGNAL(destroyed(QObject*)), - this, SLOT(tipperDestroyed(QObject*))); + disconnect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), + this, TQT_SLOT(tipperDestroyed(TQObject*))); } m_tippingFor = w; if (m_tippingFor) { - connect(m_tippingFor, SIGNAL(destroyed(QObject*)), - this, SLOT(tipperDestroyed(QObject*))); + connect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), + this, TQT_SLOT(tipperDestroyed(TQObject*))); } } -void KickerTip::untipFor(const QWidget* w) +void KickerTip::untipFor(const TQWidget* w) { if (isTippingFor(w)) hide(); } -bool KickerTip::isTippingFor(const QWidget* w) const +bool KickerTip::isTippingFor(const TQWidget* w) const { return m_tippingFor == w; } -void KickerTip::tipperDestroyed(QObject* o) +void KickerTip::tipperDestroyed(TQObject* o) { // we can't do a dynamic cast because we are in the process of dieing // so static it is. - untipFor(static_cast<QWidget*>(o)); + untipFor(static_cast<TQWidget*>(o)); } void KickerTip::internalUpdate() @@ -479,10 +479,10 @@ void KickerTip::hide() tipFor(0); m_timer.stop(); m_frameTimer.stop(); - QWidget::hide(); + TQWidget::hide(); } -bool KickerTip::eventFilter(QObject *object, QEvent *event) +bool KickerTip::eventFilter(TQObject *object, TQEvent *event) { if (!tippingEnabled()) { @@ -494,11 +494,11 @@ bool KickerTip::eventFilter(QObject *object, QEvent *event) return false; } - QWidget *widget = static_cast<QWidget*>(object); + TQWidget *widget = static_cast<TQWidget*>(object); switch (event->type()) { - case QEvent::Enter: + case TQEvent::Enter: if (!KickerSettings::showMouseOverEffects()) { return false; @@ -508,13 +508,13 @@ bool KickerTip::eventFilter(QObject *object, QEvent *event) !qApp->activePopupWidget() && !isTippingFor(widget)) { - m_toolTipsEnabled = QToolTip::isGloballyEnabled(); - QToolTip::setGloballyEnabled(false); + m_toolTipsEnabled = TQToolTip::isGloballyEnabled(); + TQToolTip::setGloballyEnabled(false); tipFor(widget); m_timer.stop(); - disconnect(&m_timer, SIGNAL(timeout()), 0, 0); - connect(&m_timer, SIGNAL(timeout()), SLOT(display())); + disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(display())); // delay to avoid false starts // e.g. when the user quickly zooms their mouse over @@ -529,22 +529,22 @@ bool KickerTip::eventFilter(QObject *object, QEvent *event) } } break; - case QEvent::Leave: - QToolTip::setGloballyEnabled(m_toolTipsEnabled); + case TQEvent::Leave: + TQToolTip::setGloballyEnabled(m_toolTipsEnabled); m_timer.stop(); if (isTippingFor(widget) && isVisible()) { - disconnect(&m_timer, SIGNAL(timeout()), 0, 0); - connect(&m_timer, SIGNAL(timeout()), SLOT(hide())); + disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); m_timer.start(KickerSettings::mouseOversHideDelay(), true); } tipFor(0); break; - case QEvent::MouseButtonPress: - QToolTip::setGloballyEnabled(m_toolTipsEnabled); + case TQEvent::MouseButtonPress: + TQToolTip::setGloballyEnabled(m_toolTipsEnabled); hide(); default: break; diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h index 7211012fb..e51fae4ac 100644 --- a/kicker/libkicker/kickertip.h +++ b/kicker/libkicker/kickertip.h @@ -26,10 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef KICKER_TIP_H #define KICKER_TIP_H -#include <qbitmap.h> -#include <qpixmap.h> -#include <qtimer.h> -#include <qwidget.h> +#include <tqbitmap.h> +#include <tqpixmap.h> +#include <tqtimer.h> +#include <tqwidget.h> #include <kpanelapplet.h> @@ -47,15 +47,15 @@ public: struct Data { - QString message; - QString subtext; - QPixmap icon; + TQString message; + TQString subtext; + TQPixmap icon; KickerTip::MaskEffect maskEffect; int duration; KPanelApplet::Direction direction; // do NOT delete this in the client! - QMimeSourceFactory* mimeFactory; + TQMimeSourceFactory* mimeFactory; }; class KDE_EXPORT Client @@ -69,15 +69,15 @@ public: static void enableTipping(bool tip); static bool tippingEnabled(); - void untipFor(const QWidget* w); - bool eventFilter(QObject *o, QEvent *e); + void untipFor(const TQWidget* w); + bool eventFilter(TQObject *o, TQEvent *e); protected: - KickerTip(QWidget * parent); + KickerTip(TQWidget * parent); ~KickerTip(); - void paintEvent(QPaintEvent * e); - void mousePressEvent(QMouseEvent * e); + void paintEvent(TQPaintEvent * e); + void mousePressEvent(TQMouseEvent * e); void plainMask(); void dissolveMask(); @@ -85,32 +85,32 @@ protected: void displayInternal(); void hide(); - void tipFor(const QWidget* w); - bool isTippingFor(const QWidget* w) const; + void tipFor(const TQWidget* w); + bool isTippingFor(const TQWidget* w) const; protected slots: - void tipperDestroyed(QObject* o); + void tipperDestroyed(TQObject* o); void internalUpdate(); void display(); private: - QBitmap m_mask; - QPixmap m_pixmap; - QPixmap m_icon; + TQBitmap m_mask; + TQPixmap m_pixmap; + TQPixmap m_icon; MaskEffect m_maskEffect; - QSimpleRichText* m_richText; - QMimeSourceFactory* m_mimeFactory; + TQSimpleRichText* m_richText; + TQMimeSourceFactory* m_mimeFactory; int m_dissolveSize; int m_dissolveDelta; KPanelApplet::Direction m_direction; - QTimer m_timer; - QTimer m_frameTimer; + TQTimer m_timer; + TQTimer m_frameTimer; bool m_dirty; bool m_toolTipsEnabled; - const QWidget* m_tippingFor; + const TQWidget* m_tippingFor; static KickerTip* m_self; static int m_tippingEnabled; diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp index 32008883e..19ccc669d 100644 --- a/kicker/libkicker/kshadowengine.cpp +++ b/kicker/libkicker/kshadowengine.cpp @@ -21,10 +21,10 @@ * Boston, MA 02110-1301, USA. */ -#include <qcolor.h> -#include <qpainter.h> -#include <qbitmap.h> -#include <qpixmap.h> +#include <tqcolor.h> +#include <tqpainter.h> +#include <tqbitmap.h> +#include <tqpixmap.h> #include "kshadowsettings.h" #include "kshadowengine.h" @@ -58,9 +58,9 @@ KShadowSettings *KShadowEngine::shadowSettings() return m_shadowSettings; } -QImage KShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColor) +TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor) { - QImage result; + TQImage result; // create a new image for for the shaddow int w = textPixmap.width(); @@ -78,7 +78,7 @@ QImage KShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColo /* * This is the source pixmap */ - QImage img = textPixmap.convertToImage().convertDepth(32); + TQImage img = textPixmap.convertToImage().convertDepth(32); /* * Resize the image if necessary @@ -125,7 +125,7 @@ QImage KShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColo // Multiplication factor for pixels diagonal to the text #define DIAGONAL_FACTOR 1.0 -double KShadowEngine::defaultDecay(QImage& source, int i, int j) +double KShadowEngine::defaultDecay(TQImage& source, int i, int j) { if ((i < 1) || (j < 1) || (i > source.width() - 2) || (j > source.height() - 2)) return 0; @@ -144,19 +144,19 @@ double KShadowEngine::defaultDecay(QImage& source, int i, int j) return alphaShadow; } -double KShadowEngine::doubleLinearDecay(QImage& source, int i, int j) +double KShadowEngine::doubleLinearDecay(TQImage& source, int i, int j) { //printf("img: %p, %d %d\n", (char *) &source, i, j); return defaultDecay( source, i, j ); // for now } -double KShadowEngine::radialDecay(QImage& source, int i, int j) +double KShadowEngine::radialDecay(TQImage& source, int i, int j) { //printf("img: %p, %d %d\n", (char *) &source, i, j); return defaultDecay( source, i, j ); // for now } -double KShadowEngine::noDecay(QImage& source, int i, int j) +double KShadowEngine::noDecay(TQImage& source, int i, int j) { // create a new image for for the shaddow int w = source.width(); @@ -210,28 +210,28 @@ KTextShadowEngine::KTextShadowEngine() : KShadowEngine() } // taken from mtaskbar, by Sebastian Wolff -void KTextShadowEngine::drawText(QPainter &p, const QRect &tr, int tf, const QString &str, const QSize &size) +void KTextShadowEngine::drawText(TQPainter &p, const TQRect &tr, int tf, const TQString &str, const TQSize &size) { // get the color of the shadow: white for dark text, black for bright text - QPen textPen = p.pen(); - QColor shadCol = textPen.color(); + TQPen textPen = p.pen(); + TQColor shadCol = textPen.color(); if (shadCol.red() + shadCol.green() + shadCol.blue() <= 3*256/2-1) { - shadCol = QColor(255,255,255); + shadCol = TQColor(255,255,255); } else { - shadCol = QColor(0,0,0); + shadCol = TQColor(0,0,0); } // get a transparent pixmap - QPainter pixPainter; - QPixmap textPixmap(size); + TQPainter pixPainter; + TQPixmap textPixmap(size); - textPixmap.fill(QColor(0,0,0)); + textPixmap.fill(TQColor(0,0,0)); textPixmap.setMask(textPixmap.createHeuristicMask(true)); // draw text @@ -242,7 +242,7 @@ void KTextShadowEngine::drawText(QPainter &p, const QRect &tr, int tf, const QSt pixPainter.end(); // draw shadow - QImage img = makeShadow(textPixmap, shadCol); + TQImage img = makeShadow(textPixmap, shadCol); // return p.drawImage(0, 0, img); diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h index 0fc4877fa..041e8faf6 100644 --- a/kicker/libkicker/kshadowengine.h +++ b/kicker/libkicker/kshadowengine.h @@ -24,9 +24,9 @@ #ifndef __FX_SHADOW #define __FX_SHADOW -#include <qpixmap.h> -#include <qimage.h> -#include <qcolor.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqcolor.h> #include <kdemacros.h> @@ -79,7 +79,7 @@ public: * @param bgColor the background color * @return the resulting image */ - QImage makeShadow(const QPixmap& textPixmap, const QColor &bgColor); + TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor); private: // No static objects in libs, and no static deleters in kdefx... @@ -90,24 +90,24 @@ private: /* * a simple algorithm with 3 pixels thickness */ - double defaultDecay(QImage& source, int x, int y); + double defaultDecay(TQImage& source, int x, int y); /* * a slower algorithm where the influence of a pixel * is qGray(px)/(abs(dx) + abs(dy) +1). */ - double doubleLinearDecay(QImage& source, int x, int y); + double doubleLinearDecay(TQImage& source, int x, int y); /* * a very slow algorithm where the influence of a pixel * is qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). */ - double radialDecay(QImage& source, int x, int y); + double radialDecay(TQImage& source, int x, int y); /* * a nice/fast algorithm proposed by Bernardo Hung */ - double noDecay(QImage& source, int x, int y); + double noDecay(TQImage& source, int x, int y); void *d; }; @@ -117,7 +117,7 @@ class KDE_EXPORT KTextShadowEngine : public KShadowEngine public: KTextShadowEngine(); - void drawText(QPainter &p, const QRect &tr, int tf, const QString &str, const QSize &size); + void drawText(TQPainter &p, const TQRect &tr, int tf, const TQString &str, const TQSize &size); }; #endif diff --git a/kicker/libkicker/kshadowsettings.cpp b/kicker/libkicker/kshadowsettings.cpp index 9c935d30f..4d6bce5c3 100644 --- a/kicker/libkicker/kshadowsettings.cpp +++ b/kicker/libkicker/kshadowsettings.cpp @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. */ -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include "kshadowsettings.h" KShadowSettings::KShadowSettings() @@ -30,7 +30,7 @@ KShadowSettings::KShadowSettings() } // load/save methods -void KShadowSettings::fromString(const QString &val) +void KShadowSettings::fromString(const TQString &val) { setOffsetX(val.section(',', OFFSET_X, OFFSET_X).toInt()); setOffsetY(val.section(',', OFFSET_Y, OFFSET_Y).toInt()); @@ -41,9 +41,9 @@ void KShadowSettings::fromString(const QString &val) setSelectionType((SelectionType)val.section(',', SELECTION_TYPE, SELECTION_TYPE).toInt()); } -QString KShadowSettings::toString() const +TQString KShadowSettings::toString() const { - QString result; + TQString result; result.sprintf("%d,%d,%f,%f,%d,%d,%d", offsetX(), offsetY(), diff --git a/kicker/libkicker/kshadowsettings.h b/kicker/libkicker/kshadowsettings.h index 9a91f1c15..e222b964d 100644 --- a/kicker/libkicker/kshadowsettings.h +++ b/kicker/libkicker/kshadowsettings.h @@ -24,12 +24,12 @@ #include <kdemacros.h> -#define SHADOW_CONFIG_ENTRY QString("ShadowParameters") -#define SHADOW_TEXT_COLOR QString("ShadowTextColor") -#define SHADOW_TEXT_BACKGROUND QString("ShadowTextBackground") +#define SHADOW_CONFIG_ENTRY TQString("ShadowParameters") +#define SHADOW_TEXT_COLOR TQString("ShadowTextColor") +#define SHADOW_TEXT_BACKGROUND TQString("ShadowTextBackground") // fallback configuration string -#define DEFAULT_SHADOW_CONFIGURATION QString("0,0,4.0,120.0,2,1,1,0,0,0") +#define DEFAULT_SHADOW_CONFIGURATION TQString("0,0,4.0,120.0,2,1,1,0,0,0") /** * This class is the implementation of a structure for the @@ -92,13 +92,13 @@ class KDE_EXPORT KShadowSettings * @param the string to load from (comma-separated values) * @see ConfigurationOrder */ - virtual void fromString(const QString &s); + virtual void fromString(const TQString &s); /** * Saves the configuration to a string. * @return the configuration (comma-separated values) * @see ConfigurationOrder */ - virtual QString toString() const; + virtual TQString toString() const; // get methods /** diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index 740d44d95..0c36ffea0 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "menuinfo.h" -#include <qfile.h> -#include <qwidget.h> +#include <tqfile.h> +#include <tqwidget.h> #include <kapplication.h> #include <ksimpleconfig.h> @@ -33,15 +33,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kpanelmenu.h> #include <kparts/componentfactory.h> -MenuInfo::MenuInfo(const QString& desktopFile) +MenuInfo::MenuInfo(const TQString& desktopFile) { - KSimpleConfig df(locate("data", QString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); + KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); df.setGroup("Desktop Entry"); - QStringList list = df.readListEntry("X-KDE-AuthorizeAction"); + TQStringList list = df.readListEntry("X-KDE-AuthorizeAction"); if (kapp && !list.isEmpty()) { - for(QStringList::ConstIterator it = list.begin(); + for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { @@ -57,12 +57,12 @@ MenuInfo::MenuInfo(const QString& desktopFile) desktopfile_ = desktopFile; } -KPanelMenu* MenuInfo::load(QWidget *parent, const char *name) +KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name) { if (library_.isEmpty()) return 0; return KParts::ComponentFactory::createInstanceFromLibrary<KPanelMenu>( - QFile::encodeName( library_ ), + TQFile::encodeName( library_ ), parent, name ); } diff --git a/kicker/libkicker/menuinfo.h b/kicker/libkicker/menuinfo.h index 0d324538e..4a2074830 100644 --- a/kicker/libkicker/menuinfo.h +++ b/kicker/libkicker/menuinfo.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _menuinfo_h_ #define _menuinfo_h_ -#include <qstring.h> +#include <tqstring.h> #include <kdemacros.h> @@ -34,19 +34,19 @@ class QWidget; class KDE_EXPORT MenuInfo { public: - MenuInfo(const QString& desktopFile); + MenuInfo(const TQString& desktopFile); - QString name() const { return name_; } - QString comment() const { return comment_; } - QString icon() const { return icon_; } - QString library() const { return library_; } - QString desktopFile() const { return desktopfile_; } + TQString name() const { return name_; } + TQString comment() const { return comment_; } + TQString icon() const { return icon_; } + TQString library() const { return library_; } + TQString desktopFile() const { return desktopfile_; } bool isValid() const { return !name_.isEmpty(); } - KPanelMenu* load(QWidget *parent = 0, const char *name = 0); + KPanelMenu* load(TQWidget *parent = 0, const char *name = 0); private: - QString name_, comment_, icon_, library_, desktopfile_; + TQString name_, comment_, icon_, library_, desktopfile_; }; #endif diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 407a78ca6..972e5195e 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -21,15 +21,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcursor.h> -#include <qfile.h> -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qpopupmenu.h> -#include <qstyle.h> -#include <qstylesheet.h> -#include <qtooltip.h> -#include <qpixmap.h> +#include <tqcursor.h> +#include <tqfile.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqpopupmenu.h> +#include <tqstyle.h> +#include <tqstylesheet.h> +#include <tqtooltip.h> +#include <tqpixmap.h> #include <kapplication.h> #include <kconfig.h> @@ -57,8 +57,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // init static variable KShadowEngine* PanelButton::s_textShadowEngine = 0L; -PanelButton::PanelButton( QWidget* parent, const char* name ) - : QButton(parent, name), +PanelButton::PanelButton( TQWidget* parent, const char* name ) + : TQButton(parent, name), m_valid(true), m_isLeftMouseButtonDown(false), m_drawArrow(false), @@ -85,41 +85,41 @@ PanelButton::PanelButton( QWidget* parent, const char* name ) installEventFilter(KickerTip::the()); - connect(kapp, SIGNAL(settingsChanged(int)), SLOT(updateSettings(int))); - connect(kapp, SIGNAL(iconChanged(int)), SLOT(updateIcon(int))); + connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int))); + connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int))); } void PanelButton::configure() { - QString name = tileName(); + TQString name = tileName(); if( name.isEmpty() ) return; if (!KickerSettings::enableTileBackground()) { - setTile(QString::null); + setTile(TQString::null); return; } KConfigGroup tilesGroup( KGlobal::config(), "button_tiles" ); if( !tilesGroup.readBoolEntry( "Enable" + name + "Tiles", true ) ) { - setTile( QString::null ); + setTile( TQString::null ); return; } - QString tile = tilesGroup.readEntry( name + "Tile" ); - QColor color = QColor(); + TQString tile = tilesGroup.readEntry( name + "Tile" ); + TQColor color = TQColor(); if (tile == "Colorize") { color = tilesGroup.readColorEntry( name + "TileColor" ); - tile = QString::null; + tile = TQString::null; } setTile( tile, color ); } -void PanelButton::setTile(const QString& tile, const QColor& color) +void PanelButton::setTile(const TQString& tile, const TQColor& color) { if (tile == m_tile && m_tileColor == color) { @@ -143,11 +143,11 @@ void PanelButton::setDrawArrow(bool drawArrow) update(); } -QImage PanelButton::loadTile(const QString& tile, - const QSize& size, - const QString& state) +TQImage PanelButton::loadTile(const TQString& tile, + const TQSize& size, + const TQString& state) { - QString name = tile; + TQString name = tile; if (size.height() < 42) { @@ -164,7 +164,7 @@ QImage PanelButton::loadTile(const QString& tile, name += state + ".png"; - QImage tileImg(KGlobal::dirs()->findResource("tiles", name)); + TQImage tileImg(KGlobal::dirs()->findResource("tiles", name)); // scale if size does not match exactly if (!tileImg.isNull() && tileImg.size() != size) @@ -177,7 +177,7 @@ QImage PanelButton::loadTile(const QString& tile, void PanelButton::setEnabled(bool enable) { - QButton::setEnabled(enable); + TQButton::setEnabled(enable); loadIcons(); update(); } @@ -223,18 +223,18 @@ void PanelButton::updateSettings(int category) } } -void PanelButton::checkForDeletion(const QString& path) +void PanelButton::checkForDeletion(const TQString& path) { if (path == m_backingFile) { setEnabled(false); - QTimer::singleShot(1000, this, SLOT(scheduleForRemoval())); + TQTimer::singleShot(1000, this, TQT_SLOT(scheduleForRemoval())); } } bool PanelButton::checkForBackingFile() { - return QFile::exists(m_backingFile); + return TQFile::exists(m_backingFile); } void PanelButton::scheduleForRemoval() @@ -261,7 +261,7 @@ void PanelButton::scheduleForRemoval() } timelapse *= 2; - QTimer::singleShot(timelapse, this, SLOT(scheduleForRemoval())); + TQTimer::singleShot(timelapse, this, TQT_SLOT(scheduleForRemoval())); } } @@ -290,9 +290,9 @@ int PanelButton::widthForHeight(int height) const // before adding the text in here if (orientation() == Horizontal && !m_buttonText.isEmpty()) { - QFont f(font()); + TQFont f(font()); //f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16))); - QFontMetrics fm(f); + TQFontMetrics fm(f); //rc += fm.width(m_buttonText) + KMIN(25, KMAX(5, fm.width('m') / 2)); rc += fm.width(m_buttonText); @@ -306,12 +306,12 @@ int PanelButton::heightForWidth(int width) const return preferredDimension(width); } -const QPixmap& PanelButton::labelIcon() const +const TQPixmap& PanelButton::labelIcon() const { return m_highlight ? m_iconh : m_icon; } -const QPixmap& PanelButton::zoomIcon() const +const TQPixmap& PanelButton::zoomIcon() const { return m_iconz; } @@ -321,12 +321,12 @@ bool PanelButton::isValid() const return m_valid; } -void PanelButton::setTitle(const QString& t) +void PanelButton::setTitle(const TQString& t) { m_title = t; } -void PanelButton::setIcon(const QString& icon) +void PanelButton::setIcon(const TQString& icon) { if (icon == m_iconName) { @@ -339,7 +339,7 @@ void PanelButton::setIcon(const QString& icon) emit iconChanged(); } -QString PanelButton::icon() const +TQString PanelButton::icon() const { return m_iconName; } @@ -349,23 +349,23 @@ bool PanelButton::hasText() const return !m_buttonText.isEmpty(); } -void PanelButton::setButtonText(const QString& text) +void PanelButton::setButtonText(const TQString& text) { m_buttonText = " " + text; update(); } -QString PanelButton::buttonText() const +TQString PanelButton::buttonText() const { return m_buttonText; } -void PanelButton::setTextColor(const QColor& c) +void PanelButton::setTextColor(const TQColor& c) { m_textColor = c; } -QColor PanelButton::textColor() const +TQColor PanelButton::textColor() const { return m_textColor; } @@ -390,12 +390,12 @@ KPanelApplet::Direction PanelButton::popupDirection() const return m_popupDirection; } -QPoint PanelButton::center() const +TQPoint PanelButton::center() const { return mapToGlobal(rect().center()); } -QString PanelButton::title() const +TQString PanelButton::title() const { return m_title; } @@ -412,7 +412,7 @@ void PanelButton::startDrag() emit dragme(m_icon); } -void PanelButton::enterEvent(QEvent* e) +void PanelButton::enterEvent(TQEvent* e) { if (!m_highlight) { @@ -420,10 +420,10 @@ void PanelButton::enterEvent(QEvent* e) repaint(false); } - QButton::enterEvent(e); + TQButton::enterEvent(e); } -void PanelButton::leaveEvent(QEvent* e) +void PanelButton::leaveEvent(TQEvent* e) { if (m_highlight) { @@ -431,10 +431,10 @@ void PanelButton::leaveEvent(QEvent* e) repaint(false); } - QButton::leaveEvent(e); + TQButton::leaveEvent(e); } -void PanelButton::dragEnterEvent(QDragEnterEvent* e) +void PanelButton::dragEnterEvent(TQDragEnterEvent* e) { if (e->isAccepted()) { @@ -442,31 +442,31 @@ void PanelButton::dragEnterEvent(QDragEnterEvent* e) } update(); - QButton::dragEnterEvent( e ); + TQButton::dragEnterEvent( e ); } -void PanelButton::dragLeaveEvent(QDragLeaveEvent* e) +void PanelButton::dragLeaveEvent(TQDragLeaveEvent* e) { m_hasAcceptedDrag = false; update(); - QButton::dragLeaveEvent( e ); + TQButton::dragLeaveEvent( e ); } -void PanelButton::dropEvent(QDropEvent* e) +void PanelButton::dropEvent(TQDropEvent* e) { m_hasAcceptedDrag = false; update(); - QButton::dropEvent( e ); + TQButton::dropEvent( e ); } -void PanelButton::mouseMoveEvent(QMouseEvent *e) +void PanelButton::mouseMoveEvent(TQMouseEvent *e) { if (!m_isLeftMouseButtonDown || (e->state() & LeftButton) == 0) { return; } - QPoint p(e->pos() - m_lastLeftMouseButtonPress); + TQPoint p(e->pos() - m_lastLeftMouseButtonPress); if (p.manhattanLength() <= 16) { // KGlobalSettings::dndEventDelay() is not enough! @@ -477,29 +477,29 @@ void PanelButton::mouseMoveEvent(QMouseEvent *e) triggerDrag(); } -void PanelButton::mousePressEvent(QMouseEvent *e) +void PanelButton::mousePressEvent(TQMouseEvent *e) { if (e->button() == LeftButton) { m_lastLeftMouseButtonPress = e->pos(); m_isLeftMouseButtonDown = true; } - QButton::mousePressEvent(e); + TQButton::mousePressEvent(e); } -void PanelButton::mouseReleaseEvent(QMouseEvent *e) +void PanelButton::mouseReleaseEvent(TQMouseEvent *e) { if (e->button() == LeftButton) { m_isLeftMouseButtonDown = false; - QPixmap pix = labelIcon(); + TQPixmap pix = labelIcon(); KIconEffect::visualActivate(this, this->geometry(), &pix); } - QButton::mouseReleaseEvent(e); + TQButton::mouseReleaseEvent(e); } -void PanelButton::resizeEvent(QResizeEvent*) +void PanelButton::resizeEvent(TQResizeEvent*) { loadTiles(); @@ -509,20 +509,20 @@ void PanelButton::resizeEvent(QResizeEvent*) } } -void PanelButton::drawButton(QPainter *p) +void PanelButton::drawButton(TQPainter *p) { - const QPixmap& tile = (isDown() || isOn()) ? m_down : m_up; + const TQPixmap& tile = (isDown() || isOn()) ? m_down : m_up; if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - style().drawPrimitive(QStyle::PE_Panel, p, rect(), colorGroup()); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { // Draw the background. This is always needed, even when using tiles, // because they don't have to cover the entire button. - QPoint offset = backgroundOffset(); + TQPoint offset = backgroundOffset(); int ox = offset.x(); int oy = offset.y(); p->drawTiledPixmap( 0, 0, width(), height(),*paletteBackgroundPixmap(), ox, oy); @@ -536,7 +536,7 @@ void PanelButton::drawButton(QPainter *p) else if (isDown() || isOn()) { // Draw shapes to indicate the down state. - style().drawPrimitive(QStyle::PE_Panel, p, rect(), colorGroup(), QStyle::Style_Sunken); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); } drawButtonLabel(p); @@ -545,15 +545,15 @@ void PanelButton::drawButton(QPainter *p) { int x1, y1, x2, y2; rect().coords(&x1, &y1, &x2, &y2); - QRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - style().drawPrimitive(QStyle::PE_FocusRect, p, r, colorGroup(), - QStyle::Style_Default, colorGroup().button()); + TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); + style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + TQStyle::Style_Default, colorGroup().button()); } } -void PanelButton::drawButtonLabel(QPainter *p) +void PanelButton::drawButtonLabel(TQPainter *p) { - QPixmap icon = labelIcon(); + TQPixmap icon = labelIcon(); bool active = isDown() || isOn(); if (active) @@ -568,7 +568,7 @@ void PanelButton::drawButtonLabel(QPainter *p) int w = width(); int y = (h - icon.height())/2; p->save(); - QFont f = font(); + TQFont f = font(); double fontPercent = m_fontPercent; if (active) @@ -576,12 +576,12 @@ void PanelButton::drawButtonLabel(QPainter *p) fontPercent *= .8; } //f.setPixelSize(KMIN(h, KMAX(int(float(h) * m_fontPercent), 16))); - QFontMetrics fm(f); + TQFontMetrics fm(f); p->setFont(f); /* Draw shadowed text */ - bool reverse = QApplication::reverseLayout(); - QPainter::TextDirection rtl = reverse ? QPainter::RTL : QPainter::LTR; + bool reverse = TQApplication::reverseLayout(); + TQPainter::TextDirection rtl = reverse ? TQPainter::RTL : TQPainter::LTR; if (!reverse && !icon.isNull()) { @@ -592,13 +592,13 @@ void PanelButton::drawButtonLabel(QPainter *p) int tX = reverse ? 3 : icon.width() + KMIN(25, KMAX(5, fm.width('m') / 2)); int tY = fm.ascent() + ((h - fm.height()) / 2); - QColor shadCol = KickerLib::shadowColor(m_textColor); + TQColor shadCol = KickerLib::shadowColor(m_textColor); // get a transparent pixmap - QPainter pixPainter; - QPixmap textPixmap(w, h); + TQPainter pixPainter; + TQPixmap textPixmap(w, h); - textPixmap.fill(QColor(0,0,0)); + textPixmap.fill(TQColor(0,0,0)); textPixmap.setMask(textPixmap.createHeuristicMask(true)); // draw text @@ -619,7 +619,7 @@ void PanelButton::drawButtonLabel(QPainter *p) } // draw shadow - QImage img = s_textShadowEngine->makeShadow(textPixmap, shadCol); + TQImage img = s_textShadowEngine->makeShadow(textPixmap, shadCol); p->drawImage(0, 0, img); p->save(); p->setPen(m_textColor); @@ -642,50 +642,50 @@ void PanelButton::drawButtonLabel(QPainter *p) if (m_drawArrow && (m_highlight || active)) { - QStyle::PrimitiveElement e = QStyle::PE_ArrowUp; - int arrowSize = style().pixelMetric(QStyle::PM_MenuButtonIndicator); - QRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); + TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp; + int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator); + TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); switch (m_arrowDirection) { case KPanelExtension::Top: - e = QStyle::PE_ArrowUp; + e = TQStyle::PE_ArrowUp; break; case KPanelExtension::Bottom: - e = QStyle::PE_ArrowDown; + e = TQStyle::PE_ArrowDown; r.moveBy(0, height() - arrowSize); break; case KPanelExtension::Right: - e = QStyle::PE_ArrowRight; - r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize); + e = TQStyle::PE_ArrowRight; + r = TQRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize); break; case KPanelExtension::Left: - e = QStyle::PE_ArrowLeft; - r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize); + e = TQStyle::PE_ArrowLeft; + r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize); break; case KPanelExtension::Floating: if (orientation() == Horizontal) { - e = QStyle::PE_ArrowDown; + e = TQStyle::PE_ArrowDown; r.moveBy(0, height() - arrowSize); } - else if (QApplication::reverseLayout()) + else if (TQApplication::reverseLayout()) { - e = QStyle::PE_ArrowLeft; - r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize); + e = TQStyle::PE_ArrowLeft; + r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize); } else { - e = QStyle::PE_ArrowRight; - r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize); + e = TQStyle::PE_ArrowRight; + r = TQRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize); } break; } - int flags = QStyle::Style_Enabled; + int flags = TQStyle::Style_Enabled; if (active) { - flags |= QStyle::Style_Down; + flags |= TQStyle::Style_Down; } style().drawPrimitive(e, p, r, colorGroup(), flags); } @@ -704,7 +704,7 @@ int PanelButton::preferredIconSize(int proposed_size) const return -1; // unknown icon size } - QValueList<int> sizes = ith->querySizes(KIcon::Panel); + TQValueList<int> sizes = ith->querySizes(KIcon::Panel); int sz = ith->defaultSize(KIcon::Panel); @@ -723,7 +723,7 @@ int PanelButton::preferredIconSize(int proposed_size) const } //kdDebug()<<endl<<endl<<flush; - QValueListConstIterator<int> i = sizes.constBegin(); + TQValueListConstIterator<int> i = sizes.constBegin(); while (i != sizes.constEnd()) { if ((*i) + (2 * KickerSettings::iconMargin()) > upperLimit) @@ -738,7 +738,7 @@ int PanelButton::preferredIconSize(int proposed_size) const return sz; } -void PanelButton::backedByFile(const QString& localFilePath) +void PanelButton::backedByFile(const TQString& localFilePath) { m_backingFile = localFilePath; @@ -748,16 +748,16 @@ void PanelButton::backedByFile(const QString& localFilePath) } // avoid multiple connections - disconnect(KDirWatch::self(), SIGNAL(deleted(const QString&)), - this, SLOT(checkForDeletion(const QString&))); + disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), + this, TQT_SLOT(checkForDeletion(const TQString&))); if (!KDirWatch::self()->contains(m_backingFile)) { KDirWatch::self()->addFile(m_backingFile); } - connect(KDirWatch::self(), SIGNAL(deleted(const QString&)), - this, SLOT(checkForDeletion(const QString&))); + connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), + this, TQT_SLOT(checkForDeletion(const TQString&))); } @@ -775,27 +775,27 @@ void PanelButton::loadTiles() if (m_tileColor.isValid()) { setBackgroundOrigin(WidgetOrigin); - m_up = m_down = QPixmap(); + m_up = m_down = TQPixmap(); } else if (m_tile.isNull()) { setBackgroundOrigin(AncestorOrigin); - m_up = m_down = QPixmap(); + m_up = m_down = TQPixmap(); } else { setBackgroundOrigin(WidgetOrigin); // If only the tiles were named a bit smarter we wouldn't have // to pass the up or down argument. - m_up = QPixmap(loadTile(m_tile, size(), "up")); - m_down = QPixmap(loadTile(m_tile, size(), "down")); + m_up = TQPixmap(loadTile(m_tile, size(), "up")); + m_down = TQPixmap(loadTile(m_tile, size(), "down")); } } void PanelButton::loadIcons() { KIconLoader * ldr = KGlobal::iconLoader(); - QString nm = m_iconName; + TQString nm = m_iconName; KIcon::States defaultState = isEnabled() ? KIcon::DefaultState : KIcon::DisabledState; m_icon = ldr->loadIcon(nm, KIcon::Panel, m_size, defaultState, 0L, true); @@ -844,8 +844,8 @@ bool PanelButton::calculateIconSize() void PanelButton::updateKickerTip(KickerTip::Data& data) { - data.message = QStyleSheet::escape(title()); - data.subtext = QStyleSheet::escape(QToolTip::textFor(this)); + data.message = TQStyleSheet::escape(title()); + data.subtext = TQStyleSheet::escape(TQToolTip::textFor(this)); data.icon = zoomIcon(); data.direction = popupDirection(); } @@ -854,21 +854,21 @@ void PanelButton::updateKickerTip(KickerTip::Data& data) // PanelPopupButton class // -PanelPopupButton::PanelPopupButton(QWidget *parent, const char *name) +PanelPopupButton::PanelPopupButton(TQWidget *parent, const char *name) : PanelButton(parent, name), m_popup(0), m_pressedDuringPopup(false), m_initialized(false) { - connect(this, SIGNAL(pressed()), SLOT(slotExecMenu())); + connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotExecMenu())); } -void PanelPopupButton::setPopup(QPopupMenu *popup) +void PanelPopupButton::setPopup(TQPopupMenu *popup) { if (m_popup) { m_popup->removeEventFilter(this); - disconnect(m_popup, SIGNAL(aboutToHide()), this, SLOT(menuAboutToHide())); + disconnect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); } m_popup = popup; @@ -877,20 +877,20 @@ void PanelPopupButton::setPopup(QPopupMenu *popup) if (m_popup) { m_popup->installEventFilter(this); - connect(m_popup, SIGNAL(aboutToHide()), this, SLOT(menuAboutToHide())); + connect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); } } -QPopupMenu *PanelPopupButton::popup() const +TQPopupMenu *PanelPopupButton::popup() const { return m_popup; } -bool PanelPopupButton::eventFilter(QObject *, QEvent *e) +bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) { - if (e->type() == QEvent::MouseMove) + if (e->type() == TQEvent::MouseMove) { - QMouseEvent *me = static_cast<QMouseEvent *>(e); + TQMouseEvent *me = static_cast<TQMouseEvent *>(e); if (rect().contains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) @@ -899,19 +899,19 @@ bool PanelPopupButton::eventFilter(QObject *, QEvent *e) return true; } } - else if (e->type() == QEvent::MouseButtonPress || - e->type() == QEvent::MouseButtonDblClick) + else if (e->type() == TQEvent::MouseButtonPress || + e->type() == TQEvent::MouseButtonDblClick) { - QMouseEvent *me = static_cast<QMouseEvent *>(e); + TQMouseEvent *me = static_cast<TQMouseEvent *>(e); if (rect().contains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; return true; } } - else if (e->type() == QEvent::MouseButtonRelease) + else if (e->type() == TQEvent::MouseButtonRelease) { - QMouseEvent *me = static_cast<QMouseEvent *>(e); + TQMouseEvent *me = static_cast<TQMouseEvent *>(e); if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index f71865c77..5a7b6d197 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <algorithm> -#include <qbutton.h> +#include <tqbutton.h> #include <kpanelapplet.h> #include <kpanelextension.h> @@ -40,10 +40,10 @@ class KShadowEngine; /** * PanelButton is the base class for all buttons to be - * placed in Kicker's panels. It inherits QButton, and + * placed in Kicker's panels. It inherits TQButton, and * KickerTip::Client. */ -class KDE_EXPORT PanelButton: public QButton, public KickerTip::Client +class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client { Q_OBJECT @@ -53,7 +53,7 @@ public: * @param parent the parent widget * @param name the widget's name */ - PanelButton( QWidget* parent, const char* name ); + PanelButton( TQWidget* parent, const char* name ); /** * Configures this button according to the user's preferences for @@ -90,12 +90,12 @@ public: /** * @return the button's current icon */ - virtual const QPixmap& labelIcon() const; + virtual const TQPixmap& labelIcon() const; /** * @return the button's zoom icon */ - virtual const QPixmap& zoomIcon() const; + virtual const TQPixmap& zoomIcon() const; /** * @return true if this button is valid. @@ -106,12 +106,12 @@ public: * Changes the title for the panel button. * @param t the button's title */ - void setTitle(const QString& t); + void setTitle(const TQString& t); /** * @return the title of the button. */ - QString title() const; + TQString title() const; /** * Changes the name of the panel button's tile, with @@ -119,7 +119,7 @@ public: * @param tile the button's tile name * @param color the button's tile color */ - void setTile(const QString& tile, const QColor& color = QColor()); + void setTile(const TQString& tile, const TQColor& color = TQColor()); /** * Set to true to draw an arrow on the button. @@ -130,12 +130,12 @@ public: * Used to set the icon for this panel button. * @param icon the path to the button's icon */ - void setIcon(const QString& icon); + void setIcon(const TQString& icon); /** * @return the button's icon */ - QString icon() const; + TQString icon() const; /** * @return whether this button has a text label or not @@ -146,23 +146,23 @@ public: * Change the button's text label * @param text text for button's label */ - void setButtonText(const QString& text); + void setButtonText(const TQString& text); /** * @return button's text label */ - QString buttonText() const; + TQString buttonText() const; /** * Change the button's text label color * @param c the new text label color */ - void setTextColor(const QColor& c); + void setTextColor(const TQColor& c); /** * @return the button's text label color */ - QColor textColor() const; + TQColor textColor() const; /** * Change the button's text scale @@ -188,7 +188,7 @@ public: /** * @return global position of the center of the button */ - QPoint center() const; + TQPoint center() const; /** * Used to load the graphical tile of the button @@ -196,8 +196,8 @@ public: * @param size size of the tile * @param state used if button has multiple states (null by default) */ - static QImage loadTile(const QString& name, const QSize&, - const QString& state = QString::null); + static TQImage loadTile(const TQString& name, const TQSize&, + const TQString& state = TQString::null); /** * Update the contents of the button's KickerTip @@ -233,12 +233,12 @@ signals: /** * Emitted when button initiates a drag */ - void dragme(const QPixmap); + void dragme(const TQPixmap); /** * Overloads dragme to support panel button's with a list of KURL's ([url/servicemenu/browser]button) */ - void dragme(const KURL::List, const QPixmap); + void dragme(const KURL::List, const TQPixmap); public slots: /** @@ -263,12 +263,12 @@ protected: * to the subclass, should not be i18n'd and is never made user visible. * KDE4: remove this and use the classname directly instead. */ - virtual QString tileName() = 0; + virtual TQString tileName() = 0; /** * @return the default icon for the button */ - virtual QString defaultIcon() const { return "unknown"; }; + virtual TQString defaultIcon() const { return "unknown"; }; /** * Called right before drag occurs. @@ -277,22 +277,22 @@ protected: /** * Emits a signal to drag the button. Reimplement this if, for example, - * if you need the button to call dragme(KURL::List, const QPixmap) - * instead of dragme(const QPixmap) + * if you need the button to call dragme(KURL::List, const TQPixmap) + * instead of dragme(const TQPixmap) */ virtual void startDrag(); - virtual void enterEvent(QEvent *); - virtual void leaveEvent(QEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); - virtual void dragLeaveEvent(QDragLeaveEvent *); - virtual void dropEvent(QDropEvent *); - virtual void mouseMoveEvent(QMouseEvent *); - virtual void mousePressEvent(QMouseEvent *); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void resizeEvent(QResizeEvent*); - virtual void drawButton(QPainter *); - virtual void drawButtonLabel(QPainter *); + virtual void enterEvent(TQEvent *); + virtual void leaveEvent(TQEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); + virtual void dragLeaveEvent(TQDragLeaveEvent *); + virtual void dropEvent(TQDropEvent *); + virtual void mouseMoveEvent(TQMouseEvent *); + virtual void mousePressEvent(TQMouseEvent *); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void resizeEvent(TQResizeEvent*); + virtual void drawButton(TQPainter *); + virtual void drawButtonLabel(TQPainter *); /** * @return the preferred icon size. @@ -320,7 +320,7 @@ protected: * Set the file backing this button (See @ref checkForBackingFile()), * you shouldn't need to use this, currently it's only used in [url/service]button */ - void backedByFile(const QString& localFilePath); + void backedByFile(const TQString& localFilePath); /** * Sets the button's arrow direction. @@ -344,7 +344,7 @@ protected: bool calculateIconSize(); bool m_valid; - QPixmap m_icon; + TQPixmap m_icon; protected slots: /** @@ -364,7 +364,7 @@ protected slots: * has been deleted. * @param path path to backing file */ - void checkForDeletion(const QString& path); + void checkForDeletion(const TQString& path); /** * Called to prepare the button for removal from the Kicker @@ -372,23 +372,23 @@ protected slots: void scheduleForRemoval(); private: - QPoint m_lastLeftMouseButtonPress; + TQPoint m_lastLeftMouseButtonPress; bool m_isLeftMouseButtonDown; bool m_drawArrow; bool m_highlight; bool m_changeCursorOverItem; bool m_hasAcceptedDrag; - QColor m_textColor; - QColor m_tileColor; - QString m_buttonText; - QString m_tile; - QString m_title; - QString m_iconName; - QString m_backingFile; - QPixmap m_up; - QPixmap m_down; - QPixmap m_iconh; // hover - QPixmap m_iconz; // mouse over + TQColor m_textColor; + TQColor m_tileColor; + TQString m_buttonText; + TQString m_tile; + TQString m_title; + TQString m_iconName; + TQString m_backingFile; + TQPixmap m_up; + TQPixmap m_down; + TQPixmap m_iconh; // hover + TQPixmap m_iconz; // mouse over KPanelExtension::Position m_arrowDirection; KPanelApplet::Direction m_popupDirection; Orientation m_orientation; @@ -413,20 +413,20 @@ public: * @param parent the parent widget * @param name the widget's name */ - PanelPopupButton(QWidget *parent=0, const char *name=0); + PanelPopupButton(TQWidget *parent=0, const char *name=0); /** * Sets the button's popup menu. * @param popup the menu to pop up */ - void setPopup(QPopupMenu *popup); + void setPopup(TQPopupMenu *popup); /** * @return the button's popup menu */ - QPopupMenu *popup() const; + TQPopupMenu *popup() const; - bool eventFilter(QObject *, QEvent *); + bool eventFilter(TQObject *, TQEvent *); virtual void showMenu(); protected: @@ -460,7 +460,7 @@ private slots: void menuAboutToHide(); private: - QPopupMenu *m_popup; + TQPopupMenu *m_popup; bool m_pressedDuringPopup; bool m_initialized; diff --git a/kicker/libkicker/paneldrag.cpp b/kicker/libkicker/paneldrag.cpp index 871ac1d96..1fb6b9ce6 100644 --- a/kicker/libkicker/paneldrag.cpp +++ b/kicker/libkicker/paneldrag.cpp @@ -24,14 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <sys/types.h> #include <unistd.h> -#include <qbuffer.h> +#include <tqbuffer.h> #include "paneldrag.h" #define PANELDRAG_BUFSIZE sizeof(BaseContainer*) + sizeof(pid_t) -PanelDrag::PanelDrag(BaseContainer* container, QWidget* dragSource) - : QDragObject(dragSource, 0) +PanelDrag::PanelDrag(BaseContainer* container, TQWidget* dragSource) + : TQDragObject(dragSource, 0) { pid_t source_pid = getpid(); @@ -44,9 +44,9 @@ PanelDrag::~PanelDrag() { } -bool PanelDrag::decode(const QMimeSource* e, BaseContainer** container) +bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container) { - QByteArray a = e->encodedData("application/basecontainerptr"); + TQByteArray a = e->encodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { @@ -55,25 +55,25 @@ bool PanelDrag::decode(const QMimeSource* e, BaseContainer** container) pid_t target_pid = getpid(); pid_t source_pid; - memcpy(&source_pid, a.data() + sizeof(QObject*), sizeof(pid_t)); + memcpy(&source_pid, a.data() + sizeof(TQObject*), sizeof(pid_t)); if (source_pid == target_pid) { - memcpy(container, a.data(), sizeof(QObject*)); + memcpy(container, a.data(), sizeof(TQObject*)); return true; } return false; } -bool PanelDrag::canDecode(const QMimeSource *e) +bool PanelDrag::canDecode(const TQMimeSource *e) { if (!e->provides("application/basecontainerptr")) { return false; } - QByteArray a = e->encodedData("application/basecontainerptr"); + TQByteArray a = e->encodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { return false; @@ -91,15 +91,15 @@ bool PanelDrag::canDecode(const QMimeSource *e) return true; } -QByteArray PanelDrag::encodedData(const char * mimeType) const +TQByteArray PanelDrag::encodedData(const char * mimeType) const { - if (QString("application/basecontainerptr") == mimeType && + if (TQString("application/basecontainerptr") == mimeType && a.size() == PANELDRAG_BUFSIZE) { return a; } - return QByteArray(); + return TQByteArray(); } const char * PanelDrag::format(int i) const @@ -113,12 +113,12 @@ const char * PanelDrag::format(int i) const } -AppletInfoDrag::AppletInfoDrag(const AppletInfo& info, QWidget *dragSource) - : QDragObject(dragSource, 0) +AppletInfoDrag::AppletInfoDrag(const AppletInfo& info, TQWidget *dragSource) + : TQDragObject(dragSource, 0) { - QBuffer buff(a); + TQBuffer buff(a); buff.open(IO_WriteOnly); - QDataStream s(&buff); + TQDataStream s(&buff); s << info.desktopFile() << info.configFile() << info.type(); } @@ -136,17 +136,17 @@ const char * AppletInfoDrag::format(int i) const return 0; } -QByteArray AppletInfoDrag::encodedData(const char* mimeType) const +TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const { - if (QString("application/appletinfo") == mimeType) + if (TQString("application/appletinfo") == mimeType) { return a; } - return QByteArray(); + return TQByteArray(); } -bool AppletInfoDrag::canDecode(const QMimeSource * e) +bool AppletInfoDrag::canDecode(const TQMimeSource * e) { if (!e->provides("application/appletinfo")) { @@ -156,21 +156,21 @@ bool AppletInfoDrag::canDecode(const QMimeSource * e) return true; } -bool AppletInfoDrag::decode(const QMimeSource* e, AppletInfo& container) +bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container) { - QByteArray a = e->encodedData("application/appletinfo"); + TQByteArray a = e->encodedData("application/appletinfo"); if (a.isEmpty()) { return false; } - QBuffer buff(a); + TQBuffer buff(a); buff.open(IO_ReadOnly); - QDataStream s(&buff); + TQDataStream s(&buff); - QString desktopFile; - QString configFile; + TQString desktopFile; + TQString configFile; int type; s >> desktopFile >> configFile >> type; AppletInfo info(desktopFile, configFile, (AppletInfo::AppletType)type); diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h index ba85ad375..3d7cbf858 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _paneldrag_h_ #define _paneldrag_h_ -#include <qdragobject.h> +#include <tqdragobject.h> #include <kdemacros.h> @@ -35,33 +35,33 @@ class BaseContainer; class KDE_EXPORT PanelDrag : public QDragObject { public: - PanelDrag(BaseContainer* container, QWidget *dragSource); + PanelDrag(BaseContainer* container, TQWidget *dragSource); ~PanelDrag(); virtual const char * format(int i = 0) const; - virtual QByteArray encodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; - static bool canDecode(const QMimeSource * e); - static bool decode(const QMimeSource* e, BaseContainer** container); + static bool canDecode(const TQMimeSource * e); + static bool decode(const TQMimeSource* e, BaseContainer** container); private: - QByteArray a; + TQByteArray a; }; class KDE_EXPORT AppletInfoDrag : public QDragObject { public: - AppletInfoDrag(const AppletInfo& container, QWidget *dragSource); + AppletInfoDrag(const AppletInfo& container, TQWidget *dragSource); ~AppletInfoDrag(); virtual const char * format(int i = 0) const; - virtual QByteArray encodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; - static bool canDecode(const QMimeSource * e); - static bool decode(const QMimeSource* e, AppletInfo& container); + static bool canDecode(const TQMimeSource * e); + static bool decode(const TQMimeSource* e, AppletInfo& container); private: - QByteArray a; + TQByteArray a; }; #endif diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index 43dd67a41..7d11a429e 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlayout.h> -#include <qtooltip.h> -#include <qtimer.h> -#include <qpainter.h> -#include <qstyle.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqtimer.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <kglobal.h> #include <klocale.h> @@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "panner.h" #include "panner.moc" -Panner::Panner( QWidget* parent, const char* name ) - : QWidget( parent, name ), +Panner::Panner( TQWidget* parent, const char* name ) + : TQWidget( parent, name ), _luSB(0), _rdSB(0), _cwidth(0), _cheight(0), @@ -45,17 +45,17 @@ Panner::Panner( QWidget* parent, const char* name ) KGlobal::locale()->insertCatalogue("libkicker"); setBackgroundOrigin( AncestorOrigin ); - _updateScrollButtonsTimer = new QTimer(this); - connect(_updateScrollButtonsTimer, SIGNAL(timeout()), this, SLOT(reallyUpdateScrollButtons())); + _updateScrollButtonsTimer = new TQTimer(this); + connect(_updateScrollButtonsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reallyUpdateScrollButtons())); - _clipper = new QWidget(this); + _clipper = new TQWidget(this); _clipper->setBackgroundOrigin(AncestorOrigin); _clipper->installEventFilter( this ); - _viewport = new QWidget(_clipper); + _viewport = new TQWidget(_clipper); _viewport->setBackgroundOrigin(AncestorOrigin); // layout - _layout = new QBoxLayout(this, QBoxLayout::LeftToRight); + _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); _layout->addWidget(_clipper, 1); setOrientation(Horizontal); } @@ -78,8 +78,8 @@ void Panner::createScrollButtons() _luSB->setMinimumSize(12, 12); _luSB->hide(); _layout->addWidget(_luSB); - connect(_luSB, SIGNAL(pressed()), SLOT(startScrollLeftUp())); - connect(_luSB, SIGNAL(released()), SLOT(stopScroll())); + connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp())); + connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); // right/down scroll button _rdSB = new SimpleArrowButton(this); @@ -88,8 +88,8 @@ void Panner::createScrollButtons() _rdSB->setMinimumSize(12, 12); _rdSB->hide(); _layout->addWidget(_rdSB); - connect(_rdSB, SIGNAL(pressed()), SLOT(startScrollRightDown())); - connect(_rdSB, SIGNAL(released()), SLOT(stopScroll())); + connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown())); + connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); // set up the buttons setupButtons(); @@ -103,13 +103,13 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::LeftArrow); _rdSB->setArrowType(Qt::RightArrow); - _luSB->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding)); - _rdSB->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding)); - QToolTip::add(_luSB, i18n("Scroll left")); - QToolTip::add(_rdSB, i18n("Scroll right")); + _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + TQToolTip::add(_luSB, i18n("Scroll left")); + TQToolTip::add(_rdSB, i18n("Scroll right")); setMinimumSize(24, 0); } - _layout->setDirection(QBoxLayout::LeftToRight); + _layout->setDirection(TQBoxLayout::LeftToRight); } else { @@ -117,13 +117,13 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::UpArrow); _rdSB->setArrowType(Qt::DownArrow); - _luSB->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); - _rdSB->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); - QToolTip::add(_luSB, i18n("Scroll up")); - QToolTip::add(_rdSB, i18n("Scroll down")); + _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + TQToolTip::add(_luSB, i18n("Scroll up")); + TQToolTip::add(_rdSB, i18n("Scroll down")); setMinimumSize(0, 24); } - _layout->setDirection(QBoxLayout::TopToBottom); + _layout->setDirection(TQBoxLayout::TopToBottom); } if (isVisible()) @@ -141,9 +141,9 @@ void Panner::setOrientation(Orientation o) reallyUpdateScrollButtons(); } -void Panner::resizeEvent( QResizeEvent* ) +void Panner::resizeEvent( TQResizeEvent* ) { - //QScrollView::resizeEvent( e ); + //TQScrollView::resizeEvent( e ); //updateScrollButtons(); } @@ -169,8 +169,8 @@ void Panner::scrollLeftUp() void Panner::startScrollRightDown() { - _scrollTimer = new QTimer(this); - connect(_scrollTimer, SIGNAL(timeout()), SLOT(scrollRightDown())); + _scrollTimer = new TQTimer(this); + connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollRightDown())); _scrollTimer->start(50); _step = 8; scrollRightDown(); @@ -178,8 +178,8 @@ void Panner::startScrollRightDown() void Panner::startScrollLeftUp() { - _scrollTimer = new QTimer(this); - connect(_scrollTimer, SIGNAL(timeout()), SLOT(scrollLeftUp())); + _scrollTimer = new TQTimer(this); + connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollLeftUp())); _scrollTimer->start(50); _step = 8; scrollLeftUp(); @@ -258,26 +258,26 @@ void Panner::resizeContents( int w, int h ) updateScrollButtons(); } -QPoint Panner::contentsToViewport( const QPoint& p ) const +TQPoint Panner::contentsToViewport( const TQPoint& p ) const { - return QPoint(p.x() - contentsX() - _clipper->x(), p.y() - contentsY() - _clipper->y()); + return TQPoint(p.x() - contentsX() - _clipper->x(), p.y() - contentsY() - _clipper->y()); } -QPoint Panner::viewportToContents( const QPoint& vp ) const +TQPoint Panner::viewportToContents( const TQPoint& vp ) const { - return QPoint(vp.x() + contentsX() + _clipper->x(), vp.y() + contentsY() + _clipper->y()); + return TQPoint(vp.x() + contentsX() + _clipper->x(), vp.y() + contentsY() + _clipper->y()); } void Panner::contentsToViewport( int x, int y, int& vx, int& vy ) const { - const QPoint v = contentsToViewport(QPoint(x,y)); + const TQPoint v = contentsToViewport(TQPoint(x,y)); vx = v.x(); vy = v.y(); } void Panner::viewportToContents( int vx, int vy, int& x, int& y ) const { - const QPoint c = viewportToContents(QPoint(vx,vy)); + const TQPoint c = viewportToContents(TQPoint(vx,vy)); x = c.x(); y = c.y(); } @@ -334,33 +334,33 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin ) setContentsPos( -cx, -cy ); } -bool Panner::eventFilter( QObject *obj, QEvent *e ) +bool Panner::eventFilter( TQObject *obj, TQEvent *e ) { if ( obj == _viewport || obj == _clipper ) { switch ( e->type() ) { - case QEvent::Resize: - viewportResizeEvent((QResizeEvent *)e); + case TQEvent::Resize: + viewportResizeEvent((TQResizeEvent *)e); break; - case QEvent::MouseButtonPress: - viewportMousePressEvent( (QMouseEvent*)e ); - if ( ((QMouseEvent*)e)->isAccepted() ) + case TQEvent::MouseButtonPress: + viewportMousePressEvent( (TQMouseEvent*)e ); + if ( ((TQMouseEvent*)e)->isAccepted() ) return true; break; - case QEvent::MouseButtonRelease: - viewportMouseReleaseEvent( (QMouseEvent*)e ); - if ( ((QMouseEvent*)e)->isAccepted() ) + case TQEvent::MouseButtonRelease: + viewportMouseReleaseEvent( (TQMouseEvent*)e ); + if ( ((TQMouseEvent*)e)->isAccepted() ) return true; break; - case QEvent::MouseButtonDblClick: - viewportMouseDoubleClickEvent( (QMouseEvent*)e ); - if ( ((QMouseEvent*)e)->isAccepted() ) + case TQEvent::MouseButtonDblClick: + viewportMouseDoubleClickEvent( (TQMouseEvent*)e ); + if ( ((TQMouseEvent*)e)->isAccepted() ) return true; break; - case QEvent::MouseMove: - viewportMouseMoveEvent( (QMouseEvent*)e ); - if ( ((QMouseEvent*)e)->isAccepted() ) + case TQEvent::MouseMove: + viewportMouseMoveEvent( (TQMouseEvent*)e ); + if ( ((TQMouseEvent*)e)->isAccepted() ) return true; break; default: @@ -368,29 +368,29 @@ bool Panner::eventFilter( QObject *obj, QEvent *e ) } } - return QWidget::eventFilter( obj, e ); // always continue with standard event processing + return TQWidget::eventFilter( obj, e ); // always continue with standard event processing } -void Panner::viewportResizeEvent( QResizeEvent* ) +void Panner::viewportResizeEvent( TQResizeEvent* ) { } -void Panner::viewportMousePressEvent( QMouseEvent* e) +void Panner::viewportMousePressEvent( TQMouseEvent* e) { e->ignore(); } -void Panner::viewportMouseReleaseEvent( QMouseEvent* e ) +void Panner::viewportMouseReleaseEvent( TQMouseEvent* e ) { e->ignore(); } -void Panner::viewportMouseDoubleClickEvent( QMouseEvent* e ) +void Panner::viewportMouseDoubleClickEvent( TQMouseEvent* e ) { e->ignore(); } -void Panner::viewportMouseMoveEvent( QMouseEvent* e ) +void Panner::viewportMouseMoveEvent( TQMouseEvent* e ) { e->ignore(); } diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 6657c9a76..ee1bc026a 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __panner_h__ #define __panner_h__ -#include <qwidget.h> +#include <tqwidget.h> #include "simplebutton.h" @@ -36,17 +36,17 @@ class KDE_EXPORT Panner : public QWidget Q_OBJECT public: - Panner( QWidget* parent, const char* name = 0 ); + Panner( TQWidget* parent, const char* name = 0 ); ~Panner(); - QSize minimumSizeHint() const { return QWidget::minimumSizeHint(); } + TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); } Qt::Orientation orientation() const { return _orient; } virtual void setOrientation(Orientation orientation); - QWidget *viewport() const { return _viewport; } + TQWidget *viewport() const { return _viewport; } - QRect contentsRect() const { return QRect(0, 0, width(), height()); } + 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; } @@ -59,14 +59,14 @@ public: void contentsToViewport( int x, int y, int& vx, int& vy ) const; void viewportToContents( int vx, int vy, int& x, int& y ) const; - QPoint contentsToViewport( const QPoint& ) const; - QPoint viewportToContents( const QPoint& ) const; + QPoint contentsToViewport( const TQPoint& ) const; + QPoint viewportToContents( const TQPoint& ) const; - void addChild(QWidget *child) { child->show(); } - void removeChild(QWidget *child) { child->hide(); } - int childX(QWidget *child) const { return child->x(); } - int childY(QWidget *child) const { return child->y(); } - void moveChild(QWidget *child, int x, int y) { child->move(x, y); } + void addChild(TQWidget *child) { child->show(); } + void removeChild(TQWidget *child) { child->hide(); } + int childX(TQWidget *child) const { return child->x(); } + int childY(TQWidget *child) const { return child->y(); } + void moveChild(TQWidget *child, int x, int y) { child->move(x, y); } void ensureVisible( int x, int y ); void ensureVisible( int x, int y, int xmargin, int ymargin ); @@ -85,13 +85,13 @@ signals: void contentsMoving(int x, int y); protected: - virtual bool eventFilter( QObject *obj, QEvent *e ); - virtual void resizeEvent(QResizeEvent *ev); - virtual void viewportResizeEvent( QResizeEvent* ); - virtual void viewportMousePressEvent( QMouseEvent* ); - virtual void viewportMouseReleaseEvent( QMouseEvent* ); - virtual void viewportMouseDoubleClickEvent( QMouseEvent* ); - virtual void viewportMouseMoveEvent( QMouseEvent* ); + virtual bool eventFilter( TQObject *obj, TQEvent *e ); + virtual void resizeEvent(TQResizeEvent *ev); + virtual void viewportResizeEvent( TQResizeEvent* ); + virtual void viewportMousePressEvent( TQMouseEvent* ); + virtual void viewportMouseReleaseEvent( TQMouseEvent* ); + virtual void viewportMouseDoubleClickEvent( TQMouseEvent* ); + virtual void viewportMouseMoveEvent( TQMouseEvent* ); private: void setupButtons(); @@ -99,14 +99,14 @@ private: void updateScrollButtons(); Orientation _orient; - QBoxLayout *_layout; + TQBoxLayout *_layout; SimpleArrowButton *_luSB; // Left Scroll Button SimpleArrowButton *_rdSB; // Right Scroll Button - QTimer *_updateScrollButtonsTimer; - QTimer *_scrollTimer; + TQTimer *_updateScrollButtonsTimer; + TQTimer *_scrollTimer; - QWidget *_clipper; - QWidget *_viewport; + TQWidget *_clipper; + TQWidget *_viewport; int _cwidth, _cheight; int _cx, _cy; int _step; diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 223e71982..4c28b2101 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -20,8 +20,8 @@ #include "simplebutton.h" -#include <qpainter.h> -#include <qstyle.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <kapplication.h> #include <kcursor.h> @@ -34,17 +34,17 @@ #define BUTTON_MARGIN KDialog::spacingHint() -SimpleButton::SimpleButton(QWidget *parent, const char *name) - : QButton(parent, name), +SimpleButton::SimpleButton(TQWidget *parent, const char *name) + : TQButton(parent, name), m_highlight(false), m_orientation(Qt::Horizontal) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, SIGNAL( settingsChanged( int ) ), - SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, SIGNAL( iconChanged( int ) ), - SLOT( slotIconChanged( int ) ) ); + connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), + TQT_SLOT( slotSettingsChanged( int ) ) ); + connect( kapp, TQT_SIGNAL( iconChanged( int ) ), + TQT_SLOT( slotIconChanged( int ) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); @@ -52,9 +52,9 @@ SimpleButton::SimpleButton(QWidget *parent, const char *name) slotSettingsChanged( KApplication::SETTINGS_MOUSE ); } -void SimpleButton::setPixmap(const QPixmap &pix) +void SimpleButton::setPixmap(const TQPixmap &pix) { - QButton::setPixmap(pix); + TQButton::setPixmap(pix); generateIcons(); update(); } @@ -65,39 +65,39 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -QSize SimpleButton::sizeHint() const +TQSize SimpleButton::sizeHint() const { - const QPixmap* pm = pixmap(); + const TQPixmap* pm = pixmap(); if (!pm) - return QButton::sizeHint(); + return TQButton::sizeHint(); else - return QSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN); + return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN); } -QSize SimpleButton::minimumSizeHint() const +TQSize SimpleButton::minimumSizeHint() const { - const QPixmap* pm = pixmap(); + const TQPixmap* pm = pixmap(); if (!pm) - return QButton::minimumSizeHint(); + return TQButton::minimumSizeHint(); else - return QSize(pm->width(), pm->height()); + return TQSize(pm->width(), pm->height()); } -void SimpleButton::drawButton( QPainter *p ) +void SimpleButton::drawButton( TQPainter *p ) { drawButtonLabel(p); } -void SimpleButton::drawButtonLabel( QPainter *p ) +void SimpleButton::drawButtonLabel( TQPainter *p ) { if (!pixmap()) { return; } - QPixmap pix = isEnabled() ? (m_highlight? m_activeIcon : m_normalIcon) : m_disabledIcon; + TQPixmap pix = isEnabled() ? (m_highlight? m_activeIcon : m_normalIcon) : m_disabledIcon; if (isOn() || isDown()) { @@ -110,7 +110,7 @@ void SimpleButton::drawButtonLabel( QPainter *p ) int ph = pix.height(); int pw = pix.width(); int margin = BUTTON_MARGIN; - QPoint origin(margin / 2, margin / 2); + TQPoint origin(margin / 2, margin / 2); if (ph < (h - margin)) { @@ -132,7 +132,7 @@ void SimpleButton::generateIcons() return; } - QImage image = pixmap()->convertToImage(); + TQImage image = pixmap()->convertToImage(); KIconEffect effect; m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState); @@ -172,29 +172,29 @@ void SimpleButton::slotIconChanged( int group ) update(); } -void SimpleButton::enterEvent( QEvent *e ) +void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; repaint( false ); - QButton::enterEvent( e ); + TQButton::enterEvent( e ); } -void SimpleButton::leaveEvent( QEvent *e ) +void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; repaint( false ); - QButton::enterEvent( e ); + TQButton::enterEvent( e ); } -void SimpleButton::resizeEvent( QResizeEvent * ) +void SimpleButton::resizeEvent( TQResizeEvent * ) { generateIcons(); } -SimpleArrowButton::SimpleArrowButton(QWidget *parent, Qt::ArrowType arrow, const char *name) +SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name) : SimpleButton(parent, name) { setBackgroundOrigin(AncestorOrigin); @@ -202,9 +202,9 @@ SimpleArrowButton::SimpleArrowButton(QWidget *parent, Qt::ArrowType arrow, const _inside = false; } -QSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::sizeHint() const { - return QSize( 12, 12 ); + return TQSize( 12, 12 ); } void SimpleArrowButton::setArrowType(Qt::ArrowType a) @@ -221,32 +221,32 @@ Qt::ArrowType SimpleArrowButton::arrowType() const return _arrow; } -void SimpleArrowButton::drawButton( QPainter *p ) +void SimpleArrowButton::drawButton( TQPainter *p ) { - QRect r(1, 1, width() - 2, height() - 2); + TQRect r(1, 1, width() - 2, height() - 2); - QStyle::PrimitiveElement pe = QStyle::PE_ArrowLeft; + TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft; switch (_arrow) { - case Qt::LeftArrow: pe = QStyle::PE_ArrowLeft; break; - case Qt::RightArrow: pe = QStyle::PE_ArrowRight; break; - case Qt::UpArrow: pe = QStyle::PE_ArrowUp; break; - case Qt::DownArrow: pe = QStyle::PE_ArrowDown; break; + case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; + case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break; + case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break; + case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break; } - int flags = QStyle::Style_Default | QStyle::Style_Enabled; - if (isDown() || isOn()) flags |= QStyle::Style_Down; + int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; + if (isDown() || isOn()) flags |= TQStyle::Style_Down; style().drawPrimitive(pe, p, r, colorGroup(), flags); } -void SimpleArrowButton::enterEvent( QEvent *e ) +void SimpleArrowButton::enterEvent( TQEvent *e ) { _inside = true; SimpleButton::enterEvent( e ); update(); } -void SimpleArrowButton::leaveEvent( QEvent *e ) +void SimpleArrowButton::leaveEvent( TQEvent *e ) { _inside = false; SimpleButton::enterEvent( e ); diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index 5423dff6b..1ea5c7a44 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -21,8 +21,8 @@ #ifndef SIMPLEBUTTON_H #define SIMPLEBUTTON_H -#include <qbutton.h> -#include <qpixmap.h> +#include <tqbutton.h> +#include <tqpixmap.h> #include <kdemacros.h> @@ -31,20 +31,20 @@ class KDE_EXPORT SimpleButton : public QButton Q_OBJECT public: - SimpleButton(QWidget *parent, const char *name = 0); - void setPixmap(const QPixmap &pix); + SimpleButton(TQWidget *parent, const char *name = 0); + void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: - void drawButton( QPainter *p ); - void drawButtonLabel( QPainter *p ); + void drawButton( TQPainter *p ); + void drawButtonLabel( TQPainter *p ); void generateIcons(); - void enterEvent( QEvent *e ); - void leaveEvent( QEvent *e ); - void resizeEvent( QResizeEvent *e ); + void enterEvent( TQEvent *e ); + void leaveEvent( TQEvent *e ); + void resizeEvent( TQResizeEvent *e ); protected slots: virtual void slotSettingsChanged( int category ); @@ -52,9 +52,9 @@ class KDE_EXPORT SimpleButton : public QButton private: bool m_highlight; - QPixmap m_normalIcon; - QPixmap m_activeIcon; - QPixmap m_disabledIcon; + TQPixmap m_normalIcon; + TQPixmap m_activeIcon; + TQPixmap m_disabledIcon; Qt::Orientation m_orientation; class SimpleButtonPrivate; SimpleButtonPrivate* d; @@ -65,14 +65,14 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton Q_OBJECT public: - SimpleArrowButton(QWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - QSize sizeHint() const; + TQSize sizeHint() const; protected: - virtual void enterEvent( QEvent *e ); - virtual void leaveEvent( QEvent *e ); - virtual void drawButton(QPainter *p); + virtual void enterEvent( TQEvent *e ); + virtual void leaveEvent( TQEvent *e ); + virtual void drawButton(TQPainter *p); Qt::ArrowType arrowType() const; public slots: diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp index fc3ae12a6..24020e0c2 100644 --- a/kicker/menuext/find/findmenu.cpp +++ b/kicker/menuext/find/findmenu.cpp @@ -31,8 +31,8 @@ K_EXPORT_KICKER_MENUEXT( find, FindMenu ) -FindMenu::FindMenu( QWidget *parent, const char *name, - const QStringList &/*args*/) +FindMenu::FindMenu( TQWidget *parent, const char *name, + const TQStringList &/*args*/) : KPanelMenu( "", parent, name ) { } @@ -44,19 +44,19 @@ FindMenu::~FindMenu() void FindMenu::initialize() { - QStringList list = KGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true ); + TQStringList list = KGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true ); list.sort(); int id = 0; mConfigList.clear(); - for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { + for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { KSimpleConfig config( *it, true ); config.setDesktopGroup(); mConfigList.append( *it ); - QString text = config.readEntry( "Name" ); + TQString text = config.readEntry( "Name" ); insertItem( SmallIconSet( config.readEntry( "Icon" ) ), text, id ); id++; @@ -65,7 +65,7 @@ void FindMenu::initialize() void FindMenu::slotExec( int pos ) { - QString app = mConfigList[ pos ]; + TQString app = mConfigList[ pos ]; kapp->propagateSessionManager(); diff --git a/kicker/menuext/find/findmenu.h b/kicker/menuext/find/findmenu.h index 2297c4dff..09bd06aca 100644 --- a/kicker/menuext/find/findmenu.h +++ b/kicker/menuext/find/findmenu.h @@ -33,7 +33,7 @@ class FindMenu : public KPanelMenu Q_OBJECT public: - FindMenu( QWidget* parent, const char* name, const QStringList &/*args*/ ); + FindMenu( TQWidget* parent, const char* name, const TQStringList &/*args*/ ); ~FindMenu(); protected slots: @@ -41,7 +41,7 @@ class FindMenu : public KPanelMenu void slotExec( int ); private: - QStringList mConfigList; + TQStringList mConfigList; }; #endif diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 63cee8106..584a345aa 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -32,18 +32,18 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> -#include <qvalidator.h> +#include <tqvalidator.h> -class Validator : public QValidator { +class Validator : public TQValidator { public: - Validator( QObject *parent ) : QValidator( parent, 0 ) {} + Validator( TQObject *parent ) : TQValidator( parent, 0 ) {} ~Validator() {} - virtual QValidator::State validate( QString &, int & ) const { return QValidator::Acceptable; } + virtual TQValidator::State validate( TQString &, int & ) const { return TQValidator::Acceptable; } }; K_EXPORT_KICKER_MENUEXT(kate, KateSessionMenu) -KateSessionMenu::KateSessionMenu( QWidget *parent, const char *name, const QStringList& ) +KateSessionMenu::KateSessionMenu( TQWidget *parent, const char *name, const TQStringList& ) : KPanelMenu( parent, name ), m_parent( parent ) { @@ -76,8 +76,8 @@ void KateSessionMenu::initialize() insertSeparator(); - QStringList list = KGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true); - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) + TQStringList list = KGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true); + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig config( *it, true ); config.setGroup( "General" ); @@ -86,14 +86,14 @@ void KateSessionMenu::initialize() m_sessions.sort(); - for ( QStringList::ConstIterator it1 = m_sessions.begin(); it1 != m_sessions.end(); ++it1 ) + for ( TQStringList::ConstIterator it1 = m_sessions.begin(); it1 != m_sessions.end(); ++it1 ) { insertItem( *it1, id++ ); } // means for updating, to let the user manually update if he/she added new sessions. insertSeparator(); - insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, SLOT(reinitialize()) ); + insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQT_SLOT(reinitialize()) ); } void KateSessionMenu::slotExec( int id ) @@ -101,7 +101,7 @@ void KateSessionMenu::slotExec( int id ) if ( id < 0 ) return; - QStringList args; + TQStringList args; if ( id > 0 ) args << "--start"; @@ -109,9 +109,9 @@ void KateSessionMenu::slotExec( int id ) if ( id == 1 ) { bool ok (false); - QString name = KInputDialog::getText( i18n("Session Name"), + TQString name = KInputDialog::getText( i18n("Session Name"), i18n("Please enter a name for the new session"), - QString::null, + TQString::null, &ok, 0, 0, new Validator( m_parent ) ); if ( ! ok ) return; diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h index ea78bf6ba..3d5519496 100644 --- a/kicker/menuext/kate/katesessionmenu.h +++ b/kicker/menuext/kate/katesessionmenu.h @@ -26,7 +26,7 @@ class KateSessionMenu : public KPanelMenu { Q_OBJECT public: - KateSessionMenu( QWidget *parent=0, const char *name=0, const QStringList& /*args*/=QStringList() ); + KateSessionMenu( TQWidget *parent=0, const char *name=0, const TQStringList& /*args*/=TQStringList() ); ~KateSessionMenu(); public slots: @@ -36,8 +36,8 @@ class KateSessionMenu : public KPanelMenu { virtual void slotExec( int id ); private: - QStringList m_sessions; - QWidget *m_parent; + TQStringList m_sessions; + TQWidget *m_parent; }; #endif // _KateSessionMenu_h_ diff --git a/kicker/menuext/kdeprint/print_mnu.cpp b/kicker/menuext/kdeprint/print_mnu.cpp index 8b2679432..eb2dbd8ab 100644 --- a/kicker/menuext/kdeprint/print_mnu.cpp +++ b/kicker/menuext/kdeprint/print_mnu.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kapplication.h> #include <krun.h> #include <kdeprint/kmmanager.h> -#include <qregexp.h> +#include <tqregexp.h> K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu) @@ -40,7 +40,7 @@ K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu) #define KPRINTER_ID 5 #define PRINTER_LIST_ID 10 -PrintMenu::PrintMenu(QWidget *parent, const char *name, const QStringList & /*args*/) +PrintMenu::PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/) : KPanelMenu("", parent, name) { static bool kdeprintIconsInitialized = false; @@ -75,11 +75,11 @@ void PrintMenu::initialize() insertItem(SmallIconSet("fileprint"), i18n("Print File..."), KPRINTER_ID); // printer list - QPtrList<KMPrinter> *l = KMManager::self()->printerList(); + TQPtrList<KMPrinter> *l = KMManager::self()->printerList(); if (l && !l->isEmpty()) { bool separatorInserted = false; - QPtrListIterator<KMPrinter> it(*l); + TQPtrListIterator<KMPrinter> it(*l); for (; it.current(); ++it) { // no special, implicit or pure instances @@ -106,10 +106,10 @@ void PrintMenu::slotExec(int ID) kapp->kdeinitExec("kaddprinterwizard"); break; case KDEPRINT_SETTINGS_ID: - kapp->kdeinitExec("kaddprinterwizard", QStringList("--kdeconfig")); + kapp->kdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig")); break; case CONFIG_SERVER_ID: - kapp->kdeinitExec("kaddprinterwizard", QStringList("--serverconfig")); + kapp->kdeinitExec("kaddprinterwizard", TQStringList("--serverconfig")); break; case PRINT_MANAGER_ID: KRun::runCommand("kcmshell kde-printers.desktop"); @@ -123,7 +123,7 @@ void PrintMenu::slotExec(int ID) default: { // start kjobviewer - QStringList args; + TQStringList args; args << "--show" << "-d" << text(ID).remove('&'); kapp->kdeinitExec("kjobviewer", args); } diff --git a/kicker/menuext/kdeprint/print_mnu.h b/kicker/menuext/kdeprint/print_mnu.h index a80da4be2..da795c039 100644 --- a/kicker/menuext/kdeprint/print_mnu.h +++ b/kicker/menuext/kdeprint/print_mnu.h @@ -32,7 +32,7 @@ class PrintMenu : public KPanelMenu, public KPReloadObject Q_OBJECT public: - PrintMenu(QWidget *parent, const char *name, const QStringList & /*args*/); + PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/); ~PrintMenu(); protected slots: diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp index 3ac09e050..4010bace7 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.cpp +++ b/kicker/menuext/konq-profiles/konqy_menu.cpp @@ -31,12 +31,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kio/global.h> #include <ksimpleconfig.h> -#include <qregexp.h> -#include <qfileinfo.h> +#include <tqregexp.h> +#include <tqfileinfo.h> K_EXPORT_KICKER_MENUEXT(konqueror, KonquerorProfilesMenu) -KonquerorProfilesMenu::KonquerorProfilesMenu(QWidget *parent, const char *name, const QStringList & /*args*/) +KonquerorProfilesMenu::KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/) : KPanelMenu("", parent, name) { static bool kdeprintIconsInitialized = false; @@ -55,16 +55,16 @@ void KonquerorProfilesMenu::initialize() if (initialized()) clear(); setInitialized(true); - QStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); + TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); m_profiles.resize(profiles.count()); int id=1; - QStringList::ConstIterator pEnd = profiles.end(); - for (QStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt ) + TQStringList::ConstIterator pEnd = profiles.end(); + for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt ) { - QFileInfo info( *pIt ); - QString profileName = KIO::decodeFileName( info.baseName() ); - QString niceName=profileName; + TQFileInfo info( *pIt ); + TQString profileName = KIO::decodeFileName( info.baseName() ); + TQString niceName=profileName; KSimpleConfig cfg( *pIt, true ); if ( cfg.hasGroup( "Profile" ) ) { @@ -81,7 +81,7 @@ void KonquerorProfilesMenu::initialize() void KonquerorProfilesMenu::slotExec(int id) { - QStringList args; + TQStringList args; args<<"--profile"<<m_profiles[id-1]; kapp->kdeinitExec("konqueror", args); } diff --git a/kicker/menuext/konq-profiles/konqy_menu.h b/kicker/menuext/konq-profiles/konqy_menu.h index f47b026ee..ba3bb19f7 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.h +++ b/kicker/menuext/konq-profiles/konqy_menu.h @@ -26,14 +26,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kpanelmenu.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> class KonquerorProfilesMenu : public KPanelMenu { Q_OBJECT public: - KonquerorProfilesMenu(QWidget *parent, const char *name, const QStringList & /*args*/); + KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/); ~KonquerorProfilesMenu(); protected slots: @@ -43,7 +43,7 @@ class KonquerorProfilesMenu : public KPanelMenu protected: void reload(); - QValueVector<QString> m_profiles; + TQValueVector<TQString> m_profiles; }; diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index 87df6f268..afd1127f6 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <unistd.h> #include <sys/stat.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqdir.h> +#include <tqfileinfo.h> #include <kapplication.h> #include <kglobal.h> @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. K_EXPORT_KICKER_MENUEXT(konsole, KonsoleMenu) -KonsoleMenu::KonsoleMenu(QWidget *parent, const char *name, const QStringList& /* args */) +KonsoleMenu::KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */) : KPanelMenu("", parent, name), m_profileMenu(0), m_bookmarksSession(0), @@ -58,8 +58,8 @@ KonsoleMenu::~KonsoleMenu() } static void insertItemSorted(KPopupMenu *menu, - const QIconSet &iconSet, - const QString &txt, int id) + const TQIconSet &iconSet, + const TQString &txt, int id) { const int defaultId = 1; // The id of the 'new' item. int index = menu->indexOf(defaultId); @@ -96,17 +96,17 @@ void KonsoleMenu::initialize() setInitialized(true); - QStringList list = KGlobal::dirs()->findAllResources("data", + TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true); - QString defaultShell = locate("data", "konsole/shell.desktop"); + TQString defaultShell = locate("data", "konsole/shell.desktop"); list.prepend(defaultShell); int id = 1; sessionList.clear(); - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { if ((*it == defaultShell) && (id != 1)) { @@ -115,10 +115,10 @@ void KonsoleMenu::initialize() KSimpleConfig conf(*it, true /* read only */); conf.setDesktopGroup(); - QString text = conf.readEntry("Name"); + TQString text = conf.readEntry("Name"); // try to locate the binary - QString exec= conf.readPathEntry("Exec"); + TQString exec= conf.readPathEntry("Exec"); if (exec.startsWith("su -c \'")) { exec = exec.mid(7,exec.length()-8); @@ -126,7 +126,7 @@ void KonsoleMenu::initialize() exec = KRun::binaryName(exec, false); exec = KShell::tildeExpand(exec); - QString pexec = KGlobal::dirs()->findExe(exec); + TQString pexec = KGlobal::dirs()->findExe(exec); if (text.isEmpty() || conf.readEntry("Type") != "KonsoleApplication" || (!exec.isEmpty() && pexec.isEmpty())) @@ -135,7 +135,7 @@ void KonsoleMenu::initialize() } insertItemSorted(this, SmallIconSet(conf.readEntry("Icon", "konsole")), text, id++); - QFileInfo fi(*it); + TQFileInfo fi(*it); sessionList.append(fi.baseName(true)); if (id == 2) @@ -150,27 +150,27 @@ void KonsoleMenu::initialize() insertItem(SmallIconSet("keditbookmarks"), i18n("New Session at Bookmark"), m_bookmarksSession); connect(m_bookmarkHandlerSession, - SIGNAL(openURL(const QString&, const QString&)), - SLOT(newSession(const QString&, const QString&))); + TQT_SIGNAL(openURL(const TQString&, const TQString&)), + TQT_SLOT(newSession(const TQString&, const TQString&))); screenList.clear(); - QCString screenDir = getenv("SCREENDIR"); + TQCString screenDir = getenv("SCREENDIR"); if (screenDir.isEmpty()) { - screenDir = QFile::encodeName(QDir::homeDirPath()) + "/.screen/"; + screenDir = TQFile::encodeName(TQDir::homeDirPath()) + "/.screen/"; } - QStringList sessions; - // Can't use QDir as it doesn't support FIFOs :( + TQStringList sessions; + // Can't use TQDir as it doesn't support FIFOs :( DIR *dir = opendir(screenDir); if (dir) { struct dirent *entry; while ((entry = readdir(dir))) { - QCString path = screenDir + "/" + entry->d_name; + TQCString path = screenDir + "/" + entry->d_name; struct stat st; if (stat(path, &st) != 0) { @@ -182,7 +182,7 @@ void KonsoleMenu::initialize() (fd = open(path, O_WRONLY | O_NONBLOCK)) != -1) { ::close(fd); - screenList.append(QFile::decodeName(entry->d_name)); + screenList.append(TQFile::decodeName(entry->d_name)); insertItem(SmallIconSet("konsole"), i18n("Screen is a program controlling screens!", "Screen at %1").arg(entry->d_name), id); @@ -197,16 +197,16 @@ void KonsoleMenu::initialize() delete m_profileMenu; m_profileMenu = new KPopupMenu(this); - QStringList profiles = KGlobal::dirs()->findAllResources("data", + TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true ); m_profiles.resize(profiles.count()); - QStringList::ConstIterator pEnd = profiles.end(); - for (QStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt) + TQStringList::ConstIterator pEnd = profiles.end(); + for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt) { - QFileInfo info(*pIt); - QString profileName = KIO::decodeFileName(info.baseName()); - QString niceName = profileName; + TQFileInfo info(*pIt); + TQString profileName = KIO::decodeFileName(info.baseName()); + TQString niceName = profileName; KSimpleConfig cfg(*pIt, true); if (cfg.hasGroup("Profile")) { @@ -229,11 +229,11 @@ void KonsoleMenu::initialize() // we don't have any profiles, disable the menu setItemEnabled(profileID, false); } - connect(m_profileMenu, SIGNAL(activated(int)), SLOT(launchProfile(int))); + connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int))); insertSeparator(); insertItem(SmallIconSet("reload"), - i18n("Reload Sessions"), this, SLOT(reinitialize())); + i18n("Reload Sessions"), this, TQT_SLOT(reinitialize())); } void KonsoleMenu::slotExec(int id) @@ -245,7 +245,7 @@ void KonsoleMenu::slotExec(int id) --id; kapp->propagateSessionManager(); - QStringList args; + TQStringList args; if (static_cast<unsigned int>(id) < sessionList.count()) { args << "--type"; @@ -271,7 +271,7 @@ void KonsoleMenu::launchProfile(int id) --id; // this is a session, not a bookmark, so execute that instead - QStringList args; + TQStringList args; args << "--profile" << m_profiles[id]; kapp->kdeinitExec("konsole", args); } @@ -283,9 +283,9 @@ KURL KonsoleMenu::baseURL() const return url; } -void KonsoleMenu::newSession(const QString& sURL, const QString& title) +void KonsoleMenu::newSession(const TQString& sURL, const TQString& title) { - QStringList args; + TQStringList args; KURL url = KURL(sURL); if ((url.protocol() == "file") && (url.hasPath())) @@ -297,8 +297,8 @@ void KonsoleMenu::newSession(const QString& sURL, const QString& title) } else if ((!url.protocol().isEmpty()) && (url.hasHost())) { - QString protocol = url.protocol(); - QString host = url.host(); + TQString protocol = url.protocol(); + TQString host = url.host(); args << "-T" << title; args << "-e" << protocol.latin1(); /* argv[0] == command to run. */ if (url.hasUser()) { diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h index 988764124..e64c53212 100644 --- a/kicker/menuext/konsole/konsole_mnu.h +++ b/kicker/menuext/konsole/konsole_mnu.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _konsole_mnu_h_ #define _konsole_mnu_h_ -#include <qvaluevector.h> +#include <tqvaluevector.h> #include <kpanelmenu.h> #include <klibloader.h> @@ -38,7 +38,7 @@ class KonsoleMenu : public KPanelMenu/*, public KPReloadObject*/ Q_OBJECT public: - KonsoleMenu(QWidget *parent, const char *name, const QStringList& /* args */); + KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */); ~KonsoleMenu(); KURL baseURL() const; @@ -47,13 +47,13 @@ protected slots: void slotExec(int id); void launchProfile(int id); void initialize(); - void newSession(const QString& sURL, const QString& title); + void newSession(const TQString& sURL, const TQString& title); private: - QStringList sessionList; - QStringList screenList; - QValueVector<QString> m_profiles; + TQStringList sessionList; + TQStringList screenList; + TQValueVector<TQString> m_profiles; KPopupMenu* m_profileMenu; KPopupMenu* m_bookmarksSession; diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index c9f8e2806..46967b54c 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdlib.h> -#include <qtextstream.h> +#include <tqtextstream.h> #include <kbookmarkimporter.h> #include <kmimetype.h> @@ -16,20 +16,20 @@ #include "konsolebookmarkhandler.h" KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool ) - : QObject( konsole, "KonsoleBookmarkHandler" ), + : TQObject( konsole, "KonsoleBookmarkHandler" ), KBookmarkOwner(), m_konsole( konsole ), m_importStream( 0L ) { m_menu = new KPopupMenu( konsole, "bookmark menu" ); - QString file = locate( "data", "konsole/bookmarks.xml" ); + TQString file = locate( "data", "konsole/bookmarks.xml" ); if ( file.isEmpty() ) file = locateLocal( "data", "konsole/bookmarks.xml" ); // import old bookmarks if ( !KStandardDirs::exists( file ) ) { - QString oldFile = locate( "data", "kfile/bookmarks.html" ); + TQString oldFile = locate( "data", "kfile/bookmarks.html" ); if ( !oldFile.isEmpty() ) importOldBookmarks( oldFile, file ); } @@ -38,20 +38,20 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool ) manager->setUpdate( true ); manager->setShowNSBookmarks( false ); - connect( manager, SIGNAL( changed(const QString &, const QString &) ), - SLOT( slotBookmarksChanged(const QString &, const QString &) ) ); + connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), + TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu, NULL, false, /*Not toplevel*/ false /*No 'Add Bookmark'*/ ); } -QString KonsoleBookmarkHandler::currentURL() const +TQString KonsoleBookmarkHandler::currentURL() const { return m_konsole->baseURL().url(); } -void KonsoleBookmarkHandler::importOldBookmarks( const QString& path, - const QString& destinationPath ) +void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path, + const TQString& destinationPath ) { KSaveFile file( destinationPath ); if ( file.status() != 0 ) @@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const QString& path, KNSBookmarkImporter importer( path ); connect( &importer, - SIGNAL( newBookmark( const QString&, const QCString&, const QString& )), - SLOT( slotNewBookmark( const QString&, const QCString&, const QString& ))); + TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )), + TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& ))); connect( &importer, - SIGNAL( newFolder( const QString&, bool, const QString& )), - SLOT( slotNewFolder( const QString&, bool, const QString& ))); - connect( &importer, SIGNAL( newSeparator() ), SLOT( newSeparator() )); - connect( &importer, SIGNAL( endMenu() ), SLOT( endMenu() )); + TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )), + TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& ))); + connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() )); + connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() )); importer.parseNSBookmarks( false ); @@ -78,24 +78,24 @@ void KonsoleBookmarkHandler::importOldBookmarks( const QString& path, m_importStream = 0L; } -void KonsoleBookmarkHandler::slotNewBookmark( const QString& /*text*/, - const QCString& url, - const QString& additionalInfo ) +void KonsoleBookmarkHandler::slotNewBookmark( const TQString& /*text*/, + const TQCString& url, + const TQString& additionalInfo ) { *m_importStream << "<bookmark icon=\"" << KMimeType::iconForURL( KURL( url ) ); - *m_importStream << "\" href=\"" << QString::fromUtf8(url) << "\">\n"; - *m_importStream << "<title>" << (additionalInfo.isEmpty() ? QString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n"; + *m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n"; + *m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n"; } -void KonsoleBookmarkHandler::slotNewFolder( const QString& text, bool /*open*/, - const QString& /*additionalInfo*/ ) +void KonsoleBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/, + const TQString& /*additionalInfo*/ ) { *m_importStream << "<folder icon=\"bookmark_folder\">\n<title=\""; *m_importStream << text << "\">\n"; } -void KonsoleBookmarkHandler::slotBookmarksChanged( const QString &, - const QString & ) +void KonsoleBookmarkHandler::slotBookmarksChanged( const TQString &, + const TQString & ) { // This is called when someone changes bookmarks in konsole.... m_bookmarkMenu->slotBookmarksChanged(""); diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h index b22f0d03d..eed2c00d6 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.h +++ b/kicker/menuext/konsole/konsolebookmarkhandler.h @@ -12,42 +12,42 @@ class KPopupMenu; class KonsoleBookmarkMenu; class KonsoleMenu; -class KonsoleBookmarkHandler : public QObject, public KBookmarkOwner +class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner { Q_OBJECT public: KonsoleBookmarkHandler( KonsoleMenu *konsole, bool toplevel ); - QPopupMenu * popupMenu(); + TQPopupMenu * popupMenu(); // KBookmarkOwner interface: - virtual void openBookmarkURL( const QString& url, const QString& title ) + virtual void openBookmarkURL( const TQString& url, const TQString& title ) { emit openURL( url, title ); } - virtual QString currentURL() const; + virtual TQString currentURL() const; KPopupMenu *menu() const { return m_menu; } signals: - void openURL( const QString& url, const QString& title ); + void openURL( const TQString& url, const TQString& title ); private slots: // for importing - void slotNewBookmark( const QString& text, const QCString& url, - const QString& additionalInfo ); - void slotNewFolder( const QString& text, bool open, - const QString& additionalInfo ); - void slotBookmarksChanged( const QString &, const QString & caller ); + void slotNewBookmark( const TQString& text, const TQCString& url, + const TQString& additionalInfo ); + void slotNewFolder( const TQString& text, bool open, + const TQString& additionalInfo ); + void slotBookmarksChanged( const TQString &, const TQString & caller ); void newSeparator(); void endFolder(); private: - void importOldBookmarks( const QString& path, const QString& destinationPath ); + void importOldBookmarks( const TQString& path, const TQString& destinationPath ); KonsoleMenu *m_konsole; KPopupMenu *m_menu; KonsoleBookmarkMenu *m_bookmarkMenu; - QTextStream *m_importStream; + TQTextStream *m_importStream; protected: virtual void virtual_hook( int id, void* data ); diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index b10d26c40..1a31fe55c 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdlib.h> -#include <qtextstream.h> +#include <tqtextstream.h> #include <kbookmarkimporter.h> #include <kmimetype.h> @@ -14,7 +14,7 @@ #include "konsolebookmarkmenu.h" #include "konsolebookmarkhandler.h" -#include <qfile.h> +#include <tqfile.h> #include <kaction.h> #include <klocale.h> @@ -23,7 +23,7 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu, KActionCollection *collec, bool _isRoot, bool _add, - const QString & parentAddress ) + const TQString & parentAddress ) : KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add, parentAddress), m_kOwner(_owner) @@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, /* * First, we disconnect KBookmarkMenu::slotAboutToShow() * Then, we connect KonsoleBookmarkMenu::slotAboutToShow(). - * They are named differently because the SLOT() macro thinks we want + * They are named differently because the TQT_SLOT() macro thinks we want * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow() * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu? */ - disconnect( _parentMenu, SIGNAL( aboutToShow() ), this, - SLOT( slotAboutToShow() ) ); - connect( _parentMenu, SIGNAL( aboutToShow() ), - SLOT( slotAboutToShow2() ) ); + disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this, + TQT_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), + TQT_SLOT( slotAboutToShow2() ) ); } /* @@ -64,7 +64,7 @@ void KonsoleBookmarkMenu::refill() { //kdDebug(1203) << "KBookmarkMenu::refill()" << endl; m_lstSubMenus.clear(); - QPtrListIterator<KAction> it( m_actions ); + TQPtrListIterator<KAction> it( m_actions ); for (; it.current(); ++it ) it.current()->unplug( m_parentMenu ); m_parentMenu->clear(); @@ -86,7 +86,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() addNewFolder(); if ( m_pManager->showNSBookmarks() - && QFile::exists( KNSBookmarkImporter::netscapeBookmarksFile() ) ) + && TQFile::exists( KNSBookmarkImporter::netscapeBookmarksFile() ) ) { m_parentMenu->insertSeparator(); @@ -98,10 +98,10 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() KonsoleBookmarkMenu *subMenu = new KonsoleBookmarkMenu( m_pManager, m_kOwner, actionMenu->popupMenu(), m_actionCollection, false, - m_bAddBookmark, QString::null ); + m_bAddBookmark, TQString::null ); m_lstSubMenus.append(subMenu); - connect( actionMenu->popupMenu(), SIGNAL(aboutToShow()), subMenu, - SLOT(slotNSLoad())); + connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, + TQT_SLOT(slotNSLoad())); } } @@ -111,7 +111,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() for ( KBookmark bm = parentBookmark.first(); !bm.isNull(); bm = parentBookmark.next(bm) ) { - QString text = bm.text(); + TQString text = bm.text(); text.replace( '&', "&&" ); if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark m_parentMenu->insertSeparator(); @@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name KAction * action = new KAction( text, bm.icon(), 0, - this, SLOT( slotBookmarkSelected() ), + this, TQT_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); action->setStatusText( bm.url().prettyURL() ); @@ -163,21 +163,21 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() void KonsoleBookmarkMenu::slotBookmarkSelected() { KAction * a; - QString b; + TQString b; if ( !m_pOwner ) return; // this view doesn't handle bookmarks... a = (KAction*)sender(); b = a->text(); - m_kOwner->openBookmarkURL( QString::fromUtf8(sender()->name()), /* URL */ + m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */ ( (KAction *)sender() )->text() /* Title */ ); } void KonsoleBookmarkMenu::slotNSBookmarkSelected() { KAction *a; - QString b; + TQString b; - QString link(sender()->name()+8); + TQString link(sender()->name()+8); a = (KAction*)sender(); b = a->text(); m_kOwner->openBookmarkURL( link, /*URL */ diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h index 65e87f0f5..681236708 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.h +++ b/kicker/menuext/konsole/konsolebookmarkmenu.h @@ -1,9 +1,9 @@ #ifndef KONSOLEBOOKMARKMENU_H #define KONSOLEBOOKMARKMENU_H -#include <qptrlist.h> -#include <qptrstack.h> -#include <qobject.h> +#include <tqptrlist.h> +#include <tqptrstack.h> +#include <tqobject.h> #include <sys/types.h> #include <kbookmark.h> #include <kbookmarkmenu.h> @@ -29,7 +29,7 @@ public: KonsoleBookmarkMenu( KBookmarkManager* mgr, KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu, KActionCollection *collec, bool _isRoot, - bool _add = true, const QString & parentAddress = ""); + bool _add = true, const TQString & parentAddress = ""); void fillBookmarkMenu(); diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index dd157d2cb..0c072e026 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcursor.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqtimer.h> #include <kapplication.h> #include <kglobal.h> @@ -43,28 +43,28 @@ K_EXPORT_KICKER_MENUEXT(prefmenu, PrefMenu) const int idStart = 4242; -PrefMenu::PrefMenu(QWidget *parent, +PrefMenu::PrefMenu(TQWidget *parent, const char *name, - const QStringList &/*args*/) + const TQStringList &/*args*/) : KPanelMenu(i18n("Settings"), parent, name), m_clearOnClose(false) { } -PrefMenu::PrefMenu(const QString& label, - const QString& root, - QWidget *parent) +PrefMenu::PrefMenu(const TQString& label, + const TQString& root, + TQWidget *parent) : KPanelMenu(label, parent), m_clearOnClose(false), m_root(root) { m_subMenus.setAutoDelete(true); - connect(KSycoca::self(), SIGNAL(databaseChanged()), - this, SLOT(clearOnClose())); + connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), + this, TQT_SLOT(clearOnClose())); - connect(this, SIGNAL(aboutToHide()), - this, SLOT(aboutToClose())); + connect(this, TQT_SIGNAL(aboutToHide()), + this, TQT_SLOT(aboutToClose())); } PrefMenu::~PrefMenu() @@ -74,11 +74,11 @@ PrefMenu::~PrefMenu() void PrefMenu::insertMenuItem(KService::Ptr& s, int nId, int nIndex, - const QStringList *suppressGenericNames) + const TQStringList *suppressGenericNames) { - QString serviceName = s->name(); + TQString serviceName = s->name(); // add comment - QString comment = s->genericName(); + TQString comment = s->genericName(); if (!comment.isEmpty()) { if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription) @@ -86,12 +86,12 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, if (!suppressGenericNames || !suppressGenericNames->contains(s->untranslatedGenericName())) { - serviceName = QString("%1 (%2)").arg(serviceName).arg(comment); + serviceName = TQString("%1 (%2)").arg(serviceName).arg(comment); } } else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionAndName) { - serviceName = QString("%1 (%2)").arg(comment).arg(serviceName); + serviceName = TQString("%1 (%2)").arg(comment).arg(serviceName); } else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionOnly) { @@ -126,13 +126,13 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, m_entryMap.insert(newId, static_cast<KSycocaEntry*>(s)); } -void PrefMenu::mousePressEvent(QMouseEvent * ev) +void PrefMenu::mousePressEvent(TQMouseEvent * ev) { m_dragStartPos = ev->pos(); KPanelMenu::mousePressEvent(ev); } -void PrefMenu::mouseMoveEvent(QMouseEvent * ev) +void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) { KPanelMenu::mouseMoveEvent(ev); @@ -141,8 +141,8 @@ void PrefMenu::mouseMoveEvent(QMouseEvent * ev) return; } - QPoint p = ev->pos() - m_dragStartPos; - if (p.manhattanLength() <= QApplication::startDragDistance()) + TQPoint p = ev->pos() - m_dragStartPos; + if (p.manhattanLength() <= TQApplication::startDragDistance()) { return; } @@ -163,7 +163,7 @@ void PrefMenu::mouseMoveEvent(QMouseEvent * ev) KSycocaEntry * e = m_entryMap[id]; - QPixmap icon; + TQPixmap icon; KURL url; switch (e->sycocaType()) @@ -171,7 +171,7 @@ void PrefMenu::mouseMoveEvent(QMouseEvent * ev) case KST_KService: { icon = static_cast<KService *>(e)->pixmap(KIcon::Small); - QString filePath = static_cast<KService *>(e)->desktopEntryPath(); + TQString filePath = static_cast<KService *>(e)->desktopEntryPath(); if (filePath[0] != '/') { filePath = locate("apps", filePath); @@ -198,17 +198,17 @@ void PrefMenu::mouseMoveEvent(QMouseEvent * ev) // If the path to the desktop file is relative, try to get the full // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, SIGNAL(destroyed()), this, SLOT(dragObjectDestroyed())); + connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(dragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); // Set the startposition outside the panel, so there is no drag initiated // when we use drag and click to select items. A drag is only initiated when // you click to open the menu, and then press and drag an item. - m_dragStartPos = QPoint(-1,-1); + m_dragStartPos = TQPoint(-1,-1); } -void PrefMenu::dragEnterEvent(QDragEnterEvent *event) +void PrefMenu::dragEnterEvent(TQDragEnterEvent *event) { // Set the DragObject's target to this widget. This is needed because the // widget doesn't accept drops, but we want to determine if the drag object @@ -221,10 +221,10 @@ void PrefMenu::dragEnterEvent(QDragEnterEvent *event) event->ignore(); } -void PrefMenu::dragLeaveEvent(QDragLeaveEvent */*event*/) +void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/) { // see PrefMenu::dragEnterEvent why this is nescessary - if (!frameGeometry().contains(QCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -240,13 +240,13 @@ void PrefMenu::initialize() // Set the startposition outside the panel, so there is no drag initiated // when we use drag and click to select items. A drag is only initiated when // you click to open the menu, and then press and drag an item. - m_dragStartPos = QPoint(-1,-1); + m_dragStartPos = TQPoint(-1,-1); if (m_root.isEmpty()) { insertItem(KickerLib::menuIconSet("kcontrol"), i18n("Control Center"), - this, SLOT(launchControlCenter())); + this, TQT_SLOT(launchControlCenter())); insertSeparator(); } @@ -269,7 +269,7 @@ void PrefMenu::initialize() int id = idStart; - QStringList suppressGenericNames = root->suppressGenericNames(); + TQStringList suppressGenericNames = root->suppressGenericNames(); KServiceGroup::List::ConstIterator it = list.begin(); for (; it != list.end(); ++it) @@ -280,7 +280,7 @@ void PrefMenu::initialize() { KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e)); - QString groupCaption = g->caption(); + TQString groupCaption = g->caption(); // Avoid adding empty groups. KServiceGroup::Ptr subMenuRoot = KServiceGroup::group(g->relPath()); @@ -332,8 +332,8 @@ void PrefMenu::slotExec(int id) KSycocaEntry *e = m_entryMap[id]; KService::Ptr service = static_cast<KService *>(e); KApplication::startServiceByDesktopPath(service->desktopEntryPath(), - QStringList(), 0, 0, 0, "", true); - m_dragStartPos = QPoint(-1,-1); + TQStringList(), 0, 0, 0, "", true); + m_dragStartPos = TQPoint(-1,-1); } void PrefMenu::clearOnClose() @@ -358,7 +358,7 @@ void PrefMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - QTimer::singleShot( 100, this, SLOT( slotClear())); + TQTimer::singleShot( 100, this, TQT_SLOT( slotClear())); return; } @@ -378,7 +378,7 @@ void PrefMenu::aboutToClose() void PrefMenu::launchControlCenter() { - KApplication::startServiceByDesktopName("kcontrol", QStringList(), + KApplication::startServiceByDesktopName("kcontrol", TQStringList(), 0, 0, 0, "", true); } diff --git a/kicker/menuext/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h index 99c3772fc..d673fceef 100644 --- a/kicker/menuext/prefmenu/prefmenu.h +++ b/kicker/menuext/prefmenu/prefmenu.h @@ -24,40 +24,40 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _prefmenu_h_ #define _prefmenu_h_ -#include <qmap.h> +#include <tqmap.h> #include <kpanelmenu.h> #include <ksycocaentry.h> -typedef QMap<int, KSycocaEntry::Ptr> EntryMap; -typedef QPtrList<QPopupMenu> PopupMenuList; +typedef TQMap<int, KSycocaEntry::Ptr> EntryMap; +typedef TQPtrList<TQPopupMenu> PopupMenuList; class PrefMenu : public KPanelMenu { Q_OBJECT public: - PrefMenu(QWidget *parent, + PrefMenu(TQWidget *parent, const char *name, - const QStringList & /*args*/); - PrefMenu(const QString& label, - const QString& root, - QWidget *parent); + const TQStringList & /*args*/); + PrefMenu(const TQString& label, + const TQString& root, + TQWidget *parent); ~PrefMenu(); protected: void insertMenuItem(KService::Ptr & s, int nId, int nIndex= -1, - const QStringList *suppressGenericNames = 0); - virtual void mousePressEvent(QMouseEvent *); - virtual void mouseMoveEvent(QMouseEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); - virtual void dragLeaveEvent(QDragLeaveEvent *); + const TQStringList *suppressGenericNames = 0); + virtual void mousePressEvent(TQMouseEvent *); + virtual void mouseMoveEvent(TQMouseEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); + virtual void dragLeaveEvent(TQDragLeaveEvent *); bool m_clearOnClose; - QString m_root; - QPoint m_dragStartPos; + TQString m_root; + TQPoint m_dragStartPos; EntryMap m_entryMap; PopupMenuList m_subMenus; diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index 06c84d7a6..b8c3c6d81 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdragobject.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqdragobject.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kglobal.h> #include <kiconloader.h> @@ -39,8 +39,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. K_EXPORT_KICKER_MENUEXT(recentdocs, RecentDocsMenu) -RecentDocsMenu::RecentDocsMenu(QWidget *parent, const char *name, - const QStringList &/*args*/) +RecentDocsMenu::RecentDocsMenu(TQWidget *parent, const char *name, + const TQStringList &/*args*/) : KPanelMenu(KRecentDocument::recentDocumentDirectory(), parent, name) { } @@ -52,7 +52,7 @@ RecentDocsMenu::~RecentDocsMenu() void RecentDocsMenu::initialize() { if (initialized()) clear(); - insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, SLOT(slotClearHistory())); + insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory())); insertSeparator(); _fileList = KRecentDocument::recentDocuments(); @@ -65,24 +65,24 @@ void RecentDocsMenu::initialize() { int id = 0; char alreadyPresentInMenu; - QStringList previousEntries; - for (QStringList::ConstIterator it = _fileList.begin(); it != _fileList.end(); ++it) { + TQStringList previousEntries; + for (TQStringList::ConstIterator it = _fileList.begin(); it != _fileList.end(); ++it) { KDesktopFile f(*it, true /* read only */); // Make sure this entry is not already present in the menu alreadyPresentInMenu = 0; - for ( QStringList::Iterator previt = previousEntries.begin(); previt != previousEntries.end(); ++previt ) { - if (QString::localeAwareCompare(*previt, f.readName().replace('&', QString::fromAscii("&&") )) == 0) { + for ( TQStringList::Iterator previt = previousEntries.begin(); previt != previousEntries.end(); ++previt ) { + if (TQString::localeAwareCompare(*previt, f.readName().replace('&', TQString::fromAscii("&&") )) == 0) { alreadyPresentInMenu = 1; } } if (alreadyPresentInMenu == 0) { // Add item to menu - insertItem(SmallIconSet(f.readIcon()), f.readName().replace('&', QString::fromAscii("&&") ), id++); + insertItem(SmallIconSet(f.readIcon()), f.readName().replace('&', TQString::fromAscii("&&") ), id++); // Append to duplicate checking list - previousEntries.append(f.readName().replace('&', QString::fromAscii("&&") )); + previousEntries.append(f.readName().replace('&', TQString::fromAscii("&&") )); } } @@ -103,12 +103,12 @@ void RecentDocsMenu::slotExec(int id) { } } -void RecentDocsMenu::mousePressEvent(QMouseEvent* e) { +void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) { _mouseDown = e->pos(); - QPopupMenu::mousePressEvent(e); + TQPopupMenu::mousePressEvent(e); } -void RecentDocsMenu::mouseMoveEvent(QMouseEvent* e) { +void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { KPanelMenu::mouseMoveEvent(e); if (!(e->state() & LeftButton)) diff --git a/kicker/menuext/recentdocs/recentdocsmenu.h b/kicker/menuext/recentdocs/recentdocsmenu.h index 1e3157495..d2e777570 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.h +++ b/kicker/menuext/recentdocs/recentdocsmenu.h @@ -34,7 +34,7 @@ class RecentDocsMenu : public KPanelMenu Q_OBJECT public: - RecentDocsMenu(QWidget* parent, const char* name, const QStringList &/*args*/); + RecentDocsMenu(TQWidget* parent, const char* name, const TQStringList &/*args*/); ~RecentDocsMenu(); void initialize(); @@ -44,12 +44,12 @@ protected slots: void slotAboutToShow(); protected: - void mousePressEvent(QMouseEvent* e); - void mouseMoveEvent(QMouseEvent* e); + void mousePressEvent(TQMouseEvent* e); + void mouseMoveEvent(TQMouseEvent* e); private: - QStringList _fileList; - QPoint _mouseDown; + TQStringList _fileList; + TQPoint _mouseDown; }; #endif // RECENTDOCSMENU_H diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index 42b3d5339..c09f9a825 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -27,9 +27,9 @@ #include <kdesktopfile.h> #include <kservice.h> -#include <qpixmap.h> -#include <qdir.h> -#include <qtimer.h> +#include <tqpixmap.h> +#include <tqdir.h> +#include <tqtimer.h> #include "kickerSettings.h" @@ -38,16 +38,16 @@ K_EXPORT_KICKER_MENUEXT(remotemenu, RemoteMenu) -RemoteMenu::RemoteMenu(QWidget *parent, const char *name, - const QStringList &/*args*/) +RemoteMenu::RemoteMenu(TQWidget *parent, const char *name, + const TQStringList &/*args*/) : KPanelMenu(parent, name), KDirNotify() { KGlobal::dirs()->addResourceType("remote_entries", KStandardDirs::kde_default("data") + "remoteview"); - QString path = KGlobal::dirs()->saveLocation("remote_entries"); + TQString path = KGlobal::dirs()->saveLocation("remote_entries"); - QDir dir = path; + TQDir dir = path; if (!dir.exists()) { dir.cdUp(); @@ -68,35 +68,35 @@ void RemoteMenu::initialize() } id = insertItem(SmallIcon("wizard"), i18n("Add Network Folder")); - connectItem(id, this, SLOT(startWizard())); + connectItem(id, this, TQT_SLOT(startWizard())); id = insertItem(SmallIcon("kfm"), i18n("Manage Network Folders")); - connectItem(id, this, SLOT(openRemoteDir())); + connectItem(id, this, TQT_SLOT(openRemoteDir())); insertSeparator(); m_desktopMap.clear(); - QStringList names_found; - QStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries"); + TQStringList names_found; + TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries"); - QStringList::ConstIterator dirpath = dirList.begin(); - QStringList::ConstIterator end = dirList.end(); + TQStringList::ConstIterator dirpath = dirList.begin(); + TQStringList::ConstIterator end = dirList.end(); for(; dirpath!=end; ++dirpath) { - QDir dir = *dirpath; + TQDir dir = *dirpath; if (!dir.exists()) continue; - QStringList filenames - = dir.entryList( QDir::Files | QDir::Readable ); + TQStringList filenames + = dir.entryList( TQDir::Files | TQDir::Readable ); - QStringList::ConstIterator name = filenames.begin(); - QStringList::ConstIterator endf = filenames.end(); + TQStringList::ConstIterator name = filenames.begin(); + TQStringList::ConstIterator endf = filenames.end(); for(; name!=endf; ++name) { if (!names_found.contains(*name)) { names_found.append(*name); - QString filename = *dirpath+*name; + TQString filename = *dirpath+*name; KDesktopFile desktop(filename); id = insertItem(SmallIcon(desktop.readIcon()), desktop.readName()); m_desktopMap[id] = filename; diff --git a/kicker/menuext/remote/remotemenu.h b/kicker/menuext/remote/remotemenu.h index 1e46bb4e3..607e1fc64 100644 --- a/kicker/menuext/remote/remotemenu.h +++ b/kicker/menuext/remote/remotemenu.h @@ -22,7 +22,7 @@ #include <kdirnotify.h> #include <kpanelmenu.h> -#include <qmap.h> +#include <tqmap.h> class RemoteMenu : public KPanelMenu, public KDirNotify { @@ -30,8 +30,8 @@ class RemoteMenu : public KPanelMenu, public KDirNotify K_DCOP public: - RemoteMenu(QWidget *parent, const char *name, - const QStringList & /*args*/); + RemoteMenu(TQWidget *parent, const char *name, + const TQStringList & /*args*/); ~RemoteMenu(); k_dcop: @@ -47,7 +47,7 @@ class RemoteMenu : public KPanelMenu, public KDirNotify void slotExec(int id); private: - QMap<int, QString> m_desktopMap; + TQMap<int, TQString> m_desktopMap; }; #endif diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp index 68c3f5c66..12ec087d8 100644 --- a/kicker/menuext/system/systemmenu.cpp +++ b/kicker/menuext/system/systemmenu.cpp @@ -21,19 +21,19 @@ #include <krun.h> #include <kiconloader.h> -#include <qpixmap.h> +#include <tqpixmap.h> #include "global.h" K_EXPORT_KICKER_MENUEXT(systemmenu, SystemMenu) -SystemMenu::SystemMenu(QWidget *parent, const char *name, - const QStringList &/*args*/) +SystemMenu::SystemMenu(TQWidget *parent, const char *name, + const TQStringList &/*args*/) : KPanelMenu( parent, name) { - connect( &m_dirLister, SIGNAL( completed() ), - this, SLOT( slotCompleted() ) ); + connect( &m_dirLister, TQT_SIGNAL( completed() ), + this, TQT_SLOT( slotCompleted() ) ); m_dirLister.openURL(KURL("system:/")); } @@ -42,8 +42,8 @@ SystemMenu::~SystemMenu() { } -void SystemMenu::append(const QString &icon, const KURL &url, - const QString &label) +void SystemMenu::append(const TQString &icon, const KURL &url, + const TQString &label) { int id = insertItem(KickerLib::menuIconSet(icon), label); m_urlMap.insert(id, url); @@ -68,9 +68,9 @@ void SystemMenu::initialize() for (; it!=end; ++it) { - QString icon = (*it)->iconName(); + TQString icon = (*it)->iconName(); KURL url = (*it)->url(); - QString name = (*it)->name(); + TQString name = (*it)->name(); append(icon, url, name); } } diff --git a/kicker/menuext/system/systemmenu.h b/kicker/menuext/system/systemmenu.h index 6f118d21c..f25280989 100644 --- a/kicker/menuext/system/systemmenu.h +++ b/kicker/menuext/system/systemmenu.h @@ -30,8 +30,8 @@ class SystemMenu : public KPanelMenu Q_OBJECT public: - SystemMenu(QWidget *parent, const char *name, - const QStringList & /*args*/); + SystemMenu(TQWidget *parent, const char *name, + const TQStringList & /*args*/); ~SystemMenu(); protected slots: @@ -41,10 +41,10 @@ class SystemMenu : public KPanelMenu void slotCompleted(); private: - void append(const QString &icon, const KURL &url, const QString &label); + void append(const TQString &icon, const KURL &url, const TQString &label); KDirLister m_dirLister; KFileItemList m_entries; - QMap<int, KURL> m_urlMap; + TQMap<int, KURL> m_urlMap; }; #endif diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 80ea3e71d..3a4ebf4ed 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -23,15 +23,15 @@ using namespace std; #include <pwd.h> #include <sys/types.h> -#include <qdir.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qregexp.h> -#include <qsettings.h> -#include <qstyle.h> -#include <qfile.h> +#include <tqdir.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqregexp.h> +#include <tqsettings.h> +#include <tqstyle.h> +#include <tqfile.h> #include <dcopclient.h> #include <kapplication.h> @@ -69,51 +69,51 @@ extern "C" } }; -TOMFactory::TOMFactory(QObject *parent, const char *name) +TOMFactory::TOMFactory(TQObject *parent, const char *name) : KLibFactory(parent, name) { } -QObject* TOMFactory::createObject(QObject *parent, const char *name, const char*, const QStringList&) +TQObject* TOMFactory::createObject(TQObject *parent, const char *name, const char*, const TQStringList&) { - return new TOM((QWidget*)parent, name); + return new TOM((TQWidget*)parent, name); } -#include <qmenudata.h> +#include <tqmenudata.h> /* * TODO: switch the backgroundmode when translucency turns on/off * TODO: catch font changes too? */ -class runMenuWidget : public QWidget, public QMenuItem +class runMenuWidget : public TQWidget, public QMenuItem { public: runMenuWidget(KPopupMenu* parent, int index) - : QWidget (parent), + : TQWidget (parent), m_menu(parent), m_index(index) { setFocusPolicy(StrongFocus); - QHBoxLayout* runLayout = new QHBoxLayout(this); + TQHBoxLayout* runLayout = new TQHBoxLayout(this); textRect = fontMetrics().boundingRect(i18n("Run:")); runLayout->setSpacing(KDialog::spacingHint()); runLayout->addSpacing((KDialog::spacingHint() * 3) + KIcon::SizeMedium + textRect.width()); icon = DesktopIcon("run", KIcon::SizeMedium); - /*QLabel* l1 = new QLabel(this); - QPixmap foo = DesktopIcon("run", KIcon::SizeMedium); + /*TQLabel* l1 = new TQLabel(this); + TQPixmap foo = DesktopIcon("run", KIcon::SizeMedium); cout << "foo is: " << foo.width() << " by " << foo.height() << endl; l1->setPixmap(foo); runLayout->addWidget(l1);*/ - /*QLabel* l2 = new QLabel(i18n("&Run: "), this); + /*TQLabel* l2 = new TQLabel(i18n("&Run: "), this); l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); - m_runEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + m_runEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); runLayout->addWidget(m_runEdit, 10); runLayout->addSpacing(KDialog::spacingHint()); - QSettings settings; + TQSettings settings; if (settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled") { setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); @@ -138,18 +138,18 @@ class runMenuWidget : public QWidget, public QMenuItem ~runMenuWidget() {} - void paintEvent(QPaintEvent * /*e*/) + void paintEvent(TQPaintEvent * /*e*/) { - QPainter p(this); - QRect r(rect()); + TQPainter p(this); + TQRect r(rect()); // ew, nasty hack. may result in coredumps due to horrid C-style cast??? - kapp->style().drawControl(QStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), QStyle::Style_Enabled, - QStyleOption(static_cast<QMenuItem*>(this), 0, KIcon::SizeMedium )); + kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, + TQStyleOption(static_cast<TQMenuItem*>(this), 0, KIcon::SizeMedium )); p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); } - void focusInEvent (QFocusEvent* e) + void focusInEvent (TQFocusEvent* e) { if (!e || e->gotFocus()) { @@ -158,7 +158,7 @@ class runMenuWidget : public QWidget, public QMenuItem } } - void enterEvent(QEvent*) + void enterEvent(TQEvent*) { focusInEvent(0); } @@ -166,12 +166,12 @@ class runMenuWidget : public QWidget, public QMenuItem private: KPopupMenu* m_menu; KHistoryCombo* m_runEdit; - QPixmap icon; - QRect textRect; + TQPixmap icon; + TQRect textRect; int m_index; }; -TOM::TOM(QWidget *parent, const char *name) +TOM::TOM(TQWidget *parent, const char *name) : KPanelMenu(parent, name), m_maxIndex(0) { @@ -199,7 +199,7 @@ TOM::~TOM() slotClear(); } -void TOM::initializeRecentApps(QPopupMenu* menu) +void TOM::initializeRecentApps(TQPopupMenu* menu) { /* * TODO: make this real @@ -217,7 +217,7 @@ void TOM::initializeRecentDocs() { m_recentDocsMenu->clear(); m_recentDocsMenu->insertItem(SmallIconSet("history_clear"), i18n("Clear History"), - this, SLOT(clearRecentDocHistory())); + this, TQT_SLOT(clearRecentDocHistory())); m_recentDocsMenu->insertSeparator(); m_recentDocURLs = KRecentDocument::recentDocuments(); @@ -229,7 +229,7 @@ void TOM::initializeRecentDocs() } int id = 0; - for (QStringList::ConstIterator it = m_recentDocURLs.begin(); + for (TQStringList::ConstIterator it = m_recentDocURLs.begin(); it != m_recentDocURLs.end(); ++it) { @@ -258,8 +258,8 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) return 0; } - QString name = config.readEntry("Name", i18n("Unknown")); - QString icon = config.readEntry("Icon"); + TQString name = config.readEntry("Name", i18n("Unknown")); + TQString icon = config.readEntry("Icon"); int numTasks = config.readNumEntry("NumTasks", 0); if (numTasks < 1) @@ -272,7 +272,7 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) { taskGroup = new KPopupMenu(this); - if (icon != QString::null) + if (icon != TQString::null) { insertItem(DesktopIcon(icon, KIcon::SizeMedium), name, taskGroup); } @@ -289,7 +289,7 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) int foundTasks = 0; for (int i = 0; i < numTasks; ++i) { - QString groupName = QString("Task%1").arg(i); + TQString groupName = TQString("Task%1").arg(i); if (config.hasGroup(groupName)) { @@ -300,10 +300,10 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) continue; } - QString name = config.readEntry("Name"); + TQString name = config.readEntry("Name"); // in case the name contains an ampersand, double 'em up name.replace("&", "&&"); - QString desktopfile = config.readPathEntry("DesktopFile"); + TQString desktopfile = config.readPathEntry("DesktopFile"); KService::Ptr pService = KService::serviceByDesktopPath(desktopfile); if (!pService) @@ -316,12 +316,12 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) } } - QString execName = pService->name(); - QString icon = pService->icon(); + TQString execName = pService->name(); + TQString icon = pService->icon(); if (m_detailedTaskEntries && !execName.isEmpty()) { - QString tmp = i18n("%1 (%2)"); + TQString tmp = i18n("%1 (%2)"); if (m_detailedNamesFirst) { @@ -341,7 +341,7 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) else { - QIconSet iconset = BarIconSet(icon, 22); + TQIconSet iconset = BarIconSet(icon, 22); if (iconset.isNull()) taskGroup->insertItem(name, m_maxIndex); else @@ -365,13 +365,13 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) return 0; } - connect(taskGroup, SIGNAL(activated(int)), this, SLOT(runTask(int))); + connect(taskGroup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(runTask(int))); // so we have an actual task group menu with tasks, let's add it if (inSubMenu) { - QObject::connect(taskGroup, SIGNAL(aboutToShowContextMenu(KPopupMenu*, int, QPopupMenu*)), - this, SLOT(contextualizeRMBmenu(KPopupMenu*, int, QPopupMenu*))); + TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*)), + this, TQT_SLOT(contextualizeRMBmenu(KPopupMenu*, int, TQPopupMenu*))); m_submenus.append(taskGroup); @@ -382,14 +382,14 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) { taskGroup->insertSeparator(); taskGroup->insertItem("Modify These Tasks", configureMenuID); - QPopupMenu* rmbMenu = taskGroup->contextMenu(); + TQPopupMenu* rmbMenu = taskGroup->contextMenu(); rmbMenu->setFont(m_largerFont); KPopupTitle* title = new KPopupTitle(); title->setText(i18n("%1 Menu Editor").arg(name)); rmbMenu->insertItem(title, contextMenuTitleID); rmbMenu->insertItem(i18n("Add This Task to Panel")); rmbMenu->insertItem(i18n("Modify This Task...")); - rmbMenu->insertItem(i18n("Remove This Task..."), this, SLOT(removeTask())); + rmbMenu->insertItem(i18n("Remove This Task..."), this, TQT_SLOT(removeTask())); rmbMenu->insertItem(i18n("Insert New Task...")); } } @@ -428,27 +428,27 @@ void TOM::initialize() /*if (!loadSidePixmap()) { - m_sidePixmap = m_sideTilePixmap = QPixmap(); + m_sidePixmap = m_sideTilePixmap = TQPixmap(); } else { - connect(kapp, SIGNAL(kdisplayPaletteChanged()), SLOT(paletteChanged())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); }*/ // TASKS insertTitle(i18n("Tasks"), contextMenuTitleID); - QStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/tom/"); - QStringList::ConstIterator dIt = dirs.begin(); - QStringList::ConstIterator dEnd = dirs.end(); + TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/tom/"); + TQStringList::ConstIterator dIt = dirs.begin(); + TQStringList::ConstIterator dEnd = dirs.end(); for (; dIt != dEnd; ++dIt ) { - QDir dir(*dIt); + TQDir dir(*dIt); - QStringList entries = dir.entryList("*rc", QDir::Files); - QStringList::ConstIterator eIt = entries.begin(); - QStringList::ConstIterator eEnd = entries.end(); + TQStringList entries = dir.entryList("*rc", TQDir::Files); + TQStringList::ConstIterator eIt = entries.begin(); + TQStringList::ConstIterator eEnd = entries.end(); for (; eIt != eEnd; ++eIt ) { @@ -457,7 +457,7 @@ void TOM::initialize() } } - PanelServiceMenu* moreApps = new PanelServiceMenu(QString::null, QString::null, this, "More Applications"); + PanelServiceMenu* moreApps = new PanelServiceMenu(TQString::null, TQString::null, this, "More Applications"); moreApps->setFont(m_largerFont); insertItem(DesktopIcon("misc", KIcon::SizeMedium), i18n("More Applications"), moreApps); m_submenus.append(moreApps); @@ -472,9 +472,9 @@ void TOM::initialize() // DESTINATIONS insertTitle(i18n("Destinations"), destMenuTitleID); int numDests = 0; - QString destinationsConfig = locate("appdata", "tom/destinations"); + TQString destinationsConfig = locate("appdata", "tom/destinations"); - if (!destinationsConfig.isEmpty() && QFile::exists(destinationsConfig)) + if (!destinationsConfig.isEmpty() && TQFile::exists(destinationsConfig)) { KConfig config(destinationsConfig); numDests = appendTaskGroup(config, false); @@ -486,7 +486,7 @@ void TOM::initialize() } else if (kapp->authorize("run_command")) { - insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, SLOT(runCommand())); + insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); } // RECENTLY USED ITEMS @@ -494,8 +494,8 @@ void TOM::initialize() m_recentDocsMenu = new KPopupMenu(this, "recentDocs"); m_recentDocsMenu->setFont(m_largerFont); - connect(m_recentDocsMenu, SIGNAL(aboutToShow()), this, SLOT(initializeRecentDocs())); - connect(m_recentDocsMenu, SIGNAL(activated(int)), this, SLOT(openRecentDocument(int))); + connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs())); + connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int))); insertItem(DesktopIcon("document", KIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu); m_submenus.append(m_recentDocsMenu); @@ -512,16 +512,16 @@ void TOM::initialize() // if we have no destinations, put the run command here if (numDests == 0 && kapp->authorize("run_command")) { - insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, SLOT(runCommand())); + insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); } KConfig* config = KGlobal::config(); - QStringList menu_ext = config->readListEntry("Extensions"); + TQStringList menu_ext = config->readListEntry("Extensions"); if (!menu_ext.isEmpty()) { bool needSeparator = false; - for (QStringList::ConstIterator it = menu_ext.begin(); it != menu_ext.end(); ++it) + for (TQStringList::ConstIterator it = menu_ext.begin(); it != menu_ext.end(); ++it) { MenuInfo info(*it); if (!info.isValid()) @@ -546,11 +546,11 @@ void TOM::initialize() } - QString username; + TQString username; struct passwd *userInfo = getpwuid(getuid()); if (userInfo) { - username = QString::fromLocal8Bit(userInfo->pw_gecos); + username = TQString::fromLocal8Bit(userInfo->pw_gecos); if (username.find(',') != -1) { // Remove everything from and including first comma @@ -559,12 +559,12 @@ void TOM::initialize() if (username.isEmpty()) { - username = QString::fromLocal8Bit(userInfo->pw_name); + username = TQString::fromLocal8Bit(userInfo->pw_name); } } insertItem(DesktopIcon("exit", KIcon::SizeMedium), - i18n("Logout %1").arg(username), this, SLOT(logout())); + i18n("Logout %1").arg(username), this, TQT_SLOT(logout())); } void TOM::reload() @@ -573,7 +573,7 @@ void TOM::reload() initialize(); } -void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu) +void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu) { if (menuItem == configureMenuID) { @@ -582,7 +582,7 @@ void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, QPopupMenu* ctxMe } ctxMenu->removeItem(contextMenuTitleID); - QString text = menu->text(menuItem); + TQString text = menu->text(menuItem); int parens = text.find('(') - 1; if (parens > 0) { @@ -608,7 +608,7 @@ void TOM::slotExec(int /* id */) void TOM::removeTask() { // TODO: write this change out to the appropriate config file - QString task = KPopupMenu::contextMenuFocus()->text(KPopupMenu::contextMenuFocusItem()); + TQString task = KPopupMenu::contextMenuFocus()->text(KPopupMenu::contextMenuFocusItem()); if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure you want to remove the <strong>%1</strong> task?<p>" "<em>Tip: You can restore the task after it has been removed by selecting the "Modify These Tasks" entry</em></qt>").arg(task), @@ -629,12 +629,12 @@ void TOM::removeTask() bool TOM::loadSidePixmap() { KConfig *config = KGlobal::config(); - QColor color = palette().active().highlight(); - QImage image; + TQColor color = palette().active().highlight(); + TQImage image; config->setGroup("WM"); - QColor activeTitle = config->readColorEntry("activeBackground", &color); - QColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); + TQColor activeTitle = config->readColorEntry("activeBackground", &color); + TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); config->setGroup("KMenu"); if (!config->readBoolEntry("Usem_sidePixmap", true)) @@ -667,8 +667,8 @@ bool TOM::loadSidePixmap() } color.setRgb(r, g, b); - QString sideName = config->readEntry("SideName", "kside.png"); - QString sideTileName = config->readEntry("SideTileName", "kside_tile.png"); + TQString sideName = config->readEntry("SideName", "kside.png"); + TQString sideTileName = config->readEntry("SideTileName", "kside_tile.png"); image.load(locate("data", "kicker/pics/" + sideName)); @@ -699,8 +699,8 @@ bool TOM::loadSidePixmap() if (m_sideTilePixmap.height() < 100) { int tiles = (int)(100 / m_sideTilePixmap.height()) + 1; - QPixmap preTiledPixmap(m_sideTilePixmap.width(), m_sideTilePixmap.height() * tiles); - QPainter p(&preTiledPixmap); + TQPixmap preTiledPixmap(m_sideTilePixmap.width(), m_sideTilePixmap.height() * tiles); + TQPainter p(&preTiledPixmap); p.drawTiledPixmap(preTiledPixmap.rect(), m_sideTilePixmap); m_sideTilePixmap = preTiledPixmap; } @@ -711,15 +711,15 @@ bool TOM::loadSidePixmap() void TOM::paletteChanged() { if (!loadSidePixmap()) - m_sidePixmap = m_sideTilePixmap = QPixmap(); + m_sidePixmap = m_sideTilePixmap = TQPixmap(); } -void TOM::setMinimumSize(const QSize & s) +void TOM::setMinimumSize(const TQSize & s) { KPanelMenu::setMinimumSize(s.width() + m_sidePixmap.width(), s.height()); } -void TOM::setMaximumSize(const QSize & s) +void TOM::setMaximumSize(const TQSize & s) { KPanelMenu::setMaximumSize(s.width() + m_sidePixmap.width(), s.height()); } @@ -734,33 +734,33 @@ void TOM::setMaximumSize(int w, int h) KPanelMenu::setMaximumSize(w + m_sidePixmap.width(), h); } -QRect TOM::sideImageRect() +TQRect TOM::sideImageRect() { - return QStyle::visualRect( QRect( frameWidth(), frameWidth(), m_sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), height() - 2*frameWidth() ), this ); } -void TOM::resizeEvent(QResizeEvent * e) +void TOM::resizeEvent(TQResizeEvent * e) { - setFrameRect( QStyle::visualRect( QRect( m_sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( m_sidePixmap.width(), 0, width() - m_sidePixmap.width(), height() ), this ) ); } -void TOM::paintEvent(QPaintEvent * e) +void TOM::paintEvent(TQPaintEvent * e) { if (m_sidePixmap.isNull()) { KPanelMenu::paintEvent(e); return; } - QPainter p(this); + TQPainter p(this); - style().drawPrimitive( QStyle::PE_PanelPopup, &p, - QRect( 0, 0, width(), height() ), - colorGroup(), QStyle::Style_Default, - QStyleOption( frameWidth(), 0 ) ); + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, + TQRect( 0, 0, width(), height() ), + colorGroup(), TQStyle::Style_Default, + TQStyleOption( frameWidth(), 0 ) ); - QRect r = sideImageRect(); + TQRect r = sideImageRect(); r.setBottom( r.bottom() - m_sidePixmap.height() ); p.drawTiledPixmap( r, m_sideTilePixmap ); @@ -771,40 +771,40 @@ void TOM::paintEvent(QPaintEvent * e) drawContents( &p ); } -QMouseEvent TOM::translateMouseEvent( QMouseEvent* e ) +TQMouseEvent TOM::translateMouseEvent( TQMouseEvent* e ) { - QRect side = sideImageRect(); + TQRect side = sideImageRect(); if ( !side.contains( e->pos() ) ) return *e; - QPoint newpos( e->pos() ); - QApplication::reverseLayout() ? + TQPoint newpos( e->pos() ); + TQApplication::reverseLayout() ? newpos.setX( newpos.x() - side.width() ) : newpos.setX( newpos.x() + side.width() ); - QPoint newglobal( e->globalPos() ); - QApplication::reverseLayout() ? + TQPoint newglobal( e->globalPos() ); + TQApplication::reverseLayout() ? newglobal.setX( newpos.x() - side.width() ) : newglobal.setX( newpos.x() + side.width() ); - return QMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() ); + return TQMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() ); } -void TOM::mousePressEvent(QMouseEvent * e) +void TOM::mousePressEvent(TQMouseEvent * e) { - QMouseEvent newEvent = translateMouseEvent(e); + TQMouseEvent newEvent = translateMouseEvent(e); KPanelMenu::mousePressEvent( &newEvent ); } -void TOM::mouseReleaseEvent(QMouseEvent *e) +void TOM::mouseReleaseEvent(TQMouseEvent *e) { - QMouseEvent newEvent = translateMouseEvent(e); + TQMouseEvent newEvent = translateMouseEvent(e); KPanelMenu::mouseReleaseEvent( &newEvent ); } -void TOM::mouseMoveEvent(QMouseEvent *e) +void TOM::mouseMoveEvent(TQMouseEvent *e) { - QMouseEvent newEvent = translateMouseEvent(e); + TQMouseEvent newEvent = translateMouseEvent(e); KPanelMenu::mouseMoveEvent( &newEvent ); }*/ @@ -812,8 +812,8 @@ extern int kicker_screen_number; void TOM::runCommand() { - QByteArray data; - QCString appname( "kdesktop" ); + TQByteArray data; + TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); @@ -828,7 +828,7 @@ void TOM::runTask(int id) kapp->propagateSessionManager(); KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(), - QStringList(), 0, 0, 0, "", true); + TQStringList(), 0, 0, 0, "", true); } void TOM::clearRecentDocHistory() diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h index 663cb05d6..f658a1ffe 100644 --- a/kicker/menuext/tom/tom.h +++ b/kicker/menuext/tom/tom.h @@ -19,7 +19,7 @@ #ifndef __tom_h_ #define __tom_h_ -#include <qpixmap.h> +#include <tqpixmap.h> #include <kpanelmenu.h> #include <klibloader.h> @@ -27,20 +27,20 @@ class KPopupMenu; class QPopupMenu; -typedef QPtrList<QPopupMenu> PopupMenuList; -typedef QMap<int, KService::Ptr> TaskMap; +typedef TQPtrList<TQPopupMenu> PopupMenuList; +typedef TQMap<int, KService::Ptr> TaskMap; class TOM : public KPanelMenu { Q_OBJECT public: - TOM(QWidget *parent = 0, const char *name = 0); + TOM(TQWidget *parent = 0, const char *name = 0); ~TOM(); // for the side image - /*void setMinimumSize(const QSize &); - void setMaximumSize(const QSize &); + /*void setMinimumSize(const TQSize &); + void setMaximumSize(const TQSize &); void setMinimumSize(int, int); void setMaximumSize(int, int); */ @@ -49,7 +49,7 @@ class TOM : public KPanelMenu void slotExec(int); //void configChanged(); void initialize(); - void contextualizeRMBmenu(KPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu); + void contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu); //void paletteChanged(); void clearRecentDocHistory(); void runCommand(); @@ -67,43 +67,43 @@ class TOM : public KPanelMenu void reload(); int appendTaskGroup(KConfig& config, bool inSubMenu = true ); - void initializeRecentApps(QPopupMenu* menu); - //int insertTOMTitle(QPopupMenu* menu, const QString &text, int id = -1, int index = -1); + void initializeRecentApps(TQPopupMenu* menu); + //int insertTOMTitle(TQPopupMenu* menu, const TQString &text, int id = -1, int index = -1); /* * this stuff should be shared w/the kmenu - QRect sideImageRect(); - QMouseEvent translateMouseEvent( QMouseEvent* e ); - void resizeEvent(QResizeEvent *); - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + TQRect sideImageRect(); + TQMouseEvent translateMouseEvent( TQMouseEvent* e ); + void resizeEvent(TQResizeEvent *); + void paintEvent(TQPaintEvent *); + void mousePressEvent(TQMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); bool loadSidePixmap(); - QPixmap m_sidePixmap; - QPixmap m_sideTilePixmap;*/ + TQPixmap m_sidePixmap; + TQPixmap m_sideTilePixmap;*/ PopupMenuList m_submenus; - QFont m_largerFont; + TQFont m_largerFont; int m_maxIndex; bool m_isImmutable; bool m_detailedTaskEntries; bool m_detailedNamesFirst; TaskMap m_tasks; KPopupMenu* m_recentDocsMenu; - QStringList m_recentDocURLs; + TQStringList m_recentDocURLs; }; class TOMFactory : public KLibFactory { public: - TOMFactory(QObject *parent = 0, const char *name = 0); + TOMFactory(TQObject *parent = 0, const char *name = 0); protected: - QObject* createObject(QObject *parent = 0, const char *name = 0, - const char *classname = "QObject", - const QStringList& args = QStringList()); + TQObject* createObject(TQObject *parent = 0, const char *name = 0, + const char *classname = "TQObject", + const TQStringList& args = TQStringList()); }; diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index d9ac588d5..0501fcd9a 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -23,9 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> -#include <qstring.h> -#include <qfile.h> -#include <qobjectlist.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqobjectlist.h> #include <qxembed.h> #include <kapplication.h> @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kmessagebox.h> #include <kpanelapplet.h> #include <kaboutdata.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <dcopclient.h> #include <kwin.h> @@ -97,20 +97,20 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) KCmdLineArgs::usage(i18n("No desktop file specified") ); // Perhaps we should use a konsole-like solution here (shell, list of args...) - QString desktopfile( args->arg(0) ); + TQString desktopfile( args->arg(0) ); // load applet DSO - if ( !QFile::exists( desktopfile ) && + if ( !TQFile::exists( desktopfile ) && !desktopfile.endsWith( ".desktop" ) ) desktopfile.append( ".desktop" ); - if ( !QFile::exists( desktopfile ) ) + if ( !TQFile::exists( desktopfile ) ) desktopfile = locate( "applets", desktopfile ).latin1(); proxy.loadApplet( desktopfile, args->getOption("configfile")); // dock into our applet container - QCString callbackid = args->getOption( "callbackid"); + TQCString callbackid = args->getOption( "callbackid"); if ( callbackid.isEmpty() ) proxy.showStandalone(); else @@ -119,8 +119,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) return a.exec(); } -AppletProxy::AppletProxy(QObject* parent, const char* name) - : QObject(parent, name) +AppletProxy::AppletProxy(TQObject* parent, const char* name) + : TQObject(parent, name) , DCOPObject("AppletProxy") , _info(0) , _applet(0) @@ -142,7 +142,7 @@ AppletProxy::AppletProxy(QObject* parent, const char* name) exit(0); } - _bg = QPixmap(); + _bg = TQPixmap(); } AppletProxy::~AppletProxy() @@ -152,12 +152,12 @@ AppletProxy::~AppletProxy() delete _applet; } -void AppletProxy::loadApplet(const QString& desktopFile, const QString& configFile) +void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& configFile) { - QString df; + TQString df; // try simple path first - QFileInfo finfo( desktopFile ); + TQFileInfo finfo( desktopFile ); if ( finfo.exists() ) { df = finfo.absFilePath(); } else { @@ -165,7 +165,7 @@ void AppletProxy::loadApplet(const QString& desktopFile, const QString& configFi df = KGlobal::dirs()->findResource("applets", desktopFile); } - QFile file(df); + TQFile file(df); // does the config file exist? if (df.isNull() || !file.exists()) { kdError() << "Failed to locate applet desktop file: " << desktopFile << endl; @@ -197,15 +197,15 @@ void AppletProxy::loadApplet(const QString& desktopFile, const QString& configFi } // connect updateLayout signal - connect(_applet, SIGNAL(updateLayout()), SLOT(slotUpdateLayout())); + connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); // connect requestFocus signal - connect(_applet, SIGNAL(requestFocus()), SLOT(slotRequestFocus())); + connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(slotRequestFocus())); } KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) { KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library(QFile::encodeName(info.library())); + KLibrary* lib = loader->library(TQFile::encodeName(info.library())); if (!lib) { @@ -214,8 +214,8 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) return 0; } - KPanelApplet* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelApplet* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelApplet* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelApplet* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if (!init_ptr) { @@ -226,21 +226,21 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) return init_ptr(0, info.configFile()); } -void AppletProxy::repaintApplet(QWidget* widget) +void AppletProxy::repaintApplet(TQWidget* widget) { widget->repaint(); - const QObjectList* children = widget->children(); + const TQObjectList* children = widget->children(); if (!children) { return; } - QObjectList::iterator it = children->begin(); + TQObjectList::iterator it = children->begin(); for (; it != children->end(); ++it) { - QWidget *w = dynamic_cast<QWidget*>(*it); + TQWidget *w = dynamic_cast<TQWidget*>(*it); if (w) { repaintApplet(w); @@ -248,7 +248,7 @@ void AppletProxy::repaintApplet(QWidget* widget) } } -void AppletProxy::dock(const QCString& callbackID) +void AppletProxy::dock(const TQCString& callbackID) { kdDebug(1210) << "Callback ID: " << callbackID << endl; @@ -258,16 +258,16 @@ void AppletProxy::dock(const QCString& callbackID) DCOPClient* dcop = kapp->dcopClient(); dcop->setNotifications(true); - connect(dcop, SIGNAL(applicationRemoved(const QCString&)), - SLOT(slotApplicationRemoved(const QCString&))); + connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQT_SLOT(slotApplicationRemoved(const TQCString&))); WId win; // get docked { - QCString replyType; - QByteArray data, replyData; - QDataStream dataStream( data, IO_WriteOnly ); + TQCString replyType; + TQByteArray data, replyData; + TQDataStream dataStream( data, IO_WriteOnly ); int actions = 0; if (_applet) actions = _applet->actions(); @@ -282,7 +282,7 @@ void AppletProxy::dock(const QCString& callbackID) int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -298,7 +298,7 @@ void AppletProxy::dock(const QCString& callbackID) exit(0); } - QDataStream reply( replyData, IO_ReadOnly ); + TQDataStream reply( replyData, IO_ReadOnly ); reply >> win; // request background @@ -328,15 +328,15 @@ void AppletProxy::dock(const QCString& callbackID) } -bool AppletProxy::process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData) +bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData) { if ( fun == "widthForHeight(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int height; dataStream >> height; - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); replyType = "int"; if (!_applet) @@ -348,10 +348,10 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "heightForWidth(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int width; dataStream >> width; - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); replyType = "int"; if(!_applet) @@ -363,7 +363,7 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setDirection(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int dir; dataStream >> dir; @@ -374,7 +374,7 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setAlignment(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int alignment; dataStream >> alignment; @@ -412,7 +412,7 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "actions()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int actions = 0; if(_applet) actions = _applet->actions(); reply << actions; @@ -421,16 +421,16 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "type()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int type = 0; if (_applet) type = static_cast<int>(_applet->type()); reply << type; replyType = "int"; return true; } - else if ( fun == "setBackground(QPixmap)" ) + else if ( fun == "setBackground(TQPixmap)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); dataStream >> _bg; if(_applet) if ( _bg.isNull() ) { // no transparency @@ -453,11 +453,11 @@ void AppletProxy::slotUpdateLayout() { if(_callbackID.isNull()) return; - QByteArray data; + TQByteArray data; int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -470,11 +470,11 @@ void AppletProxy::slotRequestFocus() { if(_callbackID.isNull()) return; - QByteArray data; + TQByteArray data; int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -483,12 +483,12 @@ void AppletProxy::slotRequestFocus() kapp->dcopClient()->send(appname, _callbackID, "requestFocus()", data); } -void AppletProxy::slotApplicationRemoved(const QCString& appId) +void AppletProxy::slotApplicationRemoved(const TQCString& appId) { int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h index 182280193..4c504022f 100644 --- a/kicker/proxy/appletproxy.h +++ b/kicker/proxy/appletproxy.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __appletproxy_h__ #define __appletproxy_h__ -#include <qcstring.h> -#include <qobject.h> +#include <tqcstring.h> +#include <tqobject.h> #include <dcopobject.h> @@ -34,34 +34,34 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KPanelApplet; class KickerPluginManager; -class AppletProxy : public QObject, DCOPObject +class AppletProxy : public TQObject, DCOPObject { Q_OBJECT public: - AppletProxy(QObject* parent, const char* name = 0); + AppletProxy(TQObject* parent, const char* name = 0); ~AppletProxy(); - void loadApplet(const QString& desktopFile, const QString& configFile); + void loadApplet(const TQString& desktopFile, const TQString& configFile); KPanelApplet* loadApplet(const AppletInfo& info); - void dock(const QCString& callbackID); + void dock(const TQCString& callbackID); void showStandalone(); - bool process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData); + bool process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData); protected slots: void slotUpdateLayout(); void slotRequestFocus(); - void slotApplicationRemoved(const QCString&); + void slotApplicationRemoved(const TQCString&); private: - void repaintApplet(QWidget* widget); + void repaintApplet(TQWidget* widget); AppletInfo *_info; KPanelApplet *_applet; - QCString _callbackID; - QPixmap _bg; + TQCString _callbackID; + TQPixmap _bg; }; #endif diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index f7c3309c4..796f10c93 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qfile.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqfile.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kapplication.h> #include <kglobal.h> @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kpanelextension.h> #include <kaboutdata.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> #include "appletinfo.h" #include "extensiondebugger.h" @@ -51,7 +51,7 @@ static KCmdLineOptions options[] = KPanelExtension* loadExtension(const AppletInfo& info) { KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library(QFile::encodeName(info.library())); + KLibrary* lib = loader->library(TQFile::encodeName(info.library())); if (!lib) { @@ -60,8 +60,8 @@ KPanelExtension* loadExtension(const AppletInfo& info) return 0; } - KPanelExtension* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelExtension* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelExtension* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if (!init_ptr) { @@ -91,7 +91,7 @@ int main( int argc, char ** argv ) KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); - QString df; + TQString df; // parse cmdline args KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -101,19 +101,19 @@ int main( int argc, char ** argv ) KCmdLineArgs::usage(i18n("No desktop file specified") ); - QCString desktopFile = QCString( args->arg(0) ); + TQCString desktopFile = TQCString( args->arg(0) ); // try simple path first - QFileInfo finfo( desktopFile ); + TQFileInfo finfo( desktopFile ); if ( finfo.exists() ) { df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("extensions", QString(desktopFile)); + df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile)); } // does the config file exist? - if (!QFile::exists(df)) { + if (!TQFile::exists(df)) { kdError() << "Failed to locate extension desktop file: " << desktopFile << endl; return 1; } @@ -129,7 +129,7 @@ int main( int argc, char ** argv ) ExtensionContainer *container = new ExtensionContainer( extension ); container->show(); - QObject::connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); + TQObject::connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) ); int result = a.exec(); @@ -137,19 +137,19 @@ int main( int argc, char ** argv ) return result; } -ExtensionContainer::ExtensionContainer( KPanelExtension *extension, QWidget *parent, const char *name ) - : QWidget( parent, name ), m_extension( extension ) +ExtensionContainer::ExtensionContainer( KPanelExtension *extension, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), m_extension( extension ) { - ( new QVBoxLayout( this ) )->setAutoAdd( true ); + ( new TQVBoxLayout( this ) )->setAutoAdd( true ); - QPushButton *configButton = new QPushButton( i18n( "Configure..." ), this ); - connect( configButton, SIGNAL( clicked() ), - this, SLOT( showPreferences() ) ); + TQPushButton *configButton = new TQPushButton( i18n( "Configure..." ), this ); + connect( configButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( showPreferences() ) ); - m_extension->reparent( this, QPoint( 0, 0 ) ); + m_extension->reparent( this, TQPoint( 0, 0 ) ); } -void ExtensionContainer::resizeEvent( QResizeEvent * ) +void ExtensionContainer::resizeEvent( TQResizeEvent * ) { m_extension->setGeometry( 0, 0, width(), height() ); } diff --git a/kicker/proxy/extensiondebugger.h b/kicker/proxy/extensiondebugger.h index 36745ae90..87ac76ecb 100644 --- a/kicker/proxy/extensiondebugger.h +++ b/kicker/proxy/extensiondebugger.h @@ -32,10 +32,10 @@ class ExtensionContainer : public QWidget Q_OBJECT public: - ExtensionContainer(KPanelExtension *extension, QWidget* parent = 0, const char* name = 0); + ExtensionContainer(KPanelExtension *extension, TQWidget* parent = 0, const char* name = 0); protected: - void resizeEvent( QResizeEvent *ev ); + void resizeEvent( TQResizeEvent *ev ); private slots: void showPreferences(); diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 0fbb341e5..3d931c95b 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> -#include <qstring.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqfile.h> #include <qxembed.h> #include <kapplication.h> @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kpanelextension.h> #include <kaboutdata.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <dcopclient.h> #include "appletinfo.h" @@ -90,7 +90,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) } // Perhaps we should use a konsole-like solution here (shell, list of args...) - QCString desktopfile = QCString( args->arg(0) ); + TQCString desktopfile = TQCString( args->arg(0) ); // load extension DSO proxy.loadExtension( desktopfile, args->getOption("configfile")); @@ -101,8 +101,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) return a.exec(); } -ExtensionProxy::ExtensionProxy(QObject* parent, const char* name) - : QObject(parent, name) +ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name) + : TQObject(parent, name) , DCOPObject("ExtensionProxy") , _info(0) , _extension(0) @@ -124,20 +124,20 @@ ExtensionProxy::~ExtensionProxy() kapp->dcopClient()->detach(); } -void ExtensionProxy::loadExtension(const QCString& desktopFile, const QCString& configFile) +void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString& configFile) { - QString df; + TQString df; // try simple path first - QFileInfo finfo( desktopFile ); + TQFileInfo finfo( desktopFile ); if ( finfo.exists() ) { df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("extensions", QString(desktopFile)); + df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile)); } - QFile file(df); + TQFile file(df); // does the config file exist? if (df.isNull() || !file.exists()) { kdError() << "Failed to locate extension desktop file: " << desktopFile << endl; @@ -161,13 +161,13 @@ void ExtensionProxy::loadExtension(const QCString& desktopFile, const QCString& } // connect updateLayout signal - connect(_extension, SIGNAL(updateLayout()), SLOT(slotUpdateLayout())); + connect(_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); } KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info) { KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library(QFile::encodeName(info.library())); + KLibrary* lib = loader->library(TQFile::encodeName(info.library())); if (!lib) { @@ -176,8 +176,8 @@ KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info) return 0; } - KPanelExtension* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelExtension* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelExtension* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if (!init_ptr) { @@ -188,7 +188,7 @@ KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info) return init_ptr(0, info.configFile()); } -void ExtensionProxy::dock(const QCString& callbackID) +void ExtensionProxy::dock(const TQCString& callbackID) { kdDebug(1210) << "Callback ID: " << callbackID << endl; @@ -198,16 +198,16 @@ void ExtensionProxy::dock(const QCString& callbackID) DCOPClient* dcop = kapp->dcopClient(); dcop->setNotifications(true); - connect(dcop, SIGNAL(applicationRemoved(const QCString&)), - SLOT(slotApplicationRemoved(const QCString&))); + connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQT_SLOT(slotApplicationRemoved(const TQCString&))); WId win; // get docked { - QCString replyType; - QByteArray data, replyData; - QDataStream dataStream( data, IO_WriteOnly ); + TQCString replyType; + TQByteArray data, replyData; + TQDataStream dataStream( data, IO_WriteOnly ); int actions = 0; if(_extension) actions = _extension->actions(); @@ -222,7 +222,7 @@ void ExtensionProxy::dock(const QCString& callbackID) int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -235,7 +235,7 @@ void ExtensionProxy::dock(const QCString& callbackID) exit(0); } - QDataStream reply( replyData, IO_ReadOnly ); + TQDataStream reply( replyData, IO_ReadOnly ); reply >> win; } @@ -255,19 +255,19 @@ void ExtensionProxy::dock(const QCString& callbackID) } } -bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData) +bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData) { - if ( fun == "sizeHint(int,QSize)" ) + if ( fun == "sizeHint(int,TQSize)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int pos; - QSize maxSize; + TQSize maxSize; dataStream >> pos; dataStream >> maxSize; - QDataStream reply( replyData, IO_WriteOnly ); - replyType = "QSize"; + TQDataStream reply( replyData, IO_WriteOnly ); + replyType = "TQSize"; if(!_extension) reply << maxSize; @@ -278,7 +278,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setPosition(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int pos; dataStream >> pos; @@ -289,7 +289,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setAlignment(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int alignment; dataStream >> alignment; @@ -300,7 +300,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setSize(int,int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int serializedSize; int custom; dataStream >> serializedSize; @@ -338,7 +338,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "actions()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int actions = 0; if(_extension) actions = _extension->actions(); reply << actions; @@ -347,7 +347,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "preferedPosition()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int pos = static_cast<int>(KPanelExtension::Bottom); if(_extension) pos = static_cast<int>(_extension->preferedPosition()); reply << pos; @@ -356,7 +356,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "type()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int type = 0; if (_extension) type = static_cast<int>(_extension->type()); reply << type; @@ -370,11 +370,11 @@ void ExtensionProxy::slotUpdateLayout() { if(_callbackID.isNull()) return; - QByteArray data; + TQByteArray data; int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -383,12 +383,12 @@ void ExtensionProxy::slotUpdateLayout() kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); } -void ExtensionProxy::slotApplicationRemoved(const QCString& appId) +void ExtensionProxy::slotApplicationRemoved(const TQCString& appId) { int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else diff --git a/kicker/proxy/extensionproxy.h b/kicker/proxy/extensionproxy.h index e5b8ca96d..88bc0a325 100644 --- a/kicker/proxy/extensionproxy.h +++ b/kicker/proxy/extensionproxy.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __extensionproxy_h__ #define __extensionproxy_h__ -#include <qcstring.h> -#include <qobject.h> +#include <tqcstring.h> +#include <tqobject.h> #include <dcopobject.h> @@ -33,29 +33,29 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KPanelExtension; -class ExtensionProxy : public QObject, DCOPObject +class ExtensionProxy : public TQObject, DCOPObject { Q_OBJECT public: - ExtensionProxy(QObject* parent, const char* name = 0); + ExtensionProxy(TQObject* parent, const char* name = 0); ~ExtensionProxy(); - void loadExtension(const QCString& desktopFile, const QCString& configFile); + void loadExtension(const TQCString& desktopFile, const TQCString& configFile); KPanelExtension* loadExtension(const AppletInfo& info); - void dock(const QCString& callbackID); + void dock(const TQCString& callbackID); - bool process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData); + bool process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData); protected slots: void slotUpdateLayout(); - void slotApplicationRemoved(const QCString&); + void slotApplicationRemoved(const TQCString&); private: AppletInfo *_info; KPanelExtension *_extension; - QCString _callbackID; + TQCString _callbackID; }; #endif diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index c2580f5f1..88768e811 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -25,12 +25,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <math.h> -#include <qapplication.h> -#include <qbitmap.h> -#include <qdesktopwidget.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qstringlist.h> +#include <tqapplication.h> +#include <tqbitmap.h> +#include <tqdesktopwidget.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqstringlist.h> #include <dcopclient.h> #include <kapplication.h> @@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskbar.moc" -TaskBar::TaskBar( QWidget *parent, const char *name ) +TaskBar::TaskBar( TQWidget *parent, const char *name ) : Panner( parent, name ), m_showAllWindows(false), m_currentScreen(-1), @@ -65,35 +65,35 @@ TaskBar::TaskBar( QWidget *parent, const char *name ) blocklayout = true; // init - setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // setup animation frames for (int i = 1; i < 11; i++) { - frames.append(new QPixmap(locate("data", "kicker/pics/disk" + QString::number(i) + ".png"))); + frames.append(new TQPixmap(locate("data", "kicker/pics/disk" + TQString::number(i) + ".png"))); } // configure configure(); - connect(&m_relayoutTimer, SIGNAL(timeout()), - this, SLOT(reLayout())); + connect(&m_relayoutTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(reLayout())); - connect(this, SIGNAL(contentsMoving(int, int)), SLOT(setBackground())); + connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); // connect manager - connect(TaskManager::the(), SIGNAL(taskAdded(Task::Ptr)), - this, SLOT(add(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(taskRemoved(Task::Ptr)), - this, SLOT(remove(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(startupAdded(Startup::Ptr)), - this, SLOT(add(Startup::Ptr))); - connect(TaskManager::the(), SIGNAL(startupRemoved(Startup::Ptr)), - this, SLOT(remove(Startup::Ptr))); - connect(TaskManager::the(), SIGNAL(desktopChanged(int)), - this, SLOT(desktopChanged(int))); - connect(TaskManager::the(), SIGNAL(windowChanged(Task::Ptr)), - this, SLOT(windowChanged(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), + this, TQT_SLOT(add(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), + this, TQT_SLOT(remove(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), + this, TQT_SLOT(add(Startup::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), + this, TQT_SLOT(remove(Startup::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), + this, TQT_SLOT(desktopChanged(int))); + connect(TaskManager::the(), TQT_SIGNAL(windowChanged(Task::Ptr)), + this, TQT_SLOT(windowChanged(Task::Ptr))); isGrouping = shouldGroup(); @@ -115,7 +115,7 @@ TaskBar::TaskBar( QWidget *parent, const char *name ) blocklayout = false; - connect(kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int))); + connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); keys = new KGlobalAccel( this ); #include "taskbarbindings.cpp" keys->readSettings(); @@ -159,22 +159,22 @@ KTextShadowEngine *TaskBar::textShadowEngine() } -QSize TaskBar::sizeHint() const +TQSize TaskBar::sizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest - QFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(KGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); - return QSize(BUTTON_MIN_WIDTH, minButtonHeight); + return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); } -QSize TaskBar::sizeHint( KPanelExtension::Position p, QSize maxSize) const +TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest - QFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(KGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); @@ -191,7 +191,7 @@ QSize TaskBar::sizeHint( KPanelExtension::Position p, QSize maxSize) const { return maxSize; } - return QSize( maxSize.width(), actualMax ); + return TQSize( maxSize.width(), actualMax ); } else { @@ -224,7 +224,7 @@ QSize TaskBar::sizeHint( KPanelExtension::Position p, QSize maxSize) const { return maxSize; } - return QSize( actualMax, maxSize.height() ); + return TQSize( actualMax, maxSize.height() ); } } @@ -242,8 +242,8 @@ void TaskBar::configure() m_currentScreen = -1; // Show all screens or re-get our screen m_showOnlyCurrentScreen = (TaskBarSettings::showCurrentScreenOnly() && - QApplication::desktop()->isVirtualDesktop() && - QApplication::desktop()->numScreens() > 1) || (QApplication::desktop()->numScreens() < 2); + TQApplication::desktop()->isVirtualDesktop() && + TQApplication::desktop()->numScreens() > 1) || (TQApplication::desktop()->numScreens() < 2); // we need to watch geometry issues if we aren't showing windows when we // are paying attention to the current Xinerama screen @@ -251,10 +251,10 @@ void TaskBar::configure() { // disconnect first in case we've been here before // to avoid multiple connections - disconnect(TaskManager::the(), SIGNAL(windowChangedGeometry(Task::Ptr)), - this, SLOT(windowChangedGeometry(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(windowChangedGeometry(Task::Ptr)), - this, SLOT(windowChangedGeometry(Task::Ptr))); + disconnect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); } TaskManager::the()->trackGeometry(m_showOnlyCurrentScreen); @@ -283,18 +283,18 @@ void TaskBar::setOrientation( Orientation o ) reLayoutEventually(); } -void TaskBar::moveEvent( QMoveEvent* e ) +void TaskBar::moveEvent( TQMoveEvent* e ) { Panner::moveEvent(e); setViewportBackground(); } -void TaskBar::resizeEvent( QResizeEvent* e ) +void TaskBar::resizeEvent( TQResizeEvent* e ) { if (m_showOnlyCurrentScreen) { - QPoint topLeft = mapToGlobal(this->geometry().topLeft()); - if (m_currentScreen != QApplication::desktop()->screenNumber(topLeft)) + TQPoint topLeft = mapToGlobal(this->geometry().topLeft()); + if (m_currentScreen != TQApplication::desktop()->screenNumber(topLeft)) { // we have been moved to another screen! m_currentScreen = -1; @@ -366,7 +366,7 @@ void TaskBar::add(Startup::Ptr startup) // create new container TaskContainer *container = new TaskContainer(startup, frames, this, viewport()); m_hiddenContainers.append(container); - connect(container, SIGNAL(showMe(TaskContainer*)), this, SLOT(showTaskContainer(TaskContainer*))); + connect(container, TQT_SIGNAL(showMe(TaskContainer*)), this, TQT_SLOT(showTaskContainer(TaskContainer*))); } void TaskBar::showTaskContainer(TaskContainer* container) @@ -654,8 +654,8 @@ void TaskBar::reLayoutEventually() void TaskBar::reLayout() { - // Because QPopupMenu::exec() creates its own event loop, deferred deletes - // via QObject::deleteLater() may be prematurely executed when a container's + // Because TQPopupMenu::exec() creates its own event loop, deferred deletes + // via TQObject::deleteLater() may be prematurely executed when a container's // popup menu is visible. // // To get around this, we collect the containers and delete them manually @@ -695,7 +695,7 @@ void TaskBar::reLayout() // number of rows simply depends on our height which is either the // minimum button height or the height of the font in use, whichever is // largest - QFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(KGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); @@ -756,7 +756,7 @@ void TaskBar::reLayout() } int i = 0; - bool reverseLayout = QApplication::reverseLayout(); + bool reverseLayout = TQApplication::reverseLayout(); for (TaskContainer::Iterator it = list.begin(); it != list.end(); ++it, i++) @@ -812,16 +812,16 @@ void TaskBar::reLayout() } } - QTimer::singleShot(100, this, SLOT(publishIconGeometry())); + TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry())); } void TaskBar::setViewportBackground() { - const QPixmap *bg = parentWidget()->backgroundPixmap(); + const TQPixmap *bg = parentWidget()->backgroundPixmap(); if (bg) { - QPixmap pm(parentWidget()->size()); + TQPixmap pm(parentWidget()->size()); pm.fill(parentWidget(), pos() + viewport()->pos()); viewport()->setPaletteBackgroundPixmap(pm); viewport()->setBackgroundOrigin(WidgetOrigin); @@ -863,7 +863,7 @@ void TaskBar::setArrowType(Qt::ArrowType at) void TaskBar::publishIconGeometry() { - QPoint p = mapToGlobal(QPoint(0,0)); // roundtrip, don't do that too often + TQPoint p = mapToGlobal(TQPoint(0,0)); // roundtrip, don't do that too often for (TaskContainer::Iterator it = containers.begin(); it != containers.end(); @@ -873,37 +873,37 @@ void TaskBar::publishIconGeometry() } } -void TaskBar::viewportMousePressEvent( QMouseEvent* e ) +void TaskBar::viewportMousePressEvent( TQMouseEvent* e ) { propagateMouseEvent( e ); } -void TaskBar::viewportMouseReleaseEvent( QMouseEvent* e ) +void TaskBar::viewportMouseReleaseEvent( TQMouseEvent* e ) { propagateMouseEvent( e ); } -void TaskBar::viewportMouseDoubleClickEvent( QMouseEvent* e ) +void TaskBar::viewportMouseDoubleClickEvent( TQMouseEvent* e ) { propagateMouseEvent( e ); } -void TaskBar::viewportMouseMoveEvent( QMouseEvent* e ) +void TaskBar::viewportMouseMoveEvent( TQMouseEvent* e ) { propagateMouseEvent( e ); } -void TaskBar::propagateMouseEvent( QMouseEvent* e ) +void TaskBar::propagateMouseEvent( TQMouseEvent* e ) { if ( !isTopLevel() ) { - QMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ), + TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - QApplication::sendEvent( topLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } -bool TaskBar::idMatch( const QString& id1, const QString& id2 ) +bool TaskBar::idMatch( const TQString& id1, const TQString& id2 ) { if ( id1.isEmpty() || id2.isEmpty() ) return false; @@ -949,7 +949,7 @@ int TaskBar::taskCount() const int TaskBar::maximumButtonsWithoutShrinking() const { - QFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(KGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); int rows = contentsRect().height() / minButtonHeight; @@ -1124,7 +1124,7 @@ void TaskBar::activateNextTask(bool forward) } } -void TaskBar::wheelEvent(QWheelEvent* e) +void TaskBar::wheelEvent(TQWheelEvent* e) { if (e->delta() > 0) { @@ -1162,35 +1162,35 @@ int TaskBar::showScreen() const if (m_showOnlyCurrentScreen && m_currentScreen == -1) { const_cast<TaskBar*>(this)->m_currentScreen = - QApplication::desktop()->screenNumber(mapToGlobal(this->geometry().topLeft())); + TQApplication::desktop()->screenNumber(mapToGlobal(this->geometry().topLeft())); } return m_currentScreen; } -QImage* TaskBar::blendGradient(const QSize& size) +TQImage* TaskBar::blendGradient(const TQSize& size) { if (m_blendGradient.isNull() || m_blendGradient.size() != size) { - QPixmap bgpm(size); - QPainter bgp(&bgpm); + TQPixmap bgpm(size); + TQPainter bgp(&bgpm); bgpm.fill(black); - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) { - QImage gradient = KImageEffect::gradient( - QSize(30, size.height()), - QColor(255,255,255), - QColor(0,0,0), + TQImage gradient = KImageEffect::gradient( + TQSize(30, size.height()), + TQColor(255,255,255), + TQColor(0,0,0), KImageEffect::HorizontalGradient); bgp.drawImage(0, 0, gradient); } else { - QImage gradient = KImageEffect::gradient( - QSize(30, size.height()), - QColor(0,0,0), - QColor(255,255,255), + TQImage gradient = KImageEffect::gradient( + TQSize(30, size.height()), + TQColor(0,0,0), + TQColor(255,255,255), KImageEffect::HorizontalGradient); bgp.drawImage(size.width() - 30, 0, gradient); } @@ -1203,7 +1203,7 @@ QImage* TaskBar::blendGradient(const QSize& size) void TaskBar::sortContainersByDesktop(TaskContainer::List& list) { - typedef QValueVector<QPair<int, QPair<int, TaskContainer*> > > SortVector; + typedef TQValueVector<QPair<int, QPair<int, TaskContainer*> > > SortVector; SortVector sorted; sorted.resize(list.count()); int i = 0; diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index 73c397670..ff160bc92 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -44,11 +44,11 @@ class TaskBar : public Panner Q_OBJECT public: - TaskBar( QWidget *parent = 0, const char *name = 0 ); + TaskBar( TQWidget *parent = 0, const char *name = 0 ); ~TaskBar(); - QSize sizeHint() const; - QSize sizeHint( KPanelExtension::Position, QSize maxSize ) const; + TQSize sizeHint() const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setOrientation( Orientation ); void setArrowType( Qt::ArrowType at ); @@ -61,7 +61,7 @@ public: bool sortByDesktop() const { return m_sortByDesktop; } bool showAllWindows() const { return m_showAllWindows; } - QImage* blendGradient(const QSize& size); + TQImage* blendGradient(const TQSize& size); KTextShadowEngine *textShadowEngine(); @@ -93,15 +93,15 @@ protected slots: protected: void reLayoutEventually(); - void viewportMousePressEvent( QMouseEvent* ); - void viewportMouseReleaseEvent( QMouseEvent* ); - void viewportMouseDoubleClickEvent( QMouseEvent* ); - void viewportMouseMoveEvent( QMouseEvent* ); - void wheelEvent(QWheelEvent*); - void propagateMouseEvent( QMouseEvent* ); - void resizeEvent( QResizeEvent* ); - void moveEvent( QMoveEvent* ); - bool idMatch( const QString& id1, const QString& id2 ); + void viewportMousePressEvent( TQMouseEvent* ); + void viewportMouseReleaseEvent( TQMouseEvent* ); + void viewportMouseDoubleClickEvent( TQMouseEvent* ); + void viewportMouseMoveEvent( TQMouseEvent* ); + void wheelEvent(TQWheelEvent*); + void propagateMouseEvent( TQMouseEvent* ); + void resizeEvent( TQResizeEvent* ); + void moveEvent( TQMoveEvent* ); + bool idMatch( const TQString& id1, const TQString& id2 ); TaskContainer::List filteredContainers(); private: @@ -127,9 +127,9 @@ private: void reGroup(); KGlobalAccel* keys; KTextShadowEngine* m_textShadowEngine; - QTimer m_relayoutTimer; + TQTimer m_relayoutTimer; bool m_ignoreUpdates; - QImage m_blendGradient; + TQImage m_blendGradient; }; #endif diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp index 63accd854..c457d3623 100644 --- a/kicker/taskbar/taskbarbindings.cpp +++ b/kicker/taskbar/taskbarbindings.cpp @@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4, this, SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString::null, key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index a548b7837..661706bdb 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlayout.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqtimer.h> #include <dcopclient.h> #include <kapplication.h> @@ -42,8 +42,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskbarcontainer.h" #include "taskbarcontainer.moc" -TaskBarContainer::TaskBarContainer( bool enableFrame, QWidget *parent, const char *name ) - : QFrame(parent, name), +TaskBarContainer::TaskBarContainer( bool enableFrame, TQWidget *parent, const char *name ) + : TQFrame(parent, name), direction( KPanelApplet::Up ), showWindowListButton( true ), windowListButton(0), @@ -63,16 +63,16 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, QWidget *parent, const cha margin = 0; } - layout = new QBoxLayout( this, QApplication::reverseLayout() ? - QBoxLayout::RightToLeft : - QBoxLayout::LeftToRight ); + layout = new TQBoxLayout( this, TQApplication::reverseLayout() ? + TQBoxLayout::RightToLeft : + TQBoxLayout::LeftToRight ); layout->setMargin( margin ); // scrollable taskbar taskBar = new TaskBar(this); layout->addWidget( taskBar ); - connect( taskBar, SIGNAL( containerCountChanged() ), SIGNAL( containerCountChanged() ) ); + connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) ); setBackground(); @@ -105,13 +105,13 @@ void TaskBarContainer::configure() // window list button windowListButton = new SimpleButton(this); windowListMenu= new KWindowListMenu; - connect(windowListButton, SIGNAL(pressed()), - SLOT(showWindowListMenu())); - connect(windowListMenu, SIGNAL(aboutToHide()), - SLOT(windowListMenuAboutToHide())); + connect(windowListButton, TQT_SIGNAL(pressed()), + TQT_SLOT(showWindowListMenu())); + connect(windowListMenu, TQT_SIGNAL(aboutToHide()), + TQT_SLOT(windowListMenuAboutToHide())); // geometry - QString icon; + TQString icon; switch (direction) { case KPanelApplet::Up: @@ -156,7 +156,7 @@ void TaskBarContainer::configChanged() void TaskBarContainer::preferences() { - QByteArray data; + TQByteArray data; if (!kapp->dcopClient()->isAttached()) { @@ -175,9 +175,9 @@ void TaskBarContainer::orientationChange(Orientation o) windowListButton->setFixedWidth(WINDOWLISTBUTTON_SIZE); windowListButton->setMaximumHeight(BUTTON_MAX_WIDTH); } - layout->setDirection(QApplication::reverseLayout() ? - QBoxLayout::RightToLeft : - QBoxLayout::LeftToRight); + layout->setDirection(TQApplication::reverseLayout() ? + TQBoxLayout::RightToLeft : + TQBoxLayout::LeftToRight); } else { @@ -186,7 +186,7 @@ void TaskBarContainer::orientationChange(Orientation o) windowListButton->setMaximumWidth(BUTTON_MAX_WIDTH); windowListButton->setFixedHeight(WINDOWLISTBUTTON_SIZE); } - layout->setDirection(QBoxLayout::TopToBottom); + layout->setDirection(TQBoxLayout::TopToBottom); } taskBar->setOrientation(o); @@ -202,7 +202,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) direction = d; ArrowType at = UpArrow; - QString icon; + TQString icon; switch (d) { case KPanelApplet::Up: @@ -242,7 +242,7 @@ void TaskBarContainer::showWindowListMenu() windowListMenu->init(); // calc popup menu position - QPoint pos( mapToGlobal( QPoint(0,0) ) ); + TQPoint pos( mapToGlobal( TQPoint(0,0) ) ); switch( direction ) { case KPanelApplet::Right: @@ -260,9 +260,9 @@ void TaskBarContainer::showWindowListMenu() break; } - disconnect( windowListButton, SIGNAL( pressed() ), this, SLOT( showWindowListMenu() ) ); + disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) ); windowListMenu->exec( pos ); - QTimer::singleShot(100, this, SLOT(reconnectWindowListButton())); + TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton())); } void TaskBarContainer::windowListMenuAboutToHide() @@ -274,14 +274,14 @@ void TaskBarContainer::windowListMenuAboutToHide() void TaskBarContainer::reconnectWindowListButton() { - connect( windowListButton, SIGNAL( pressed() ), SLOT( showWindowListMenu() ) ); + connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); } -QSize TaskBarContainer::sizeHint( KPanelExtension::Position p, QSize maxSize) const +TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { - QSize size = taskBar->sizeHint( p, maxSize ); + TQSize size = taskBar->sizeHint( p, maxSize ); if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) { - return QSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); + return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); } return size; } diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h index c265036b6..6c542ef00 100644 --- a/kicker/taskbar/taskbarcontainer.h +++ b/kicker/taskbar/taskbarcontainer.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __taskbarcontainer_h__ #define __taskbarcontainer_h__ -#include <qframe.h> +#include <tqframe.h> #include <dcopobject.h> #include <kpanelapplet.h> @@ -35,20 +35,20 @@ class SimpleButton; class KWindowListMenu; class TaskBar; -class KDE_EXPORT TaskBarContainer : public QFrame, public DCOPObject +class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject { Q_OBJECT K_DCOP public: - TaskBarContainer( bool enableFrame, QWidget* parent = 0, const char* name = 0 ); + TaskBarContainer( bool enableFrame, TQWidget* parent = 0, const char* name = 0 ); ~TaskBarContainer(); void orientationChange( Orientation ); void popupDirectionChange( KPanelApplet::Direction ); void preferences(); //FIXME: don't use Position, use Orientation - QSize sizeHint( KPanelExtension::Position, QSize maxSize ) const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setBackground(); k_dcop: @@ -66,7 +66,7 @@ protected slots: private: KPanelApplet::Direction direction; bool showWindowListButton; - QBoxLayout * layout; + TQBoxLayout * layout; TaskBar * taskBar; SimpleButton * windowListButton; KWindowListMenu * windowListMenu; diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 7025d643a..6bc74044e 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -25,15 +25,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <assert.h> -#include <qbitmap.h> -#include <qcolor.h> -#include <qcursor.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qstyle.h> -#include <qstylesheet.h> -#include <qtooltip.h> +#include <tqbitmap.h> +#include <tqcolor.h> +#include <tqcursor.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqstylesheet.h> +#include <tqtooltip.h> #include <kapplication.h> #include <kdebug.h> @@ -55,8 +55,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskcontainer.moc" TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, - QWidget *parent, const char *name) - : QToolButton(parent, name), + TQWidget *parent, const char *name) + : TQToolButton(parent, name), currentFrame(0), attentionState(-1), lastActivated(0), @@ -82,8 +82,8 @@ TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, } TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, - TaskBar* bar, QWidget *parent, const char *name) - : QToolButton(parent, name), + TaskBar* bar, TQWidget *parent, const char *name) + : TQToolButton(parent, name), currentFrame(0), frames(startupFrames), attentionState(-1), @@ -102,7 +102,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, sid = m_startup->bin(); - connect(m_startup, SIGNAL(changed()), SLOT(update())); + connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update())); dragSwitchTimer.start(333, true); } @@ -111,14 +111,14 @@ void TaskContainer::init() { setWFlags(WNoAutoErase); setBackgroundMode(NoBackground); - animBg = QPixmap(16, 16); + animBg = TQPixmap(16, 16); installEventFilter(KickerTip::the()); - connect(&animationTimer, SIGNAL(timeout()), SLOT(animationTimerFired())); - connect(&dragSwitchTimer, SIGNAL(timeout()), SLOT(showMe())); - connect(&attentionTimer, SIGNAL(timeout()), SLOT(attentionTimerFired())); - connect(&m_paintEventCompressionTimer, SIGNAL(timeout()), SLOT(updateNow())); + connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired())); + connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe())); + connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired())); + connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow())); } TaskContainer::~TaskContainer() @@ -138,8 +138,8 @@ void TaskContainer::showMe() animationTimer.start(100); emit showMe(this); - disconnect(&dragSwitchTimer, SIGNAL(timeout()), this, SLOT(showMe())); - connect(&dragSwitchTimer, SIGNAL(timeout()), SLOT(dragSwitch())); + disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe())); + connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); } void TaskContainer::stopTimers() @@ -159,7 +159,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) return; } - const QObject* source = sender(); + const TQObject* source = sender(); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -182,7 +182,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) void TaskContainer::iconChanged() { - const QObject* source = sender(); + const TQObject* source = sender(); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -204,7 +204,7 @@ void TaskContainer::iconChanged() } KickerTip::Client::updateKickerTip(); - QToolButton::update(); + TQToolButton::update(); } void TaskContainer::setLastActivated() @@ -227,14 +227,14 @@ void TaskContainer::animationTimerFired() { if (!frames.isEmpty() && taskBar->showIcon() && frames.at(currentFrame) != frames.end()) { - QPixmap *pm = *frames.at(currentFrame); + TQPixmap *pm = *frames.at(currentFrame); // draw pixmap if ( pm && !pm->isNull() ) { // we only have to redraw the background for frames 0, 8 and 9 if ( currentFrame == 0 || currentFrame > 7 ) { // double buffered painting - QPixmap composite( animBg ); + TQPixmap composite( animBg ); bitBlt( &composite, 0, 0, pm ); bitBlt( this, iconRect.x(), iconRect.y(), &composite ); } @@ -298,16 +298,16 @@ void TaskContainer::attentionTimerFired() update(); } -QSizePolicy TaskContainer::sizePolicy() const +TQSizePolicy TaskContainer::sizePolicy() const { - return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); + return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); } -void TaskContainer::resizeEvent( QResizeEvent * ) +void TaskContainer::resizeEvent( TQResizeEvent * ) { // calculate the icon rect - QRect br( style().subRect( QStyle::SR_PushButtonContents, this ) ); - iconRect = QStyle::visualRect( QRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); + iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); } void TaskContainer::add(Task::Ptr task) @@ -330,9 +330,9 @@ void TaskContainer::add(Task::Ptr task) KickerTip::Client::updateKickerTip(); update(); - connect(task, SIGNAL(changed(bool)), SLOT(taskChanged(bool))); - connect(task, SIGNAL(iconChanged()), SLOT(iconChanged())); - connect(task, SIGNAL(activated()), SLOT(setLastActivated())); + connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool))); + connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged())); + connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated())); } void TaskContainer::remove(Task::Ptr task) @@ -342,7 +342,7 @@ void TaskContainer::remove(Task::Ptr task) return; } - task->publishIconGeometry(QRect()); + task->publishIconGeometry(TQRect()); for (Task::List::Iterator it = tasks.begin(); it != tasks.end(); ++it) { if ((*it) == task) @@ -424,7 +424,7 @@ bool TaskContainer::isEmpty() return (tasks.isEmpty() && !m_startup); } -QString TaskContainer::id() +TQString TaskContainer::id() { return sid; } @@ -440,7 +440,7 @@ void TaskContainer::setBackground() updateNow(); } -void TaskContainer::paintEvent( QPaintEvent* ) +void TaskContainer::paintEvent( TQPaintEvent* ) { if (!m_paintEventCompression) { @@ -452,14 +452,14 @@ void TaskContainer::paintEvent( QPaintEvent* ) } m_paintEventCompression = false; - QPixmap* pm = new QPixmap(size()); + TQPixmap* pm = new TQPixmap(size()); - const QPixmap* background = taskBar->backgroundPixmap(); + const TQPixmap* background = taskBar->backgroundPixmap(); if (background) { - QPoint pt = mapTo(taskBar, QPoint(0, 0)) + taskBar->backgroundOffset(); - QPainter p(pm); + TQPoint pt = mapTo(taskBar, TQPoint(0, 0)) + taskBar->backgroundOffset(); + TQPainter p(pm); p.drawTiledPixmap(0, 0, width(), height(), *background, pt.x(), pt.y()); p.end(); } @@ -468,7 +468,7 @@ void TaskContainer::paintEvent( QPaintEvent* ) pm->fill(taskBar->paletteBackgroundColor()); } - QPainter p; + TQPainter p; p.begin(pm ,this); drawButton(&p); p.end(); @@ -477,7 +477,7 @@ void TaskContainer::paintEvent( QPaintEvent* ) delete pm; } -void TaskContainer::drawButton(QPainter *p) +void TaskContainer::drawButton(TQPainter *p) { if (isEmpty()) { @@ -485,8 +485,8 @@ void TaskContainer::drawButton(QPainter *p) } // get a pointer to the pixmap we're drawing on - QPixmap *pm((QPixmap*)p->device()); - QPixmap pixmap; // icon + TQPixmap *pm((TQPixmap*)p->device()); + TQPixmap pixmap; // icon Task::Ptr task = 0; bool iconified = !TaskBarSettings::showOnlyIconified(); bool halo = TaskBarSettings::haloText(); @@ -494,7 +494,7 @@ void TaskContainer::drawButton(QPainter *p) bool drawButton = alwaysDrawButtons || (m_mouseOver && !halo && isEnabled() && TaskBarSettings::showButtonOnHover()); - QFont font(KGlobalSettings::taskbarFont()); + TQFont font(KGlobalSettings::taskbarFont()); // draw sunken if we contain the active task bool active = false; @@ -522,14 +522,14 @@ void TaskContainer::drawButton(QPainter *p) font.setBold(active); - QColorGroup colors = palette().active(); + TQColorGroup colors = palette().active(); if (TaskBarSettings::useCustomColors()) { - colors.setColor( QColorGroup::Button, TaskBarSettings::taskBackgroundColor()); - colors.setColor( QColorGroup::Background, TaskBarSettings::taskBackgroundColor() ); - colors.setColor( QColorGroup::ButtonText, TaskBarSettings::inactiveTaskTextColor() ); - colors.setColor( QColorGroup::Text, TaskBarSettings::inactiveTaskTextColor() ); + colors.setColor( TQColorGroup::Button, TaskBarSettings::taskBackgroundColor()); + colors.setColor( TQColorGroup::Background, TaskBarSettings::taskBackgroundColor() ); + colors.setColor( TQColorGroup::ButtonText, TaskBarSettings::inactiveTaskTextColor() ); + colors.setColor( TQColorGroup::Text, TaskBarSettings::inactiveTaskTextColor() ); } if (demandsAttention) @@ -538,29 +538,29 @@ void TaskContainer::drawButton(QPainter *p) { halo = true; - QRect r = rect(); - QColor line = colors.highlight(); + TQRect r = rect(); + TQColor line = colors.highlight(); r.addCoords(2, 2, -2, -2); p->fillRect(r, line); for (int i = 0; i < 2; ++i) { line = KickerLib::blendColors(line, colors.background()); - p->setPen(QPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); r.addCoords(-1, -1, 1, 1); p->drawRect(r); } } // blink until blink timeout, then display differently without blinking - colors.setColor( QColorGroup::Button, colors.highlight() ); - colors.setColor( QColorGroup::Background, colors.highlight() ); - colors.setColor( QColorGroup::ButtonText, colors.highlightedText() ); - colors.setColor( QColorGroup::Text, colors.highlightedText() ); + colors.setColor( TQColorGroup::Button, colors.highlight() ); + colors.setColor( TQColorGroup::Background, colors.highlight() ); + colors.setColor( TQColorGroup::ButtonText, colors.highlightedText() ); + colors.setColor( TQColorGroup::Text, colors.highlightedText() ); } if (active || aboutToActivate) { - colors.setColor(QColorGroup::Button, colors.button().dark(110)); + colors.setColor(TQColorGroup::Button, colors.button().dark(110)); } // get the task icon @@ -570,16 +570,16 @@ void TaskContainer::drawButton(QPainter *p) } bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); - bool reverse = QApplication::reverseLayout(); - QRect br(style().subRect(QStyle::SR_PushButtonContents, this)); - QPoint shift = QPoint(style().pixelMetric(QStyle::PM_ButtonShiftHorizontal), - style().pixelMetric(QStyle::PM_ButtonShiftVertical)); + bool reverse = TQApplication::reverseLayout(); + TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this)); + TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), + style().pixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) { - style().drawPrimitive(QStyle::PE_HeaderSection, p, - QRect(0, 0, width(), height()), + style().drawPrimitive(TQStyle::PE_HeaderSection, p, + TQRect(0, 0, width(), height()), colors); } @@ -601,7 +601,7 @@ void TaskContainer::drawButton(QPainter *p) // make sure it is no larger than 16x16 if ( pixmap.width() > 16 || pixmap.height() > 16 ) { - QImage tmp = pixmap.convertToImage(); + TQImage tmp = pixmap.convertToImage(); pixmap.convertFromImage( tmp.smoothScale( 16, 16 ) ); } @@ -612,17 +612,17 @@ void TaskContainer::drawButton(QPainter *p) } // draw icon - QRect pmr(0, 0, pixmap.width(), pixmap.height()); + TQRect pmr(0, 0, pixmap.width(), pixmap.height()); pmr.moveCenter(iconRect.center()); p->drawPixmap(pmr, pixmap); } } // find text - QString text = name(); + TQString text = name(); // modified overlay - static QString modStr = "[" + i18n( "modified" ) + "]"; + static TQString modStr = "[" + i18n( "modified" ) + "]"; int modStrPos = text.find( modStr ); int textPos = ( taskBar->showIcon() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0; @@ -630,12 +630,12 @@ void TaskContainer::drawButton(QPainter *p) { // +1 because we include a space after the closing brace. text.remove(modStrPos, modStr.length() + 1); - QPixmap modPixmap = SmallIcon("modified"); + TQPixmap modPixmap = SmallIcon("modified"); // draw modified overlay if (!modPixmap.isNull()) { - QRect r = QStyle::visualRect(QRect(br.x() + textPos, + TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos, (height() - 16) / 2, 16, 16), this); @@ -652,27 +652,27 @@ void TaskContainer::drawButton(QPainter *p) // draw text if (!text.isEmpty()) { - QRect tr = QStyle::visualRect(QRect(br.x() + textPos + 1, 0, + TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0, width() - textPos, height()), this); int textFlags = AlignVCenter | SingleLine; textFlags |= reverse ? AlignRight : AlignLeft; - QPen textPen; + TQPen textPen; // get the color for the text label if (iconified) { - textPen = QPen(KickerLib::blendColors(colors.button(), colors.buttonText())); + textPen = TQPen(KickerLib::blendColors(colors.button(), colors.buttonText())); } else if (!active) { - textPen = QPen(colors.buttonText()); + textPen = TQPen(colors.buttonText()); } else // hack for the dotNET style and others { if (TaskBarSettings::useCustomColors()) { - textPen = QPen(TaskBarSettings::activeTaskTextColor()); + textPen = TQPen(TaskBarSettings::activeTaskTextColor()); } else { @@ -686,11 +686,11 @@ void TaskContainer::drawButton(QPainter *p) availableWidth -= 8; } - if (QFontMetrics(font).width(text) > availableWidth) + if (TQFontMetrics(font).width(text) > availableWidth) { // draw text into overlay pixmap - QPixmap tpm(*pm); - QPainter tp(&tpm); + TQPixmap tpm(*pm); + TQPainter tp(&tpm); if (sunken) { @@ -710,8 +710,8 @@ void TaskContainer::drawButton(QPainter *p) } // blend text into background image - QImage img = pm->convertToImage(); - QImage timg = tpm.convertToImage(); + TQImage img = pm->convertToImage(); + TQImage timg = tpm.convertToImage(); KImageEffect::blend(img, timg, *taskBar->blendGradient(size()), KImageEffect::Red); pm->convertFromImage(img); } @@ -733,12 +733,12 @@ void TaskContainer::drawButton(QPainter *p) if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end()) { - QPixmap *anim = *frames.at(currentFrame); + TQPixmap *anim = *frames.at(currentFrame); if (anim && !anim->isNull()) { // save the background for the other frames - bitBlt(&animBg, QPoint(0,0), pm, iconRect); + bitBlt(&animBg, TQPoint(0,0), pm, iconRect); // draw the animation frame bitBlt(pm, iconRect.x(), iconRect.y(), anim); } @@ -753,22 +753,22 @@ void TaskContainer::drawButton(QPainter *p) // draw popup arrow if (m_filteredTasks.count() > 1) { - QStyle::PrimitiveElement e = QStyle::PE_ArrowLeft; + TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft; switch (arrowType) { - case Qt::LeftArrow: e = QStyle::PE_ArrowLeft; break; - case Qt::RightArrow: e = QStyle::PE_ArrowRight; break; - case Qt::UpArrow: e = QStyle::PE_ArrowUp; break; - case Qt::DownArrow: e = QStyle::PE_ArrowDown; break; + case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; + case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break; + case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break; + case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break; } - int flags = QStyle::Style_Enabled; - QRect ar = QStyle::visualRect(QRect(br.x() + br.width() - 8 - 2, + int flags = TQStyle::Style_Enabled; + TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2, br.y(), 8, br.height()), this); if (sunken) { - flags |= QStyle::Style_Down; + flags |= TQStyle::Style_Down; } style().drawPrimitive(e, p, ar, colors, flags); @@ -776,7 +776,7 @@ void TaskContainer::drawButton(QPainter *p) // draw mouse over frame in transparent mode if (m_mouseOver && halo) - KickerLib::drawBlendedRect(p, QRect(0, 0, width(), height()), colorGroup().foreground()); + KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); if (aboutToActivate) { @@ -784,10 +784,10 @@ void TaskContainer::drawButton(QPainter *p) } } -QString TaskContainer::name() +TQString TaskContainer::name() { // default to container id - QString text; + TQString text; // single task -> use mainwindow caption if (m_filteredTasks.count() == 1) @@ -798,7 +798,7 @@ QString TaskContainer::name() { // multiple tasks -> use the common part of all captions // if it is more descriptive than the class name - const QString match = m_filteredTasks.first()->visibleName(); + const TQString match = m_filteredTasks.first()->visibleName(); unsigned int maxLength = match.length(); unsigned int i = 0; bool stop = false; @@ -807,11 +807,11 @@ QString TaskContainer::name() // in common, and then use everything UP TO that as the name in the button while (i < maxLength) { - QChar check = match.at(i).lower(); + TQChar check = match.at(i).lower(); Task::List::iterator itEnd = m_filteredTasks.end(); for (Task::List::iterator it = m_filteredTasks.begin(); it != itEnd; ++it) { - // we're doing a lot of Utf8 -> QString conversions here + // we're doing a lot of Utf8 -> TQString conversions here // by repeatedly calling visibleIconicName() =/ if (check != (*it)->visibleName().at(i).lower()) { @@ -863,14 +863,14 @@ QString TaskContainer::name() // this is faster than (" [%1]").arg() or + // and it's as fast as using append, but cleaner looking text += " ["; - text += QString::number(m_filteredTasks.count()); + text += TQString::number(m_filteredTasks.count()); text += "]"; } return text; } -void TaskContainer::mousePressEvent( QMouseEvent* e ) +void TaskContainer::mousePressEvent( TQMouseEvent* e ) { if (discardNextMouseEvent) { @@ -884,7 +884,7 @@ void TaskContainer::mousePressEvent( QMouseEvent* e ) } else { - m_dragStartPos = QPoint(); + m_dragStartPos = TQPoint(); } int buttonAction = 0; @@ -913,9 +913,9 @@ void TaskContainer::mousePressEvent( QMouseEvent* e ) } } -void TaskContainer::mouseReleaseEvent(QMouseEvent *e) +void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) { - m_dragStartPos = QPoint(); + m_dragStartPos = TQPoint(); if (!TaskBarSettings::drawButtons()) { @@ -926,7 +926,7 @@ void TaskContainer::mouseReleaseEvent(QMouseEvent *e) // button as unpressed just before it's activated. if (!rect().contains(e->pos())) { - QToolButton::mouseReleaseEvent(e); + TQToolButton::mouseReleaseEvent(e); return; } @@ -960,7 +960,7 @@ void TaskContainer::mouseReleaseEvent(QMouseEvent *e) } performAction( buttonAction ); - QTimer::singleShot(0, this, SLOT(update())); + TQTimer::singleShot(0, this, TQT_SLOT(update())); } void TaskContainer::performAction(int action) @@ -1130,7 +1130,7 @@ void TaskContainer::popupMenu(int action) } // calc popup menu position - QPoint pos(mapToGlobal(QPoint(0, 0))); + TQPoint pos(mapToGlobal(TQPoint(0, 0))); switch( arrowType ) { @@ -1141,12 +1141,12 @@ void TaskContainer::popupMenu(int action) pos.setX(pos.x() - m_menu->sizeHint().width()); break; case DownArrow: - if ( QApplication::reverseLayout() ) + if ( TQApplication::reverseLayout() ) pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); pos.setY( pos.y() + height() ); break; case UpArrow: - if ( QApplication::reverseLayout() ) + if ( TQApplication::reverseLayout() ) pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); pos.setY(pos.y() - m_menu->sizeHint().height()); break; @@ -1160,7 +1160,7 @@ void TaskContainer::popupMenu(int action) m_menu = 0; } -void TaskContainer::mouseMoveEvent( QMouseEvent* e ) +void TaskContainer::mouseMoveEvent( TQMouseEvent* e ) { kdDebug() << "regular move" << endl; if (!m_dragStartPos.isNull()) @@ -1168,10 +1168,10 @@ void TaskContainer::mouseMoveEvent( QMouseEvent* e ) startDrag(e->pos()); } - QToolButton::mouseMoveEvent(e); + TQToolButton::mouseMoveEvent(e); } -bool TaskContainer::startDrag(const QPoint& pos) +bool TaskContainer::startDrag(const TQPoint& pos) { if (m_filteredTasks.count() != 1) { @@ -1205,21 +1205,21 @@ bool TaskContainer::startDrag(const QPoint& pos) // This is the code that gives us the proper behavior // when a popup menu is displayed and we are clicked: // close the menu, and don't reopen it immediately. -// It's copied from QToolButton. Unfortunately Qt is lame +// It's copied from TQToolButton. Unfortunately Qt is lame // as usual and makes interesting stuff private or // non-virtual, so we have to copy code. -bool TaskContainer::eventFilter(QObject *o, QEvent *e) +bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) { switch ( e->type() ) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonDblClick: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonDblClick: { - QMouseEvent *me = (QMouseEvent*)e; - QPoint p = me->globalPos(); - if ( QApplication::widgetAt( p, true ) == this ) + TQMouseEvent *me = (TQMouseEvent*)e; + TQPoint p = me->globalPos(); + if ( TQApplication::widgetAt( p, true ) == this ) { - if (me->type() == QEvent::MouseButtonPress && + if (me->type() == TQEvent::MouseButtonPress && me->button() == LeftButton) { m_dragStartPos = mapFromGlobal(p); @@ -1229,25 +1229,25 @@ bool TaskContainer::eventFilter(QObject *o, QEvent *e) } break; } - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: { - m_dragStartPos = QPoint(); + m_dragStartPos = TQPoint(); break; } - case QEvent::MouseMove: + case TQEvent::MouseMove: { if (!m_dragStartPos.isNull()) { - QMouseEvent* me = static_cast<QMouseEvent*>(e); - QPoint p(me->globalPos()); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + TQPoint p(me->globalPos()); if (me->state() & LeftButton && - QApplication::widgetAt(p, true) == this) + TQApplication::widgetAt(p, true) == this) { kdDebug() << "event move" << endl; if (startDrag(mapFromGlobal(p))) { - QPopupMenu* menu = dynamic_cast<QPopupMenu*>(o); + TQPopupMenu* menu = dynamic_cast<TQPopupMenu*>(o); if (menu) { @@ -1263,7 +1263,7 @@ bool TaskContainer::eventFilter(QObject *o, QEvent *e) break; } - return QToolButton::eventFilter( o, e ); + return TQToolButton::eventFilter( o, e ); } void TaskContainer::setArrowType( Qt::ArrowType at ) @@ -1277,19 +1277,19 @@ void TaskContainer::setArrowType( Qt::ArrowType at ) update(); } -void TaskContainer::publishIconGeometry( QPoint global ) +void TaskContainer::publishIconGeometry( TQPoint global ) { - QPoint p = global + geometry().topLeft(); + TQPoint p = global + geometry().topLeft(); Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) { Task::Ptr t = *it; - t->publishIconGeometry(QRect(p.x(), p.y(), width(), height())); + t->publishIconGeometry(TQRect(p.x(), p.y(), width(), height())); } } -void TaskContainer::dragEnterEvent( QDragEnterEvent* e ) +void TaskContainer::dragEnterEvent( TQDragEnterEvent* e ) { // ignore task drags and applet drags if (TaskDrag::canDecode(e) || PanelDrag::canDecode(e)) @@ -1310,37 +1310,37 @@ void TaskContainer::dragEnterEvent( QDragEnterEvent* e ) dragSwitchTimer.start(1000, true); } - QToolButton::dragEnterEvent( e ); + TQToolButton::dragEnterEvent( e ); } -void TaskContainer::dragLeaveEvent( QDragLeaveEvent* e ) +void TaskContainer::dragLeaveEvent( TQDragLeaveEvent* e ) { dragSwitchTimer.stop(); - QToolButton::dragLeaveEvent( e ); + TQToolButton::dragLeaveEvent( e ); } -void TaskContainer::enterEvent(QEvent* e) +void TaskContainer::enterEvent(TQEvent* e) { - QToolTip::remove(this); + TQToolTip::remove(this); m_mouseOver = true; updateNow(); if (tasks.isEmpty()) { - QToolButton::enterEvent(e); + TQToolButton::enterEvent(e); return; } if (!KickerSettings::showMouseOverEffects()) { - QString tooltip = "<qt>" + QStyleSheet::escape(name()) + "</qt>"; - QToolTip::add(this, tooltip); + TQString tooltip = "<qt>" + TQStyleSheet::escape(name()) + "</qt>"; + TQToolTip::add(this, tooltip); return; } } -void TaskContainer::leaveEvent(QEvent*) +void TaskContainer::leaveEvent(TQEvent*) { m_mouseOver = false; updateNow(); @@ -1458,14 +1458,14 @@ void TaskContainer::updateFilteredTaskList() } else { - t->publishIconGeometry( QRect()); + t->publishIconGeometry( TQRect()); } } // sort container list by desktop if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1) { - QValueVector<QPair<int, Task::Ptr> > sorted; + TQValueVector<QPair<int, Task::Ptr> > sorted; sorted.resize(m_filteredTasks.count()); int i = 0; @@ -1480,7 +1480,7 @@ void TaskContainer::updateFilteredTaskList() qHeapSort(sorted); m_filteredTasks.clear(); - for (QValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin(); + for (TQValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin(); it != sorted.end(); ++it) { @@ -1525,9 +1525,9 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) return; } - QPixmap pixmap; - QString name; - QString details; + TQPixmap pixmap; + TQString name; + TQString details; if (m_filteredTasks.count() > 0) { @@ -1549,7 +1549,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) } // Collect all desktops the tasks are on. Sort naturally. - QMap<int, QString> desktopMap; + TQMap<int, TQString> desktopMap; bool demandsAttention = false; bool modified = false; bool allDesktops = false; @@ -1587,8 +1587,8 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) } else { - QStringList desktopNames = desktopMap.values(); - details.append(i18n("On %1").arg(QStyleSheet::escape(desktopNames.join(", "))) + "<br>"); + TQStringList desktopNames = desktopMap.values(); + details.append(i18n("On %1").arg(TQStyleSheet::escape(desktopNames.join(", "))) + "<br>"); } } @@ -1602,7 +1602,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) { details.append(i18n("Has unsaved changes")); - static QString modStr = "[" + i18n( "modified" ) + "]"; + static TQString modStr = "[" + i18n( "modified" ) + "]"; int modStrPos = name.find(modStr); if (modStrPos >= 0) @@ -1613,7 +1613,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) } } - data.message = QStyleSheet::escape(name); + data.message = TQStyleSheet::escape(name); data.subtext = details; data.icon = pixmap; data.direction = KickerLib::arrowToDirection(arrowType); @@ -1624,7 +1624,7 @@ void TaskContainer::finish() // Disconnect all signal/slot connections to avoid triggering a popupMenu() call, // whose event loop is the root of all (or at least much) evil. // Unfortunately, we can't just do "disconnect()", because that gets us a bunch - // of dangling QGuardedPtr objects (most notably in QTipManager.) (kling) + // of dangling TQGuardedPtr objects (most notably in QTipManager.) (kling) animationTimer.disconnect(); dragSwitchTimer.disconnect(); diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index 4328c36d4..567a74a79 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -25,28 +25,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __taskcontainer_h__ #define __taskcontainer_h__ -#include <qpixmap.h> -#include <qtimer.h> -#include <qtoolbutton.h> +#include <tqpixmap.h> +#include <tqtimer.h> +#include <tqtoolbutton.h> #include "kickertip.h" #include "taskmanager.h" class TaskBar; -typedef QValueList<QPixmap*> PixmapList; +typedef TQValueList<TQPixmap*> PixmapList; -class TaskContainer : public QToolButton, public KickerTip::Client +class TaskContainer : public TQToolButton, public KickerTip::Client { Q_OBJECT public: - typedef QValueList<TaskContainer*> List; - typedef QValueList<TaskContainer*>::iterator Iterator; + typedef TQValueList<TaskContainer*> List; + typedef TQValueList<TaskContainer*>::iterator Iterator; - TaskContainer(Task::Ptr, TaskBar*, QWidget *parent = 0, const char *name = 0); + TaskContainer(Task::Ptr, TaskBar*, TQWidget *parent = 0, const char *name = 0); TaskContainer(Startup::Ptr, PixmapList&, TaskBar*, - QWidget *parent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~TaskContainer(); void setArrowType( Qt::ArrowType at ); @@ -66,17 +66,17 @@ public: bool isIconified(); bool isOnScreen(); - QString id(); + TQString id(); int desktop(); - QString name(); + TQString name(); - virtual QSizePolicy sizePolicy () const; + virtual TQSizePolicy sizePolicy () const; - void publishIconGeometry( QPoint ); + void publishIconGeometry( TQPoint ); void desktopChanged( int ); void windowChanged(Task::Ptr); void settingsChanged(); - bool eventFilter( QObject *o, QEvent *e ); + bool eventFilter( TQObject *o, TQEvent *e ); int taskCount() const { return tasks.count(); } int filteredTaskCount() const { return m_filteredTasks.count(); } @@ -96,17 +96,17 @@ signals: void showMe(TaskContainer*); protected: - void paintEvent(QPaintEvent*); - void drawButton(QPainter*); - void resizeEvent(QResizeEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void dragEnterEvent(QDragEnterEvent*); - void dragLeaveEvent(QDragLeaveEvent*); - void enterEvent(QEvent*); - void leaveEvent(QEvent*); - bool startDrag(const QPoint& pos); + void paintEvent(TQPaintEvent*); + void drawButton(TQPainter*); + void resizeEvent(TQResizeEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); + void dragEnterEvent(TQDragEnterEvent*); + void dragLeaveEvent(TQDragLeaveEvent*); + void enterEvent(TQEvent*); + void leaveEvent(TQEvent*); + bool startDrag(const TQPoint& pos); void stopTimers(); void performAction(int); @@ -125,20 +125,20 @@ protected slots: private: void checkAttention(const Task::Ptr changed_task = NULL); - QString sid; - QTimer animationTimer; - QTimer dragSwitchTimer; - QTimer attentionTimer; - QTimer m_paintEventCompressionTimer; + TQString sid; + TQTimer animationTimer; + TQTimer dragSwitchTimer; + TQTimer attentionTimer; + TQTimer m_paintEventCompressionTimer; int currentFrame; PixmapList frames; int attentionState; - QRect iconRect; - QPixmap animBg; + TQRect iconRect; + TQPixmap animBg; Task::List tasks; Task::List m_filteredTasks; Task::Ptr lastActivated; - QPopupMenu* m_menu; + TQPopupMenu* m_menu; Startup::Ptr m_startup; ArrowType arrowType; TaskBar* taskBar; @@ -147,7 +147,7 @@ private: bool m_mouseOver; bool m_paintEventCompression; enum { ATTENTION_BLINK_TIMEOUT = 4 }; - QPoint m_dragStartPos; + TQPoint m_dragStartPos; }; #endif diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 03278c0fe..864d10f5d 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -25,17 +25,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "tasklmbmenu.h" #include "tasklmbmenu.moc" -#include <qpainter.h> -#include <qstyle.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <kdebug.h> #include <kglobalsettings.h> #include "global.h" -TaskMenuItem::TaskMenuItem(const QString &text, +TaskMenuItem::TaskMenuItem(const TQString &text, bool active, bool minimized, bool attention) - : QCustomMenuItem(), + : TQCustomMenuItem(), m_text(text), m_isActive(active), m_isMinimized(minimized), @@ -48,13 +48,13 @@ TaskMenuItem::~TaskMenuItem() { } -void TaskMenuItem::paint(QPainter *p, const QColorGroup &cg, +void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg, bool highlighted, bool /*enabled*/, int x, int y, int w, int h ) { if (m_isActive) { - QFont font = p->font(); + TQFont font = p->font(); font.setBold(true); p->setFont(font); } @@ -65,7 +65,7 @@ void TaskMenuItem::paint(QPainter *p, const QColorGroup &cg, } else if (m_isMinimized) { - p->setPen(QPen(KickerLib::blendColors(cg.background(), cg.text()))); + p->setPen(TQPen(KickerLib::blendColors(cg.background(), cg.text()))); } else if (m_demandsAttention && !m_attentionState) { @@ -75,21 +75,21 @@ void TaskMenuItem::paint(QPainter *p, const QColorGroup &cg, p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } -QSize TaskMenuItem::sizeHint() +TQSize TaskMenuItem::sizeHint() { - QFont font = QFont(); + TQFont font = TQFont(); if (m_isActive) { font.setBold(true); } - return QFontMetrics(font).size(AlignAuto|AlignVCenter|DontClip|ShowPrefix, + return TQFontMetrics(font).size(AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } /*****************************************************************************/ -TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, QWidget *parent, const char *name) - : QPopupMenu(parent, name), +TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char *name) + : TQPopupMenu(parent, name), m_tasks(tasks), m_lastDragId(-1), m_attentionState(false) @@ -98,8 +98,8 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, QWidget *parent, const char *n setAcceptDrops(true); // Always enabled to activate task during drag&drop. - m_dragSwitchTimer = new QTimer(this, "DragSwitchTimer"); - connect(m_dragSwitchTimer, SIGNAL(timeout()), SLOT(dragSwitch())); + m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer"); + connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); } void TaskLMBMenu::fillMenu() @@ -111,14 +111,14 @@ void TaskLMBMenu::fillMenu() { Task::Ptr t = (*it); - QString text = t->visibleName().replace("&", "&&"); + TQString text = t->visibleName().replace("&", "&&"); TaskMenuItem *menuItem = new TaskMenuItem(text, t->isActive(), t->isIconified(), t->demandsAttention()); - int id = insertItem(QIconSet(t->pixmap()), menuItem); - connectItem(id, t, SLOT(activateRaiseOrIconify())); + int id = insertItem(TQIconSet(t->pixmap()), menuItem); + connectItem(id, t, TQT_SLOT(activateRaiseOrIconify())); setItemChecked(id, t->isActive()); if (t->demandsAttention()) @@ -130,8 +130,8 @@ void TaskLMBMenu::fillMenu() if (m_attentionState) { - m_attentionTimer = new QTimer(this, "AttentionTimer"); - connect(m_attentionTimer, SIGNAL(timeout()), SLOT(attentionTimeout())); + m_attentionTimer = new TQTimer(this, "AttentionTimer"); + connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout())); m_attentionTimer->start(500, true); } } @@ -140,7 +140,7 @@ void TaskLMBMenu::attentionTimeout() { m_attentionState = !m_attentionState; - for (QValueList<TaskMenuItem*>::const_iterator it = m_attentionMap.constBegin(); + for (TQValueList<TaskMenuItem*>::const_iterator it = m_attentionMap.constBegin(); it != m_attentionMap.constEnd(); ++it) { @@ -152,7 +152,7 @@ void TaskLMBMenu::attentionTimeout() m_attentionTimer->start(500, true); } -void TaskLMBMenu::dragEnterEvent( QDragEnterEvent* e ) +void TaskLMBMenu::dragEnterEvent( TQDragEnterEvent* e ) { // ignore task drags if (TaskDrag::canDecode(e)) @@ -173,20 +173,20 @@ void TaskLMBMenu::dragEnterEvent( QDragEnterEvent* e ) m_dragSwitchTimer->start(1000, true); } - QPopupMenu::dragEnterEvent( e ); + TQPopupMenu::dragEnterEvent( e ); } -void TaskLMBMenu::dragLeaveEvent( QDragLeaveEvent* e ) +void TaskLMBMenu::dragLeaveEvent( TQDragLeaveEvent* e ) { m_dragSwitchTimer->stop(); m_lastDragId = -1; - QPopupMenu::dragLeaveEvent(e); + TQPopupMenu::dragLeaveEvent(e); hide(); } -void TaskLMBMenu::dragMoveEvent( QDragMoveEvent* e ) +void TaskLMBMenu::dragMoveEvent( TQDragMoveEvent* e ) { // ignore task drags if (TaskDrag::canDecode(e)) @@ -207,7 +207,7 @@ void TaskLMBMenu::dragMoveEvent( QDragMoveEvent* e ) m_dragSwitchTimer->start(1000, true); } - QPopupMenu::dragMoveEvent(e); + TQPopupMenu::dragMoveEvent(e); } void TaskLMBMenu::dragSwitch() @@ -227,7 +227,7 @@ void TaskLMBMenu::dragSwitch() } } -void TaskLMBMenu::mousePressEvent( QMouseEvent* e ) +void TaskLMBMenu::mousePressEvent( TQMouseEvent* e ) { if (e->button() == LeftButton) { @@ -235,28 +235,28 @@ void TaskLMBMenu::mousePressEvent( QMouseEvent* e ) } else { - m_dragStartPos = QPoint(); + m_dragStartPos = TQPoint(); } - QPopupMenu::mousePressEvent(e); + TQPopupMenu::mousePressEvent(e); } -void TaskLMBMenu::mouseReleaseEvent(QMouseEvent* e) +void TaskLMBMenu::mouseReleaseEvent(TQMouseEvent* e) { - m_dragStartPos = QPoint(); - QPopupMenu::mouseReleaseEvent(e); + m_dragStartPos = TQPoint(); + TQPopupMenu::mouseReleaseEvent(e); } -void TaskLMBMenu::mouseMoveEvent(QMouseEvent* e) +void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e) { if (m_dragStartPos.isNull()) { - QPopupMenu::mouseMoveEvent(e); + TQPopupMenu::mouseMoveEvent(e); return; } int delay = KGlobalSettings::dndEventDelay(); - QPoint newPos(e->pos()); + TQPoint newPos(e->pos()); if ((m_dragStartPos - newPos).manhattanLength() > delay) { @@ -276,6 +276,6 @@ void TaskLMBMenu::mouseMoveEvent(QMouseEvent* e) } } - QPopupMenu::mouseMoveEvent(e); + TQPopupMenu::mouseMoveEvent(e); } diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index 945c3e649..d11091d82 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -25,24 +25,24 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __tasklmbmenu_h__ #define __tasklmbmenu_h__ -#include <qpopupmenu.h> -#include <qtimer.h> +#include <tqpopupmenu.h> +#include <tqtimer.h> #include "taskmanager.h" class TaskMenuItem : public QCustomMenuItem { public: - TaskMenuItem(const QString &text, + TaskMenuItem(const TQString &text, bool active, bool minimized, bool attention); ~TaskMenuItem(); - void paint(QPainter*, const QColorGroup&, bool, bool, int, int, int, int); - QSize sizeHint(); + void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); + TQSize sizeHint(); void setAttentionState(bool state) { m_attentionState = state; } private: - QString m_text; + TQString m_text; bool m_isActive; bool m_isMinimized; bool m_demandsAttention; @@ -56,19 +56,19 @@ class KDE_EXPORT TaskLMBMenu : public QPopupMenu Q_OBJECT public: - TaskLMBMenu(const Task::List& list, QWidget *parent = 0, const char *name = 0); + TaskLMBMenu(const Task::List& list, TQWidget *parent = 0, const char *name = 0); protected slots: void dragSwitch(); void attentionTimeout(); protected: - void dragEnterEvent(QDragEnterEvent*); - void dragLeaveEvent(QDragLeaveEvent*); - void dragMoveEvent(QDragMoveEvent*); - void mousePressEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); + void dragEnterEvent(TQDragEnterEvent*); + void dragLeaveEvent(TQDragLeaveEvent*); + void dragMoveEvent(TQDragMoveEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); private: void fillMenu(); @@ -76,10 +76,10 @@ private: Task::List m_tasks; int m_lastDragId; bool m_attentionState; - QTimer* m_attentionTimer; - QTimer* m_dragSwitchTimer; - QPoint m_dragStartPos; - QValueList<TaskMenuItem*> m_attentionMap; + TQTimer* m_attentionTimer; + TQTimer* m_dragSwitchTimer; + TQPoint m_dragStartPos; + TQValueList<TaskMenuItem*> m_attentionMap; }; #endif diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index dd9364c0e..9a912e6fd 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -21,10 +21,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qcursor.h> -#include <qimage.h> -#include <qtimer.h> +#include <tqapplication.h> +#include <tqcursor.h> +#include <tqimage.h> +#include <tqtimer.h> #include <kconfig.h> #include <kdebug.h> @@ -54,28 +54,28 @@ TaskManager* TaskManager::the() } TaskManager::TaskManager() - : QObject(), + : TQObject(), _active(0), _startup_info(0), m_winModule(new KWinModule()), m_trackGeometry(false) { KGlobal::locale()->insertCatalogue("libtaskmanager"); - connect(m_winModule, SIGNAL(windowAdded(WId)), - this, SLOT(windowAdded(WId))); - connect(m_winModule, SIGNAL(windowRemoved(WId)), - this, SLOT(windowRemoved(WId))); - connect(m_winModule, SIGNAL(activeWindowChanged(WId)), - this, SLOT(activeWindowChanged(WId))); - connect(m_winModule, SIGNAL(currentDesktopChanged(int)), - this, SLOT(currentDesktopChanged(int))); - connect(m_winModule, SIGNAL(windowChanged(WId,unsigned int)), - this, SLOT(windowChanged(WId,unsigned int))); + connect(m_winModule, TQT_SIGNAL(windowAdded(WId)), + this, TQT_SLOT(windowAdded(WId))); + connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)), + this, TQT_SLOT(windowRemoved(WId))); + connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)), + this, TQT_SLOT(activeWindowChanged(WId))); + connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)), + this, TQT_SLOT(currentDesktopChanged(int))); + connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)), + this, TQT_SLOT(windowChanged(WId,unsigned int))); // register existing windows - const QValueList<WId> windows = m_winModule->windows(); - QValueList<WId>::ConstIterator end(windows.end()); - for (QValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it) + const TQValueList<WId> windows = m_winModule->windows(); + TQValueList<WId>::ConstIterator end(windows.end()); + for (TQValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it) { windowAdded(*it); } @@ -99,14 +99,14 @@ void TaskManager::configure_startup() return; _startup_info = new KStartupInfo( KStartupInfo::CleanOnCantDetect, this ); connect( _startup_info, - SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )), - SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& ))); + TQT_SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )), + TQT_SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& ))); connect( _startup_info, - SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )), - SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& ))); + TQT_SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )), + TQT_SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& ))); connect( _startup_info, - SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )), - SLOT( killStartup( const KStartupInfoId& ))); + TQT_SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )), + TQT_SLOT( killStartup( const KStartupInfoId& ))); c.setGroup( "TaskbarButtonSettings" ); _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 )); } @@ -114,7 +114,7 @@ void TaskManager::configure_startup() #ifdef THUMBNAILING_POSSIBLE void TaskManager::setXCompositeEnabled(bool state) { - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); if (!state) { @@ -227,9 +227,9 @@ Task::Ptr TaskManager::findTask(WId w) return 0; } -Task::Ptr TaskManager::findTask(int desktop, const QPoint& p) +Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p) { - QValueList<WId> list = winModule()->stackingOrder(); + TQValueList<WId> list = winModule()->stackingOrder(); Task::Ptr task = 0; int currentIndex = -1; @@ -544,7 +544,7 @@ void TaskManager::killStartup(Startup::Ptr s) emit startupRemoved(s); } -QString TaskManager::desktopName(int desk) const +TQString TaskManager::desktopName(int desk) const { return m_winModule->desktopName(desk); } @@ -561,8 +561,8 @@ bool TaskManager::isOnTop(const Task* task) return false; } - QValueList<WId>::ConstIterator begin(m_winModule->stackingOrder().constBegin()); - QValueList<WId>::ConstIterator it = m_winModule->stackingOrder().fromLast(); + TQValueList<WId>::ConstIterator begin(m_winModule->stackingOrder().constBegin()); + TQValueList<WId>::ConstIterator it = m_winModule->stackingOrder().fromLast(); do { Task::Dict::iterator taskItEnd = m_tasksByWId.end(); @@ -602,14 +602,14 @@ bool TaskManager::isOnScreen(int screen, const WId wid) // for window decos that fudge a bit and claim to extend beyond the // edge of the screen, we just contract a bit. - QRect window = wi.frameGeometry(); - QRect desktop = QApplication::desktop()->screenGeometry(screen); + TQRect window = wi.frameGeometry(); + TQRect desktop = TQApplication::desktop()->screenGeometry(screen); desktop.addCoords(5, 5, -5, -5); return window.intersects(desktop); } -Task::Task(WId win, QObject *parent, const char *name) - : QObject(parent, name), +Task::Task(WId win, TQObject *parent, const char *name) + : TQObject(parent, name), _active(false), _win(win), m_frameId(win), @@ -657,7 +657,7 @@ Task::~Task() #ifdef THUMBNAILING_POSSIBLE if (m_windowPixmap) { - XFreePixmap(QPaintDevice::x11AppDisplay(), m_windowPixmap); + XFreePixmap(TQPaintDevice::x11AppDisplay(), m_windowPixmap); } #endif // THUMBNAILING_POSSIBLE } @@ -676,7 +676,7 @@ void Task::findWindowFrameId() target_win = _win; for (;;) { - if (!XQueryTree(QPaintDevice::x11AppDisplay(), target_win, &root, + if (!XQueryTree(TQPaintDevice::x11AppDisplay(), target_win, &root, &parent, &children, &nchildren)) { break; @@ -728,7 +728,7 @@ void Task::refreshIcon() void Task::refresh(unsigned int dirty) { - QString name = visibleName(); + TQString name = visibleName(); _info = KWin::windowInfo(_win, 0, NET::WM2AllowedActions); if (dirty != NET::WMName || name != visibleName()) @@ -804,9 +804,9 @@ bool Task::isOnTop() const bool Task::isModified() const { - static QString modStr = QString::fromUtf8("[") + + static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + - QString::fromUtf8("]"); + TQString::fromUtf8("]"); int modStrPos = _info.visibleName().find(modStr); return ( modStrPos != -1 ); @@ -859,31 +859,31 @@ void Task::removeTransient(WId w) _transients_demanding_attention.remove(w); } -QString Task::className() +TQString Task::className() { XClassHint hint; if(XGetClassHint(qt_xdisplay(), _win, &hint)) { - QString nh( hint.res_name ); + TQString nh( hint.res_name ); XFree( hint.res_name ); XFree( hint.res_class ); return nh; } - return QString::null; + return TQString::null; } -QString Task::classClass() +TQString Task::classClass() { XClassHint hint; if(XGetClassHint(qt_xdisplay(), _win, &hint)) { - QString ch( hint.res_class ); + TQString ch( hint.res_class ); XFree( hint.res_name ); XFree( hint.res_class ); return ch; } - return QString::null; + return TQString::null; } -QPixmap Task::icon( int width, int height, bool allowResize ) +TQPixmap Task::icon( int width, int height, bool allowResize ) { if ( (width == _lastWidth) && (height == _lastHeight) @@ -891,7 +891,7 @@ QPixmap Task::icon( int width, int height, bool allowResize ) && (!_lastIcon.isNull()) ) return _lastIcon; - QPixmap newIcon = KWin::icon( _win, width, height, allowResize ); + TQPixmap newIcon = KWin::icon( _win, width, height, allowResize ); if ( !newIcon.isNull() ) { _lastIcon = newIcon; _lastWidth = width; @@ -902,9 +902,9 @@ QPixmap Task::icon( int width, int height, bool allowResize ) return newIcon; } -QPixmap Task::bestIcon( int size, bool &isStaticIcon ) +TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) { - QPixmap pixmap; + TQPixmap pixmap; isStaticIcon = false; switch( size ) { @@ -979,7 +979,7 @@ QPixmap Task::bestIcon( int size, bool &isStaticIcon ) return pixmap; } -bool Task::idMatch( const QString& id1, const QString& id2 ) +bool Task::idMatch( const TQString& id1, const TQString& id2 ) { if ( id1.isEmpty() || id2.isEmpty() ) return false; @@ -1009,8 +1009,8 @@ void Task::move() KWin::deIconifyWindow(_win); } - QRect geom = _info.geometry(); - QCursor::setPos(geom.center()); + TQRect geom = _info.geometry(); + TQCursor::setPos(geom.center()); NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); ri.moveResizeRequest(_win, geom.center().x(), @@ -1032,8 +1032,8 @@ void Task::resize() KWin::deIconifyWindow(_win); } - QRect geom = _info.geometry(); - QCursor::setPos(geom.bottomRight()); + TQRect geom = _info.geometry(); + TQCursor::setPos(geom.bottomRight()); NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); ri.moveResizeRequest(_win, geom.bottomRight().x(), @@ -1269,7 +1269,7 @@ void Task::toggleShaded() setShaded( !isShaded() ); } -void Task::publishIconGeometry(QRect rect) +void Task::publishIconGeometry(TQRect rect) { if (rect == m_iconGeometry) { @@ -1305,15 +1305,15 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - QWidget *rootWin = qApp->desktop(); - QRect geom = _info.geometry(); - _grab = QPixmap::grabWindow(rootWin->winId(), + TQWidget *rootWin = qApp->desktop(); + TQRect geom = _info.geometry(); + _grab = TQPixmap::grabWindow(rootWin->winId(), geom.x(), geom.y(), geom.width(), geom.height()); if (!_grab.isNull()) { - QTimer::singleShot(200, this, SLOT(generateThumbnail())); + TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail())); } } @@ -1322,7 +1322,7 @@ void Task::generateThumbnail() if ( _grab.isNull() ) return; - QImage img = _grab.convertToImage(); + TQImage img = _grab.convertToImage(); double width = img.width(); double height = img.height(); @@ -1337,14 +1337,14 @@ void Task::generateThumbnail() } #ifdef THUMBNAILING_POSSIBLE -QPixmap Task::thumbnail(int maxDimension) +TQPixmap Task::thumbnail(int maxDimension) { if (!TaskManager::xCompositeEnabled() || !m_windowPixmap) { - return QPixmap(); + return TQPixmap(); } - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); XWindowAttributes winAttr; XGetWindowAttributes(dpy, m_frameId, &winAttr); @@ -1374,12 +1374,12 @@ QPixmap Task::thumbnail(int maxDimension) int thumbnailWidth = (int)(winAttr.width * factor); int thumbnailHeight = (int)(winAttr.height * factor); - QPixmap thumbnail(thumbnailWidth, thumbnailHeight); - thumbnail.fill(QApplication::palette().active().background()); + TQPixmap thumbnail(thumbnailWidth, thumbnailHeight); + thumbnail.fill(TQApplication::palette().active().background()); -#if 0 // QImage::smoothScale() scaling - QPixmap full(winAttr.width, winAttr.height); - full.fill(QApplication::palette().active().background()); +#if 0 // TQImage::smoothScale() scaling + TQPixmap full(winAttr.width, winAttr.height); + full.fill(TQApplication::palette().active().background()); bool hasAlpha = format->type == PictTypeDirect && format->direct.alphaMask; @@ -1394,7 +1394,7 @@ QPixmap Task::thumbnail(int maxDimension) winAttr.width, winAttr.height); KPixmapIO io; - QImage image = io.convertToImage(full); + TQImage image = io.convertToImage(full); thumbnail = io.convertToPixmap(image.smoothScale(thumbnailWidth, thumbnailHeight)); #else // XRENDER scaling @@ -1408,7 +1408,7 @@ QPixmap Task::thumbnail(int maxDimension) XRenderSetPictureTransform(dpy, picture, &transformation); XRenderSetPictureFilter(dpy, picture, FilterBest, 0, 0); - XRenderComposite(QPaintDevice::x11AppDisplay(), + XRenderComposite(TQPaintDevice::x11AppDisplay(), PictOpOver, // we're filtering, alpha values are probable picture, // src None, // mask @@ -1423,9 +1423,9 @@ QPixmap Task::thumbnail(int maxDimension) return thumbnail; } #else // THUMBNAILING_POSSIBLE -QPixmap Task::thumbnail(int /* maxDimension */) +TQPixmap Task::thumbnail(int /* maxDimension */) { - return QPixmap(); + return TQPixmap(); } #endif // THUMBNAILING_POSSIBLE @@ -1438,7 +1438,7 @@ void Task::updateWindowPixmap() return; } - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); if (m_windowPixmap) { @@ -1453,8 +1453,8 @@ void Task::updateWindowPixmap() } Startup::Startup(const KStartupInfoId& id, const KStartupInfoData& data, - QObject * parent, const char *name) - : QObject(parent, name), _id(id), _data(data) + TQObject * parent, const char *name) + : TQObject(parent, name), _id(id), _data(data) { } @@ -1473,11 +1473,11 @@ int TaskManager::currentDesktop() const return m_winModule->currentDesktop(); } -TaskDrag::TaskDrag(const Task::List& tasks, QWidget* source, const char* name) - : QStoredDrag("taskbar/task", source, name) +TaskDrag::TaskDrag(const Task::List& tasks, TQWidget* source, const char* name) + : TQStoredDrag("taskbar/task", source, name) { - QByteArray data; - QDataStream stream(data, IO_WriteOnly); + TQByteArray data; + TQDataStream stream(data, IO_WriteOnly); Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -1492,19 +1492,19 @@ TaskDrag::~TaskDrag() { } -bool TaskDrag::canDecode(const QMimeSource* e) +bool TaskDrag::canDecode(const TQMimeSource* e) { return e->provides("taskbar/task"); } -Task::List TaskDrag::decode( const QMimeSource* e ) +Task::List TaskDrag::decode( const TQMimeSource* e ) { - QByteArray data(e->encodedData("taskbar/task")); + TQByteArray data(e->encodedData("taskbar/task")); Task::List tasks; if (data.size()) { - QDataStream stream(data, IO_ReadOnly); + TQDataStream stream(data, IO_ReadOnly); while (!stream.atEnd()) { WId id; diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index 5885569d9..8f5876360 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -27,15 +27,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <sys/types.h> -#include <qobject.h> -#include <qpixmap.h> -#include <qpoint.h> -#include <qptrlist.h> -#include <qpixmap.h> -#include <qdragobject.h> -#include <qrect.h> -#include <qvaluelist.h> -#include <qvaluevector.h> +#include <tqobject.h> +#include <tqpixmap.h> +#include <tqpoint.h> +#include <tqptrlist.h> +#include <tqpixmap.h> +#include <tqdragobject.h> +#include <tqrect.h> +#include <tqvaluelist.h> +#include <tqvaluevector.h> #include <ksharedptr.h> #include <kstartupinfo.h> @@ -60,7 +60,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KWinModule; class TaskManager; -typedef QValueList<WId> WindowList; +typedef TQValueList<WId> WindowList; /** * A dynamic interface to a task (main window). @@ -68,16 +68,16 @@ typedef QValueList<WId> WindowList; * @see TaskManager * @see KWinModule */ -class KDE_EXPORT Task: public QObject, public KShared +class KDE_EXPORT Task: public TQObject, public KShared { Q_OBJECT - Q_PROPERTY( QString visibleIconicName READ visibleIconicName ) - Q_PROPERTY( QString iconicName READ iconicName ) - Q_PROPERTY( QString visibleIconicNameWithState READ visibleIconicNameWithState ) - Q_PROPERTY( QString visibleName READ visibleName ) - Q_PROPERTY( QString name READ name ) - Q_PROPERTY( QString visibleNameWithState READ visibleNameWithState ) - Q_PROPERTY( QPixmap pixmap READ pixmap ) + Q_PROPERTY( TQString visibleIconicName READ visibleIconicName ) + Q_PROPERTY( TQString iconicName READ iconicName ) + Q_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState ) + Q_PROPERTY( TQString visibleName READ visibleName ) + Q_PROPERTY( TQString name READ name ) + Q_PROPERTY( TQString visibleNameWithState READ visibleNameWithState ) + Q_PROPERTY( TQPixmap pixmap READ pixmap ) Q_PROPERTY( bool maximized READ isMaximized ) Q_PROPERTY( bool minimized READ isMinimized ) // KDE4 deprecated @@ -92,33 +92,33 @@ class KDE_EXPORT Task: public QObject, public KShared Q_PROPERTY( int desktop READ desktop ) Q_PROPERTY( double thumbnailSize READ thumbnailSize WRITE setThumbnailSize ) Q_PROPERTY( bool hasThumbnail READ hasThumbnail ) - Q_PROPERTY( QPixmap thumbnail READ thumbnail ) + Q_PROPERTY( TQPixmap thumbnail READ thumbnail ) public: typedef KSharedPtr<Task> Ptr; - typedef QValueVector<Task::Ptr> List; - typedef QMap<WId, Task::Ptr> Dict; + typedef TQValueVector<Task::Ptr> List; + typedef TQMap<WId, Task::Ptr> Dict; - Task(WId win, QObject *parent, const char *name = 0); + Task(WId win, TQObject *parent, const char *name = 0); virtual ~Task(); WId window() const { return _win; } KWin::WindowInfo info() const { return _info; } #if 0 // this would use (_NET_)WM_ICON_NAME, which is shorter, but can be different from window name - QString visibleIconicName() const { return _info.visibleIconName(); } - QString visibleIconicNameWithState() const { return _info.visibleIconNameWithState(); } - QString iconicName() const { return _info.iconName(); } + TQString visibleIconicName() const { return _info.visibleIconName(); } + TQString visibleIconicNameWithState() const { return _info.visibleIconNameWithState(); } + TQString iconicName() const { return _info.iconName(); } #else - QString visibleIconicName() const { return _info.visibleName(); } - QString visibleIconicNameWithState() const { return _info.visibleNameWithState(); } - QString iconicName() const { return _info.name(); } + TQString visibleIconicName() const { return _info.visibleName(); } + TQString visibleIconicNameWithState() const { return _info.visibleNameWithState(); } + TQString iconicName() const { return _info.name(); } #endif - QString visibleName() const { return _info.visibleName(); } - QString visibleNameWithState() const { return _info.visibleNameWithState(); } - QString name() const { return _info.name(); } - QString className(); - QString classClass(); + TQString visibleName() const { return _info.visibleName(); } + TQString visibleNameWithState() const { return _info.visibleNameWithState(); } + TQString name() const { return _info.name(); } + TQString className(); + TQString classClass(); /** * A list of the window ids of all transient windows (dialogs) associated @@ -131,7 +131,7 @@ public: * only fall back to a static icon if there is no icon of any size in * the WM hints. */ - QPixmap pixmap() const { return _pixmap; } + TQPixmap pixmap() const { return _pixmap; } /** * Returns the best icon for any of the KIcon::StdSizes. If there is no @@ -140,14 +140,14 @@ public: * * <pre> * bool gotStaticIcon; - * QPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon ); + * TQPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon ); * </pre> * * @param size Any of the constants in KIcon::StdSizes. * @param isStaticIcon Set to true if KIconLoader was used, false otherwise. * @see KIcon */ - QPixmap bestIcon( int size, bool &isStaticIcon ); + TQPixmap bestIcon( int size, bool &isStaticIcon ); /** * Tries to find an icon for the task with the specified size. If there @@ -158,13 +158,13 @@ public: * parameters will only query the NET properties if the icon has changed or * none was found. */ - QPixmap icon( int width, int height, bool allowResize = false ); + TQPixmap icon( int width, int height, bool allowResize = false ); /** * Returns true iff the windows with the specified ids should be grouped * together in the task list. */ - static bool idMatch(const QString &, const QString &); + static bool idMatch(const TQString &, const TQString &); // state @@ -264,12 +264,12 @@ public: /** * Returns the geometry for this window */ - QRect geometry() const { return _info.geometry(); } + TQRect geometry() const { return _info.geometry(); } /** * Returns the geometry for the from of this window */ - QRect frameGeometry() const { return _info.frameGeometry(); } + TQRect frameGeometry() const { return _info.frameGeometry(); } // internal @@ -312,9 +312,9 @@ public: * Returns the thumbnail for this task (or a null image if there is * none). */ - const QPixmap &thumbnail() const { return _thumb; } + const TQPixmap &thumbnail() const { return _thumb; } - QPixmap thumbnail(int maxDimension); + TQPixmap thumbnail(int maxDimension); void updateWindowPixmap(); @@ -415,7 +415,7 @@ public slots: * task will be displayed when iconised. It is used, for example by the * KWin inconify animation. */ - void publishIconGeometry(QRect); + void publishIconGeometry(TQRect); /** * Tells the task to generate a new thumbnail. When the thumbnail is @@ -460,7 +460,7 @@ private: bool _active; WId _win; WId m_frameId; - QPixmap _pixmap; + TQPixmap _pixmap; KWin::WindowInfo _info; WindowList _transients; WindowList _transients_demanding_attention; @@ -468,12 +468,12 @@ private: int _lastWidth; int _lastHeight; bool _lastResize; - QPixmap _lastIcon; + TQPixmap _lastIcon; double _thumbSize; - QPixmap _thumb; - QPixmap _grab; - QRect m_iconGeometry; + TQPixmap _thumb; + TQPixmap _grab; + TQRect m_iconGeometry; #ifdef THUMBNAILING_POSSIBLE Pixmap m_windowPixmap; #endif // THUMBNAILING_POSSIBLE @@ -489,20 +489,20 @@ public: /** * Constructs a task drag object for a task list. */ - TaskDrag(const Task::List& tasks, QWidget* source = 0, + TaskDrag(const Task::List& tasks, TQWidget* source = 0, const char* name = 0); ~TaskDrag(); /** * Returns true if the mime source can be decoded to a TaskDrag. */ - static bool canDecode( const QMimeSource* e ); + static bool canDecode( const TQMimeSource* e ); /** * Decodes the tasks from the mime source and returns them if successful. * Otherwise an empty task list is returned. */ - static Task::List decode( const QMimeSource* e ); + static Task::List decode( const TQMimeSource* e ); }; @@ -511,35 +511,35 @@ public: * * @see TaskManager */ -class KDE_EXPORT Startup: public QObject, public KShared +class KDE_EXPORT Startup: public TQObject, public KShared { Q_OBJECT - Q_PROPERTY( QString text READ text ) - Q_PROPERTY( QString bin READ bin ) - Q_PROPERTY( QString icon READ icon ) + Q_PROPERTY( TQString text READ text ) + Q_PROPERTY( TQString bin READ bin ) + Q_PROPERTY( TQString icon READ icon ) public: typedef KSharedPtr<Startup> Ptr; - typedef QValueVector<Startup::Ptr> List; + typedef TQValueVector<Startup::Ptr> List; - Startup( const KStartupInfoId& id, const KStartupInfoData& data, QObject * parent, + Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent, const char *name = 0); virtual ~Startup(); /** * The name of the starting task (if known). */ - QString text() const { return _data.findName(); } + TQString text() const { return _data.findName(); } /** * The name of the executable of the starting task. */ - QString bin() const { return _data.bin(); } + TQString bin() const { return _data.bin(); } /** * The name of the icon to be used for the starting task. */ - QString icon() const { return _data.findIcon(); } + TQString icon() const { return _data.findIcon(); } void update( const KStartupInfoData& data ); const KStartupInfoId& id() const { return _id; } @@ -583,7 +583,7 @@ public: /** * Returns the task for a given location, or 0 if there is no such task. */ - Task::Ptr findTask(int desktop, const QPoint& p); + Task::Ptr findTask(int desktop, const TQPoint& p); /** * Returns a list of all current tasks. @@ -598,7 +598,7 @@ public: /** * Returns the name of the nth desktop. */ - QString desktopName(int n) const; + TQString desktopName(int n) const; /** * Returns the number of virtual desktops. diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index 47260687f..fb4c9ae87 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -38,8 +38,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskrmbmenu.h" #include "taskrmbmenu.moc" -TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, QWidget *parent, const char *name) - : QPopupMenu( parent, name ) +TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, TQWidget *parent, const char *name) + : TQPopupMenu( parent, name ) , tasks( theTasks ) , showAll( show ) { @@ -54,8 +54,8 @@ TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, QWidget *parent, } } -TaskRMBMenu::TaskRMBMenu(Task::Ptr task, bool show, QWidget *parent, const char *name) - : QPopupMenu( parent, name ) +TaskRMBMenu::TaskRMBMenu(Task::Ptr task, bool show, TQWidget *parent, const char *name) + : TQPopupMenu( parent, name ) , showAll( show ) { fillMenu(task); @@ -76,7 +76,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) if (showAll) { id = insertItem(i18n("&To Current Desktop"), - t, SLOT(toCurrentDesktop())); + t, TQT_SLOT(toCurrentDesktop())); setItemEnabled( id, !t->isOnCurrentDesktop() ); } @@ -86,27 +86,27 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) } } - id = insertItem(SmallIconSet("move"), i18n("&Move"), t, SLOT(move())); + id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove)); - id = insertItem(i18n("Re&size"), t, SLOT(resize())); + id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize)); - id = insertItem(i18n("Mi&nimize"), t, SLOT(toggleIconified())); + id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified())); setItemChecked(id, t->isIconified()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize)); - id = insertItem(i18n("Ma&ximize"), t, SLOT(toggleMaximized())); + id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized())); setItemChecked(id, t->isMaximized()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax)); - id = insertItem(i18n("&Shade"), t, SLOT(toggleShaded())); + id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded())); setItemChecked(id, t->isShaded()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade)); insertSeparator(); - id = insertItem(SmallIcon("fileclose"), i18n("&Close"), t, SLOT(close())); + id = insertItem(SmallIcon("fileclose"), i18n("&Close"), t, TQT_SLOT(close())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose)); } @@ -120,11 +120,11 @@ void TaskRMBMenu::fillMenu() { Task::Ptr t = (*it); - id = insertItem( QIconSet( t->pixmap() ), + id = insertItem( TQIconSet( t->pixmap() ), t->visibleNameWithState(), new TaskRMBMenu(t, this) ); setItemChecked( id, t->isActive() ); - connectItem( id, t, SLOT( activateRaiseOrIconify() ) ); + connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) ); } insertSeparator(); @@ -135,7 +135,7 @@ void TaskRMBMenu::fillMenu() { id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu()); - id = insertItem(i18n("All &to Current Desktop"), this, SLOT(slotAllToCurrentDesktop())); + id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop())); Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -150,7 +150,7 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "Mi&nimize All" ), this, SLOT( slotMinimizeAll() ) ); + id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -163,7 +163,7 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "Ma&ximize All" ), this, SLOT( slotMaximizeAll() ) ); + id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -176,7 +176,7 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "&Restore All" ), this, SLOT( slotRestoreAll() ) ); + id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -191,29 +191,29 @@ void TaskRMBMenu::fillMenu() enable = false; - insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, SLOT( slotCloseAll() ) ); + insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) ); } -QPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) +TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) { int id; - QPopupMenu* menu = new QPopupMenu(this); + TQPopupMenu* menu = new TQPopupMenu(this); menu->setCheckable(true); id = menu->insertItem(SmallIconSet("up"), i18n("Keep &Above Others"), - t, SLOT(toggleAlwaysOnTop())); + t, TQT_SLOT(toggleAlwaysOnTop())); menu->setItemChecked(id, t->isAlwaysOnTop()); id = menu->insertItem(SmallIconSet("down"), i18n("Keep &Below Others"), - t, SLOT(toggleKeptBelowOthers())); + t, TQT_SLOT(toggleKeptBelowOthers())); menu->setItemChecked(id, t->isKeptBelowOthers()); id = menu->insertItem(SmallIconSet("window_fullscreen"), i18n("&Fullscreen"), - t, SLOT(toggleFullScreen())); + t, TQT_SLOT(toggleFullScreen())); menu->setItemChecked(id, t->isFullScreen()); if (KWin::allowedActionsSupported()) @@ -224,20 +224,20 @@ QPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) return menu; } -QPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) +TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) { - QPopupMenu* m = new QPopupMenu( this ); + TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), t, SLOT( toDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->setItemChecked( id, t->isOnAllDesktops() ); m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - QString name = QString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, t, SLOT( toDesktop(int) ) ); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); + id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i ); } @@ -245,19 +245,19 @@ QPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) return m; } -QPopupMenu* TaskRMBMenu::makeDesktopsMenu() +TQPopupMenu* TaskRMBMenu::makeDesktopsMenu() { - QPopupMenu* m = new QPopupMenu( this ); + TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), this, SLOT( slotAllToDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - QString name = QString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, this, SLOT( slotAllToDesktop(int) ) ); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); + id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, i ); } diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h index a167d6665..6657bf909 100644 --- a/kicker/taskmanager/taskrmbmenu.h +++ b/kicker/taskmanager/taskrmbmenu.h @@ -25,22 +25,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __taskrmbmenu_h__ #define __taskrmbmenu_h__ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> class KDE_EXPORT TaskRMBMenu : public QPopupMenu { Q_OBJECT public: - TaskRMBMenu(const Task::List&, bool showAll = true, QWidget *parent = 0, const char *name = 0); - TaskRMBMenu(Task::Ptr, bool showAll = true, QWidget *parent = 0, const char *name = 0); + TaskRMBMenu(const Task::List&, bool showAll = true, TQWidget *parent = 0, const char *name = 0); + TaskRMBMenu(Task::Ptr, bool showAll = true, TQWidget *parent = 0, const char *name = 0); private: void fillMenu(Task::Ptr); void fillMenu(); - QPopupMenu* makeAdvancedMenu(Task::Ptr); - QPopupMenu* makeDesktopsMenu(Task::Ptr); - QPopupMenu* makeDesktopsMenu(); + TQPopupMenu* makeAdvancedMenu(Task::Ptr); + TQPopupMenu* makeDesktopsMenu(Task::Ptr); + TQPopupMenu* makeDesktopsMenu(); private slots: void slotMinimizeAll(); |