diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
| commit | c663b6440964f6ac48027143ac9e63298991f9d0 (patch) | |
| tree | 6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /kicker/applets | |
| parent | a061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff) | |
| download | tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets')
53 files changed, 1285 insertions, 1285 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 |