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 /kcontrol | |
| 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 'kcontrol')
451 files changed, 11562 insertions, 11562 deletions
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 5956697b9..10c593ed7 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -1,11 +1,11 @@ #include <unistd.h> #include <stdlib.h> -#include <qtimer.h> -#include <qpainter.h> -#include <qvbox.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqtimer.h> +#include <tqpainter.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <kdialogbase.h> #include <kmessagebox.h> @@ -96,10 +96,10 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled) overlay(0), wm(0, KWinModule::INFO_DESKTOP) { _activeWindow = wm.activeWindow(); - connect(&wm, SIGNAL(activeWindowChanged(WId)), this, SLOT(activeWindowChanged(WId))); + connect(&wm, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(activeWindowChanged(WId))); - artsBellTimer = new QTimer( this ); - connect( artsBellTimer, SIGNAL( timeout() ), SLOT( slotArtsBellTimeout() )); + artsBellTimer = new TQTimer( this ); + connect( artsBellTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotArtsBellTimeout() )); features = 0; requestedFeatures = 0; @@ -132,7 +132,7 @@ void KAccessApp::readSettings() _artsBellFile = config->readPathEntry("ArtsBellFile"); _visibleBell = config->readBoolEntry("VisibleBell", false); _visibleBellInvert = config->readBoolEntry("VisibleBellInvert", false); - QColor def(Qt::red); + TQColor def(Qt::red); _visibleBellColor = config->readColorEntry("VisibleBellColor", &def); _visibleBellPause = config->readNumEntry("VisibleBellPause", 500); @@ -361,10 +361,10 @@ bool KAccessApp::x11EventFilter(XEvent *event) } -void VisualBell::paintEvent(QPaintEvent *event) +void VisualBell::paintEvent(TQPaintEvent *event) { - QWidget::paintEvent(event); - QTimer::singleShot(_pause, this, SLOT(hide())); + TQWidget::paintEvent(event); + TQTimer::singleShot(_pause, this, TQT_SLOT(hide())); } @@ -438,10 +438,10 @@ void KAccessApp::xkbBellNotify(XkbBellNotifyEvent *event) if (_visibleBellInvert) { - QPixmap screen = QPixmap::grabWindow(id, 0, 0, window.size.width, window.size.height); - QPixmap invert(window.size.width, window.size.height); - QPainter p(&invert); - p.setRasterOp(QPainter::NotCopyROP); + TQPixmap screen = TQPixmap::grabWindow(id, 0, 0, window.size.width, window.size.height); + TQPixmap invert(window.size.width, window.size.height); + TQPainter p(&invert); + p.setRasterOp(TQPainter::NotCopyROP); p.drawPixmap(0, 0, screen); overlay->setBackgroundPixmap(invert); } @@ -462,7 +462,7 @@ void KAccessApp::xkbBellNotify(XkbBellNotifyEvent *event) } } -QString mouseKeysShortcut (Display *display) { +TQString mouseKeysShortcut (Display *display) { // Calculate the keycode KeySym sym = XK_MouseKeys_Enable; KeyCode code = XKeysymToKeycode(display, sym); @@ -513,7 +513,7 @@ QString mouseKeysShortcut (Display *display) { ev.xkey.keycode = code; ev.xkey.state = 0; KKey key = KKey(KKeyNative(&ev)); - QString keyname = key.toString(); + TQString keyname = key.toString(); unsigned int AltMask = KKeyNative::modX(KKey::ALT); unsigned int WinMask = KKeyNative::modX(KKey::WIN); @@ -565,33 +565,33 @@ void KAccessApp::createDialogContents() { 0, "AccessXWarning", true, true, KStdGuiItem::cont(), KStdGuiItem::cancel()); - QVBox *topcontents = new QVBox (dialog); + TQVBox *topcontents = new TQVBox (dialog); topcontents->setSpacing(KDialog::spacingHint()*2); topcontents->setMargin(KDialog::marginHint()); - QWidget *contents = new QWidget(topcontents); - QHBoxLayout * lay = new QHBoxLayout(contents); + TQWidget *contents = new TQWidget(topcontents); + TQHBoxLayout * lay = new TQHBoxLayout(contents); lay->setSpacing(KDialog::spacingHint()); - QLabel *label1 = new QLabel( contents); - QPixmap pixmap = KApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + TQLabel *label1 = new TQLabel( contents); + TQPixmap pixmap = KApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); if (pixmap.isNull()) - pixmap = QMessageBox::standardIcon(QMessageBox::Warning); + pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning); label1->setPixmap(pixmap); lay->addWidget( label1, 0, Qt::AlignCenter ); lay->addSpacing(KDialog::spacingHint()); - QVBoxLayout * vlay = new QVBoxLayout(lay); + TQVBoxLayout * vlay = new TQVBoxLayout(lay); - featuresLabel = new QLabel( "", contents ); + featuresLabel = new TQLabel( "", contents ); featuresLabel->setAlignment( WordBreak|AlignVCenter ); vlay->addWidget( featuresLabel ); vlay->addStretch(); - QHBoxLayout * hlay = new QHBoxLayout(vlay); + TQHBoxLayout * hlay = new TQHBoxLayout(vlay); - QLabel *showModeLabel = new QLabel( i18n("&When a gesture was used:"), contents ); + TQLabel *showModeLabel = new TQLabel( i18n("&When a gesture was used:"), contents ); hlay->addWidget( showModeLabel ); showModeCombobox = new KComboBox (contents); @@ -605,9 +605,9 @@ void KAccessApp::createDialogContents() { dialog->setMainWidget(topcontents); dialog->enableButtonSeparator(false); - connect (dialog, SIGNAL(yesClicked()), this, SLOT(yesClicked())); - connect (dialog, SIGNAL(noClicked()), this, SLOT(noClicked())); - connect (dialog, SIGNAL(closeClicked()), this, SLOT(dialogClosed())); + connect (dialog, TQT_SIGNAL(yesClicked()), this, TQT_SLOT(yesClicked())); + connect (dialog, TQT_SIGNAL(noClicked()), this, TQT_SLOT(noClicked())); + connect (dialog, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(dialogClosed())); } } @@ -634,8 +634,8 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) enabled = requestedFeatures & ~features; disabled = features & ~requestedFeatures; - QStringList enabledFeatures; - QStringList disabledFeatures; + TQStringList enabledFeatures; + TQStringList disabledFeatures; if (enabled & XkbStickyKeysMask) enabledFeatures << i18n("Sticky keys"); @@ -657,7 +657,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) else if (disabled & XkbMouseKeysMask) disabledFeatures << i18n("Mouse keys"); - QString question; + TQString question; switch (enabledFeatures.count()) { case 0: switch (disabledFeatures.count()) { case 1: question = i18n("Do you really want to deactivate \"%1\"?") @@ -723,7 +723,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) .arg(enabledFeatures[2]).arg(enabledFeatures[3]); break; } - QString explanation; + TQString explanation; if (enabledFeatures.count()+disabledFeatures.count() == 1) { explanation = i18n("An application has requested to change this setting."); @@ -733,7 +733,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event) else if ((enabled | disabled) == XkbStickyKeysMask) explanation = i18n("You pressed the Shift key 5 consecutive times or an application has requested to change this setting."); else if ((enabled | disabled) == XkbMouseKeysMask) { - QString shortcut = mouseKeysShortcut(qt_xdisplay()); + TQString shortcut = mouseKeysShortcut(qt_xdisplay()); if (!shortcut.isEmpty() && !shortcut.isNull()) explanation = i18n("You pressed %1 or an application has requested to change this setting.").arg(shortcut); } diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h index d75d0bdb6..daecba440 100644 --- a/kcontrol/access/kaccess.h +++ b/kcontrol/access/kaccess.h @@ -2,8 +2,8 @@ #define __K_ACCESS_H__ -#include <qwidget.h> -#include <qcolor.h> +#include <tqwidget.h> +#include <tqcolor.h> #include <kuniqueapplication.h> @@ -62,23 +62,23 @@ private: bool _systemBell, _artsBell, _visibleBell, _visibleBellInvert; bool _artsBellBlocked; - QString _artsBellFile; - QColor _visibleBellColor; + TQString _artsBellFile; + TQColor _visibleBellColor; int _visibleBellPause; bool _gestures, _gestureConfirmation; bool _kNotifyModifiers, _kNotifyAccessX; - QWidget *overlay; + TQWidget *overlay; - QTimer *artsBellTimer; + TQTimer *artsBellTimer; KWinModule wm; WId _activeWindow; KDialogBase *dialog; - QLabel *featuresLabel; + TQLabel *featuresLabel; KComboBox *showModeCombobox; int keys[8]; @@ -93,13 +93,13 @@ class VisualBell : public QWidget public: VisualBell(int pause) - : QWidget(0, 0, WX11BypassWM), _pause(pause) + : TQWidget(0, 0, WX11BypassWM), _pause(pause) {}; protected: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); private: diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 661748e1d..d7e114c55 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -11,16 +11,16 @@ #include <dcopref.h> -#include <qtabwidget.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qradiobutton.h> -#include <qwhatsthis.h> -#include <qslider.h> -#include <qspinbox.h> +#include <tqtabwidget.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqradiobutton.h> +#include <tqwhatsthis.h> +#include <tqslider.h> +#include <tqspinbox.h> #include <kcombobox.h> @@ -43,7 +43,7 @@ ExtendedIntNumInput::ExtendedIntNumInput - (QWidget* parent, const char* name) + (TQWidget* parent, const char* name) : KIntNumInput(parent, name) { } @@ -55,10 +55,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) { KIntNumInput::setRange (min,max,step, slider); if (slider) { - disconnect(m_slider, SIGNAL(valueChanged(int)), - m_spin, SLOT(setValue(int))); - disconnect(m_spin, SIGNAL(valueChanged(int)), - this, SLOT(spinValueChanged(int))); + disconnect(m_slider, TQT_SIGNAL(valueChanged(int)), + m_spin, TQT_SLOT(setValue(int))); + disconnect(m_spin, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(spinValueChanged(int))); this->min = min; this->max = max; @@ -72,10 +72,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) { double logVal = alpha * (log(value())-log(min)); m_slider->setValue ((int)floor (0.5 + logVal)); - connect(m_slider, SIGNAL(valueChanged(int)), - this, SLOT(slotSliderValueChanged(int))); - connect(m_spin, SIGNAL(valueChanged(int)), - this, SLOT(slotSpinValueChanged(int))); + connect(m_slider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotSliderValueChanged(int))); + connect(m_spin, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotSpinValueChanged(int))); } } @@ -109,7 +109,7 @@ static bool needToRunKAccessDaemon( KConfig *config ) return true; } -QString mouseKeysShortcut (Display *display) { +TQString mouseKeysShortcut (Display *display) { // Calculate the keycode KeySym sym = XK_MouseKeys_Enable; KeyCode code = XKeysymToKeycode(display, sym); @@ -159,7 +159,7 @@ QString mouseKeysShortcut (Display *display) { ev.xkey.keycode = code; ev.xkey.state = 0; KKey key = KKey(KKeyNative(&ev)); - QString keyname = key.toString(); + TQString keyname = key.toString(); unsigned int AltMask = KKeyNative::modX(KKey::ALT); unsigned int WinMask = KKeyNative::modX(KKey::WIN); @@ -197,7 +197,7 @@ QString mouseKeysShortcut (Display *display) { if ((modifiers & ShiftMask) != 0) keyname = KKey::modFlagLabel(KKey::SHIFT) + "+" + keyname; - QString result; + TQString result; if ((modifiers & ScrollMask) != 0) if ((modifiers & LockMask) != 0) if ((modifiers & NumMask) != 0) @@ -221,7 +221,7 @@ QString mouseKeysShortcut (Display *display) { return result.arg(keyname); } -KAccessConfig::KAccessConfig(QWidget *parent, const char *) +KAccessConfig::KAccessConfig(TQWidget *parent, const char *) : KCModule(parent, "kcmaccess") { @@ -234,89 +234,89 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) setAboutData( about ); - QVBoxLayout *main = new QVBoxLayout(this, 0, KDialogBase::spacingHint()); - QTabWidget *tab = new QTabWidget(this); + TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); + TQTabWidget *tab = new TQTabWidget(this); main->addWidget(tab); // bell settings --------------------------------------- - QWidget *bell = new QWidget(this); + TQWidget *bell = new TQWidget(this); - QVBoxLayout *vbox = new QVBoxLayout(bell, KDialogBase::marginHint(), + TQVBoxLayout *vbox = new TQVBoxLayout(bell, KDialogBase::marginHint(), KDialogBase::spacingHint()); - QGroupBox *grp = new QGroupBox(i18n("Audible Bell"), bell); + TQGroupBox *grp = new TQGroupBox(i18n("Audible Bell"), bell); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - QVBoxLayout *vvbox = new QVBoxLayout(grp->layout(), + TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(), KDialogBase::spacingHint()); - systemBell = new QCheckBox(i18n("Use &system bell"), grp); + systemBell = new TQCheckBox(i18n("Use &system bell"), grp); vvbox->addWidget(systemBell); - customBell = new QCheckBox(i18n("Us&e customized bell"), grp); + customBell = new TQCheckBox(i18n("Us&e customized bell"), grp); vvbox->addWidget(customBell); - QWhatsThis::add( systemBell, i18n("If this option is checked, the default system bell will be used. See the" + TQWhatsThis::add( systemBell, i18n("If this option is checked, the default system bell will be used. See the" " \"System Bell\" control module for how to customize the system bell." " Normally, this is just a \"beep\".") ); - QWhatsThis::add( customBell, i18n("Check this option if you want to use a customized bell, playing" + TQWhatsThis::add( customBell, i18n("Check this option if you want to use a customized bell, playing" " a sound file. If you do this, you will probably want to turn off the system bell.<p> Please note" " that on slow machines this may cause a \"lag\" between the event causing the bell and the sound being played.") ); - QHBoxLayout *hbox = new QHBoxLayout(vvbox, KDialogBase::spacingHint()); + TQHBoxLayout *hbox = new TQHBoxLayout(vvbox, KDialogBase::spacingHint()); hbox->addSpacing(24); - soundEdit = new QLineEdit(grp); - soundLabel = new QLabel(soundEdit, i18n("Sound &to play:"), grp); + soundEdit = new TQLineEdit(grp); + soundLabel = new TQLabel(soundEdit, i18n("Sound &to play:"), grp); hbox->addWidget(soundLabel); hbox->addWidget(soundEdit); - soundButton = new QPushButton(i18n("Browse..."), grp); + soundButton = new TQPushButton(i18n("Browse..."), grp); hbox->addWidget(soundButton); - QString wtstr = i18n("If the option \"Use customized bell\" is enabled, you can choose a sound file here." + TQString wtstr = i18n("If the option \"Use customized bell\" is enabled, you can choose a sound file here." " Click \"Browse...\" to choose a sound file using the file dialog."); - QWhatsThis::add( soundEdit, wtstr ); - QWhatsThis::add( soundLabel, wtstr ); - QWhatsThis::add( soundButton, wtstr ); + TQWhatsThis::add( soundEdit, wtstr ); + TQWhatsThis::add( soundLabel, wtstr ); + TQWhatsThis::add( soundButton, wtstr ); - connect(soundButton, SIGNAL(clicked()), this, SLOT(selectSound())); + connect(soundButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectSound())); - connect(customBell, SIGNAL(clicked()), this, SLOT(checkAccess())); + connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(systemBell, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(customBell, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(soundEdit, SIGNAL(textChanged(const QString&)), this, SLOT(configChanged())); + connect(systemBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(soundEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); // ----------------------------------------------------- // visible bell ---------------------------------------- - grp = new QGroupBox(i18n("Visible Bell"), bell); + grp = new TQGroupBox(i18n("Visible Bell"), bell); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - visibleBell = new QCheckBox(i18n("&Use visible bell"), grp); + visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp); vvbox->addWidget(visibleBell); - QWhatsThis::add( visibleBell, i18n("This option will turn on the \"visible bell\", i.e. a visible" + TQWhatsThis::add( visibleBell, i18n("This option will turn on the \"visible bell\", i.e. a visible" " notification shown every time that normally just a bell would occur. This is especially useful" " for deaf people.") ); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - invertScreen = new QRadioButton(i18n("I&nvert screen"), grp); + invertScreen = new TQRadioButton(i18n("I&nvert screen"), grp); hbox->addWidget(invertScreen); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); - QWhatsThis::add( invertScreen, i18n("All screen colors will be inverted for the amount of time specified below.") ); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); + TQWhatsThis::add( invertScreen, i18n("All screen colors will be inverted for the amount of time specified below.") ); hbox->addSpacing(24); - flashScreen = new QRadioButton(i18n("F&lash screen"), grp); + flashScreen = new TQRadioButton(i18n("F&lash screen"), grp); hbox->addWidget(flashScreen); - QWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") ); + TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") ); hbox->addSpacing(12); colorButton = new KColorButton(grp); colorButton->setFixedWidth(colorButton->sizeHint().height()*2); hbox->addWidget(colorButton); hbox->addStretch(); - QWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") ); + TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") ); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); durationSlider = new ExtendedIntNumInput(grp); @@ -324,18 +324,18 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) durationSlider->setLabel(i18n("Duration:")); durationSlider->setSuffix(i18n(" msec")); hbox->addWidget(durationSlider); - QWhatsThis::add( durationSlider, i18n("Here you can customize the duration of the \"visible bell\" effect being shown.") ); + TQWhatsThis::add( durationSlider, i18n("Here you can customize the duration of the \"visible bell\" effect being shown.") ); - connect(invertScreen, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(flashScreen, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(visibleBell, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(visibleBell, SIGNAL(clicked()), this, SLOT(checkAccess())); - connect(colorButton, SIGNAL(clicked()), this, SLOT(changeFlashScreenColor())); + connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(colorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFlashScreenColor())); - connect(invertScreen, SIGNAL(clicked()), this, SLOT(invertClicked())); - connect(flashScreen, SIGNAL(clicked()), this, SLOT(flashClicked())); + connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertClicked())); + connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(flashClicked())); - connect(durationSlider, SIGNAL(valueChanged(int)), this, SLOT(configChanged())); + connect(durationSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); vbox->addStretch(); @@ -345,82 +345,82 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) // modifier key settings ------------------------------- - QWidget *modifiers = new QWidget(this); + TQWidget *modifiers = new TQWidget(this); - vbox = new QVBoxLayout(modifiers, KDialog::marginHint(), KDialog::spacingHint()); + vbox = new TQVBoxLayout(modifiers, KDialog::marginHint(), KDialog::spacingHint()); - grp = new QGroupBox(i18n("S&ticky Keys"), modifiers); + grp = new TQGroupBox(i18n("S&ticky Keys"), modifiers); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - stickyKeys = new QCheckBox(i18n("Use &sticky keys"), grp); + stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp); vvbox->addWidget(stickyKeys); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - stickyKeysLock = new QCheckBox(i18n("&Lock sticky keys"), grp); + stickyKeysLock = new TQCheckBox(i18n("&Lock sticky keys"), grp); hbox->addWidget(stickyKeysLock); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - stickyKeysAutoOff = new QCheckBox(i18n("Turn sticky keys off when two keys are pressed simultaneously"), grp); + stickyKeysAutoOff = new TQCheckBox(i18n("Turn sticky keys off when two keys are pressed simultaneously"), grp); hbox->addWidget(stickyKeysAutoOff); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - stickyKeysBeep = new QCheckBox(i18n("Use system bell whenever a modifier gets latched, locked or unlocked"), grp); + stickyKeysBeep = new TQCheckBox(i18n("Use system bell whenever a modifier gets latched, locked or unlocked"), grp); hbox->addWidget(stickyKeysBeep); - grp = new QGroupBox(i18n("Locking Keys"), modifiers); + grp = new TQGroupBox(i18n("Locking Keys"), modifiers); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - toggleKeysBeep = new QCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp); + toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp); vvbox->addWidget(toggleKeysBeep); - kNotifyModifiers = new QCheckBox(i18n("Use KDE's system notification mechanism whenever a modifier or locking key changes its state"), grp); + kNotifyModifiers = new TQCheckBox(i18n("Use KDE's system notification mechanism whenever a modifier or locking key changes its state"), grp); vvbox->addWidget(kNotifyModifiers); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addStretch(1); - kNotifyModifiersButton = new QPushButton(i18n("Configure System Notification..."), grp); - kNotifyModifiersButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp); + kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyModifiersButton); - connect(stickyKeys, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(stickyKeysLock, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(stickyKeysAutoOff, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(stickyKeys, SIGNAL(clicked()), this, SLOT(checkAccess())); + connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(stickyKeysLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(stickyKeysAutoOff, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(stickyKeysBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(toggleKeysBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(kNotifyModifiers, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(kNotifyModifiers, SIGNAL(clicked()), this, SLOT(checkAccess())); - connect(kNotifyModifiersButton, SIGNAL(clicked()), this, SLOT(configureKNotify())); + connect(stickyKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(toggleKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(kNotifyModifiersButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify())); vbox->addStretch(); tab->addTab(modifiers, i18n("&Modifier Keys")); // key filter settings --------------------------------- - QWidget *filters = new QWidget(this); + TQWidget *filters = new TQWidget(this); - vbox = new QVBoxLayout(filters, KDialog::marginHint(), KDialog::spacingHint()); + vbox = new TQVBoxLayout(filters, KDialog::marginHint(), KDialog::spacingHint()); - grp = new QGroupBox(i18n("Slo&w Keys"), filters); + grp = new TQGroupBox(i18n("Slo&w Keys"), filters); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - slowKeys = new QCheckBox(i18n("&Use slow keys"), grp); + slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp); vvbox->addWidget(slowKeys); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); slowKeysDelay = new ExtendedIntNumInput(grp); slowKeysDelay->setSuffix(i18n(" msec")); @@ -428,31 +428,31 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) slowKeysDelay->setLabel(i18n("Acceptance dela&y:")); hbox->addWidget(slowKeysDelay); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - slowKeysPressBeep = new QCheckBox(i18n("&Use system bell whenever a key is pressed"), grp); + slowKeysPressBeep = new TQCheckBox(i18n("&Use system bell whenever a key is pressed"), grp); hbox->addWidget(slowKeysPressBeep); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - slowKeysAcceptBeep = new QCheckBox(i18n("&Use system bell whenever a key is accepted"), grp); + slowKeysAcceptBeep = new TQCheckBox(i18n("&Use system bell whenever a key is accepted"), grp); hbox->addWidget(slowKeysAcceptBeep); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - slowKeysRejectBeep = new QCheckBox(i18n("&Use system bell whenever a key is rejected"), grp); + slowKeysRejectBeep = new TQCheckBox(i18n("&Use system bell whenever a key is rejected"), grp); hbox->addWidget(slowKeysRejectBeep); - grp = new QGroupBox(i18n("Bounce Keys"), filters); + grp = new TQGroupBox(i18n("Bounce Keys"), filters); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - bounceKeys = new QCheckBox(i18n("Use bou&nce keys"), grp); + bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp); vvbox->addWidget(bounceKeys); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); bounceKeysDelay = new ExtendedIntNumInput(grp); bounceKeysDelay->setSuffix(i18n(" msec")); @@ -460,56 +460,56 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) bounceKeysDelay->setLabel(i18n("D&ebounce time:")); hbox->addWidget(bounceKeysDelay); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); - bounceKeysRejectBeep = new QCheckBox(i18n("Use the system bell whenever a key is rejected"), grp); + bounceKeysRejectBeep = new TQCheckBox(i18n("Use the system bell whenever a key is rejected"), grp); hbox->addWidget(bounceKeysRejectBeep); - connect(slowKeysDelay, SIGNAL(valueChanged(int)), this, SLOT(configChanged())); - connect(slowKeys, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(slowKeys, SIGNAL(clicked()), this, SLOT(checkAccess())); + connect(slowKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(slowKeysPressBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(slowKeysAcceptBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(slowKeysRejectBeep, SIGNAL(clicked()), this, SLOT(configChanged())); + connect(slowKeysPressBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(slowKeysAcceptBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(slowKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(bounceKeysDelay, SIGNAL(valueChanged(int)), this, SLOT(configChanged())); - connect(bounceKeys, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(bounceKeysRejectBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(bounceKeys, SIGNAL(clicked()), this, SLOT(checkAccess())); + connect(bounceKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(bounceKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); vbox->addStretch(); tab->addTab(filters, i18n("&Keyboard Filters")); // gestures -------------------------------------------- - QWidget *features = new QWidget(this); + TQWidget *features = new TQWidget(this); - vbox = new QVBoxLayout(features, KDialog::marginHint(), KDialog::spacingHint()); + vbox = new TQVBoxLayout(features, KDialog::marginHint(), KDialog::spacingHint()); - grp = new QGroupBox(i18n("Activation Gestures"), features); + grp = new TQGroupBox(i18n("Activation Gestures"), features); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - gestures = new QCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp); + gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp); vvbox->addWidget(gestures); - QString shortcut = mouseKeysShortcut(this->x11Display()); + TQString shortcut = mouseKeysShortcut(this->x11Display()); if (shortcut.isEmpty()) - QWhatsThis::add (gestures, i18n("Here you can activate keyboard gestures that turn on the following features: \n" + TQWhatsThis::add (gestures, i18n("Here you can activate keyboard gestures that turn on the following features: \n" "Sticky keys: Press Shift key 5 consecutive times\n" "Slow keys: Hold down Shift for 8 seconds")); else - QWhatsThis::add (gestures, i18n("Here you can activate keyboard gestures that turn on the following features: \n" + TQWhatsThis::add (gestures, i18n("Here you can activate keyboard gestures that turn on the following features: \n" "Mouse Keys: %1\n" "Sticky keys: Press Shift key 5 consecutive times\n" "Slow keys: Hold down Shift for 8 seconds").arg(shortcut)); - timeout = new QCheckBox(i18n("Turn sticky keys and slow keys off after a certain period of inactivity"), grp); + timeout = new TQCheckBox(i18n("Turn sticky keys and slow keys off after a certain period of inactivity"), grp); vvbox->addWidget(timeout); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); timeoutDelay = new KIntNumInput(grp); timeoutDelay->setSuffix(i18n(" min")); @@ -517,37 +517,37 @@ KAccessConfig::KAccessConfig(QWidget *parent, const char *) timeoutDelay->setLabel(i18n("Timeout:")); hbox->addWidget(timeoutDelay); - grp = new QGroupBox(i18n("Notification"), features); + grp = new TQGroupBox(i18n("Notification"), features); grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new QVBoxLayout(grp->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint()); - accessxBeep = new QCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp); + accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp); vvbox->addWidget(accessxBeep); - gestureConfirmation = new QCheckBox(i18n("Show a confirmation dialog whenever a keyboard accessibility feature is turned on or off"), grp); + gestureConfirmation = new TQCheckBox(i18n("Show a confirmation dialog whenever a keyboard accessibility feature is turned on or off"), grp); vvbox->addWidget(gestureConfirmation); - QWhatsThis::add (gestureConfirmation, i18n("If this option is checked, KDE will show a confirmation dialog whenever a keyboard accessibility feature is turned on or off.\nBe sure you know what you are doing if you uncheck it, as the keyboard accessibility settings will then always be applied without confirmation.") ); + TQWhatsThis::add (gestureConfirmation, i18n("If this option is checked, KDE will show a confirmation dialog whenever a keyboard accessibility feature is turned on or off.\nBe sure you know what you are doing if you uncheck it, as the keyboard accessibility settings will then always be applied without confirmation.") ); - kNotifyAccessX = new QCheckBox(i18n("Use KDE's system notification mechanism whenever a keyboard accessibility feature is turned on or off"), grp); + kNotifyAccessX = new TQCheckBox(i18n("Use KDE's system notification mechanism whenever a keyboard accessibility feature is turned on or off"), grp); vvbox->addWidget(kNotifyAccessX); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addStretch(1); - kNotifyAccessXButton = new QPushButton(i18n("Configure System Notification..."), grp); - kNotifyAccessXButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp); + kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyAccessXButton); - connect(gestures, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(timeout, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(timeout, SIGNAL(clicked()), this, SLOT(checkAccess())); - connect(timeoutDelay, SIGNAL(valueChanged(int)), this, SLOT(configChanged())); - connect(accessxBeep, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(gestureConfirmation, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(kNotifyAccessX, SIGNAL(clicked()), this, SLOT(configChanged())); - connect(kNotifyAccessX, SIGNAL(clicked()), this, SLOT(checkAccess())); - connect(kNotifyAccessXButton, SIGNAL(clicked()), this, SLOT(configureKNotify())); + connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(timeoutDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(accessxBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(gestureConfirmation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(kNotifyAccessXButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify())); vbox->addStretch(); @@ -578,12 +578,12 @@ void KAccessConfig::changeFlashScreenColor() void KAccessConfig::selectSound() { - QStringList list = KGlobal::dirs()->findDirs("sound", ""); - QString start; + TQStringList list = KGlobal::dirs()->findDirs("sound", ""); + TQString start; if (list.count()>0) start = list[0]; // TODO: Why only wav's? How can I find out what artsd supports? - QString fname = KFileDialog::getOpenFileName(start, i18n("*.wav|WAV Files")); + TQString fname = KFileDialog::getOpenFileName(start, i18n("*.wav|WAV Files")); if (!fname.isEmpty()) soundEdit->setText(fname); } @@ -614,7 +614,7 @@ void KAccessConfig::load( bool useDefaults ) visibleBell->setChecked(config->readBoolEntry("VisibleBell", false)); invertScreen->setChecked(config->readBoolEntry("VisibleBellInvert", true)); flashScreen->setChecked(!invertScreen->isChecked()); - QColor def(Qt::red); + TQColor def(Qt::red); colorButton->setColor(config->readColorEntry("VisibleBellColor", &def)); durationSlider->setValue(config->readNumEntry("VisibleBellPause", 500)); @@ -783,7 +783,7 @@ void KAccessConfig::checkAccess() extern "C" { - KDE_EXPORT KCModule *create_access(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_access(TQWidget *parent, const char *name) { return new KAccessConfig(parent, name); } diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h index c40152324..058b1c491 100644 --- a/kcontrol/access/kcmaccess.h +++ b/kcontrol/access/kcmaccess.h @@ -33,7 +33,7 @@ class ExtendedIntNumInput : public KIntNumInput * Constructs an input control for integer values * with base 10 and initial value 0. */ - ExtendedIntNumInput(QWidget *parent=0, const char *name=0); + ExtendedIntNumInput(TQWidget *parent=0, const char *name=0); /** * Destructor @@ -63,7 +63,7 @@ class KAccessConfig : public KCModule public: - KAccessConfig(QWidget *parent = 0L, const char *name = 0L); + KAccessConfig(TQWidget *parent = 0L, const char *name = 0L); virtual ~KAccessConfig(); void load(); @@ -83,28 +83,28 @@ protected slots: private: - QCheckBox *systemBell, *customBell, *visibleBell; - QRadioButton *invertScreen, *flashScreen; - QLabel *soundLabel, *colorLabel; - QLineEdit *soundEdit; - QPushButton *soundButton; + TQCheckBox *systemBell, *customBell, *visibleBell; + TQRadioButton *invertScreen, *flashScreen; + TQLabel *soundLabel, *colorLabel; + TQLineEdit *soundEdit; + TQPushButton *soundButton; KColorButton *colorButton; ExtendedIntNumInput *durationSlider; - QCheckBox *stickyKeys, *stickyKeysLock, *stickyKeysAutoOff; - QCheckBox *stickyKeysBeep, *toggleKeysBeep, *kNotifyModifiers; - QPushButton *kNotifyModifiersButton; + TQCheckBox *stickyKeys, *stickyKeysLock, *stickyKeysAutoOff; + TQCheckBox *stickyKeysBeep, *toggleKeysBeep, *kNotifyModifiers; + TQPushButton *kNotifyModifiersButton; - QCheckBox *slowKeys, *bounceKeys; + TQCheckBox *slowKeys, *bounceKeys; ExtendedIntNumInput *slowKeysDelay, *bounceKeysDelay; - QCheckBox *slowKeysPressBeep, *slowKeysAcceptBeep; - QCheckBox *slowKeysRejectBeep, *bounceKeysRejectBeep; + TQCheckBox *slowKeysPressBeep, *slowKeysAcceptBeep; + TQCheckBox *slowKeysRejectBeep, *bounceKeysRejectBeep; - QCheckBox *gestures, *gestureConfirmation; - QCheckBox *timeout; + TQCheckBox *gestures, *gestureConfirmation; + TQCheckBox *timeout; KIntNumInput *timeoutDelay; - QCheckBox *accessxBeep, *kNotifyAccessX; - QPushButton *kNotifyAccessXButton; + TQCheckBox *accessxBeep, *kNotifyAccessX; + TQPushButton *kNotifyAccessXButton; }; diff --git a/kcontrol/accessibility/accessibility.cpp b/kcontrol/accessibility/accessibility.cpp index de7b9953b..7cd8fa29b 100644 --- a/kcontrol/accessibility/accessibility.cpp +++ b/kcontrol/accessibility/accessibility.cpp @@ -18,9 +18,9 @@ * * ****************************************************************************/ -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qtabwidget.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqtabwidget.h> #include <kaboutdata.h> #include <kcolorbutton.h> @@ -31,7 +31,7 @@ #include "accessibility.moc" -typedef KGenericFactory<AccessibilityConfig, QWidget> AccessibilityFactory; +typedef KGenericFactory<AccessibilityConfig, TQWidget> AccessibilityFactory; K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessibility") ) /** @@ -53,7 +53,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessib // return false; // don't need it // } -AccessibilityConfig::AccessibilityConfig(QWidget *parent, const char *name, const QStringList &) +AccessibilityConfig::AccessibilityConfig(TQWidget *parent, const char *name, const TQStringList &) : AccessibilityConfigWidget( parent, name){ KAboutData *about = @@ -65,9 +65,9 @@ AccessibilityConfig::AccessibilityConfig(QWidget *parent, const char *name, cons about->addAuthor("José Pablo Ezequiel Fernández", I18N_NOOP("Author") , "pupeno@kde.org"); setAboutData( about ); - kdDebug() << "Running: AccessibilityConfig::AccessibilityConfig(QWidget *parent, const char *name, const QStringList &)" << endl; + kdDebug() << "Running: AccessibilityConfig::AccessibilityConfig(TQWidget *parent, const char *name, const TQStringList &)" << endl; // TODO: set the KURL Dialog to open just audio files - connect( mainTab, SIGNAL(currentChanged(QWidget*)), this, SIGNAL(quickHelpChanged()) ); + connect( mainTab, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SIGNAL(quickHelpChanged()) ); load(); } @@ -101,7 +101,7 @@ void AccessibilityConfig::load( bool useDefaults ) invertScreen->setChecked(bell->readBoolEntry("Invert", true)); flashScreen->setChecked(bell->readBoolEntry("Flash", false)); // TODO: There has to be a cleaner way. - QColor *redColor = new QColor(Qt::red); + TQColor *redColor = new TQColor(Qt::red); flashScreenColor->setColor(bell->readColorEntry("FlashColor", redColor)); delete redColor; visibleBellDuration->setValue(bell->readNumEntry("Duration", 500)); diff --git a/kcontrol/accessibility/accessibility.h b/kcontrol/accessibility/accessibility.h index ad94dcdcc..9b4c833c3 100644 --- a/kcontrol/accessibility/accessibility.h +++ b/kcontrol/accessibility/accessibility.h @@ -32,7 +32,7 @@ class AccessibilityConfig : public AccessibilityConfigWidget { /** * Constructor */ - AccessibilityConfig(QWidget *parent = 0L, const char *name = 0L, const QStringList &foo = QStringList()); + AccessibilityConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &foo = TQStringList()); /** * Destructor diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index a8edb30a2..792951aec 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -25,14 +25,14 @@ #include <unistd.h> -#include <qcombobox.h> -#include <qdir.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qregexp.h> -#include <qslider.h> -#include <qtabwidget.h> -#include <qwhatsthis.h> +#include <tqcombobox.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqregexp.h> +#include <tqslider.h> +#include <tqtabwidget.h> +#include <tqwhatsthis.h> #include <dcopref.h> @@ -55,7 +55,7 @@ extern "C" { KDE_EXPORT void init_arts(); - KDE_EXPORT KCModule *create_arts(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/) { KGlobal::locale()->insertCatalogue("kcmarts"); return new KArtsModule(parent, "kcmarts" ); @@ -69,13 +69,13 @@ static bool startArts() config->setGroup("Arts"); bool startServer = config->readBoolEntry("StartServer",true); bool startRealtime = config->readBoolEntry("StartRealtime",true); - QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -c drkonqi -l 3 -f"); + TQString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -c drkonqi -l 3 -f"); delete config; if (startServer) kapp->kdeinitExec(startRealtime?"artswrapper":"artsd", - QStringList::split(" ",args)); + TQStringList::split(" ",args)); return startServer; } @@ -100,10 +100,10 @@ void KArtsModule::initAudioIOList() *artsd << "artsd"; *artsd << "-A"; - connect(artsd, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); - connect(artsd, SIGNAL(receivedStderr(KProcess*, char*, int)), - this, SLOT(slotProcessArtsdOutput(KProcess*, char*, int))); + connect(artsd, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotArtsdExited(KProcess*))); + connect(artsd, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + this, TQT_SLOT(slotProcessArtsdOutput(KProcess*, char*, int))); if (!artsd->start(KProcess::Block, KProcess::Stderr)) { KMessageBox::error(0, i18n("Unable to start the sound server to " @@ -124,13 +124,13 @@ void KArtsModule::slotProcessArtsdOutput(KProcess*, char* buf, int len) { // XXX(gioele): I suppose this will be called with full lines, am I wrong? - QStringList availableIOs = QStringList::split("\n", QCString(buf, len)); + TQStringList availableIOs = TQStringList::split("\n", TQCString(buf, len)); // valid entries have two leading spaces - availableIOs = availableIOs.grep(QRegExp("^ {2}")); + availableIOs = availableIOs.grep(TQRegExp("^ {2}")); availableIOs.sort(); - QString name, fullName; - QStringList::Iterator it; + TQString name, fullName; + TQStringList::Iterator it; for (it = availableIOs.begin(); it != availableIOs.end(); ++it) { name = (*it).left(12).stripWhiteSpace(); fullName = (*it).mid(12).stripWhiteSpace(); @@ -138,7 +138,7 @@ void KArtsModule::slotProcessArtsdOutput(KProcess*, char* buf, int len) } } -KArtsModule::KArtsModule(QWidget *parent, const char *name) +KArtsModule::KArtsModule(TQWidget *parent, const char *name) : KCModule(parent, name), configChanged(false) { setButtons(Default|Apply); @@ -151,8 +151,8 @@ KArtsModule::KArtsModule(QWidget *parent, const char *name) initAudioIOList(); - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QTabWidget *tab = new QTabWidget(this); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQTabWidget *tab = new TQTabWidget(this); layout->addWidget(tab); general = new generalTab(tab); @@ -179,18 +179,18 @@ KArtsModule::KArtsModule(QWidget *parent, const char *name) customRate = hardware->customRate; samplingRate = hardware->samplingRate; - QString deviceHint = i18n("Normally, the sound server defaults to using the device called <b>/dev/dsp</b> for sound output. That should work in most cases. On some systems where devfs is used, however, you may need to use <b>/dev/sound/dsp</b> instead. Other alternatives are things like <b>/dev/dsp0</b> or <b>/dev/dsp1</b>, if you have a soundcard that supports multiple outputs, or you have multiple soundcards."); + TQString deviceHint = i18n("Normally, the sound server defaults to using the device called <b>/dev/dsp</b> for sound output. That should work in most cases. On some systems where devfs is used, however, you may need to use <b>/dev/sound/dsp</b> instead. Other alternatives are things like <b>/dev/dsp0</b> or <b>/dev/dsp1</b>, if you have a soundcard that supports multiple outputs, or you have multiple soundcards."); - QString rateHint = i18n("Normally, the sound server defaults to using a sampling rate of 44100 Hz (CD quality), which is supported on almost any hardware. If you are using certain <b>Yamaha soundcards</b>, you might need to configure this to 48000 Hz here, if you are using <b>old SoundBlaster cards</b>, like SoundBlaster Pro, you might need to change this to 22050 Hz. All other values are possible, too, and may make sense in certain contexts (i.e. professional studio equipment)."); + TQString rateHint = i18n("Normally, the sound server defaults to using a sampling rate of 44100 Hz (CD quality), which is supported on almost any hardware. If you are using certain <b>Yamaha soundcards</b>, you might need to configure this to 48000 Hz here, if you are using <b>old SoundBlaster cards</b>, like SoundBlaster Pro, you might need to change this to 22050 Hz. All other values are possible, too, and may make sense in certain contexts (i.e. professional studio equipment)."); - QString optionsHint = i18n("This configuration module is intended to cover almost every aspect of the aRts sound server that you can configure. However, there are some things which may not be available here, so you can add <b>command line options</b> here which will be passed directly to <b>artsd</b>. The command line options will override the choices made in the GUI. To see the possible choices, open a Konsole window, and type <b>artsd -h</b>."); + TQString optionsHint = i18n("This configuration module is intended to cover almost every aspect of the aRts sound server that you can configure. However, there are some things which may not be available here, so you can add <b>command line options</b> here which will be passed directly to <b>artsd</b>. The command line options will override the choices made in the GUI. To see the possible choices, open a Konsole window, and type <b>artsd -h</b>."); - QWhatsThis::add(customDevice, deviceHint); - QWhatsThis::add(deviceName, deviceHint); - QWhatsThis::add(customRate, rateHint); - QWhatsThis::add(samplingRate, rateHint); - QWhatsThis::add(hardware->customOptions, optionsHint); - QWhatsThis::add(hardware->addOptions, optionsHint); + TQWhatsThis::add(customDevice, deviceHint); + TQWhatsThis::add(deviceName, deviceHint); + TQWhatsThis::add(customRate, rateHint); + TQWhatsThis::add(samplingRate, rateHint); + TQWhatsThis::add(hardware->customOptions, optionsHint); + TQWhatsThis::add(hardware->addOptions, optionsHint); hardware->audioIO->insertItem( i18n( "Autodetect" ) ); for (AudioIOElement *a = audioIOList.first(); a != 0; a = audioIOList.next()) @@ -199,7 +199,7 @@ KArtsModule::KArtsModule(QWidget *parent, const char *name) deviceManager = new DeviceManager(); deviceManager->initManager(); - QString s; + TQString s; for ( int i = 0; i < deviceManager->midiPorts()+deviceManager->synthDevices(); i++) { if ( strcmp( deviceManager->type( i ), "" ) != 0 ) @@ -216,31 +216,31 @@ KArtsModule::KArtsModule(QWidget *parent, const char *name) suspendTime->setRange( 1, 999, 1, true ); - connect(startServer,SIGNAL(clicked()),this,SLOT(slotChanged())); - connect(networkTransparent,SIGNAL(clicked()),this,SLOT(slotChanged())); - connect(startRealtime,SIGNAL(clicked()),this,SLOT(slotChanged())); - connect(fullDuplex,SIGNAL(clicked()),this,SLOT(slotChanged())); - connect(customDevice, SIGNAL(clicked()), SLOT(slotChanged())); - connect(deviceName, SIGNAL(textChanged(const QString&)), SLOT(slotChanged())); - connect(customRate, SIGNAL(clicked()), SLOT(slotChanged())); - connect(samplingRate, SIGNAL(valueChanged(const QString&)), SLOT(slotChanged())); -// connect(general->volumeSystray, SIGNAL(clicked()), this, SLOT(slotChanged()) ); - - connect(hardware->audioIO,SIGNAL(highlighted(int)),SLOT(slotChanged())); - connect(hardware->audioIO,SIGNAL(activated(int)),SLOT(slotChanged())); - connect(hardware->customOptions,SIGNAL(clicked()),SLOT(slotChanged())); - connect(hardware->addOptions,SIGNAL(textChanged(const QString&)),SLOT(slotChanged())); - connect(hardware->soundQuality,SIGNAL(highlighted(int)),SLOT(slotChanged())); - connect(hardware->soundQuality,SIGNAL(activated(int)),SLOT(slotChanged())); - connect(general->latencySlider,SIGNAL(valueChanged(int)),SLOT(slotChanged())); - connect(autoSuspend,SIGNAL(clicked()),SLOT(slotChanged())); - connect(suspendTime,SIGNAL(valueChanged(int)),SLOT(slotChanged())); - connect(general->testSound,SIGNAL(clicked()),SLOT(slotTestSound())); - connect(hardware->midiDevice, SIGNAL( highlighted(int) ), this, SLOT( slotChanged() ) ); - connect(hardware->midiDevice, SIGNAL( activated(int) ), this, SLOT( slotChanged() ) ); - connect(hardware->midiUseMapper, SIGNAL( clicked() ), this, SLOT( slotChanged() ) ); - connect(hardware->midiMapper, SIGNAL( textChanged( const QString& ) ), - this, SLOT( slotChanged() ) ); + connect(startServer,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); + connect(networkTransparent,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); + connect(startRealtime,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); + connect(fullDuplex,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); + connect(customDevice, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(deviceName, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); + connect(customRate, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(samplingRate, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SLOT(slotChanged())); +// connect(general->volumeSystray, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChanged()) ); + + connect(hardware->audioIO,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged())); + connect(hardware->audioIO,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged())); + connect(hardware->customOptions,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged())); + connect(hardware->addOptions,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotChanged())); + connect(hardware->soundQuality,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged())); + connect(hardware->soundQuality,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged())); + connect(general->latencySlider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged())); + connect(autoSuspend,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged())); + connect(suspendTime,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged())); + connect(general->testSound,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestSound())); + connect(hardware->midiDevice, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( slotChanged() ) ); + connect(hardware->midiDevice, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotChanged() ) ); + connect(hardware->midiUseMapper, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect(hardware->midiMapper, TQT_SIGNAL( textChanged( const TQString& ) ), + this, TQT_SLOT( slotChanged() ) ); KAboutData *about = new KAboutData(I18N_NOOP("kcmarts"), I18N_NOOP("The Sound Server Control Module"), @@ -261,9 +261,9 @@ void KArtsModule::load( bool useDefaults ) fullDuplex->setChecked(config->readBoolEntry("FullDuplex",false)); autoSuspend->setChecked(config->readBoolEntry("AutoSuspend",true)); suspendTime->setValue(config->readNumEntry("SuspendTime",60)); - deviceName->setText(config->readEntry("DeviceName",QString::null)); + deviceName->setText(config->readEntry("DeviceName",TQString::null)); customDevice->setChecked(!deviceName->text().isEmpty()); - hardware->addOptions->setText(config->readEntry("AddOptions",QString::null)); + hardware->addOptions->setText(config->readEntry("AddOptions",TQString::null)); hardware->customOptions->setChecked(!hardware->addOptions->text().isEmpty()); general->latencySlider->setValue(config->readNumEntry("Latency",250)); @@ -291,7 +291,7 @@ void KArtsModule::load( bool useDefaults ) break; } - QString audioIO = config->readEntry("AudioIO", QString::null); + TQString audioIO = config->readEntry("AudioIO", TQString::null); hardware->audioIO->setCurrentItem(0); for(AudioIOElement *a = audioIOList.first(); a != 0; a = audioIOList.next()) { @@ -310,7 +310,7 @@ void KArtsModule::load( bool useDefaults ) midiConfig->setGroup( "Configuration" ); hardware->midiDevice->setCurrentItem( midiConfig->readNumEntry( "midiDevice", 0 ) ); - QString mapurl( midiConfig->readPathEntry( "mapFilename" ) ); + TQString mapurl( midiConfig->readPathEntry( "mapFilename" ) ); hardware->midiMapper->setURL( mapurl ); hardware->midiUseMapper->setChecked( midiConfig->readBoolEntry( "useMidiMapper", false ) ); hardware->midiMapper->setEnabled( hardware->midiUseMapper->isChecked() ); @@ -329,7 +329,7 @@ KArtsModule::~KArtsModule() { void KArtsModule::saveParams( void ) { - QString audioIO; + TQString audioIO; int item = hardware->audioIO->currentItem() - 1; // first item: "default" @@ -337,9 +337,9 @@ void KArtsModule::saveParams( void ) audioIO = audioIOList.at(item)->name; } - QString dev = customDevice->isChecked() ? deviceName->text() : QString::null; + TQString dev = customDevice->isChecked() ? deviceName->text() : TQString::null; int rate = customRate->isChecked()?samplingRate->value() : 0; - QString addOptions; + TQString addOptions; if(hardware->customOptions->isChecked()) addOptions = hardware->addOptions->text(); @@ -419,10 +419,10 @@ int KArtsModule::userSavedChanges() if (!configChanged) return KMessageBox::Yes; - QString question = i18n("The settings have changed since the last time " + TQString question = i18n("The settings have changed since the last time " "you restarted the sound server.\n" "Do you want to save them?"); - QString caption = i18n("Save Sound Server Settings?"); + TQString caption = i18n("Save Sound Server Settings?"); reply = KMessageBox::questionYesNo(this, question, caption,KStdGuiItem::save(),KStdGuiItem::discard()); if ( reply == KMessageBox::Yes) { @@ -494,12 +494,12 @@ void KArtsModule::updateWidgets() "missing or disabled")); } deviceName->setEnabled(customDevice->isChecked()); - QString audioIO; + TQString audioIO; int item = hardware->audioIO->currentItem() - 1; // first item: "default" if (item >= 0) { audioIO = audioIOList.at(item)->name; - bool jack = (audioIO == QString::fromLatin1("jack")); + bool jack = (audioIO == TQString::fromLatin1("jack")); if(jack) { customRate->setChecked(false); @@ -542,8 +542,8 @@ bool KArtsModule::realtimeIsPossible() *checkProcess << "artswrapper"; *checkProcess << "check"; - connect(checkProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); + connect(checkProcess, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotArtsdExited(KProcess*))); if (!checkProcess->start(KProcess::Block)) { delete checkProcess; @@ -608,60 +608,60 @@ void init_arts() startArts(); } -QString KArtsModule::createArgs(bool netTrans, +TQString KArtsModule::createArgs(bool netTrans, bool duplex, int fragmentCount, int fragmentSize, - const QString &deviceName, - int rate, int bits, const QString &audioIO, - const QString &addOptions, bool autoSuspend, + const TQString &deviceName, + int rate, int bits, const TQString &audioIO, + const TQString &addOptions, bool autoSuspend, int suspendTime ) { - QString args; + TQString args; if(fragmentCount) - args += QString::fromLatin1(" -F %1").arg(fragmentCount); + args += TQString::fromLatin1(" -F %1").arg(fragmentCount); if(fragmentSize) - args += QString::fromLatin1(" -S %1").arg(fragmentSize); + args += TQString::fromLatin1(" -S %1").arg(fragmentSize); if (!audioIO.isEmpty()) - args += QString::fromLatin1(" -a %1").arg(audioIO); + args += TQString::fromLatin1(" -a %1").arg(audioIO); if (duplex) - args += QString::fromLatin1(" -d"); + args += TQString::fromLatin1(" -d"); if (netTrans) - args += QString::fromLatin1(" -n"); + args += TQString::fromLatin1(" -n"); if (!deviceName.isEmpty()) - args += QString::fromLatin1(" -D ") + deviceName; + args += TQString::fromLatin1(" -D ") + deviceName; if (rate) - args += QString::fromLatin1(" -r %1").arg(rate); + args += TQString::fromLatin1(" -r %1").arg(rate); if (bits) - args += QString::fromLatin1(" -b %1").arg(bits); + args += TQString::fromLatin1(" -b %1").arg(bits); if (autoSuspend && suspendTime) - args += QString::fromLatin1(" -s %1").arg(suspendTime); + args += TQString::fromLatin1(" -s %1").arg(suspendTime); if (!addOptions.isEmpty()) - args += QChar(' ') + addOptions; + args += TQChar(' ') + addOptions; - args += QString::fromLatin1(" -m artsmessage"); - args += QString::fromLatin1(" -c drkonqi"); - args += QString::fromLatin1(" -l 3"); - args += QString::fromLatin1(" -f"); + args += TQString::fromLatin1(" -m artsmessage"); + args += TQString::fromLatin1(" -c drkonqi"); + args += TQString::fromLatin1(" -l 3"); + args += TQString::fromLatin1(" -f"); return args; } KStartArtsProgressDialog::KStartArtsProgressDialog(KArtsModule *parent, const char *name, - const QString &caption, const QString &text) + const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true), m_module(parent), m_shutdown(false) { - connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotProgress())); + connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -707,7 +707,7 @@ KStartArtsProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - QTimer::singleShot(1000, this, SLOT(close())); + TQTimer::singleShot(1000, this, TQT_SLOT(close())); } diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index e69f5767d..80df5bd8e 100644 --- a/kcontrol/arts/arts.h +++ b/kcontrol/arts/arts.h @@ -28,12 +28,12 @@ #include <kapplication.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qradiobutton.h> -#include <qtimer.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqradiobutton.h> +#include <tqtimer.h> #include <kcmodule.h> #include <knuminput.h> @@ -52,7 +52,7 @@ class KArtsModule : public KCModule public: - KArtsModule(QWidget *parent=0, const char *name=0); + KArtsModule(TQWidget *parent=0, const char *name=0); ~KArtsModule(); void saveParams( void ); @@ -75,18 +75,18 @@ private: void updateWidgets (); void calculateLatency(); - QString createArgs(bool netTrans,bool duplex, int fragmentCount, + TQString createArgs(bool netTrans,bool duplex, int fragmentCount, int fragmentSize, - const QString &deviceName, - int rate, int bits, const QString &audioIO, - const QString &addOptions, bool autoSuspend, + const TQString &deviceName, + int rate, int bits, const TQString &audioIO, + const TQString &addOptions, bool autoSuspend, int suspendTime); int userSavedChanges(); - QCheckBox *startServer, *startRealtime, *networkTransparent, + TQCheckBox *startServer, *startRealtime, *networkTransparent, *fullDuplex, *customDevice, *customRate, *autoSuspend; - QLineEdit *deviceName; - QSpinBox *samplingRate; + TQLineEdit *deviceName; + TQSpinBox *samplingRate; KIntNumInput *suspendTime; generalTab *general; hardwareTab *hardware; @@ -100,14 +100,14 @@ private: class AudioIOElement { public: - AudioIOElement(const QString &name, const QString &fullName) + AudioIOElement(const TQString &name, const TQString &fullName) : name(name), fullName(fullName) {;} - QString name; - QString fullName; + TQString name; + TQString fullName; }; void initAudioIOList(); - QPtrList<AudioIOElement> audioIOList; + TQPtrList<AudioIOElement> audioIOList; void restartServer(); bool realtimeIsPossible(); @@ -119,13 +119,13 @@ class KStartArtsProgressDialog : public KProgressDialog Q_OBJECT public: KStartArtsProgressDialog(KArtsModule *parent, const char *name, - const QString &caption, const QString &text); + const TQString &caption, const TQString &text); public slots: void slotProgress(); void slotFinished(); private: - QTimer m_timer; + TQTimer m_timer; int m_timeStep; KArtsModule *m_module; bool m_shutdown; diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index 7e292cde1..5c7618a1b 100644 --- a/kcontrol/arts/krichtextlabel.cpp +++ b/kcontrol/arts/krichtextlabel.cpp @@ -18,35 +18,35 @@ #include "krichtextlabel.h" -#include <qtooltip.h> -#include <qstylesheet.h> -#include <qsimplerichtext.h> +#include <tqtooltip.h> +#include <tqstylesheet.h> +#include <tqsimplerichtext.h> #include <kglobalsettings.h> -static QString qrichtextify( const QString& text ) +static TQString qrichtextify( const TQString& text ) { if ( text.isEmpty() || text[0] == '<' ) return text; - QStringList lines = QStringList::split('\n', text); - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) + TQStringList lines = TQStringList::split('\n', text); + for(TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { - *it = QStyleSheet::convertFromPlainText( *it, QStyleSheetItem::WhiteSpaceNormal ); + *it = TQStyleSheet::convertFromPlainText( *it, TQStyleSheetItem::WhiteSpaceNormal ); } - return lines.join(QString::null); + return lines.join(TQString::null); } -KRichTextLabel::KRichTextLabel( const QString &text , QWidget *parent, const char *name ) - : QLabel ( parent, name ) { +KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); setAlignment( Qt::WordBreak ); setText(text); } -KRichTextLabel::KRichTextLabel( QWidget *parent, const char *name ) - : QLabel ( parent, name ) { +KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); setAlignment( Qt::WordBreak ); } @@ -57,17 +57,17 @@ void KRichTextLabel::setDefaultWidth(int defaultWidth) updateGeometry(); } -QSizePolicy KRichTextLabel::sizePolicy() const +TQSizePolicy KRichTextLabel::sizePolicy() const { - return QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum, false); + return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -QSize KRichTextLabel::minimumSizeHint() const +TQSize KRichTextLabel::minimumSizeHint() const { - QString qt_text = qrichtextify( text() ); + TQString qt_text = qrichtextify( text() ); int pref_width = 0; int pref_height = 0; - QSimpleRichText rt(qt_text, font()); + TQSimpleRichText rt(qt_text, font()); pref_width = m_defaultWidth; rt.setWidth(pref_width); int used_width = rt.widthUsed(); @@ -94,19 +94,19 @@ QSize KRichTextLabel::minimumSizeHint() const pref_width = used_width; } - return QSize(pref_width, rt.height()); + return TQSize(pref_width, rt.height()); } -QSize KRichTextLabel::sizeHint() const +TQSize KRichTextLabel::sizeHint() const { return minimumSizeHint(); } -void KRichTextLabel::setText( const QString &text ) { +void KRichTextLabel::setText( const TQString &text ) { if (!text.startsWith("<qt>")) - QLabel::setText("<qt>"+text+"</qt>"); + TQLabel::setText("<qt>"+text+"</qt>"); else - QLabel::setText(text); + TQLabel::setText(text); } void KRichTextLabel::virtual_hook( int, void* ) diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index e03fe2509..40ead0375 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -19,12 +19,12 @@ #ifndef KRICHTEXTLABEL_H #define KRICHTEXTLABEL_H -#include <qlabel.h> +#include <tqlabel.h> #include <kdelibs_export.h> /** - * @short A replacement for QLabel that supports richtext and proper layout management + * @short A replacement for TQLabel that supports richtext and proper layout management * * @author Waldo Bastian <bastian@kde.org> */ @@ -32,25 +32,25 @@ /* * QLabel */ -class KDEUI_EXPORT KRichTextLabel : public QLabel { +class KDEUI_EXPORT KRichTextLabel : public TQLabel { Q_OBJECT public: /** * Default constructor. */ - KRichTextLabel( QWidget *parent, const char *name = 0 ); - KRichTextLabel( const QString &text, QWidget *parent, const char *name = 0 ); + KRichTextLabel( TQWidget *parent, const char *name = 0 ); + KRichTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual QSize minimumSizeHint() const; - virtual QSize sizeHint() const; - QSizePolicy sizePolicy() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; + TQSizePolicy sizePolicy() const; public slots: - void setText( const QString & ); + void setText( const TQString & ); protected: int m_defaultWidth; diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index 3218ec470..e1f9ece96 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -20,17 +20,17 @@ Boston, MA 02110-1301, USA. */ -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qpushbutton.h> -#include <qslider.h> -#include <qspinbox.h> -#include <qwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqpushbutton.h> +#include <tqslider.h> +#include <tqspinbox.h> +#include <tqwhatsthis.h> #include <kconfig.h> #include <kcolorbutton.h> @@ -48,12 +48,12 @@ /**** BGAdvancedDialog ****/ -static QCString desktopConfigname() +static TQCString desktopConfigname() { int desktop=0; if (qt_xdisplay()) desktop = DefaultScreen(qt_xdisplay()); - QCString name; + TQCString name; if (desktop == 0) name = "kdesktoprc"; else @@ -64,7 +64,7 @@ static QCString desktopConfigname() BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, - QWidget *parent, + TQWidget *parent, bool m_multidesktop) : KDialogBase(parent, "BGAdvancedDialog", true, i18n("Advanced Background Settings"), @@ -77,12 +77,12 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_listPrograms->header()->setStretchEnabled ( true, 1 ); dlg->m_listPrograms->setAllColumnsShowFocus(true); - connect(dlg->m_listPrograms, SIGNAL(clicked(QListViewItem *)), - SLOT(slotProgramItemClicked(QListViewItem *))); + connect(dlg->m_listPrograms, TQT_SIGNAL(clicked(TQListViewItem *)), + TQT_SLOT(slotProgramItemClicked(TQListViewItem *))); // Load programs - QStringList lst = KBackgroundProgram::list(); - QStringList::Iterator it; + TQStringList lst = KBackgroundProgram::list(); + TQStringList::Iterator it; for (it=lst.begin(); it != lst.end(); ++it) addProgram(*it); @@ -100,15 +100,15 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_spinCache->setSpecialValueText(i18n("Unlimited")); dlg->m_spinCache->setSuffix(i18n(" KB")); - connect(dlg->m_buttonAdd, SIGNAL(clicked()), - SLOT(slotAdd())); - connect(dlg->m_buttonRemove, SIGNAL(clicked()), - SLOT(slotRemove())); - connect(dlg->m_buttonModify, SIGNAL(clicked()), - SLOT(slotModify())); + connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), + TQT_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), + TQT_SLOT(slotRemove())); + connect(dlg->m_buttonModify, TQT_SIGNAL(clicked()), + TQT_SLOT(slotModify())); - connect(dlg->m_listPrograms, SIGNAL(doubleClicked(QListViewItem *)), - SLOT(slotProgramItemDoubleClicked(QListViewItem *))); + connect(dlg->m_listPrograms, TQT_SIGNAL(doubleClicked(TQListViewItem *)), + TQT_SLOT(slotProgramItemDoubleClicked(TQListViewItem *))); } else { @@ -119,8 +119,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_groupCache->hide(); } - connect( dlg->m_cbProgram, SIGNAL(toggled(bool)), - SLOT(slotEnableProgram(bool))); + connect( dlg->m_cbProgram, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(slotEnableProgram(bool))); m_backgroundMode = m_oldBackgroundMode = r->backgroundMode(); if (m_oldBackgroundMode == KBackgroundSettings::Program) @@ -146,23 +146,23 @@ int BGAdvancedDialog::cacheSize() return dlg->m_spinCache->value(); } -QColor BGAdvancedDialog::textColor() +TQColor BGAdvancedDialog::textColor() { return dlg->m_colorText->color(); } -void BGAdvancedDialog::setTextColor(const QColor &color) +void BGAdvancedDialog::setTextColor(const TQColor &color) { dlg->m_colorText->setColor(color); } -QColor BGAdvancedDialog::textBackgroundColor() +TQColor BGAdvancedDialog::textBackgroundColor() { return dlg->m_cbSolidTextBackground->isChecked() ? - dlg->m_colorTextBackground->color() : QColor(); + dlg->m_colorTextBackground->color() : TQColor(); } -void BGAdvancedDialog::setTextBackgroundColor(const QColor &color) +void BGAdvancedDialog::setTextBackgroundColor(const TQColor &color) { dlg->m_colorTextBackground->blockSignals(true); dlg->m_cbSolidTextBackground->blockSignals(true); @@ -214,7 +214,7 @@ int BGAdvancedDialog::textWidth() const void BGAdvancedDialog::updateUI() { - QString prog = r->KBackgroundProgram::name(); + TQString prog = r->KBackgroundProgram::name(); dlg->m_cbProgram->blockSignals(true); if ((r->backgroundMode() == KBackgroundSettings::Program) @@ -238,7 +238,7 @@ void BGAdvancedDialog::updateUI() dlg->m_cbProgram->blockSignals(false); } -void BGAdvancedDialog::removeProgram(const QString &name) +void BGAdvancedDialog::removeProgram(const TQString &name) { if (m_programItems.find(name)) { @@ -247,7 +247,7 @@ void BGAdvancedDialog::removeProgram(const QString &name) } } -void BGAdvancedDialog::addProgram(const QString &name) +void BGAdvancedDialog::addProgram(const TQString &name) { removeProgram(name); @@ -255,7 +255,7 @@ void BGAdvancedDialog::addProgram(const QString &name) if (prog.command().isEmpty() || (prog.isGlobal() && !prog.isAvailable())) return; - QListViewItem *item = new QListViewItem(dlg->m_listPrograms); + TQListViewItem *item = new TQListViewItem(dlg->m_listPrograms); item->setText(0, prog.name()); item->setText(1, prog.comment()); item->setText(2, i18n("%1 min.").arg(prog.refresh())); @@ -263,11 +263,11 @@ void BGAdvancedDialog::addProgram(const QString &name) m_programItems.insert(name, item); } -void BGAdvancedDialog::selectProgram(const QString &name) +void BGAdvancedDialog::selectProgram(const TQString &name) { if (m_programItems.find(name)) { - QListViewItem *item = m_programItems[name]; + TQListViewItem *item = m_programItems[name]; dlg->m_listPrograms->ensureItemVisible(item); dlg->m_listPrograms->setSelected(item, true); m_selectedProgram = name; @@ -278,9 +278,9 @@ void BGAdvancedDialog::slotAdd() { KProgramEditDialog dlg; dlg.exec(); - if (dlg.result() == QDialog::Accepted) + if (dlg.result() == TQDialog::Accepted) { - QString program = dlg.program(); + TQString program = dlg.program(); addProgram(program); selectProgram(program); } @@ -309,7 +309,7 @@ void BGAdvancedDialog::slotRemove() prog.remove(); removeProgram(m_selectedProgram); - m_selectedProgram = QString::null; + m_selectedProgram = TQString::null; } /* @@ -322,9 +322,9 @@ void BGAdvancedDialog::slotModify() KProgramEditDialog dlg(m_selectedProgram); dlg.exec(); - if (dlg.result() == QDialog::Accepted) + if (dlg.result() == TQDialog::Accepted) { - QString program = dlg.program(); + TQString program = dlg.program(); if (program != m_selectedProgram) { KBackgroundProgram prog(m_selectedProgram); @@ -336,14 +336,14 @@ void BGAdvancedDialog::slotModify() } } -void BGAdvancedDialog::slotProgramItemClicked(QListViewItem *item) +void BGAdvancedDialog::slotProgramItemClicked(TQListViewItem *item) { if (item) m_selectedProgram = item->text(0); slotProgramChanged(); } -void BGAdvancedDialog::slotProgramItemDoubleClicked(QListViewItem *item) +void BGAdvancedDialog::slotProgramItemDoubleClicked(TQListViewItem *item) { slotProgramItemClicked(item); slotModify(); @@ -363,7 +363,7 @@ void BGAdvancedDialog::slotEnableProgram(bool b) if (b) { dlg->m_listPrograms->blockSignals(true); - QListViewItem *cur = dlg->m_listPrograms->currentItem(); + TQListViewItem *cur = dlg->m_listPrograms->currentItem(); dlg->m_listPrograms->setSelected(cur, true); dlg->m_listPrograms->ensureItemVisible(cur); dlg->m_listPrograms->blockSignals(false); @@ -375,7 +375,7 @@ void BGAdvancedDialog::slotEnableProgram(bool b) } } -QString BGAdvancedDialog::backgroundProgram() const +TQString BGAdvancedDialog::backgroundProgram() const { return m_selectedProgram; } @@ -387,48 +387,48 @@ int BGAdvancedDialog::backgroundMode() const /**** KProgramEditDialog ****/ -KProgramEditDialog::KProgramEditDialog(const QString &program, QWidget *parent, char *name) +KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent, char *name) : KDialogBase(parent, name, true, i18n("Configure Background Program"), Ok | Cancel, Ok, true) { - QFrame *frame = makeMainWidget(); + TQFrame *frame = makeMainWidget(); - QGridLayout *grid = new QGridLayout(frame, 6, 2, 0, spacingHint()); + TQGridLayout *grid = new TQGridLayout(frame, 6, 2, 0, spacingHint()); grid->addColSpacing(1, 300); - QLabel *lbl = new QLabel(i18n("&Name:"), frame); + TQLabel *lbl = new TQLabel(i18n("&Name:"), frame); grid->addWidget(lbl, 0, 0); - m_NameEdit = new QLineEdit(frame); + m_NameEdit = new TQLineEdit(frame); lbl->setBuddy(m_NameEdit); grid->addWidget(m_NameEdit, 0, 1); - lbl = new QLabel(i18n("Co&mment:"), frame); + lbl = new TQLabel(i18n("Co&mment:"), frame); grid->addWidget(lbl, 1, 0); - m_CommentEdit = new QLineEdit(frame); + m_CommentEdit = new TQLineEdit(frame); lbl->setBuddy(m_CommentEdit); grid->addWidget(m_CommentEdit, 1, 1); - lbl = new QLabel(i18n("Comman&d:"), frame); + lbl = new TQLabel(i18n("Comman&d:"), frame); grid->addWidget(lbl, 2, 0); - m_CommandEdit = new QLineEdit(frame); + m_CommandEdit = new TQLineEdit(frame); lbl->setBuddy(m_CommandEdit); grid->addWidget(m_CommandEdit, 2, 1); - lbl = new QLabel(i18n("&Preview cmd:"), frame); + lbl = new TQLabel(i18n("&Preview cmd:"), frame); grid->addWidget(lbl, 3, 0); - m_PreviewEdit = new QLineEdit(frame); + m_PreviewEdit = new TQLineEdit(frame); lbl->setBuddy(m_PreviewEdit); grid->addWidget(m_PreviewEdit, 3, 1); - lbl = new QLabel(i18n("&Executable:"), frame); + lbl = new TQLabel(i18n("&Executable:"), frame); grid->addWidget(lbl, 4, 0); - m_ExecEdit = new QLineEdit(frame); + m_ExecEdit = new TQLineEdit(frame); lbl->setBuddy(m_ExecEdit); grid->addWidget(m_ExecEdit, 4, 1); - lbl = new QLabel(i18n("&Refresh time:"), frame); + lbl = new TQLabel(i18n("&Refresh time:"), frame); grid->addWidget(lbl, 5, 0); - m_RefreshEdit = new QSpinBox(frame); + m_RefreshEdit = new TQSpinBox(frame); m_RefreshEdit->setRange(5, 60); m_RefreshEdit->setSteps(5, 10); m_RefreshEdit->setSuffix(i18n(" min")); @@ -459,14 +459,14 @@ KProgramEditDialog::KProgramEditDialog(const QString &program, QWidget *parent, } -QString KProgramEditDialog::program()const +TQString KProgramEditDialog::program()const { return m_NameEdit->text(); } void KProgramEditDialog::slotOk() { - QString s = m_NameEdit->text(); + TQString s = m_NameEdit->text(); if (s.isEmpty()) { KMessageBox::sorry(this, i18n("You did not fill in the `Name' field.\n" "This is a required field.")); @@ -477,7 +477,7 @@ void KProgramEditDialog::slotOk() if ((s != m_Program) && !prog.command().isEmpty()) { int ret = KMessageBox::warningContinueCancel(this, i18n("There is already a program with the name `%1'.\n" - "Do you want to overwrite it?").arg(s),QString::null,i18n("Overwrite")); + "Do you want to overwrite it?").arg(s),TQString::null,i18n("Overwrite")); if (ret != KMessageBox::Continue) return; } diff --git a/kcontrol/background/bgadvanced.h b/kcontrol/background/bgadvanced.h index 6ede665a1..8c2a0b801 100644 --- a/kcontrol/background/bgadvanced.h +++ b/kcontrol/background/bgadvanced.h @@ -23,9 +23,9 @@ #ifndef BGADVANCED_H #define BGADVANCED_H -#include <qdict.h> -#include <qlistview.h> -#include <qstringlist.h> +#include <tqdict.h> +#include <tqlistview.h> +#include <tqstringlist.h> #include <kdialogbase.h> @@ -40,14 +40,14 @@ class BGAdvancedDialog : public KDialogBase { Q_OBJECT public: - BGAdvancedDialog(KBackgroundRenderer *_r, QWidget *parent, bool m_multidesktop); + BGAdvancedDialog(KBackgroundRenderer *_r, TQWidget *parent, bool m_multidesktop); void setCacheSize(int s); int cacheSize(); - QColor textColor(); - void setTextColor(const QColor &color); - QColor textBackgroundColor(); - void setTextBackgroundColor(const QColor &color); + TQColor textColor(); + void setTextColor(const TQColor &color); + TQColor textBackgroundColor(); + void setTextBackgroundColor(const TQColor &color); bool shadowEnabled(); void setShadowEnabled(bool enabled); void setTextLines(int lines); @@ -59,7 +59,7 @@ public: void makeReadOnly(); - QString backgroundProgram() const; + TQString backgroundProgram() const; int backgroundMode() const; public slots: @@ -68,13 +68,13 @@ public slots: void slotModify(); protected: - void addProgram(const QString &name); - void removeProgram(const QString &name); - void selectProgram(const QString &name); + void addProgram(const TQString &name); + void removeProgram(const TQString &name); + void selectProgram(const TQString &name); protected slots: - void slotProgramItemClicked(QListViewItem *item); - void slotProgramItemDoubleClicked(QListViewItem *item); + void slotProgramItemClicked(TQListViewItem *item); + void slotProgramItemDoubleClicked(TQListViewItem *item); void slotProgramChanged(); void slotEnableProgram(bool b); @@ -83,9 +83,9 @@ private: BGAdvancedBase *dlg; - QWidget *m_pMonitor; - QDict<QListViewItem> m_programItems; - QString m_selectedProgram; + TQWidget *m_pMonitor; + TQDict<TQListViewItem> m_programItems; + TQString m_selectedProgram; int m_oldBackgroundMode; int m_backgroundMode; }; @@ -98,21 +98,21 @@ class KProgramEditDialog: public KDialogBase Q_OBJECT public: - KProgramEditDialog(const QString &program=QString::null, QWidget *parent=0L, + KProgramEditDialog(const TQString &program=TQString::null, TQWidget *parent=0L, char *name=0L); /** The program name is here in case the user changed it */ - QString program()const; + TQString program()const; public slots: void slotOk(); private: - QString m_Program; - QLineEdit *m_NameEdit, *m_CommentEdit; - QLineEdit *m_ExecEdit, *m_CommandEdit; - QLineEdit *m_PreviewEdit; - QSpinBox *m_RefreshEdit; + TQString m_Program; + TQLineEdit *m_NameEdit, *m_CommentEdit; + TQLineEdit *m_ExecEdit, *m_CommandEdit; + TQLineEdit *m_PreviewEdit; + TQSpinBox *m_RefreshEdit; KBackgroundProgram *m_Prog; }; diff --git a/kcontrol/background/bgdefaults.h b/kcontrol/background/bgdefaults.h index 99846f0b0..b7de45bda 100644 --- a/kcontrol/background/bgdefaults.h +++ b/kcontrol/background/bgdefaults.h @@ -26,8 +26,8 @@ // Per desktop defaults // Before you change this get in touch with me (torsten@kde.org) // Thanks!! -#define _defColorA QColor("#003082") -#define _defColorB QColor("#C0C0C0") +#define _defColorA TQColor("#003082") +#define _defColorB TQColor("#C0C0C0") #define _defBackgroundMode KBackgroundSettings::Flat #define _defWallpaperMode KBackgroundSettings::NoWallpaper #define _defMultiMode KBackgroundSettings::NoMulti diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 6a7e44234..ae76b701a 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -29,16 +29,16 @@ #include <config.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qradiobutton.h> -#include <qslider.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qapplication.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqradiobutton.h> +#include <tqslider.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqapplication.h> #include <kconfig.h> #include <kdebug.h> @@ -66,7 +66,7 @@ #define NR_PREDEF_PATTERNS 6 -BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) +BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) : BGDialog_UI(parent, "BGDialog") { m_pGlobals = new KGlobalBackgroundSettings(_config); @@ -77,20 +77,20 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) KWinModule *m_kwin; m_kwin = new KWinModule(this); m_curDesk = m_kwin->currentDesktop(); - QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; m_numDesks = m_multidesktop ? KWin::numberOfDesktops() : 1; m_numViewports = s.width() * s.height(); - m_numScreens = QApplication::desktop()->numScreens(); + m_numScreens = TQApplication::desktop()->numScreens(); - QCString multiHead = getenv("KDE_MULTIHEAD"); + TQCString multiHead = getenv("KDE_MULTIHEAD"); if (multiHead.lower() == "true") { m_numScreens = 1; } - QPoint vx(m_kwin->currentViewport(m_kwin->currentDesktop())); + TQPoint vx(m_kwin->currentViewport(m_kwin->currentDesktop())); int t_eViewport = (vx.x() * vx.y()); if (t_eViewport < 1) { t_eViewport = 1; @@ -101,7 +101,7 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) m_desk = m_multidesktop ? (m_useViewports ? (((m_desk - 1) * m_numViewports) + t_eViewport) : m_desk) : m_desk; m_numDesks = m_multidesktop ? (m_useViewports ? (m_numDesks * m_numViewports) : m_numDesks) : m_numDesks; - m_screen = QApplication::desktop()->screenNumber(this); + m_screen = TQApplication::desktop()->screenNumber(this); if (m_screen >= (int)m_numScreens) m_screen = m_numScreens-1; @@ -124,62 +124,62 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) m_eScreen = 0; } - connect(m_buttonIdentifyScreens, SIGNAL(clicked()), SLOT(slotIdentifyScreens())); + connect(m_buttonIdentifyScreens, TQT_SIGNAL(clicked()), TQT_SLOT(slotIdentifyScreens())); // preview monitor m_pMonitorArrangement = new BGMonitorArrangement(m_screenArrangement, "monitor arrangement"); - connect(m_pMonitorArrangement, SIGNAL(imageDropped(const QString &)), SLOT(slotImageDropped(const QString &))); + connect(m_pMonitorArrangement, TQT_SIGNAL(imageDropped(const TQString &)), TQT_SLOT(slotImageDropped(const TQString &))); if( m_multidesktop) { // desktop - connect(m_comboDesktop, SIGNAL(activated(int)), - SLOT(slotSelectDesk(int))); + connect(m_comboDesktop, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotSelectDesk(int))); } if (m_numScreens > 1) { - connect(m_comboScreen, SIGNAL(activated(int)), - SLOT(slotSelectScreen(int))); + connect(m_comboScreen, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotSelectScreen(int))); } // background image settings - QIconSet iconSet = SmallIconSet(QString::fromLatin1("fileopen")); - QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal ); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); + TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_urlWallpaperButton->setIconSet( iconSet ); m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - QToolTip::add(m_urlWallpaperButton, i18n("Open file dialog")); - - connect(m_buttonGroupBackground, SIGNAL(clicked(int)), - SLOT(slotWallpaperTypeChanged(int))); - connect(m_urlWallpaperBox, SIGNAL(activated(int)), - SLOT(slotWallpaper(int))); - connect(m_urlWallpaperButton, SIGNAL(clicked()), - SLOT(slotWallpaperSelection())); - connect(m_comboWallpaperPos, SIGNAL(activated(int)), - SLOT(slotWallpaperPos(int))); - connect(m_buttonSetupWallpapers, SIGNAL(clicked()), - SLOT(slotSetupMulti())); + TQToolTip::add(m_urlWallpaperButton, i18n("Open file dialog")); + + connect(m_buttonGroupBackground, TQT_SIGNAL(clicked(int)), + TQT_SLOT(slotWallpaperTypeChanged(int))); + connect(m_urlWallpaperBox, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotWallpaper(int))); + connect(m_urlWallpaperButton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotWallpaperSelection())); + connect(m_comboWallpaperPos, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotWallpaperPos(int))); + connect(m_buttonSetupWallpapers, TQT_SIGNAL(clicked()), + TQT_SLOT(slotSetupMulti())); // set up the background colour stuff - connect(m_colorPrimary, SIGNAL(changed(const QColor &)), - SLOT(slotPrimaryColor(const QColor &))); - connect(m_colorSecondary, SIGNAL(changed(const QColor &)), - SLOT(slotSecondaryColor(const QColor &))); - connect(m_comboPattern, SIGNAL(activated(int)), - SLOT(slotPattern(int))); + connect(m_colorPrimary, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotPrimaryColor(const TQColor &))); + connect(m_colorSecondary, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotSecondaryColor(const TQColor &))); + connect(m_comboPattern, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotPattern(int))); // blend - connect(m_comboBlend, SIGNAL(activated(int)), SLOT(slotBlendMode(int))); - connect(m_sliderBlend, SIGNAL(valueChanged(int)), - SLOT(slotBlendBalance(int))); - connect(m_cbBlendReverse, SIGNAL(toggled(bool)), - SLOT(slotBlendReverse(bool))); + connect(m_comboBlend, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBlendMode(int))); + connect(m_sliderBlend, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotBlendBalance(int))); + connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(slotBlendReverse(bool))); // advanced options - connect(m_buttonAdvanced, SIGNAL(clicked()), - SLOT(slotAdvanced())); + connect(m_buttonAdvanced, TQT_SIGNAL(clicked()), + TQT_SLOT(slotAdvanced())); - connect(m_buttonGetNew, SIGNAL(clicked()), - SLOT(slotGetNewStuff())); + connect(m_buttonGetNew, TQT_SIGNAL(clicked()), + TQT_SLOT(slotGetNewStuff())); // renderers m_renderer.resize(m_numDesks+1); @@ -196,19 +196,19 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) // Setup the merged-screen renderer KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config); m_renderer[i].insert( 0, r ); - connect( r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int)) ); + connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); // Setup the common-screen renderer r = new KBackgroundRenderer(eDesk, 0, true, _config); m_renderer[i].insert( 1, r ); - connect( r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int)) ); + connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); // Setup the remaining renderers for each screen for (unsigned j=0; j < m_numScreens; ++j ) { r = new KBackgroundRenderer(eDesk, j, true, _config); m_renderer[i].insert( j+2, r ); - connect( r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int)) ); + connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); } } } @@ -223,14 +223,14 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) // set up the common desktop renderer KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config); m_renderer[0].insert(0, r); - connect(r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int))); + connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); // set up all the other desktop renderers for (unsigned i = 0; i < m_numDesks; ++i) { r = new KBackgroundRenderer(i, 0, false, _config); m_renderer[i+1].insert(0, r); - connect(r, SIGNAL(imageDone(int,int)), SLOT(slotPreviewDone(int,int))); + connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); } } @@ -257,7 +257,7 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop) updateUI(); #if (QT_VERSION-0 >= 0x030200) - connect( qApp->desktop(), SIGNAL( resized( int )), SLOT( desktopResized())); // RANDR support + connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support #endif } @@ -380,7 +380,7 @@ void BGDialog::defaults() eRenderer()->setWallpaper( eRenderer()->wallpaper() ); } -QString BGDialog::quickHelp() const +TQString BGDialog::quickHelp() const { return i18n("<h1>Background</h1> This module allows you to control the" " appearance of the virtual desktops. KDE offers a variety of options" @@ -405,23 +405,23 @@ void BGDialog::slotIdentifyScreens() // Taken from PositionTab::showIdentify in kdebase/kcontrol/kicker/positiontab_impl.cpp for(unsigned s = 0; s < m_numScreens; s++) { - QLabel *screenLabel = new QLabel(0,"Screen Identify", WDestructiveClose | WStyle_Customize | WX11BypassWM); + TQLabel *screenLabel = new TQLabel(0,"Screen Identify", WDestructiveClose | WStyle_Customize | WX11BypassWM); - QFont identifyFont(KGlobalSettings::generalFont()); + TQFont identifyFont(KGlobalSettings::generalFont()); identifyFont.setPixelSize(100); screenLabel->setFont(identifyFont); - screenLabel->setFrameStyle(QFrame::Panel); - screenLabel->setFrameShadow(QFrame::Plain); + screenLabel->setFrameStyle(TQFrame::Panel); + screenLabel->setFrameShadow(TQFrame::Plain); screenLabel->setAlignment(Qt::AlignCenter); screenLabel->setNum(int(s + 1)); // BUGLET: we should not allow the identification to be entered again // until the timer fires. - QTimer::singleShot(1500, screenLabel, SLOT(close())); + TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); - QPoint screenCenter(QApplication::desktop()->screenGeometry(s).center()); - QRect targetGeometry(QPoint(0,0),screenLabel->sizeHint()); + TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); @@ -448,7 +448,7 @@ void BGDialog::initUI() // Screens for (unsigned i = 0; i < m_numScreens; ++i) - m_comboScreen->insertItem( i18n("Screen %1").arg(QString::number(i+1)) ); + m_comboScreen->insertItem( i18n("Screen %1").arg(TQString::number(i+1)) ); // Patterns m_comboPattern->insertItem(i18n("Single Color")); @@ -460,7 +460,7 @@ void BGDialog::initUI() m_patterns = KBackgroundPattern::list(); m_patterns.sort(); // Defined order - QStringList::Iterator it; + TQStringList::Iterator it; for (it=m_patterns.begin(); it != m_patterns.end(); ++it) { KBackgroundPattern pat(*it); @@ -497,20 +497,20 @@ void BGDialog::initUI() void BGDialog::loadWallpaperFilesList() { // Wallpapers - // the following QMap is lower cased names mapped to cased names and URLs + // the following TQMap is lower cased names mapped to cased names and URLs // this way we get case insensitive sorting - QMap<QString, QPair<QString, QString> > papers; + TQMap<TQString, QPair<TQString, TQString> > papers; //search for .desktop files before searching for images without .desktop files - QStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true); - QStringList files; - for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) + TQStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true); + TQStringList files; + for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) { KSimpleConfig fileConfig(*it); fileConfig.setGroup("Wallpaper"); - QString imageCaption = fileConfig.readEntry("Name"); - QString fileName = fileConfig.readEntry("File"); + TQString imageCaption = fileConfig.readEntry("Name"); + TQString fileName = fileConfig.readEntry("File"); if (imageCaption.isEmpty()) { @@ -520,15 +520,15 @@ void BGDialog::loadWallpaperFilesList() { } // avoid name collisions - QString rs = imageCaption; - QString lrs = rs.lower(); + TQString rs = imageCaption; + TQString lrs = rs.lower(); for (int n = 1; papers.find(lrs) != papers.end(); ++n) { - rs = imageCaption + " (" + QString::number(n) + ')'; + rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); } int slash = (*it).findRev('/') + 1; - QString directory = (*it).left(slash); + TQString directory = (*it).left(slash); bool canLoadScaleable = false; #ifdef HAVE_LIBART canLoadScaleable = true; @@ -541,13 +541,13 @@ void BGDialog::loadWallpaperFilesList() { //now find any wallpapers that don't have a .desktop file lst = m_pDirs->findAllResources("wallpaper", "*", false, true); - for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) + for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) { if ( !(*it).endsWith(".desktop") && files.grep(*it).empty() ) { // First try to see if we have a comment describing the image. If we do // just use the first line of said comment. KFileMetaInfo metaInfo(*it); - QString imageCaption; + TQString imageCaption; if (metaInfo.isValid() && metaInfo.item("Comment").isValid()) imageCaption = metaInfo.item("Comment").string().section('\n', 0, 0); @@ -568,11 +568,11 @@ void BGDialog::loadWallpaperFilesList() { } // avoid name collisions - QString rs = imageCaption; - QString lrs = rs.lower(); + TQString rs = imageCaption; + TQString lrs = rs.lower(); for (int n = 1; papers.find(lrs) != papers.end(); ++n) { - rs = imageCaption + " (" + QString::number(n) + ')'; + rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); } papers[lrs] = qMakePair(rs, *it); @@ -583,7 +583,7 @@ void BGDialog::loadWallpaperFilesList() { comboWallpaper->clear(); m_wallpaper.clear(); int i = 0; - for (QMap<QString, QPair<QString, QString> >::Iterator it = papers.begin(); + for (TQMap<TQString, QPair<TQString, TQString> >::Iterator it = papers.begin(); it != papers.end(); ++it) { @@ -593,7 +593,7 @@ void BGDialog::loadWallpaperFilesList() { } } -void BGDialog::setWallpaper(const QString &s) +void BGDialog::setWallpaper(const TQString &s) { KComboBox *comboWallpaper = m_urlWallpaperBox; comboWallpaper->blockSignals(true); @@ -601,7 +601,7 @@ void BGDialog::setWallpaper(const QString &s) if (m_wallpaper.find(s) == m_wallpaper.end()) { int i = comboWallpaper->count(); - QString imageCaption; + TQString imageCaption; int slash = s.findRev('/') + 1; int endDot = s.findRev('.'); @@ -628,13 +628,13 @@ void BGDialog::setWallpaper(const QString &s) void BGDialog::slotWallpaperSelection() { - KFileDialog dlg( QString::null, QString::null, this, + KFileDialog dlg( TQString::null, TQString::null, this, "file dialog", true ); KImageFilePreview* previewWidget = new KImageFilePreview(&dlg); dlg.setPreviewWidget(previewWidget); - QStringList mimeTypes = KImageIO::mimeTypes( KImageIO::Reading ); + TQStringList mimeTypes = KImageIO::mimeTypes( KImageIO::Reading ); #ifdef HAVE_LIBART mimeTypes += "image/svg+xml"; #endif @@ -643,8 +643,8 @@ void BGDialog::slotWallpaperSelection() dlg.setCaption( i18n("Select Wallpaper") ); int j = m_urlWallpaperBox->currentItem(); - QString uri; - for(QMap<QString,int>::ConstIterator it = m_wallpaper.begin(); + TQString uri; + for(TQMap<TQString,int>::ConstIterator it = m_wallpaper.begin(); it != m_wallpaper.end(); ++it) { @@ -659,7 +659,7 @@ void BGDialog::slotWallpaperSelection() dlg.setSelection( uri ); } - if ( dlg.exec() == QDialog::Accepted ) + if ( dlg.exec() == TQDialog::Accepted ) { setWallpaper(dlg.selectedFile()); @@ -819,7 +819,7 @@ void BGDialog::slotPreviewDone(int desk_done, int screen_done) r->saveCacheFile(); KPixmap pm; - if (QPixmap::defaultDepth() < 15) + if (TQPixmap::defaultDepth() < 15) pm.convertFromImage(r->image(), KPixmap::LowColor); else pm.convertFromImage(r->image()); @@ -839,7 +839,7 @@ void BGDialog::slotPreviewDone(int desk_done, int screen_done) } } -void BGDialog::slotImageDropped(const QString &uri) +void BGDialog::slotImageDropped(const TQString &uri) { setWallpaper(uri); @@ -911,8 +911,8 @@ void BGDialog::slotWallpaperTypeChanged(int i) r->setMultiWallpaperMode(KBackgroundSettings::NoMultiRandom); int j = m_urlWallpaperBox->currentItem(); - QString path; - for(QMap<QString,int>::ConstIterator it = m_wallpaper.begin(); + TQString path; + for(TQMap<TQString,int>::ConstIterator it = m_wallpaper.begin(); it != m_wallpaper.end(); ++it) { @@ -929,7 +929,7 @@ void BGDialog::slotWallpaperTypeChanged(int i) // If the image is greater than 800x600 default to using scaled mode, // otherwise default to tiled. - QSize s = metaInfo.item("Dimensions").value().toSize(); + TQSize s = metaInfo.item("Dimensions").value().toSize(); if (s.width() >= 800 && s.height() >= 600) m_wallpaperPos = KBackgroundSettings::Scaled; else @@ -997,7 +997,7 @@ void BGDialog::slotSetupMulti() KBackgroundRenderer *r = eRenderer(); BGMultiWallpaperDialog dlg(r, topLevelWidget()); - if (dlg.exec() == QDialog::Accepted) { + if (dlg.exec() == TQDialog::Accepted) { r->stop(); m_slideShowRandom = r->multiWallpaperMode(); r->setWallpaperMode(m_wallpaperPos); @@ -1008,7 +1008,7 @@ void BGDialog::slotSetupMulti() } } -void BGDialog::slotPrimaryColor(const QColor &color) +void BGDialog::slotPrimaryColor(const TQColor &color) { KBackgroundRenderer *r = eRenderer(); @@ -1023,7 +1023,7 @@ void BGDialog::slotPrimaryColor(const QColor &color) emit changed(true); } -void BGDialog::slotSecondaryColor(const QColor &color) +void BGDialog::slotSecondaryColor(const TQColor &color) { KBackgroundRenderer *r = eRenderer(); diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h index 8782b73f7..30bb0f004 100644 --- a/kcontrol/background/bgdialog.h +++ b/kcontrol/background/bgdialog.h @@ -20,9 +20,9 @@ #ifndef _BGDIALOG_H_ #define _BGDIALOG_H_ -#include <qptrvector.h> -#include <qmap.h> -#include <qvaluevector.h> +#include <tqptrvector.h> +#include <tqmap.h> +#include <tqvaluevector.h> #include "bgdialog_ui.h" #include "bgrender.h" @@ -36,7 +36,7 @@ class BGDialog : public BGDialog_UI { Q_OBJECT public: - BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop = true); + BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop = true); ~BGDialog(); void load( bool useDefaults ); @@ -45,7 +45,7 @@ public: void makeReadOnly(); - QString quickHelp() const; + TQString quickHelp() const; signals: void changed(bool); @@ -55,7 +55,7 @@ protected: void updateUI(); KBackgroundRenderer * eRenderer(); - void setWallpaper(const QString &); + void setWallpaper(const TQString &); void loadWallpaperFilesList(); @@ -68,10 +68,10 @@ protected slots: void slotWallpaperPos(int); void slotWallpaperSelection(); void slotSetupMulti(); - void slotPrimaryColor(const QColor &color); - void slotSecondaryColor(const QColor &color); + void slotPrimaryColor(const TQColor &color); + void slotSecondaryColor(const TQColor &color); void slotPattern(int pattern); - void slotImageDropped(const QString &uri); + void slotImageDropped(const TQString &uri); void slotPreviewDone(int desk, int screen); void slotAdvanced(); void slotGetNewStuff(); @@ -95,9 +95,9 @@ protected: int m_screen; int m_eDesk; int m_eScreen; - QValueVector< QPtrVector<KBackgroundRenderer> > m_renderer; // m_renderer[desk][screen] - QMap<QString,int> m_wallpaper; - QStringList m_patterns; + TQValueVector< TQPtrVector<KBackgroundRenderer> > m_renderer; // m_renderer[desk][screen] + TQMap<TQString,int> m_wallpaper; + TQStringList m_patterns; int m_slideShowRandom; // Remembers last Slide Show setting int m_wallpaperPos; // Remembers last wallpaper pos diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h index 932c6ebab..ab13daf90 100644 --- a/kcontrol/background/bghash.h +++ b/kcontrol/background/bghash.h @@ -2,13 +2,13 @@ #define BGHASH_H /* - * QString -> int hash. From Qt's QGDict::hashKeyString(). + * TQString -> int hash. From Qt's TQGDict::hashKeyString(). */ -static int QHash(QString key) +static int QHash(TQString key) { int g, h = 0; - const QChar *p = key.unicode(); + const TQChar *p = key.unicode(); for (unsigned i=0; i < key.length(); i++) { h = (h << 4) + p[i].cell(); if ((g = (h & 0xf0000000))) diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index 6af2f7458..f78a7b616 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -27,9 +27,9 @@ #include <kpixmap.h> #include <kstandarddirs.h> #include <kurldrag.h> -#include <qapplication.h> -#include <qpixmap.h> -#include <qwhatsthis.h> +#include <tqapplication.h> +#include <tqpixmap.h> +#include <tqwhatsthis.h> #include "bgmonitor.h" @@ -38,17 +38,17 @@ // Geometry of "display" part of monitor image: (23,14)-[151x115] //BEGIN class BGMonitorArrangement -BGMonitorArrangement::BGMonitorArrangement(QWidget *parent, const char *name) - : QWidget(parent, name) +BGMonitorArrangement::BGMonitorArrangement(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - m_pBGMonitor.resize( QApplication::desktop()->numScreens(), 0l ); + m_pBGMonitor.resize( TQApplication::desktop()->numScreens(), 0l ); - for (int screen = 0; screen < QApplication::desktop()->numScreens(); ++screen) + for (int screen = 0; screen < TQApplication::desktop()->numScreens(); ++screen) { BGMonitorLabel * label = new BGMonitorLabel(this); m_pBGMonitor[screen] = label; - connect( label->monitor(), SIGNAL(imageDropped(const QString &)), this, SIGNAL(imageDropped(const QString &)) ); + connect( label->monitor(), TQT_SIGNAL(imageDropped(const TQString &)), this, TQT_SIGNAL(imageDropped(const TQString &)) ); } parent->setFixedSize(200, 186); @@ -63,27 +63,27 @@ BGMonitor * BGMonitorArrangement::monitor( unsigned screen ) const } -QRect BGMonitorArrangement::expandToPreview( QRect r ) const +TQRect BGMonitorArrangement::expandToPreview( TQRect r ) const { double scaleX = 200.0 / 151.0; double scaleY = 186.0 / 115.0; - return QRect( int(r.x()*scaleX), int(r.y()*scaleY), int(r.width()*scaleX), int(r.height()*scaleY) ); + return TQRect( int(r.x()*scaleX), int(r.y()*scaleY), int(r.width()*scaleX), int(r.height()*scaleY) ); } -QSize BGMonitorArrangement::expandToPreview( QSize s ) const +TQSize BGMonitorArrangement::expandToPreview( TQSize s ) const { double scaleX = 200.0 / 151.0; double scaleY = 186.0 / 115.0; - return QSize( int(s.width()*scaleX), int(s.height()*scaleY) ); + return TQSize( int(s.width()*scaleX), int(s.height()*scaleY) ); } -QPoint BGMonitorArrangement::expandToPreview( QPoint p ) const +TQPoint BGMonitorArrangement::expandToPreview( TQPoint p ) const { double scaleX = 200.0 / 151.0; double scaleY = 186.0 / 115.0; - return QPoint( int(p.x()*scaleX), int(p.y()*scaleY) ); + return TQPoint( int(p.x()*scaleX), int(p.y()*scaleY) ); } @@ -94,11 +94,11 @@ void BGMonitorArrangement::updateArrangement() // image that contains the preview of the background. The monitor image // will set the background preview back to the normal value. - QRect overallGeometry; - for (int screen = 0; screen < QApplication::desktop()->numScreens(); ++screen) - overallGeometry |= QApplication::desktop()->screenGeometry(screen); + TQRect overallGeometry; + for (int screen = 0; screen < TQApplication::desktop()->numScreens(); ++screen) + overallGeometry |= TQApplication::desktop()->screenGeometry(screen); - QRect expandedOverallGeometry = expandToPreview(overallGeometry); + TQRect expandedOverallGeometry = expandToPreview(overallGeometry); double scale = QMIN( double(width()) / double(expandedOverallGeometry.width()), @@ -107,16 +107,16 @@ void BGMonitorArrangement::updateArrangement() m_combinedPreviewSize = overallGeometry.size() * scale; - m_maxPreviewSize = QSize(0,0); + m_maxPreviewSize = TQSize(0,0); int previousMax = 0; - for (int screen = 0; screen < QApplication::desktop()->numScreens(); ++screen) + for (int screen = 0; screen < TQApplication::desktop()->numScreens(); ++screen) { - QPoint topLeft = (QApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft()) * scale; - QPoint expandedTopLeft = expandToPreview(topLeft); + TQPoint topLeft = (TQApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft()) * scale; + TQPoint expandedTopLeft = expandToPreview(topLeft); - QSize previewSize = QApplication::desktop()->screenGeometry(screen).size() * scale; - QSize expandedPreviewSize = expandToPreview(previewSize); + TQSize previewSize = TQApplication::desktop()->screenGeometry(screen).size() * scale; + TQSize expandedPreviewSize = expandToPreview(previewSize); if ( (previewSize.width() * previewSize.height()) > previousMax ) { @@ -124,16 +124,16 @@ void BGMonitorArrangement::updateArrangement() m_maxPreviewSize = previewSize; } - m_pBGMonitor[screen]->setPreviewPosition( QRect( topLeft, previewSize ) ); - m_pBGMonitor[screen]->setGeometry( QRect( expandedTopLeft, expandedPreviewSize ) ); + m_pBGMonitor[screen]->setPreviewPosition( TQRect( topLeft, previewSize ) ); + m_pBGMonitor[screen]->setGeometry( TQRect( expandedTopLeft, expandedPreviewSize ) ); m_pBGMonitor[screen]->updateMonitorGeometry(); } } -void BGMonitorArrangement::resizeEvent( QResizeEvent * e ) +void BGMonitorArrangement::resizeEvent( TQResizeEvent * e ) { - QWidget::resizeEvent(e); + TQWidget::resizeEvent(e); updateArrangement(); } @@ -142,9 +142,9 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm ) { for (unsigned screen = 0; screen < m_pBGMonitor.size(); ++screen) { - QRect position = m_pBGMonitor[screen]->previewPosition(); + TQRect position = m_pBGMonitor[screen]->previewPosition(); - QPixmap monitorPixmap( position.size(), pm.depth() ); + TQPixmap monitorPixmap( position.size(), pm.depth() ); copyBlt( &monitorPixmap, 0, 0, &pm, position.x(), position.y(), position.width(), position.height() ); m_pBGMonitor[screen]->monitor()->setPixmap(monitorPixmap); } @@ -154,15 +154,15 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm ) //BEGIN class BGMonitorLabel -BGMonitorLabel::BGMonitorLabel(QWidget *parent, const char *name) - : QLabel(parent, name) +BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name) + : TQLabel(parent, name) { setAlignment(AlignCenter); setScaledContents(true); - setPixmap( QPixmap( locate("data", "kcontrol/pics/monitor.png") ) ); + setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) ); m_pBGMonitor = new BGMonitor(this); - QWhatsThis::add( this, i18n("This picture of a monitor contains a preview of what the current settings will look like on your desktop.") ); + TQWhatsThis::add( this, i18n("This picture of a monitor contains a preview of what the current settings will look like on your desktop.") ); } @@ -171,14 +171,14 @@ void BGMonitorLabel::updateMonitorGeometry() double scaleX = double(width()) / double(sizeHint().width()); double scaleY = double(height()) / double(sizeHint().height()); - kdDebug() << k_funcinfo << " Setting geometry to " << QRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl; + kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl; m_pBGMonitor->setGeometry( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ); } -void BGMonitorLabel::resizeEvent( QResizeEvent * e ) +void BGMonitorLabel::resizeEvent( TQResizeEvent * e ) { - QWidget::resizeEvent(e); + TQWidget::resizeEvent(e); updateMonitorGeometry(); } //END class BGMonitorLabel @@ -186,8 +186,8 @@ void BGMonitorLabel::resizeEvent( QResizeEvent * e ) //BEGIN class BGMonitor -BGMonitor::BGMonitor(QWidget *parent, const char *name) - : QLabel(parent, name) +BGMonitor::BGMonitor(TQWidget *parent, const char *name) + : TQLabel(parent, name) { setAlignment(AlignCenter); setScaledContents(true); @@ -195,7 +195,7 @@ BGMonitor::BGMonitor(QWidget *parent, const char *name) } -void BGMonitor::dropEvent(QDropEvent *e) +void BGMonitor::dropEvent(TQDropEvent *e) { if (!KURLDrag::canDecode(e)) return; @@ -208,7 +208,7 @@ void BGMonitor::dropEvent(QDropEvent *e) } } -void BGMonitor::dragEnterEvent(QDragEnterEvent *e) +void BGMonitor::dragEnterEvent(TQDragEnterEvent *e) { if (KURLDrag::canDecode(e)) e->accept(rect()); diff --git a/kcontrol/background/bgmonitor.h b/kcontrol/background/bgmonitor.h index 1e714194e..92cf5eef4 100644 --- a/kcontrol/background/bgmonitor.h +++ b/kcontrol/background/bgmonitor.h @@ -25,9 +25,9 @@ #ifndef _BGMONITOR_H_ #define _BGMONITOR_H_ -#include <qlabel.h> -#include <qvaluevector.h> -#include <qwidget.h> +#include <tqlabel.h> +#include <tqvaluevector.h> +#include <tqwidget.h> class BGMonitor; class BGMonitorLabel; @@ -41,32 +41,32 @@ class BGMonitorArrangement : public QWidget { Q_OBJECT public: - BGMonitorArrangement(QWidget *parent, const char *name=0L); + BGMonitorArrangement(TQWidget *parent, const char *name=0L); /** * Splits up the pixmap according to monitor geometries and sets each * BGMonitor pixmap accordingly. */ void setPixmap( const KPixmap & pm ); - QSize combinedPreviewSize() const { return m_combinedPreviewSize; } - QSize maxPreviewSize() const { return m_maxPreviewSize; } + TQSize combinedPreviewSize() const { return m_combinedPreviewSize; } + TQSize maxPreviewSize() const { return m_maxPreviewSize; } unsigned numMonitors() const { return m_pBGMonitor.size(); } BGMonitor * monitor( unsigned screen ) const; void updateArrangement(); signals: - void imageDropped(const QString &); + void imageDropped(const TQString &); protected: - virtual void resizeEvent( QResizeEvent * ); - QRect expandToPreview( QRect r ) const; - QSize expandToPreview( QSize s ) const; - QPoint expandToPreview( QPoint p ) const; + virtual void resizeEvent( TQResizeEvent * ); + TQRect expandToPreview( TQRect r ) const; + TQSize expandToPreview( TQSize s ) const; + TQPoint expandToPreview( TQPoint p ) const; - QValueVector<BGMonitorLabel*> m_pBGMonitor; - QSize m_combinedPreviewSize; - QSize m_maxPreviewSize; + TQValueVector<BGMonitorLabel*> m_pBGMonitor; + TQSize m_combinedPreviewSize; + TQSize m_maxPreviewSize; }; /** @@ -75,18 +75,18 @@ protected: class BGMonitorLabel : public QLabel { public: - BGMonitorLabel(QWidget *parent, const char *name=0L); + BGMonitorLabel(TQWidget *parent, const char *name=0L); BGMonitor * monitor() const { return m_pBGMonitor; } void updateMonitorGeometry(); - void setPreviewPosition( QRect r ) { m_previewPosition = r; } - QRect previewPosition() const { return m_previewPosition; } + void setPreviewPosition( TQRect r ) { m_previewPosition = r; } + TQRect previewPosition() const { return m_previewPosition; } protected: - virtual void resizeEvent( QResizeEvent * ); + virtual void resizeEvent( TQResizeEvent * ); BGMonitor * m_pBGMonitor; - QRect m_previewPosition; + TQRect m_previewPosition; }; @@ -97,14 +97,14 @@ class BGMonitor : public QLabel { Q_OBJECT public: - BGMonitor(QWidget *parent, const char *name=0L); + BGMonitor(TQWidget *parent, const char *name=0L); signals: - void imageDropped(const QString &); + void imageDropped(const TQString &); protected: - virtual void dropEvent(QDropEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); + virtual void dropEvent(TQDropEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); }; diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 47d52b193..4aca82145 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -14,11 +14,11 @@ #include <stdlib.h> #include <utime.h> -#include <qtimer.h> -#include <qpainter.h> -#include <qimage.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqtimer.h> +#include <tqpainter.h> +#include <tqimage.h> +#include <tqfileinfo.h> +#include <tqdir.h> #include <dcopclient.h> #include <kapplication.h> @@ -61,8 +61,8 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou m_Cached = false; m_TilingEnabled = false; - m_pTimer = new QTimer(this); - connect(m_pTimer, SIGNAL(timeout()), SLOT(render())); + m_pTimer = new TQTimer(this); + connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(render())); } @@ -74,7 +74,7 @@ KBackgroundRenderer::~KBackgroundRenderer() } -void KBackgroundRenderer::setSize(const QSize &size) +void KBackgroundRenderer::setSize(const TQSize &size) { m_rSize = m_Size = size; } @@ -91,7 +91,7 @@ void KBackgroundRenderer::desktopResized() } -void KBackgroundRenderer::tile(QImage& dest, QRect rect, const QImage& src) +void KBackgroundRenderer::tile(TQImage& dest, TQRect rect, const TQImage& src) { rect &= dest.rect(); @@ -110,19 +110,19 @@ void KBackgroundRenderer::tile(QImage& dest, QRect rect, const QImage& src) * Build a command line to run the program. */ -QString KBackgroundRenderer::buildCommand() +TQString KBackgroundRenderer::buildCommand() { - QString num; + TQString num; int pos = 0; - QString cmd; + TQString cmd; if (m_bPreview) cmd = previewCommand(); else cmd = command(); if (cmd.isEmpty()) - return QString(); + return TQString(); while ((pos = cmd.find('%', pos)) != -1) { @@ -182,13 +182,13 @@ int KBackgroundRenderer::doBackground(bool quit) } int retval = Done; - QString file; + TQString file; static unsigned int tileWidth = 0; static unsigned int tileHeight = 0; if( tileWidth == 0 ) { - int tile_val = QPixmap::defaultDepth() >= 24 ? 1 : 2; + int tile_val = TQPixmap::defaultDepth() >= 24 ? 1 : 2; // some dithering may be needed even with bpb==15/16, so don't use tileWidth==1 // for them // with tileWidth>2, repainting the desktop causes nasty effect (XFree86 4.1.0 ) @@ -238,15 +238,15 @@ int KBackgroundRenderer::doBackground(bool quit) delete m_pProc; m_pProc = new KShellProcess; *m_pProc << file; - connect(m_pProc, SIGNAL(processExited(KProcess *)), - SLOT(slotBackgroundDone(KProcess *))); + connect(m_pProc, TQT_SIGNAL(processExited(KProcess *)), + TQT_SLOT(slotBackgroundDone(KProcess *))); m_pProc->start(KShellProcess::NotifyOnExit); retval = Wait; break; case HorizontalGradient: { - QSize size = m_Size; + TQSize size = m_Size; // on <16bpp displays the gradient sucks when tiled because of dithering if( canTile()) size.setHeight( tileHeight ); @@ -256,7 +256,7 @@ int KBackgroundRenderer::doBackground(bool quit) } case VerticalGradient: { - QSize size = m_Size; + TQSize size = m_Size; // on <16bpp displays the gradient sucks when tiled because of dithering if( canTile()) size.setWidth( tileWidth ); @@ -298,14 +298,14 @@ int KBackgroundRenderer::doWallpaper(bool quit) int wpmode= enabled()?wallpaperMode():NoWallpaper; - m_Wallpaper = QImage(); + m_Wallpaper = TQImage(); if (wpmode != NoWallpaper) { wp_load: if (currentWallpaper().isEmpty()) { wpmode = NoWallpaper; goto wp_out; } - QString file = m_pDirs->findResource("wallpaper", currentWallpaper()); + TQString file = m_pDirs->findResource("wallpaper", currentWallpaper()); if (file.isEmpty()) { wpmode = NoWallpaper; goto wp_out; @@ -362,7 +362,7 @@ wp_load: } if (svgEngine->load(svgWidth, svgHeight, file )) { - QImage *image = svgEngine->image(); + TQImage *image = svgEngine->image(); m_Wallpaper = *image; delete image; } else { @@ -394,7 +394,7 @@ wp_load: { xs = ys = 1; } - if( m_Wallpaper.size() != QSize( xs, ys )) + if( m_Wallpaper.size() != TQSize( xs, ys )) m_Wallpaper = m_Wallpaper.smoothScale(xs, ys); } @@ -456,7 +456,7 @@ wp_out: int ww = m_Wallpaper.width(); // wallpaper width/height int wh = m_Wallpaper.height(); - m_WallpaperRect = QRect(); // to be filled destination rectangle; may exceed desktop! + m_WallpaperRect = TQRect(); // to be filled destination rectangle; may exceed desktop! switch (wpmode) { @@ -474,7 +474,7 @@ wp_out: case Scaled: ww = w; wh = h; - if( m_WallpaperRect.size() != QSize( w, h )) + if( m_WallpaperRect.size() != TQSize( w, h )) m_Wallpaper = m_Wallpaper.smoothScale( w, h ); m_WallpaperRect.setRect(0, 0, w, h); break; @@ -495,7 +495,7 @@ wp_out: wh = (int)(sx * wh); ww = w; } - if( m_WallpaperRect.size() != QSize( ww, wh )) + if( m_WallpaperRect.size() != TQSize( ww, wh )) m_Wallpaper = m_Wallpaper.smoothScale(ww, wh); m_WallpaperRect.setRect((w - ww) / 2, (h - wh) / 2, ww, wh); break; @@ -511,7 +511,7 @@ wp_out: wh = (int)(sx * wh); ww = w; } - if( m_WallpaperRect.size() != QSize( ww, wh )) + if( m_WallpaperRect.size() != TQSize( ww, wh )) m_Wallpaper = m_Wallpaper.smoothScale(ww, wh); m_WallpaperRect.setRect(0, 0, w, h); break; @@ -529,7 +529,7 @@ wp_out: wh = h; ww = (int)(sy*ww); } - if( m_WallpaperRect.size() != QSize( ww, wh )) + if( m_WallpaperRect.size() != TQSize( ww, wh )) m_Wallpaper = m_Wallpaper.smoothScale(ww, wh); m_WallpaperRect.setRect((w - ww) / 2, (h - wh) / 2,w, h); break; @@ -563,10 +563,10 @@ void KBackgroundRenderer::wallpaperBlend() } // works only for NoBlending and no alpha in wallpaper -// but is much faster than QImage fidling +// but is much faster than TQImage fidling void KBackgroundRenderer::fastWallpaperBlend() { - m_Image = QImage(); + m_Image = TQImage(); // copy background to m_pPixmap if( !enabled() || (wallpaperMode() == NoWallpaper && canTile())) { // if there's no wallpaper, no need to tile the pixmap to the size of desktop, as X does @@ -584,22 +584,22 @@ void KBackgroundRenderer::fastWallpaperBlend() m_Pixmap.convertFromImage( m_Wallpaper ); return; } - else if( m_WallpaperRect.contains( QRect( QPoint( 0, 0 ), m_Size )) + else if( m_WallpaperRect.contains( TQRect( TQPoint( 0, 0 ), m_Size )) && !m_Wallpaper.hasAlphaBuffer()) // wallpaper covers all and no blending - m_Pixmap = QPixmap( m_Size ); + m_Pixmap = TQPixmap( m_Size ); else if (m_Background.size() == m_Size) m_Pixmap.convertFromImage( m_Background ); else { - m_Pixmap = QPixmap( m_Size ); - QPainter p( &m_Pixmap ); - QPixmap pm; + m_Pixmap = TQPixmap( m_Size ); + TQPainter p( &m_Pixmap ); + TQPixmap pm; pm.convertFromImage( m_Background ); p.drawTiledPixmap( 0, 0, m_Size.width(), m_Size.height(), pm ); } // paint/alpha-blend wallpaper to destination rectangle of m_pPixmap if (m_WallpaperRect.isValid()) { - QPixmap wp_pixmap; + TQPixmap wp_pixmap; if( useShm() && !m_Wallpaper.hasAlphaBuffer()) { KPixmapIO io; wp_pixmap = io.convertToPixmap( m_Wallpaper ); @@ -619,7 +619,7 @@ void KBackgroundRenderer::fastWallpaperBlend() void KBackgroundRenderer::fullWallpaperBlend() { - m_Pixmap = QPixmap(); + m_Pixmap = TQPixmap(); int w = m_Size.width(); // desktop width/height int h = m_Size.height(); // copy background to m_pImage @@ -631,7 +631,7 @@ void KBackgroundRenderer::fullWallpaperBlend() } else { m_Image.create(w, h, 32); - tile(m_Image, QRect(0, 0, w, h), m_Background); + tile(m_Image, TQRect(0, 0, w, h), m_Background); } // blend wallpaper to destination rectangle of m_pImage @@ -644,8 +644,8 @@ void KBackgroundRenderer::fullWallpaperBlend() int wh = m_Wallpaper.height(); for (int y = m_WallpaperRect.top(); y < m_WallpaperRect.bottom(); y += wh) { for (int x = m_WallpaperRect.left(); x < m_WallpaperRect.right(); x += ww) { - blend(m_Image, QRect(x, y, ww, wh), m_Wallpaper, - QPoint(-QMIN(x, 0), -QMIN(y, 0)), blendFactor); + blend(m_Image, TQRect(x, y, ww, wh), m_Wallpaper, + TQPoint(-QMIN(x, 0), -QMIN(y, 0)), blendFactor); } } } @@ -714,10 +714,10 @@ void KBackgroundRenderer::fullWallpaperBlend() } /* Alpha blend an area from <src> with offset <soffs> to rectangle <dr> of <dst> - * Default offset is QPoint(0, 0). + * Default offset is TQPoint(0, 0). * blendfactor = [0, 100%] */ -void KBackgroundRenderer::blend(QImage& dst, QRect dr, const QImage& src, QPoint soffs, int blendFactor) +void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQPoint soffs, int blendFactor) { int x, y, a; dr &= dst.rect(); @@ -785,17 +785,17 @@ void KBackgroundRenderer::render() return; if( !(m_State & InitCheck)) { - QString f = cacheFileName(); + TQString f = cacheFileName(); if( useCacheFile()) { - QString w = m_pDirs->findResource("wallpaper", currentWallpaper()); - QFileInfo wi( w ); - QFileInfo fi( f ); + TQString w = m_pDirs->findResource("wallpaper", currentWallpaper()); + TQFileInfo wi( w ); + TQFileInfo fi( f ); if( wi.lastModified().isValid() && fi.lastModified().isValid() && wi.lastModified() < fi.lastModified()) { - QImage im; + TQImage im; if( im.load( f, "PNG" )) { m_Image = im; - m_Pixmap = QPixmap( m_Size ); + m_Pixmap = TQPixmap( m_Size ); m_Pixmap.convertFromImage( m_Image ); m_Cached = true; m_State |= InitCheck | BackgroundDone | WallpaperDone; @@ -857,9 +857,9 @@ void KBackgroundRenderer::setBusyCursor(bool isBusy) { return; m_isBusyCursor = isBusy; if(isBusy) - QApplication::setOverrideCursor( KCursor::workingCursor() ); + TQApplication::setOverrideCursor( KCursor::workingCursor() ); else - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } /* @@ -882,18 +882,18 @@ void KBackgroundRenderer::stop() void KBackgroundRenderer::cleanup() { setBusyCursor(false); - m_Background = QImage(); - m_Image = QImage(); - m_Pixmap = QPixmap(); - m_Wallpaper = QImage(); + m_Background = TQImage(); + m_Image = TQImage(); + m_Pixmap = TQPixmap(); + m_Wallpaper = TQImage(); delete m_pProc; m_pProc = 0L; m_State = 0; - m_WallpaperRect = QRect(); + m_WallpaperRect = TQRect(); m_Cached = false; } -void KBackgroundRenderer::setPreview(const QSize &size) +void KBackgroundRenderer::setPreview(const TQSize &size) { if (size.isNull()) m_bPreview = false; @@ -904,24 +904,24 @@ void KBackgroundRenderer::setPreview(const QSize &size) } -QPixmap KBackgroundRenderer::pixmap() +TQPixmap KBackgroundRenderer::pixmap() { if (m_State & AllDone) { if( m_Pixmap.isNull()) m_Pixmap.convertFromImage( m_Image ); return m_Pixmap; } - return QPixmap(); + return TQPixmap(); } -QImage KBackgroundRenderer::image() +TQImage KBackgroundRenderer::image() { if (m_State & AllDone) { if( m_Image.isNull()) fullWallpaperBlend(); // create from m_Pixmap return m_Image; } - return QImage(); + return TQImage(); } @@ -943,12 +943,12 @@ void KBackgroundRenderer::createTempFile() m_Tempfile = new KTempFile(); } -QString KBackgroundRenderer::cacheFileName() +TQString KBackgroundRenderer::cacheFileName() { - QString f = fingerprint(); + TQString f = fingerprint(); f.replace ( ':', '_' ); // avoid characters that shouldn't be in filenames f.replace ( '/', '#' ); - f = locateLocal( "cache", QString( "background/%1x%2_%3.png" ) + f = locateLocal( "cache", TQString( "background/%1x%2_%3.png" ) .arg( m_Size.width()).arg( m_Size.height()).arg( f )); return f; } @@ -961,7 +961,7 @@ bool KBackgroundRenderer::useCacheFile() const return false; // don't cache these at all if( wallpaperMode() == NoWallpaper ) return false; // generating only background patterns should be always faster - QString file = currentWallpaper(); + TQString file = currentWallpaper(); if( file.endsWith(".svg") || file.endsWith(".svgz")) return true; // cache these, they can be bloody slow switch( backgroundMode()) @@ -989,21 +989,21 @@ void KBackgroundRenderer::saveCacheFile() return; if( m_Image.isNull()) fullWallpaperBlend(); // generate from m_Pixmap - QString f = cacheFileName(); + TQString f = cacheFileName(); if( KStandardDirs::exists( f ) || m_Cached ) - utime( QFile::encodeName( f ), NULL ); + utime( TQFile::encodeName( f ), NULL ); else { m_Image.save( f, "PNG" ); // remove old entries from the cache - QDir dir( locateLocal( "cache", "background/" )); - if( const QFileInfoList* list = dir.entryInfoList( "*.png", QDir::Files, QDir::Time | QDir::Reversed )) { + TQDir dir( locateLocal( "cache", "background/" )); + if( const QFileInfoList* list = dir.entryInfoList( "*.png", TQDir::Files, TQDir::Time | TQDir::Reversed )) { int size = 0; for( QFileInfoListIterator it( *list ); - QFileInfo* info = it.current(); + TQFileInfo* info = it.current(); ++it ) size += info->size(); for( QFileInfoListIterator it( *list ); - QFileInfo* info = it.current(); + TQFileInfo* info = it.current(); ++it ) { if( size < 8 * 1024 * 1024 ) break; @@ -1012,7 +1012,7 @@ void KBackgroundRenderer::saveCacheFile() && ( time_t ) info->lastModified().toTime_t() >= time( NULL ) - 10 * 60 ) break; size -= info->size(); - QFile::remove( info->absFilePath()); + TQFile::remove( info->absFilePath()); } } } @@ -1032,7 +1032,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config ) int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString configname; + TQCString configname; if (screen_number == 0) configname = "kdesktoprc"; else @@ -1067,7 +1067,7 @@ KBackgroundRenderer * KVirtualBGRenderer::renderer(unsigned screen) } -QPixmap KVirtualBGRenderer::pixmap() +TQPixmap KVirtualBGRenderer::pixmap() { if (m_numRenderers == 1) return m_renderer[0]->pixmap(); @@ -1123,7 +1123,7 @@ void KVirtualBGRenderer::changeWallpaper() int KVirtualBGRenderer::hash() { - QString fp; + TQString fp; for (unsigned i=0; i<m_numRenderers; ++i) { fp += m_renderer[i]->fingerprint(); @@ -1158,7 +1158,7 @@ void KVirtualBGRenderer::desktopResized() if (m_pPixmap) { delete m_pPixmap; - m_pPixmap = new QPixmap(m_size); + m_pPixmap = new TQPixmap(m_size); m_pPixmap->fill(Qt::black); } @@ -1166,7 +1166,7 @@ void KVirtualBGRenderer::desktopResized() } -void KVirtualBGRenderer::setPreview(const QSize & size) +void KVirtualBGRenderer::setPreview(const TQSize & size) { if (m_size == size) return; @@ -1177,22 +1177,22 @@ void KVirtualBGRenderer::setPreview(const QSize & size) m_pPixmap->resize(m_size); // Scaling factors - m_scaleX = float(m_size.width()) / float(QApplication::desktop()->size().width()); - m_scaleY = float(m_size.height()) / float(QApplication::desktop()->size().height()); + m_scaleX = float(m_size.width()) / float(TQApplication::desktop()->size().width()); + m_scaleY = float(m_size.height()) / float(TQApplication::desktop()->size().height()); // Scale renderers appropriately for (unsigned i=0; i<m_renderer.size(); ++i) { - QSize unscaledRendererSize = renderSize(i); + TQSize unscaledRendererSize = renderSize(i); - m_renderer[i]->setPreview( QSize( + m_renderer[i]->setPreview( TQSize( int(unscaledRendererSize.width() * m_scaleX), int(unscaledRendererSize.height() * m_scaleY) ) ); } } -QSize KVirtualBGRenderer::renderSize(int screen) +TQSize KVirtualBGRenderer::renderSize(int screen) { return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size(); } @@ -1201,7 +1201,7 @@ QSize KVirtualBGRenderer::renderSize(int screen) void KVirtualBGRenderer::initRenderers() { m_pConfig->setGroup("Background Common"); - m_bDrawBackgroundPerScreen = m_pConfig->readBoolEntry( QString("DrawBackgroundPerScreen_%1").arg(m_desk), _defDrawBackgroundPerScreen ); + m_bDrawBackgroundPerScreen = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(m_desk), _defDrawBackgroundPerScreen ); m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen); @@ -1223,7 +1223,7 @@ void KVirtualBGRenderer::initRenderers() KBackgroundRenderer * r = new KBackgroundRenderer( m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig ); m_renderer.insert( i, r ); r->setSize(renderSize(i)); - connect( r, SIGNAL(imageDone(int,int)), this, SLOT(screenDone(int,int)) ); + connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) ); } } @@ -1263,21 +1263,21 @@ void KVirtualBGRenderer::screenDone(int _desk, int _screen) { // There's more than one renderer, so we are drawing each output to our own pixmap - QRect overallGeometry; + TQRect overallGeometry; for (int i=0; i < KApplication::desktop()->numScreens(); ++i) { overallGeometry |= KApplication::desktop()->screenGeometry(i); } - QPoint drawPos = KApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft(); + TQPoint drawPos = KApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft(); drawPos.setX( int(drawPos.x() * m_scaleX) ); drawPos.setY( int(drawPos.y() * m_scaleY) ); - QPixmap source = m_renderer[screen]->pixmap(); - QSize renderSize = this->renderSize(screen); + TQPixmap source = m_renderer[screen]->pixmap(); + TQSize renderSize = this->renderSize(screen); renderSize.setWidth( int(renderSize.width() * m_scaleX) ); renderSize.setHeight( int(renderSize.height() * m_scaleY) ); - QPainter p(m_pPixmap); + TQPainter p(m_pPixmap); if (renderSize == source.size()) p.drawPixmap( drawPos, source ); @@ -1308,7 +1308,7 @@ void KVirtualBGRenderer::start() if (m_numRenderers > 1) { - m_pPixmap = new QPixmap(m_size); + m_pPixmap = new TQPixmap(m_size); // If are screen sizes do not properly tile the overall virtual screen // size, then we want the untiled parts to be black for use in desktop // previews, etc diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h index 39e00ff5d..055512618 100644 --- a/kcontrol/background/bgrender.h +++ b/kcontrol/background/bgrender.h @@ -11,10 +11,10 @@ #ifndef BGRender_h_Included #define BGRender_h_Included -#include <qobject.h> -#include <qptrvector.h> -#include <qimage.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqptrvector.h> +#include <tqimage.h> +#include <tqpixmap.h> #include "bgsettings.h" @@ -30,13 +30,13 @@ class KShellProcess; class KStandardDirs; /** - * This class renders a desktop background to a QImage. The operation is + * This class renders a desktop background to a TQImage. The operation is * asynchronous: connect to the signal imageDone() to find out when the * rendering is finished. It also has support for preview images, like * the monitor in kcmdisplay. */ class KBackgroundRenderer: - public QObject, + public TQObject, public KBackgroundSettings { Q_OBJECT @@ -47,11 +47,11 @@ public: void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig=true); - void setPreview(const QSize &size); - void setSize(const QSize &size); + void setPreview(const TQSize &size); + void setSize(const TQSize &size); - QPixmap pixmap(); - QImage image(); + TQPixmap pixmap(); + TQImage image(); bool isActive() { return m_State & Rendering; } void cleanup(); void saveCacheFile(); @@ -79,10 +79,10 @@ private: WallpaperStarted = 0x10, WallpaperDone = 0x20, AllDone = 0x40 }; - QString buildCommand(); + TQString buildCommand(); void createTempFile(); - void tile(QImage& dst, QRect rect, const QImage& src); - void blend(QImage& dst, QRect dr, const QImage& src, QPoint soffs = QPoint(0, 0), int blendFactor=100); + void tile(TQImage& dst, TQRect rect, const TQImage& src); + void blend(TQImage& dst, TQRect dr, const TQImage& src, TQPoint soffs = TQPoint(0, 0), int blendFactor=100); void wallpaperBlend(); void fastWallpaperBlend(); @@ -91,7 +91,7 @@ private: int doBackground(bool quit=false); int doWallpaper(bool quit=false); void setBusyCursor(bool isBusy); - QString cacheFileName(); + TQString cacheFileName(); bool useCacheFile() const; bool canTile() const; @@ -103,11 +103,11 @@ private: bool m_TilingEnabled; KTempFile* m_Tempfile; - QSize m_Size, m_rSize; - QRect m_WallpaperRect; - QImage m_Image, m_Background, m_Wallpaper; - QPixmap m_Pixmap; - QTimer *m_pTimer; + TQSize m_Size, m_rSize; + TQRect m_WallpaperRect; + TQImage m_Image, m_Background, m_Wallpaper; + TQPixmap m_Pixmap; + TQTimer *m_pTimer; KStandardDirs *m_pDirs; KShellProcess *m_pProc; @@ -130,9 +130,9 @@ public: KBackgroundRenderer * renderer(unsigned screen); unsigned numRenderers() const { return m_numRenderers; } - QPixmap pixmap(); + TQPixmap pixmap(); - void setPreview(const QSize & size); + void setPreview(const TQSize & size); bool needProgramUpdate(); void programUpdate(); @@ -159,7 +159,7 @@ private slots: void screenDone(int desk, int screen); private: - QSize renderSize(int screen); // the size the renderer should be + TQSize renderSize(int screen); // the size the renderer should be void initRenderers(); KConfig *m_pConfig; @@ -170,11 +170,11 @@ private: bool m_bDrawBackgroundPerScreen; bool m_bCommonScreen; bool m_bDeleteConfig; - QSize m_size; + TQSize m_size; - QMemArray<bool> m_bFinished; - QPtrVector<KBackgroundRenderer> m_renderer; - QPixmap *m_pPixmap; + TQMemArray<bool> m_bFinished; + TQPtrVector<KBackgroundRenderer> m_renderer; + TQPixmap *m_pPixmap; }; diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 9b657393f..8d3bdac0f 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -17,8 +17,8 @@ #undef Bool #undef Unsorted -#include <qdir.h> -#include <qpixmap.h> +#include <tqdir.h> +#include <tqpixmap.h> #include <dcopclient.h> #include <kapplication.h> @@ -37,7 +37,7 @@ /**** KBackgroundPattern ****/ -KBackgroundPattern::KBackgroundPattern(QString name) +KBackgroundPattern::KBackgroundPattern(TQString name) { dirty = false; hashdirty = true; @@ -70,7 +70,7 @@ void KBackgroundPattern::copyConfig(const KBackgroundPattern *settings) m_File = settings->m_File; } -void KBackgroundPattern::load(QString name) +void KBackgroundPattern::load(TQString name) { m_Name = name; init(); @@ -91,12 +91,12 @@ void KBackgroundPattern::init(bool force_rw) m_pConfig->setGroup("KDE Desktop Pattern"); - QFileInfo fi(m_File); + TQFileInfo fi(m_File); m_bReadOnly = !fi.isWritable(); } -void KBackgroundPattern::setComment(const QString &comment) +void KBackgroundPattern::setComment(const TQString &comment) { if (m_Comment == comment) return; @@ -105,7 +105,7 @@ void KBackgroundPattern::setComment(const QString &comment) } -void KBackgroundPattern::setPattern(QString pattern) +void KBackgroundPattern::setPattern(TQString pattern) { if (m_Pattern == pattern) return; @@ -147,10 +147,10 @@ bool KBackgroundPattern::isAvailable() { if (m_Pattern.isEmpty()) return false; - QString file = m_Pattern; + TQString file = m_Pattern; if (file.at(0) != '/') file = m_pDirs->findResource("dtop_pattern", file); - QFileInfo fi(file); + TQFileInfo fi(file); return (fi.exists()); } @@ -159,11 +159,11 @@ bool KBackgroundPattern::remove() { if (m_bReadOnly) return false; - return !unlink(QFile::encodeName(m_File)); + return !unlink(TQFile::encodeName(m_File)); } -QString KBackgroundPattern::fingerprint() +TQString KBackgroundPattern::fingerprint() { return m_File; } @@ -180,14 +180,14 @@ int KBackgroundPattern::hash() /* static */ -QStringList KBackgroundPattern::list() +TQStringList KBackgroundPattern::list() { KStandardDirs *dirs = KGlobal::dirs(); dirs->addResourceType("dtop_pattern", dirs->kde_default("data") + "kdesktop/patterns"); - QStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop", + TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop", false, true); - QStringList::Iterator it; + TQStringList::Iterator it; for (it=lst.begin(); it!=lst.end(); ++it) { // Strip path and suffix int pos = (*it).findRev('/'); @@ -204,7 +204,7 @@ QStringList KBackgroundPattern::list() /**** KBackgroundProgram ****/ -KBackgroundProgram::KBackgroundProgram(QString name) +KBackgroundProgram::KBackgroundProgram(TQString name) { dirty = false; hashdirty = true; @@ -262,7 +262,7 @@ void KBackgroundProgram::init(bool force_rw) } -void KBackgroundProgram::load(const QString &name) +void KBackgroundProgram::load(const TQString &name) { m_Name = name; init(); @@ -270,7 +270,7 @@ void KBackgroundProgram::load(const QString &name) } -void KBackgroundProgram::setComment(const QString &comment) +void KBackgroundProgram::setComment(const TQString &comment) { if (m_Comment == comment) return; @@ -279,7 +279,7 @@ void KBackgroundProgram::setComment(const QString &comment) } -void KBackgroundProgram::setExecutable(const QString &executable) +void KBackgroundProgram::setExecutable(const TQString &executable) { if (m_Executable == executable) return; @@ -288,7 +288,7 @@ void KBackgroundProgram::setExecutable(const QString &executable) } -void KBackgroundProgram::setCommand(const QString &command) +void KBackgroundProgram::setCommand(const TQString &command) { if (m_Command == command) return; @@ -297,7 +297,7 @@ void KBackgroundProgram::setCommand(const QString &command) } -void KBackgroundProgram::setPreviewCommand(const QString &command) +void KBackgroundProgram::setPreviewCommand(const TQString &command) { if (m_PreviewCommand == command) return; @@ -358,7 +358,7 @@ bool KBackgroundProgram::remove() { if (m_bReadOnly) return false; - return !unlink(QFile::encodeName(m_File)); + return !unlink(TQFile::encodeName(m_File)); } @@ -374,9 +374,9 @@ void KBackgroundProgram::update() } -QString KBackgroundProgram::fingerprint() +TQString KBackgroundProgram::fingerprint() { - return QString("co:%1;re:%2").arg(m_Command).arg(m_Refresh); + return TQString("co:%1;re:%2").arg(m_Command).arg(m_Refresh); } @@ -391,14 +391,14 @@ int KBackgroundProgram::hash() /* static */ -QStringList KBackgroundProgram::list() +TQStringList KBackgroundProgram::list() { KStandardDirs *dirs = KGlobal::dirs(); dirs->addResourceType("dtop_program", dirs->kde_default("data") + "kdesktop/programs"); - QStringList lst = dirs->findAllResources("dtop_program", "*.desktop", + TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop", false, true); - QStringList::Iterator it; + TQStringList::Iterator it; for (it=lst.begin(); it!=lst.end(); ++it) { // Strip path and suffix int pos = (*it).findRev('/'); @@ -428,7 +428,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou // Default values. defColorA = _defColorA; defColorB = _defColorB; - if (QPixmap::defaultDepth() > 8) + if (TQPixmap::defaultDepth() > 8) defBackgroundMode = _defBackgroundMode; else defBackgroundMode = Flat; @@ -495,7 +495,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString configname; + TQCString configname; if (screen_number == 0) configname = "kdesktoprc"; else @@ -558,7 +558,7 @@ void KBackgroundSettings::load(int desk, int screen, bool drawBackgroundPerScree } -void KBackgroundSettings::setColorA(const QColor& color) +void KBackgroundSettings::setColorA(const TQColor& color) { if (m_ColorA == color) return; @@ -567,7 +567,7 @@ void KBackgroundSettings::setColorA(const QColor& color) } -void KBackgroundSettings::setColorB(const QColor& color) +void KBackgroundSettings::setColorB(const TQColor& color) { if (m_ColorB == color) return; @@ -576,7 +576,7 @@ void KBackgroundSettings::setColorB(const QColor& color) } -void KBackgroundSettings::setPatternName(QString name) +void KBackgroundSettings::setPatternName(TQString name) { int ohash = KBackgroundPattern::hash(); KBackgroundPattern::load(name); @@ -588,7 +588,7 @@ void KBackgroundSettings::setPatternName(QString name) } -void KBackgroundSettings::setProgram(QString name) +void KBackgroundSettings::setProgram(TQString name) { int ohash = KBackgroundProgram::hash(); KBackgroundProgram::load(name); @@ -633,7 +633,7 @@ void KBackgroundSettings::setReverseBlending(bool value) } -void KBackgroundSettings::setWallpaper(QString wallpaper) +void KBackgroundSettings::setWallpaper(TQString wallpaper) { dirty = hashdirty = true; m_Wallpaper = wallpaper; @@ -649,7 +649,7 @@ void KBackgroundSettings::setWallpaperMode(int mode) } -void KBackgroundSettings::setWallpaperList(QStringList list) +void KBackgroundSettings::setWallpaperList(TQStringList list) { KStandardDirs *d = KGlobal::dirs(); if (m_WallpaperList == list) @@ -657,10 +657,10 @@ void KBackgroundSettings::setWallpaperList(QStringList list) dirty = hashdirty = true; m_WallpaperList.clear(); - for(QStringList::ConstIterator it = list.begin(); + for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - QString rpath = d->relativeLocation("wallpaper", *it); + TQString rpath = d->relativeLocation("wallpaper", *it); m_WallpaperList.append( !rpath.isEmpty() ? rpath : *it ); } updateWallpaperFiles(); @@ -704,9 +704,9 @@ bool KBackgroundSettings::optimize() const case AlwaysOpt : return true; case Opt16bpp : - return QPixmap::defaultDepth() >= 16; + return TQPixmap::defaultDepth() >= 16; case Opt15bpp : - return QPixmap::defaultDepth() >= 15; + return TQPixmap::defaultDepth() >= 15; case NeverOpt : default : return false; @@ -721,12 +721,12 @@ void KBackgroundSettings::setUseShm(bool use) m_bShm = use; } -QString KBackgroundSettings::configGroupName() const +TQString KBackgroundSettings::configGroupName() const { - QString screenName; + TQString screenName; if (m_bDrawBackgroundPerScreen) - screenName = QString("Screen%1").arg(QString::number(m_Screen)); - return QString("Desktop%1%2").arg(m_Desk).arg(screenName); + screenName = TQString("Screen%1").arg(TQString::number(m_Screen)); + return TQString("Desktop%1%2").arg(m_Desk).arg(screenName); } void KBackgroundSettings::readSettings(bool reparse) @@ -740,7 +740,7 @@ void KBackgroundSettings::readSettings(bool reparse) m_ColorA = m_pConfig->readColorEntry("Color1", &defColorA); m_ColorB = m_pConfig->readColorEntry("Color2", &defColorB); - QString s = m_pConfig->readPathEntry("Pattern"); + TQString s = m_pConfig->readPathEntry("Pattern"); if (!s.isEmpty()) KBackgroundPattern::load(s); @@ -853,25 +853,25 @@ void KBackgroundSettings::writeSettings() */ void KBackgroundSettings::updateWallpaperFiles() { - QStringList::Iterator it; + TQStringList::Iterator it; m_WallpaperFiles.clear(); for (it=m_WallpaperList.begin(); it!=m_WallpaperList.end(); ++it) { - QString file = locate("wallpaper", *it); + TQString file = locate("wallpaper", *it); if (file.isEmpty()) continue; - QFileInfo fi(file); + TQFileInfo fi(file); if (!fi.exists()) continue; if (fi.isFile() && fi.isReadable()) m_WallpaperFiles.append(file); if (fi.isDir()) { - QDir dir(file); - QStringList lst = dir.entryList(QDir::Files | QDir::Readable); - QStringList::Iterator it; + TQDir dir(file); + TQStringList lst = dir.entryList(TQDir::Files | TQDir::Readable); + TQStringList::Iterator it; for (it=lst.begin(); it!=lst.end(); ++it) { file = dir.absFilePath(*it); - QFileInfo fi(file); + TQFileInfo fi(file); if (fi.isFile() && fi.isReadable()) m_WallpaperFiles.append(file); } @@ -889,8 +889,8 @@ void KBackgroundSettings::randomizeWallpaperFiles() return; KRandomSequence rseq; - QStringList tmpList = m_WallpaperFiles; - QStringList randomList; + TQStringList tmpList = m_WallpaperFiles; + TQStringList randomList; randomList.append(tmpList.front()); tmpList.pop_front(); while(tmpList.count()) @@ -904,21 +904,21 @@ void KBackgroundSettings::randomizeWallpaperFiles() m_WallpaperFiles = randomList; } -QStringList KBackgroundSettings::wallpaperList() const +TQStringList KBackgroundSettings::wallpaperList() const { if ( m_WallpaperMode == NoWallpaper ) - return QStringList(); + return TQStringList(); if ( m_MultiMode == NoMulti || m_MultiMode == NoMultiRandom ) - return QStringList(m_Wallpaper); + return TQStringList(m_Wallpaper); return m_WallpaperList; } -QStringList KBackgroundSettings::wallpaperFiles() const +TQStringList KBackgroundSettings::wallpaperFiles() const { if ( m_WallpaperMode == NoWallpaper ) - return QStringList(); + return TQStringList(); if ( m_MultiMode == NoMulti || m_MultiMode == NoMultiRandom ) - return QStringList(m_Wallpaper); + return TQStringList(m_Wallpaper); return m_WallpaperFiles; } @@ -930,7 +930,7 @@ void KBackgroundSettings::changeWallpaper(bool init) if (m_WallpaperFiles.count() == 0) { if( init ) { m_CurrentWallpaper = 0; - m_CurrentWallpaperName = QString(); + m_CurrentWallpaperName = TQString(); } return; } @@ -967,16 +967,16 @@ void KBackgroundSettings::changeWallpaper(bool init) } -QString KBackgroundSettings::currentWallpaper() const +TQString KBackgroundSettings::currentWallpaper() const { if ( m_WallpaperMode == NoWallpaper ) - return QString::null; + return TQString::null; if (m_MultiMode == NoMulti || m_MultiMode == NoMultiRandom) return m_Wallpaper; if (m_CurrentWallpaper >= 0 && m_CurrentWallpaper < (int) m_WallpaperFiles.count()) return m_WallpaperFiles[m_CurrentWallpaper]; - return QString::null; + return TQString::null; } bool KBackgroundSettings::discardCurrentWallpaper() @@ -1007,39 +1007,39 @@ bool KBackgroundSettings::needWallpaperChange() * that only a different final result will give a different fingerprint. */ -QString KBackgroundSettings::fingerprint() +TQString KBackgroundSettings::fingerprint() { - QString s = QString("bm:%1;en:%2").arg(m_BackgroundMode).arg(m_bEnabled); + TQString s = TQString("bm:%1;en:%2").arg(m_BackgroundMode).arg(m_bEnabled); switch (m_BackgroundMode) { case Flat: - s += QString("ca:%1;").arg(m_ColorA.rgb()); + s += TQString("ca:%1;").arg(m_ColorA.rgb()); break; case Program: - s += QString("pr:%1;").arg(KBackgroundProgram::hash()); + s += TQString("pr:%1;").arg(KBackgroundProgram::hash()); break; case Pattern: - s += QString("ca:%1;cb:%2;pt:%3;").arg(m_ColorA.rgb()) + s += TQString("ca:%1;cb:%2;pt:%3;").arg(m_ColorA.rgb()) .arg(m_ColorB.rgb()).arg(KBackgroundPattern::hash()); break; default: - s += QString("ca:%1;cb:%2;").arg(m_ColorA.rgb()).arg(m_ColorB.rgb()); + s += TQString("ca:%1;cb:%2;").arg(m_ColorA.rgb()).arg(m_ColorB.rgb()); break; } - s += QString("wm:%1;").arg(m_WallpaperMode); + s += TQString("wm:%1;").arg(m_WallpaperMode); if (m_WallpaperMode != NoWallpaper) { Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false); - s += QString("wp:%2:%1;").arg(rh).arg(currentWallpaper()); + s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper()); } - s += QString("blm:%1;").arg(m_BlendMode); + s += TQString("blm:%1;").arg(m_BlendMode); if (m_BlendMode != NoBlending) { - s += QString("blb:%1;").arg(m_BlendBalance); - s += QString("rbl:%1;").arg(int(m_ReverseBlending)); + s += TQString("blb:%1;").arg(m_BlendBalance); + s += TQString("rbl:%1;").arg(int(m_ReverseBlending)); } - s += QString::number( m_bShm ); - s += QString::number( m_MinOptimizationDepth ); + s += TQString::number( m_bShm ); + s += TQString::number( m_MinOptimizationDepth ); return s; } @@ -1073,14 +1073,14 @@ KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config) } -QString KGlobalBackgroundSettings::deskName(int desk) +TQString KGlobalBackgroundSettings::deskName(int desk) { return m_Names[desk]; } /* -void KGlobalBackgroundSettings::setDeskName(int desk, QString name) +void KGlobalBackgroundSettings::setDeskName(int desk, TQString name) { if (name == m_Names[desk]) return; @@ -1164,7 +1164,7 @@ void KGlobalBackgroundSettings::setExportBackground(bool _export) m_bExport = _export; } -void KGlobalBackgroundSettings::setTextColor(QColor _color) +void KGlobalBackgroundSettings::setTextColor(TQColor _color) { if (_color == m_TextColor) return; @@ -1172,7 +1172,7 @@ void KGlobalBackgroundSettings::setTextColor(QColor _color) m_TextColor = _color; } -void KGlobalBackgroundSettings::setTextBackgroundColor(QColor _color) +void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color) { if (_color == m_TextBackgroundColor) return; @@ -1218,7 +1218,7 @@ void KGlobalBackgroundSettings::readSettings() NETRootInfo info( qt_xdisplay(), NET::DesktopNames | NET::NumberOfDesktops ); m_bDrawBackgroundPerScreen.resize(info.numberOfDesktops()); for ( int i = 0 ; i < info.numberOfDesktops() ; ++i ) - m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( QString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen ); + m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen ); m_TextColor = KGlobalSettings::textColor(); m_pConfig->setGroup("FMSettings"); @@ -1229,7 +1229,7 @@ void KGlobalBackgroundSettings::readSettings() m_textWidth = m_pConfig->readNumEntry("TextWidth", DEFAULT_TEXTWIDTH); for ( int i = 0 ; i < info.numberOfDesktops() ; ++i ) - m_Names.append( QString::fromUtf8(info.desktopName(i+1)) ); + m_Names.append( TQString::fromUtf8(info.desktopName(i+1)) ); dirty = false; } @@ -1248,7 +1248,7 @@ void KGlobalBackgroundSettings::writeSettings() m_pConfig->writeEntry("CacheSize", m_CacheSize); for ( unsigned i = 0 ; i < m_bDrawBackgroundPerScreen.size() ; ++i ) - m_pConfig->writeEntry(QString("DrawBackgroundPerScreen_%1").arg(i), m_bDrawBackgroundPerScreen[i] ); + m_pConfig->writeEntry(TQString("DrawBackgroundPerScreen_%1").arg(i), m_bDrawBackgroundPerScreen[i] ); m_pConfig->setGroup("FMSettings"); m_pConfig->writeEntry("NormalTextColor", m_TextColor); @@ -1261,7 +1261,7 @@ void KGlobalBackgroundSettings::writeSettings() dirty = false; // tell kdesktop to get it's butt in gear and pick up the new settings - QByteArray data; + TQByteArray data; kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data); } diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h index 928f66360..bdf971c3c 100644 --- a/kcontrol/background/bgsettings.h +++ b/kcontrol/background/bgsettings.h @@ -12,11 +12,11 @@ #define __BGSettings_h_Included__ -#include <qstringlist.h> -#include <qcolor.h> -#include <qvaluevector.h> +#include <tqstringlist.h> +#include <tqcolor.h> +#include <tqvaluevector.h> -template <class QString, class T> class QMap; +template <class TQString, class T> class QMap; class KStandardDirs; class KSimpleConfig; class KConfig; @@ -32,19 +32,19 @@ class QImage; class KBackgroundPattern { public: - KBackgroundPattern(QString name=QString::null); + KBackgroundPattern(TQString name=TQString::null); ~KBackgroundPattern(); void copyConfig(const KBackgroundPattern*); - QString name() const { return m_Name; } - void load(QString name); + TQString name() const { return m_Name; } + void load(TQString name); - void setComment(const QString &comment); - QString comment() const {return m_Comment; } + void setComment(const TQString &comment); + TQString comment() const {return m_Comment; } - void setPattern(QString file); - QString pattern() const { return m_Pattern; } + void setPattern(TQString file); + TQString pattern() const { return m_Pattern; } void readSettings(); void writeSettings(); @@ -55,17 +55,17 @@ public: int hash(); - static QStringList list(); + static TQStringList list(); private: void init(bool force_rw=false); - QString fingerprint(); + TQString fingerprint(); bool dirty, hashdirty; bool m_bReadOnly; int m_Hash; - QString m_Name, m_Comment; - QString m_Pattern, m_File; + TQString m_Name, m_Comment; + TQString m_Pattern, m_File; KStandardDirs *m_pDirs; KSimpleConfig *m_pConfig; }; @@ -90,28 +90,28 @@ private: class KBackgroundProgram { public: - KBackgroundProgram(QString name=QString::null); + KBackgroundProgram(TQString name=TQString::null); ~KBackgroundProgram(); void copyConfig(const KBackgroundProgram*); - QString name()const { return m_Name; } - void load(const QString & name); + TQString name()const { return m_Name; } + void load(const TQString & name); - void setComment(const QString &comment); - QString comment()const { return m_Comment; } + void setComment(const TQString &comment); + TQString comment()const { return m_Comment; } - void setCommand(const QString &command); - QString command()const { return m_Command; } + void setCommand(const TQString &command); + TQString command()const { return m_Command; } - void setPreviewCommand(const QString &command); - QString previewCommand()const { return m_PreviewCommand; } + void setPreviewCommand(const TQString &command); + TQString previewCommand()const { return m_PreviewCommand; } void setRefresh(int refresh); int refresh()const { return m_Refresh; } - void setExecutable(const QString &executable); - QString executable()const { return m_Executable; } + void setExecutable(const TQString &executable); + TQString executable()const { return m_Executable; } void readSettings(); void writeSettings(); @@ -125,18 +125,18 @@ public: bool isGlobal()const { return m_bReadOnly; } bool remove(); - static QStringList list(); + static TQStringList list(); private: void init(bool force_rw=false); - QString fingerprint(); + TQString fingerprint(); bool dirty, hashdirty; bool m_bReadOnly; int m_Refresh, m_Hash, m_LastChange; - QString m_Name, m_Command; - QString m_PreviewCommand, m_Comment; - QString m_Executable, m_File; + TQString m_Name, m_Command; + TQString m_PreviewCommand, m_Comment; + TQString m_Executable, m_File; KStandardDirs *m_pDirs; KSimpleConfig *m_pConfig; }; @@ -169,13 +169,13 @@ public: // void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig=true); void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig); - void setColorA(const QColor &color); - QColor colorA() const { return m_ColorA; } - void setColorB(const QColor &color); - QColor colorB() const { return m_ColorB; } + void setColorA(const TQColor &color); + TQColor colorA() const { return m_ColorA; } + void setColorB(const TQColor &color); + TQColor colorB() const { return m_ColorB; } - void setProgram(QString program); - void setPatternName(QString pattern); + void setProgram(TQString program); + void setPatternName(TQString pattern); enum BackgroundMode { Flat, Pattern, Program, @@ -201,8 +201,8 @@ public: void setBlendBalance(int value); int blendBalance() const { return m_BlendBalance; } - void setWallpaper(QString name); - QString wallpaper() const { return m_Wallpaper; } + void setWallpaper(TQString name); + TQString wallpaper() const { return m_Wallpaper; } enum WallpaperMode { NoWallpaper, Centred, Tiled, CenterTiled, CentredMaxpect, TiledMaxpect, @@ -211,9 +211,9 @@ public: void setWallpaperMode(int mode); int wallpaperMode() const { return m_WallpaperMode; } - void setWallpaperList(QStringList); - QStringList wallpaperList() const; - QStringList wallpaperFiles() const; + void setWallpaperList(TQStringList); + TQStringList wallpaperList() const; + TQStringList wallpaperFiles() const; void setWallpaperChangeInterval(int); int wallpaperChangeInterval() const { return m_Interval; } @@ -238,7 +238,7 @@ public: void updateWallpaperFiles(); void randomizeWallpaperFiles(); - QString currentWallpaper() const; + TQString currentWallpaper() const; /** * @return true if the currentWallpaper has changed */ @@ -248,10 +248,10 @@ public: void readSettings(bool reparse=false); void writeSettings(); - QString configGroupName() const; + TQString configGroupName() const; int hash(); - QString fingerprint(); + TQString fingerprint(); void setEnabled( const bool enable ); bool enabled() const { return m_bEnabled; } @@ -263,10 +263,10 @@ private: bool hashdirty; int m_Screen, m_Desk, m_Hash; - QColor m_ColorA, defColorA; - QColor m_ColorB, defColorB; - QString m_Wallpaper; - QStringList m_WallpaperList, m_WallpaperFiles; + TQColor m_ColorA, defColorA; + TQColor m_ColorB, defColorB; + TQString m_Wallpaper; + TQStringList m_WallpaperList, m_WallpaperFiles; int m_BackgroundMode, defBackgroundMode; int m_WallpaperMode, defWallpaperMode; @@ -280,7 +280,7 @@ private: int m_MultiMode, defMultiMode; int m_Interval, m_LastChange; int m_CurrentWallpaper; - QString m_CurrentWallpaperName; + TQString m_CurrentWallpaperName; KConfig *m_pConfig; KStandardDirs *m_pDirs; @@ -288,10 +288,10 @@ private: bool m_bEnabled; public: - QMap<QString,int> m_BMMap; - QMap<QString,int> m_WMMap; - QMap<QString,int> m_MMMap; - QMap<QString,int> m_BlMMap; + TQMap<TQString,int> m_BMMap; + TQMap<TQString,int> m_WMMap; + TQMap<TQString,int> m_MMMap; + TQMap<TQString,int> m_BlMMap; char *m_BMRevMap[16]; char *m_WMRevMap[16]; char *m_MMRevMap[16]; @@ -307,8 +307,8 @@ class KGlobalBackgroundSettings public: KGlobalBackgroundSettings(KConfig *config); - QString deskName(int desk); - //void setDeskName(int desk, QString name); + TQString deskName(int desk); + //void setDeskName(int desk, TQString name); int cacheSize() { return m_CacheSize; } void setCacheSize(int size); @@ -331,11 +331,11 @@ public: bool exportBackground() {return m_bExport; } void setExportBackground(bool _export); - void setTextColor(QColor _color); - QColor textColor() const { return m_TextColor; } + void setTextColor(TQColor _color); + TQColor textColor() const { return m_TextColor; } - void setTextBackgroundColor(QColor _color); - QColor textBackgroundColor() const { return m_TextBackgroundColor; } + void setTextBackgroundColor(TQColor _color); + TQColor textBackgroundColor() const { return m_TextBackgroundColor; } void setShadowEnabled(bool enabled); bool shadowEnabled() const { return m_shadowEnabled; } @@ -356,16 +356,16 @@ private: bool m_bDock; bool m_bLimitCache, m_bExport; int m_CacheSize; - QStringList m_Names; + TQStringList m_Names; - QColor m_TextColor; - QColor m_TextBackgroundColor; + TQColor m_TextColor; + TQColor m_TextBackgroundColor; bool m_shadowEnabled; int m_textLines; int m_textWidth; KConfig *m_pConfig; bool m_bDeleteConfig; - QValueVector<bool> m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk] + TQValueVector<bool> m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk] }; diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index 9786059eb..82bb1d8af 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -22,10 +22,10 @@ #include <config.h> -#include <qcheckbox.h> -#include <qevent.h> -#include <qpushbutton.h> -#include <qspinbox.h> +#include <tqcheckbox.h> +#include <tqevent.h> +#include <tqpushbutton.h> +#include <tqspinbox.h> #include <kfiledialog.h> #include <kimageio.h> @@ -39,23 +39,23 @@ /**** BGMultiWallpaperList ****/ -BGMultiWallpaperList::BGMultiWallpaperList(QWidget *parent, const char *name) - : QListBox(parent, name) +BGMultiWallpaperList::BGMultiWallpaperList(TQWidget *parent, const char *name) + : TQListBox(parent, name) { setAcceptDrops(true); - setSelectionMode(QListBox::Extended); + setSelectionMode(TQListBox::Extended); } -void BGMultiWallpaperList::dragEnterEvent(QDragEnterEvent *ev) +void BGMultiWallpaperList::dragEnterEvent(TQDragEnterEvent *ev) { ev->accept(KURLDrag::canDecode(ev)); } -void BGMultiWallpaperList::dropEvent(QDropEvent *ev) +void BGMultiWallpaperList::dropEvent(TQDropEvent *ev) { - QStringList files; + TQStringList files; KURL::List urls; KURLDrag::decode(ev, urls); for(KURL::List::ConstIterator it = urls.begin(); @@ -95,7 +95,7 @@ void BGMultiWallpaperList::ensureSelectionVisible() /**** BGMultiWallpaperDialog ****/ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Setup Slide Show"), Ok | Cancel, Ok, true), m_pSettings(settings) { @@ -114,18 +114,18 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings, if (m_pSettings->multiWallpaperMode() == KBackgroundSettings::Random) dlg->m_cbRandom->setChecked(true); - connect(dlg->m_buttonAdd, SIGNAL(clicked()), SLOT(slotAdd())); - connect(dlg->m_buttonRemove, SIGNAL(clicked()), SLOT(slotRemove())); - connect(dlg->m_buttonMoveUp, SIGNAL(clicked()), SLOT(slotMoveUp())); - connect(dlg->m_buttonMoveDown, SIGNAL(clicked()), SLOT(slotMoveDown())); - connect(dlg->m_listImages, SIGNAL(clicked ( QListBoxItem * )), SLOT(slotItemSelected( QListBoxItem *))); + connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); + connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); + connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); + connect(dlg->m_listImages, TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *))); dlg->m_buttonRemove->setEnabled( false ); dlg->m_buttonMoveUp->setEnabled( false ); dlg->m_buttonMoveDown->setEnabled( false ); } -void BGMultiWallpaperDialog::slotItemSelected( QListBoxItem * ) +void BGMultiWallpaperDialog::slotItemSelected( TQListBoxItem * ) { dlg->m_buttonRemove->setEnabled( dlg->m_listImages->hasSelection() ); setEnabledMoveButtons(); @@ -134,7 +134,7 @@ void BGMultiWallpaperDialog::slotItemSelected( QListBoxItem * ) void BGMultiWallpaperDialog::setEnabledMoveButtons() { bool hasSelection = dlg->m_listImages->hasSelection(); - QListBoxItem * item; + TQListBoxItem * item; item = dlg->m_listImages->firstItem(); dlg->m_buttonMoveUp->setEnabled( hasSelection && item && !item->isSelected() ); @@ -144,7 +144,7 @@ void BGMultiWallpaperDialog::setEnabledMoveButtons() void BGMultiWallpaperDialog::slotAdd() { - QStringList mimeTypes = KImageIO::mimeTypes( KImageIO::Reading ); + TQStringList mimeTypes = KImageIO::mimeTypes( KImageIO::Reading ); #ifdef HAVE_LIBART mimeTypes += "image/svg+xml"; #endif @@ -160,7 +160,7 @@ void BGMultiWallpaperDialog::slotAdd() KFile::LocalOnly); fileDialog.setMode(mode); fileDialog.exec(); - QStringList files = fileDialog.selectedFiles(); + TQStringList files = fileDialog.selectedFiles(); if (files.isEmpty()) return; @@ -172,7 +172,7 @@ void BGMultiWallpaperDialog::slotRemove() int current = -1; for ( unsigned i = 0; i < dlg->m_listImages->count();) { - QListBoxItem * item = dlg->m_listImages->item( i ); + TQListBoxItem * item = dlg->m_listImages->item( i ); if ( item && item->isSelected()) { dlg->m_listImages->removeItem(i); @@ -194,7 +194,7 @@ void BGMultiWallpaperDialog::slotMoveUp() { for ( unsigned i = 1; i < dlg->m_listImages->count(); i++) { - QListBoxItem * item = dlg->m_listImages->item( i ); + TQListBoxItem * item = dlg->m_listImages->item( i ); if ( item && item->isSelected() ) { dlg->m_listImages->takeItem( item ); @@ -209,7 +209,7 @@ void BGMultiWallpaperDialog::slotMoveDown() { for ( unsigned i = dlg->m_listImages->count() - 1; i > 0; i--) { - QListBoxItem * item = dlg->m_listImages->item( i - 1 ); + TQListBoxItem * item = dlg->m_listImages->item( i - 1 ); if ( item && item->isSelected()) { dlg->m_listImages->takeItem( item ); @@ -222,7 +222,7 @@ void BGMultiWallpaperDialog::slotMoveDown() void BGMultiWallpaperDialog::slotOk() { - QStringList lst; + TQStringList lst; for (unsigned i=0; i < dlg->m_listImages->count(); i++) lst.append(dlg->m_listImages->text(i)); m_pSettings->setWallpaperList(lst); diff --git a/kcontrol/background/bgwallpaper.h b/kcontrol/background/bgwallpaper.h index 0ecc1e6a4..d2771c884 100644 --- a/kcontrol/background/bgwallpaper.h +++ b/kcontrol/background/bgwallpaper.h @@ -23,8 +23,8 @@ #ifndef _BGWALLPAPER_H_ #define _BGWALLPAPER_H_ -#include <qlistbox.h> -#include <qstringlist.h> +#include <tqlistbox.h> +#include <tqstringlist.h> #include <kdialogbase.h> @@ -34,10 +34,10 @@ class KBackgroundSettings; class BGMultiWallpaperList : public QListBox { public: - BGMultiWallpaperList(QWidget *parent, const char *name); + BGMultiWallpaperList(TQWidget *parent, const char *name); - void dragEnterEvent(QDragEnterEvent *ev); - void dropEvent(QDropEvent *ev); + void dragEnterEvent(TQDragEnterEvent *ev); + void dropEvent(TQDropEvent *ev); bool hasSelection(); void ensureSelectionVisible(); }; @@ -46,7 +46,7 @@ class BGMultiWallpaperDialog : public KDialogBase { Q_OBJECT public: - BGMultiWallpaperDialog(KBackgroundSettings *settings, QWidget *parent, const char *name=0); + BGMultiWallpaperDialog(KBackgroundSettings *settings, TQWidget *parent, const char *name=0); public slots: void slotAdd(); @@ -54,7 +54,7 @@ public slots: void slotMoveUp(); void slotMoveDown(); void slotOk(); - void slotItemSelected( QListBoxItem * ); + void slotItemSelected( TQListBoxItem * ); private: void setEnabledMoveButtons(); diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index 7bcd5649b..da77d7cda 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -15,7 +15,7 @@ * License. See the file "COPYING" for the exact licensing terms. */ -#include <qlayout.h> +#include <tqlayout.h> #include <kapplication.h> #include <kaboutdata.h> #include <kconfig.h> @@ -32,7 +32,7 @@ #include <X11/Xlib.h> /**** DLL Interface ****/ -typedef KGenericFactory<KBackground, QWidget> KBackGndFactory; +typedef KGenericFactory<KBackground, TQWidget> KBackGndFactory; K_EXPORT_COMPONENT_FACTORY( kcm_background, KBackGndFactory("kcmbackground")) /**** KBackground ****/ @@ -41,20 +41,20 @@ KBackground::~KBackground( ) delete m_pConfig; } -KBackground::KBackground(QWidget *parent, const char *name, const QStringList &/* */) +KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList &/* */) : KCModule(KBackGndFactory::instance(), parent, name) { int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString configname; + TQCString configname; if (screen_number == 0) configname = "kdesktoprc"; else configname.sprintf("kdesktop-screen-%drc", screen_number); m_pConfig = new KConfig(configname, false, false); - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_base = new BGDialog(this, m_pConfig); setQuickHelp( m_base->quickHelp()); layout->add(m_base); @@ -65,7 +65,7 @@ KBackground::KBackground(QWidget *parent, const char *name, const QStringList &/ // reparenting that is done. setAcceptDrops(true); - connect(m_base, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); KAboutData *about = new KAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("KDE Background Control Module"), @@ -107,7 +107,7 @@ void KBackground::save() int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kdesktop"; else diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h index a220b57b6..100d9c2b9 100644 --- a/kcontrol/background/main.h +++ b/kcontrol/background/main.h @@ -23,7 +23,7 @@ class KBackground: public KCModule Q_OBJECT public: - KBackground(QWidget *parent, const char *name, const QStringList &); + KBackground(TQWidget *parent, const char *name, const TQStringList &); ~KBackground(); virtual void load(); diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 707e6c151..10d774da7 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -19,11 +19,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> #include <kaboutdata.h> #include <kapplication.h> @@ -40,7 +40,7 @@ extern "C" { - KDE_EXPORT KCModule *create_bell(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_bell(TQWidget *parent, const char *) { return new KBellConfig(parent, "kcmbell"); } @@ -64,27 +64,27 @@ extern "C" } } -KBellConfig::KBellConfig(QWidget *parent, const char *name): +KBellConfig::KBellConfig(TQWidget *parent, const char *name): KCModule(parent, name) { - QBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); int row = 0; - QGroupBox *box = new QGroupBox( i18n("Bell Settings"), this ); + TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this ); box->setColumnLayout( 0, Qt::Horizontal ); layout->addWidget(box); layout->addStretch(); - QGridLayout *grid = new QGridLayout(box->layout(), KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint()); grid->setColStretch(0, 0); grid->setColStretch(1, 1); grid->addColSpacing(0, 30); - m_useBell = new QCheckBox( i18n("&Use system bell instead of system notification" ), box ); - QWhatsThis::add(m_useBell, i18n("You can use the standard system bell (PC speaker) or a " + m_useBell = new TQCheckBox( i18n("&Use system bell instead of system notification" ), box ); + TQWhatsThis::add(m_useBell, i18n("You can use the standard system bell (PC speaker) or a " "more sophisticated system notification, see the " "\"System Notifications\" control module for the " "\"Something Special Happened in the Program\" event.")); - connect(m_useBell, SIGNAL( toggled( bool )), SLOT( useBell( bool ))); + connect(m_useBell, TQT_SIGNAL( toggled( bool )), TQT_SLOT( useBell( bool ))); row++; grid->addMultiCellWidget(m_useBell, row, row, 0, 1); @@ -99,7 +99,7 @@ KBellConfig::KBellConfig(QWidget *parent, const char *name): m_volume->setSuffix("%"); m_volume->setSteps(5,25); grid->addWidget(m_volume, ++row, 1); - QWhatsThis::add( m_volume, i18n("Here you can customize the volume of the system bell. For further" + TQWhatsThis::add( m_volume, i18n("Here you can customize the volume of the system bell. For further" " customization of the bell, see the \"Accessibility\" control module.") ); m_pitch = new KIntNumInput(m_volume, 800, box); @@ -108,7 +108,7 @@ KBellConfig::KBellConfig(QWidget *parent, const char *name): m_pitch->setSuffix(i18n(" Hz")); m_pitch->setSteps(40,200); grid->addWidget(m_pitch, ++row, 1); - QWhatsThis::add( m_pitch, i18n("Here you can customize the pitch of the system bell. For further" + TQWhatsThis::add( m_pitch, i18n("Here you can customize the pitch of the system bell. For further" " customization of the bell, see the \"Accessibility\" control module.") ); m_duration = new KIntNumInput(m_pitch, 100, box); @@ -117,20 +117,20 @@ KBellConfig::KBellConfig(QWidget *parent, const char *name): m_duration->setSuffix(i18n(" msec")); m_duration->setSteps(20,100); grid->addWidget(m_duration, ++row, 1); - QWhatsThis::add( m_duration, i18n("Here you can customize the duration of the system bell. For further" + TQWhatsThis::add( m_duration, i18n("Here you can customize the duration of the system bell. For further" " customization of the bell, see the \"Accessibility\" control module.") ); - QBoxLayout *boxLayout = new QHBoxLayout(); - m_testButton = new QPushButton(i18n("&Test"), box, "test"); + TQBoxLayout *boxLayout = new TQHBoxLayout(); + m_testButton = new TQPushButton(i18n("&Test"), box, "test"); boxLayout->addWidget(m_testButton, 0, AlignRight); grid->addLayout( boxLayout, ++row, 1 ); - connect( m_testButton, SIGNAL(clicked()), SLOT(ringBell())); - QWhatsThis::add( m_testButton, i18n("Click \"Test\" to hear how the system bell will sound using your changed settings.") ); + connect( m_testButton, TQT_SIGNAL(clicked()), TQT_SLOT(ringBell())); + TQWhatsThis::add( m_testButton, i18n("Click \"Test\" to hear how the system bell will sound using your changed settings.") ); // watch for changes - connect(m_volume, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(m_pitch, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(m_duration, SIGNAL(valueChanged(int)), SLOT(changed())); + connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); KAboutData *about = new KAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("KDE Bell Control Module"), diff --git a/kcontrol/bell/bell.h b/kcontrol/bell/bell.h index ceaf875df..dc17def93 100644 --- a/kcontrol/bell/bell.h +++ b/kcontrol/bell/bell.h @@ -32,7 +32,7 @@ class KBellConfig : public KCModule Q_OBJECT public: - KBellConfig(QWidget *parent, const char *name); + KBellConfig(TQWidget *parent, const char *name); void load(); void load( bool useDefaults ); @@ -44,11 +44,11 @@ class KBellConfig : public KCModule void useBell( bool ); private: - QPushButton *m_testButton; + TQPushButton *m_testButton; KIntNumInput *m_volume; KIntNumInput *m_pitch; KIntNumInput *m_duration; - QCheckBox *m_useBell; + TQCheckBox *m_useBell; }; #endif diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index ba8330c7a..109e436c4 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -22,15 +22,15 @@ #include <unistd.h> #include <sys/types.h> -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qregexp.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqregexp.h> #include <kdebug.h> #include <klocale.h> @@ -42,22 +42,22 @@ #include "dtime.h" #include "dtime.moc" -HMSTimeWidget::HMSTimeWidget(QWidget *parent, const char *name) : +HMSTimeWidget::HMSTimeWidget(TQWidget *parent, const char *name) : KIntSpinBox(parent, name) { } -QString HMSTimeWidget::mapValueToText(int value) +TQString HMSTimeWidget::mapValueToText(int value) { - QString s = QString::number(value); + TQString s = TQString::number(value); if( value < 10 ) { s = "0" + s; } return s; } -Dtime::Dtime(QWidget * parent, const char *name) - : QWidget(parent, name) +Dtime::Dtime(TQWidget * parent, const char *name) + : TQWidget(parent, name) { // ************************************************************* // Start Dialog @@ -65,51 +65,51 @@ Dtime::Dtime(QWidget * parent, const char *name) // Time Server - privateLayoutWidget = new QWidget( this, "layout1" ); - QHBoxLayout *layout1 = new QHBoxLayout( privateLayoutWidget, 0, 0, "ntplayout"); + privateLayoutWidget = new TQWidget( this, "layout1" ); + TQHBoxLayout *layout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntplayout"); - setDateTimeAuto = new QCheckBox( privateLayoutWidget, "setDateTimeAuto" ); + setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" ); setDateTimeAuto->setText(i18n("Set date and time &automatically:")); - connect(setDateTimeAuto, SIGNAL(toggled(bool)), this, SLOT(serverTimeCheck())); - connect(setDateTimeAuto, SIGNAL(toggled(bool)), SLOT(configChanged())); + connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck())); + connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); layout1->addWidget( setDateTimeAuto ); - timeServerList = new QComboBox( false, privateLayoutWidget, "timeServerList" ); - connect(timeServerList, SIGNAL(activated(int)), SLOT(configChanged())); - connect(timeServerList, SIGNAL(textChanged(const QString &)), SLOT(configChanged())); - connect(setDateTimeAuto, SIGNAL(toggled(bool)), timeServerList, SLOT(setEnabled(bool))); + timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" ); + connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged())); + connect(timeServerList, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(configChanged())); + connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool))); timeServerList->setEnabled(false); timeServerList->setEditable(true); layout1->addWidget( timeServerList ); findNTPutility(); // Date box - QGroupBox* dateBox = new QGroupBox( this, "dateBox" ); + TQGroupBox* dateBox = new TQGroupBox( this, "dateBox" ); - QVBoxLayout *l1 = new QVBoxLayout( dateBox, KDialog::spacingHint() ); + TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() ); cal = new KDatePicker( dateBox ); cal->setMinimumSize(cal->sizeHint()); l1->addWidget( cal ); - QWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") ); + TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") ); // Time frame - QGroupBox* timeBox = new QGroupBox( this, "timeBox" ); + TQGroupBox* timeBox = new TQGroupBox( this, "timeBox" ); - QVBoxLayout *v2 = new QVBoxLayout( timeBox, KDialog::spacingHint() ); + TQVBoxLayout *v2 = new TQVBoxLayout( timeBox, KDialog::spacingHint() ); kclock = new Kclock( timeBox, "kclock" ); kclock->setMinimumSize(150,150); v2->addWidget( kclock ); - QGridLayout *v3 = new QGridLayout( v2, 2, 9 ); + TQGridLayout *v3 = new TQGridLayout( v2, 2, 9 ); // Even if the module's widgets are reversed (usually when using RTL // languages), the placing of the time fields must always be H:M:S, from // left to right. - bool isRTL = QApplication::reverseLayout(); + bool isRTL = TQApplication::reverseLayout(); - QSpacerItem *spacer1 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem *spacer1 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); v3->addMultiCell(spacer1, 0, 1, 1, 1); hour = new HMSTimeWidget( timeBox ); @@ -118,9 +118,9 @@ Dtime::Dtime(QWidget * parent, const char *name) hour->setValidator(new KStrictIntValidator(0, 23, hour)); v3->addMultiCellWidget(hour, 0, 1, isRTL ? 6 : 2, isRTL ? 6 : 2 ); - QLabel *dots1 = new QLabel(":", timeBox); + TQLabel *dots1 = new TQLabel(":", timeBox); dots1->setMinimumWidth( 7 ); - dots1->setAlignment( QLabel::AlignCenter ); + dots1->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots1, 0, 1, 3, 3 ); minute = new HMSTimeWidget( timeBox ); @@ -130,9 +130,9 @@ Dtime::Dtime(QWidget * parent, const char *name) minute->setValidator(new KStrictIntValidator(0, 59, minute)); v3->addMultiCellWidget(minute, 0, 1, 4, 4 ); - QLabel *dots2 = new QLabel(":", timeBox); + TQLabel *dots2 = new TQLabel(":", timeBox); dots2->setMinimumWidth( 7 ); - dots2->setAlignment( QLabel::AlignCenter ); + dots2->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots2, 0, 1, 5, 5 ); second = new HMSTimeWidget( timeBox ); @@ -144,17 +144,17 @@ Dtime::Dtime(QWidget * parent, const char *name) v3->addColSpacing(7, 7); - QString wtstr = i18n("Here you can change the system time. Click into the" + TQString wtstr = i18n("Here you can change the system time. Click into the" " hours, minutes or seconds field to change the relevant value, either" " using the up and down buttons to the right or by entering a new value."); - QWhatsThis::add( hour, wtstr ); - QWhatsThis::add( minute, wtstr ); - QWhatsThis::add( second, wtstr ); + TQWhatsThis::add( hour, wtstr ); + TQWhatsThis::add( minute, wtstr ); + TQWhatsThis::add( second, wtstr ); - QSpacerItem *spacer3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem *spacer3 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); v3->addMultiCell(spacer3, 0, 1, 9, 9); - QGridLayout *top = new QGridLayout( this, 2,2, KDialog::spacingHint() ); + TQGridLayout *top = new TQGridLayout( this, 2,2, KDialog::spacingHint() ); top->addWidget(dateBox, 1,0); top->addWidget(timeBox, 1,1); @@ -164,12 +164,12 @@ Dtime::Dtime(QWidget * parent, const char *name) // End Dialog // ************************************************************* - connect( hour, SIGNAL(valueChanged(int)), SLOT(set_time()) ); - connect( minute, SIGNAL(valueChanged(int)), SLOT(set_time()) ); - connect( second, SIGNAL(valueChanged(int)), SLOT(set_time()) ); - connect( cal, SIGNAL(dateChanged(QDate)), SLOT(changeDate(QDate))); + connect( hour, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); + connect( minute, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); + connect( second, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); + connect( cal, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(changeDate(TQDate))); - connect( &internalTimer, SIGNAL(timeout()), SLOT(timeout()) ); + connect( &internalTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); load(); @@ -228,7 +228,7 @@ void Dtime::set_time() emit timeChanged( TRUE ); } -void Dtime::changeDate(QDate d) +void Dtime::changeDate(TQDate d) { date = d; emit timeChanged( TRUE ); @@ -242,7 +242,7 @@ void Dtime::load() { KConfig config("kcmclockrc", true, false); config.setGroup("NTP"); - timeServerList->insertStringList(QStringList::split(',', config.readEntry("servers", + timeServerList->insertStringList(TQStringList::split(',', config.readEntry("servers", i18n("Public Time Server (pool.ntp.org),\ asia.pool.ntp.org,\ europe.pool.ntp.org,\ @@ -251,8 +251,8 @@ oceania.pool.ntp.org")))); setDateTimeAuto->setChecked(config.readBoolEntry("enabled", false)); // Reset to the current date and time - time = QTime::currentTime(); - date = QDate::currentDate(); + time = TQTime::currentTime(); + date = TQDate::currentDate(); cal->setDate(date); // start internal timer @@ -267,11 +267,11 @@ void Dtime::save() config.setGroup("NTP"); // Save the order, but don't duplicate! - QStringList list; + TQStringList list; if( timeServerList->count() != 0) list.append(timeServerList->currentText()); for ( int i=0; i<timeServerList->count();i++ ) { - QString text = timeServerList->text(i); + TQString text = timeServerList->text(i); if( list.find(text) == list.end()) list.append(text); // Limit so errors can go away and not stored forever @@ -283,17 +283,17 @@ void Dtime::save() if(setDateTimeAuto->isChecked() && !ntpUtility.isEmpty()){ // NTP Time setting - QString timeServer = timeServerList->currentText(); - if( timeServer.find( QRegExp(".*\\(.*\\)$") ) != -1 ) { - timeServer.replace( QRegExp(".*\\("), "" ); - timeServer.replace( QRegExp("\\).*"), "" ); + TQString timeServer = timeServerList->currentText(); + if( timeServer.find( TQRegExp(".*\\(.*\\)$") ) != -1 ) { + timeServer.replace( TQRegExp(".*\\("), "" ); + timeServer.replace( TQRegExp("\\).*"), "" ); // Would this be better?: s/^.*\(([^)]*)\).*$/\1/ } KProcess proc; proc << ntpUtility << timeServer; proc.start( KProcess::Block ); if( proc.exitStatus() != 0 ){ - KMessageBox::error( this, i18n(QString("Unable to contact time server: %1.").arg(timeServer).latin1())); + KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1())); setDateTimeAuto->setChecked( false ); } else { @@ -345,7 +345,7 @@ void Dtime::save() void Dtime::timeout() { // get current time - time = QTime::currentTime(); + time = TQTime::currentTime(); ontimeout = TRUE; second->setValue(time.second()); @@ -356,7 +356,7 @@ void Dtime::timeout() kclock->setTime( time ); } -QString Dtime::quickHelp() const +TQString Dtime::quickHelp() const { return i18n("<h1>Date & Time</h1> This control module can be used to set the system date and" " time. As these settings do not only affect you as a user, but rather the whole system, you" @@ -365,32 +365,32 @@ QString Dtime::quickHelp() const " administrator."); } -void Kclock::setTime(const QTime &time) +void Kclock::setTime(const TQTime &time) { this->time = time; repaint(); } -void Kclock::paintEvent( QPaintEvent * ) +void Kclock::paintEvent( TQPaintEvent * ) { if ( !isVisible() ) return; - QPainter paint; + TQPainter paint; paint.begin( this ); - QPointArray pts; - QPoint cp = rect().center(); + TQPointArray pts; + TQPoint cp = rect().center(); int d = QMIN(width(),height()); - QColor hands = colorGroup().dark(); - QColor shadow = colorGroup().text(); + TQColor hands = colorGroup().dark(); + TQColor shadow = colorGroup().text(); paint.setPen( shadow ); paint.setBrush( shadow ); paint.setViewport(4,4,width(),height()); 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 ); @@ -435,12 +435,12 @@ void Kclock::paintEvent( QPaintEvent * ) paint.end(); } -QValidator::State KStrictIntValidator::validate( QString & input, int & d ) const +TQValidator::State KStrictIntValidator::validate( TQString & input, int & d ) const { if( input.isEmpty() ) return Valid; - State st = QIntValidator::validate( input, d ); + State st = TQIntValidator::validate( input, d ); if( st == Intermediate ) return Invalid; diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h index 5fcbb62df..cf6cccc63 100644 --- a/kcontrol/clock/dtime.h +++ b/kcontrol/clock/dtime.h @@ -22,14 +22,14 @@ #ifndef dtime_included #define dtime_included -#include <qdatetime.h> -#include <qlineedit.h> -#include <qspinbox.h> -#include <qstring.h> -#include <qtimer.h> -#include <qvalidator.h> -#include <qwidget.h> -#include <qcheckbox.h> +#include <tqdatetime.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqstring.h> +#include <tqtimer.h> +#include <tqvalidator.h> +#include <tqwidget.h> +#include <tqcheckbox.h> #include <kdatepicker.h> #include <knuminput.h> @@ -40,21 +40,21 @@ class HMSTimeWidget : public KIntSpinBox { Q_OBJECT public: - HMSTimeWidget(QWidget *parent=0, const char *name=0); + HMSTimeWidget(TQWidget *parent=0, const char *name=0); protected: - QString mapValueToText(int); + TQString mapValueToText(int); }; class Dtime : public QWidget { Q_OBJECT public: - Dtime( QWidget *parent=0, const char* name=0 ); + Dtime( TQWidget *parent=0, const char* name=0 ); void save(); void load(); - QString quickHelp() const; + TQString quickHelp() const; signals: void timeChanged(bool); @@ -64,13 +64,13 @@ signals: void serverTimeCheck(); void timeout(); void set_time(); - void changeDate(QDate); + void changeDate(TQDate); private: void findNTPutility(); QString ntpUtility; - QWidget* privateLayoutWidget; + TQWidget* privateLayoutWidget; QCheckBox *setDateTimeAuto; QComboBox *timeServerList; @@ -99,27 +99,27 @@ class Kclock : public QWidget Q_OBJECT public: - Kclock( QWidget *parent=0, const char *name=0 ) - : QWidget(parent, name) {}; + Kclock( TQWidget *parent=0, const char *name=0 ) + : TQWidget(parent, name) {}; - void setTime(const QTime&); + void setTime(const TQTime&); protected: - virtual void paintEvent( QPaintEvent *event ); + virtual void paintEvent( TQPaintEvent *event ); private: QTime time; }; -class KStrictIntValidator : public QIntValidator +class KStrictIntValidator : public TQIntValidator { public: - KStrictIntValidator(int bottom, int top, QWidget * parent, + KStrictIntValidator(int bottom, int top, TQWidget * parent, const char * name = 0 ) - : QIntValidator(bottom, top, parent, name) {}; + : TQIntValidator(bottom, top, parent, name) {}; - QValidator::State validate( QString & input, int & d ) const; + TQValidator::State validate( TQString & input, int & d ) const; }; #endif // dtime_included diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index 8522973a1..86e47e7ad 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -20,8 +20,8 @@ */ #include <unistd.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <dcopclient.h> @@ -36,10 +36,10 @@ #include "tzone.h" #include "dtime.h" -typedef KGenericFactory<KclockModule, QWidget> KlockModuleFactory; +typedef KGenericFactory<KclockModule, TQWidget> KlockModuleFactory; K_EXPORT_COMPONENT_FACTORY( kcm_clock, KlockModuleFactory("kcmkclock")) -KclockModule::KclockModule(QWidget *parent, const char *name, const QStringList &) +KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KlockModuleFactory::instance(), parent, name) { KAboutData *about = @@ -59,15 +59,15 @@ KclockModule::KclockModule(QWidget *parent, const char *name, const QStringList KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); dtime = new Dtime(this); layout->addWidget(dtime); - connect(dtime, SIGNAL(timeChanged(bool)), this, SIGNAL(changed(bool))); + connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool))); tzone = new Tzone(this); layout->addWidget(tzone); - connect(tzone, SIGNAL(zoneChanged(bool)), this, SIGNAL(changed(bool))); + connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool))); layout->addStretch(); @@ -84,7 +84,7 @@ void KclockModule::save() tzone->save(); // Tell the clock applet about the change so that it can update its timezone - kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", QByteArray() ); + kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() ); } void KclockModule::load() diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h index 3c57469f0..53a060674 100644 --- a/kcontrol/clock/main.h +++ b/kcontrol/clock/main.h @@ -33,13 +33,13 @@ class KclockModule : public KCModule Q_OBJECT public: - KclockModule(QWidget *parent, const char *name, const QStringList &); + KclockModule(TQWidget *parent, const char *name, const TQStringList &); void save(); void load(); private: - QTabWidget *tab; + TQTabWidget *tab; Tzone *tzone; Dtime *dtime; }; diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index fad22152a..506bde5b6 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -25,8 +25,8 @@ #include <time.h> #include <config.h> -#include <qlabel.h> -#include <qfile.h> +#include <tqlabel.h> +#include <tqfile.h> #include <kdebug.h> #include <klocale.h> @@ -46,15 +46,15 @@ #include <sys/stat.h> #endif -Tzone::Tzone(QWidget * parent, const char *name) - : QVGroupBox(parent, name) +Tzone::Tzone(TQWidget * parent, const char *name) + : TQVGroupBox(parent, name) { setTitle(i18n("To change the timezone, select your area from the list below")); tzonelist = new KTimezoneWidget(this, "ComboBox_1", &m_zoneDb); - connect( tzonelist, SIGNAL(selectionChanged()), SLOT(handleZoneChange()) ); + connect( tzonelist, TQT_SIGNAL(selectionChanged()), TQT_SLOT(handleZoneChange()) ); - m_local = new QLabel(this); + m_local = new TQLabel(this); load(); @@ -71,8 +71,8 @@ void Tzone::load() void Tzone::currentZone() { - QString localZone(i18n("Current local timezone: %1 (%2)")); - QCString result(100); + TQString localZone(i18n("Current local timezone: %1 (%2)")); + TQCString result(100); time_t now = time(0); tzset(); @@ -84,33 +84,33 @@ void Tzone::currentZone() // on non-Solaris systems which do not use /etc/timezone? void Tzone::save() { - QStringList selectedZones(tzonelist->selection()); + TQStringList selectedZones(tzonelist->selection()); if (selectedZones.count() > 0) { // Find untranslated selected zone - QString selectedzone(selectedZones[0]); + TQString selectedzone(selectedZones[0]); #if defined(USE_SOLARIS) // MARCO KTempFile tf( locateLocal( "tmp", "kde-tzone" ) ); tf.setAutoDelete( true ); - QTextStream *ts = tf.textStream(); + TQTextStream *ts = tf.textStream(); # ifndef INITFILE # define INITFILE "/etc/default/init" # endif - QFile fTimezoneFile(INITFILE); + TQFile fTimezoneFile(INITFILE); bool updatedFile = false; if (tf.status() == 0 && fTimezoneFile.open(IO_ReadOnly)) { bool found = false; - QTextStream is(&fTimezoneFile); + TQTextStream is(&fTimezoneFile); - for (QString line = is.readLine(); !line.isNull(); + for (TQString line = is.readLine(); !line.isNull(); line = is.readLine()) { if (line.find("TZ=") == 0) @@ -140,9 +140,9 @@ void Tzone::save() if (fTimezoneFile.open(IO_WriteOnly | IO_Truncate)) { - QTextStream os(&fTimezoneFile); + TQTextStream os(&fTimezoneFile); - for (QString line = ts->readLine(); !line.isNull(); + for (TQString line = ts->readLine(); !line.isNull(); line = ts->readLine()) { os << line << endl; @@ -156,22 +156,22 @@ void Tzone::save() } - QString val = selectedzone; + TQString val = selectedzone; #else - QFile fTimezoneFile("/etc/timezone"); + TQFile fTimezoneFile("/etc/timezone"); if (fTimezoneFile.open(IO_WriteOnly | IO_Truncate) ) { - QTextStream t(&fTimezoneFile); + TQTextStream t(&fTimezoneFile); t << selectedzone; fTimezoneFile.close(); } - QString tz = "/usr/share/zoneinfo/" + selectedzone; + TQString tz = "/usr/share/zoneinfo/" + selectedzone; kdDebug() << "Set time zone " << tz << endl; - if (!QFile::remove("/etc/localtime")) + if (!TQFile::remove("/etc/localtime")) { //After the KDE 3.2 release, need to add an error message } @@ -180,7 +180,7 @@ void Tzone::save() KMessageBox::error( 0, i18n("Error setting new timezone."), i18n("Timezone Error")); - QString val = ":" + tz; + TQString val = ":" + tz; #endif // !USE_SOLARIS setenv("TZ", val.ascii(), 1); diff --git a/kcontrol/clock/tzone.h b/kcontrol/clock/tzone.h index 618cb10c6..fe9119773 100644 --- a/kcontrol/clock/tzone.h +++ b/kcontrol/clock/tzone.h @@ -24,7 +24,7 @@ #include <ktimezones.h> #include <ktimezonewidget.h> -#include <qvgroupbox.h> +#include <tqvgroupbox.h> class QComboBox; class QLabel; @@ -34,7 +34,7 @@ class Tzone : public QVGroupBox Q_OBJECT public: - Tzone( QWidget *parent=0, const char* name=0 ); + Tzone( TQWidget *parent=0, const char* name=0 ); void save(); void load(); @@ -48,7 +48,7 @@ protected slots: private: void currentZone(); KTimezones m_zoneDb; - QLabel *m_local; + TQLabel *m_local; KTimezoneWidget *tzonelist; }; diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 39e5574c2..d735d1248 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -12,15 +12,15 @@ #include <stdlib.h> #include <unistd.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qdir.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qslider.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqdir.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqslider.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> #include <kcolorbutton.h> #include <kcursor.h> @@ -46,25 +46,25 @@ /**** DLL Interface ****/ -typedef KGenericFactory<KColorScheme , QWidget> KolorFactory; +typedef KGenericFactory<KColorScheme , TQWidget> KolorFactory; K_EXPORT_COMPONENT_FACTORY( kcm_colors, KolorFactory("kcmcolors") ) class KColorSchemeEntry { public: - KColorSchemeEntry(const QString &_path, const QString &_name, bool _local) + KColorSchemeEntry(const TQString &_path, const TQString &_name, bool _local) : path(_path), name(_name), local(_local) { } - QString path; - QString name; + TQString path; + TQString name; bool local; }; -class KColorSchemeList : public QPtrList<KColorSchemeEntry> { +class KColorSchemeList : public TQPtrList<KColorSchemeEntry> { public: KColorSchemeList() { setAutoDelete(true); } - int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2) + int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2) { KColorSchemeEntry *i1 = (KColorSchemeEntry*)item1; KColorSchemeEntry *i2 = (KColorSchemeEntry*)item2; @@ -77,22 +77,22 @@ public: #define SIZE 8 // make a 24 * 8 pixmap with the main colors in a scheme -QPixmap mkColorPreview(const WidgetCanvas *cs) +TQPixmap mkColorPreview(const WidgetCanvas *cs) { - QPixmap group(SIZE*3,SIZE); - QPixmap block(SIZE,SIZE); - group.fill(QColor(0,0,0)); + TQPixmap group(SIZE*3,SIZE); + TQPixmap block(SIZE,SIZE); + group.fill(TQColor(0,0,0)); block.fill(cs->back); bitBlt(&group,0*SIZE,0,&block,0,0,SIZE,SIZE); block.fill(cs->window); bitBlt(&group,1*SIZE,0,&block,0,0,SIZE,SIZE); block.fill(cs->aTitle); bitBlt(&group,2*SIZE,0,&block,0,0,SIZE,SIZE); - QPainter p(&group); + TQPainter p(&group); p.drawRect(0,0,3*SIZE,SIZE); return group; } /**** KColorScheme ****/ -KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList &) +KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KolorFactory::instance(), parent, name) { nSysSchemes = 2; @@ -120,7 +120,7 @@ KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList // LAYOUT - QGridLayout *topLayout = new QGridLayout( this, 3, 2, 0, + TQGridLayout *topLayout = new TQGridLayout( this, 3, 2, 0, KDialog::spacingHint() ); topLayout->setRowStretch(0,0); topLayout->setRowStretch(1,0); @@ -130,28 +130,28 @@ KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList cs->setFixedHeight(160); cs->setMinimumWidth(440); - QWhatsThis::add( cs, i18n("This is a preview of the color settings which" + TQWhatsThis::add( cs, i18n("This is a preview of the color settings which" " will be applied if you click \"Apply\" or \"OK\". You can click on" " different parts of this preview image. The widget name in the" " \"Widget color\" box will change to reflect the part of the preview" " image you clicked.") ); - connect( cs, SIGNAL( widgetSelected( int ) ), - SLOT( slotWidgetColor( int ) ) ); - connect( cs, SIGNAL( colorDropped( int, const QColor&)), - SLOT( slotColorForWidget( int, const QColor&))); + connect( cs, TQT_SIGNAL( widgetSelected( int ) ), + TQT_SLOT( slotWidgetColor( int ) ) ); + connect( cs, TQT_SIGNAL( colorDropped( int, const TQColor&)), + TQT_SLOT( slotColorForWidget( int, const TQColor&))); topLayout->addMultiCellWidget( cs, 0, 0, 0, 1 ); - QGroupBox *group = new QVGroupBox( i18n("Color Scheme"), this ); + TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this ); topLayout->addWidget( group, 1, 0 ); sList = new KListBox( group ); mSchemeList = new KColorSchemeList(); readSchemeNames(); sList->setCurrentItem( 0 ); - connect(sList, SIGNAL(highlighted(int)), SLOT(slotPreviewScheme(int))); + connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); - QWhatsThis::add( sList, i18n("This is a list of predefined color schemes," + TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes," " including any that you may have created. You can preview an existing" " color scheme by selecting it from the list. The current scheme will" " be replaced by the selected color scheme.<p>" @@ -159,41 +159,41 @@ KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList " to the current scheme, those changes will be lost if you select" " another color scheme.") ); - addBt = new QPushButton(i18n("&Save Scheme..."), group); - connect(addBt, SIGNAL(clicked()), SLOT(slotAdd())); + addBt = new TQPushButton(i18n("&Save Scheme..."), group); + connect(addBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - QWhatsThis::add( addBt, i18n("Press this button if you want to save" + TQWhatsThis::add( addBt, i18n("Press this button if you want to save" " the current color settings as a color scheme. You will be" " prompted for a name.") ); - removeBt = new QPushButton(i18n("R&emove Scheme"), group); + removeBt = new TQPushButton(i18n("R&emove Scheme"), group); removeBt->setEnabled(FALSE); - connect(removeBt, SIGNAL(clicked()), SLOT(slotRemove())); + connect(removeBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - QWhatsThis::add( removeBt, i18n("Press this button to remove the selected" + TQWhatsThis::add( removeBt, i18n("Press this button to remove the selected" " color scheme. Note that this button is disabled if you do not have" " permission to delete the color scheme.") ); - importBt = new QPushButton(i18n("I&mport Scheme..."), group); - connect(importBt, SIGNAL(clicked()),SLOT(slotImport())); + importBt = new TQPushButton(i18n("I&mport Scheme..."), group); + connect(importBt, TQT_SIGNAL(clicked()),TQT_SLOT(slotImport())); - QWhatsThis::add( importBt, i18n("Press this button to import a new color" + TQWhatsThis::add( importBt, i18n("Press this button to import a new color" " scheme. Note that the color scheme will only be available for the" " current user." )); - QBoxLayout *stackLayout = new QVBoxLayout; + TQBoxLayout *stackLayout = new QVBoxLayout; topLayout->addLayout(stackLayout, 1, 1); - group = new QGroupBox(i18n("&Widget Color"), this); + group = new TQGroupBox(i18n("&Widget Color"), this); stackLayout->addWidget(group); - QBoxLayout *groupLayout = new QVBoxLayout(group, 10); + TQBoxLayout *groupLayout = new TQVBoxLayout(group, 10); groupLayout->addSpacing(10); - wcCombo = new QComboBox(false, group); + wcCombo = new TQComboBox(false, group); for(int i=0; i < CSM_LAST;i++) { - wcCombo->insertItem(QString::null); + wcCombo->insertItem(TQString::null); } setColorName(i18n("Inactive Title Bar") , CSM_Inactive_title_bar); @@ -221,60 +221,60 @@ KColorScheme::KColorScheme(QWidget *parent, const char *name, const QStringList setColorName(i18n("Alternate Background in Lists"), CSM_Alternate_background); wcCombo->adjustSize(); - connect(wcCombo, SIGNAL(activated(int)), SLOT(slotWidgetColor(int))); + connect(wcCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidgetColor(int))); groupLayout->addWidget(wcCombo); - QWhatsThis::add( wcCombo, i18n("Click here to select an element of" + TQWhatsThis::add( wcCombo, i18n("Click here to select an element of" " the KDE desktop whose color you want to change. You may either" " choose the \"widget\" here, or click on the corresponding part" " of the preview image above.") ); colorButton = new KColorButton( group ); - connect( colorButton, SIGNAL( changed(const QColor &)), - SLOT(slotSelectColor(const QColor &))); + connect( colorButton, TQT_SIGNAL( changed(const TQColor &)), + TQT_SLOT(slotSelectColor(const TQColor &))); groupLayout->addWidget( colorButton ); - QWhatsThis::add( colorButton, i18n("Click here to bring up a dialog" + TQWhatsThis::add( colorButton, i18n("Click here to bring up a dialog" " box where you can choose a color for the \"widget\" selected" " in the above list.") ); - cbShadeList = new QCheckBox(i18n("Shade sorted column in lists"), this); + cbShadeList = new TQCheckBox(i18n("Shade sorted column in lists"), this); stackLayout->addWidget(cbShadeList); - connect(cbShadeList, SIGNAL(toggled(bool)), this, SLOT(slotShadeSortColumnChanged(bool))); + connect(cbShadeList, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotShadeSortColumnChanged(bool))); - QWhatsThis::add(cbShadeList, + TQWhatsThis::add(cbShadeList, i18n("Check this box to show the sorted column in a list with a shaded background")); - group = new QGroupBox( i18n("Con&trast"), this ); + group = new TQGroupBox( i18n("Con&trast"), this ); stackLayout->addWidget(group); - QVBoxLayout *groupLayout2 = new QVBoxLayout(group, 10); + TQVBoxLayout *groupLayout2 = new TQVBoxLayout(group, 10); groupLayout2->addSpacing(10); groupLayout = new QHBoxLayout; groupLayout2->addLayout(groupLayout); - sb = new QSlider( QSlider::Horizontal,group,"Slider" ); + sb = new TQSlider( TQSlider::Horizontal,group,"Slider" ); sb->setRange( 0, 10 ); - sb->setFocusPolicy( QWidget::StrongFocus ); - connect(sb, SIGNAL(valueChanged(int)), SLOT(sliderValueChanged(int))); + sb->setFocusPolicy( TQWidget::StrongFocus ); + connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); - QWhatsThis::add(sb, i18n("Use this slider to change the contrast level" + TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level" " of the current color scheme. Contrast does not affect all of the" " colors, only the edges of 3D objects.")); - QLabel *label = new QLabel(sb, i18n("Low Contrast", "Low"), group); + TQLabel *label = new TQLabel(sb, i18n("Low Contrast", "Low"), group); groupLayout->addWidget(label); groupLayout->addWidget(sb, 10); - label = new QLabel(group); + label = new TQLabel(group); label->setText(i18n("High Contrast", "High")); groupLayout->addWidget( label ); - cbExportColors = new QCheckBox(i18n("Apply colors to &non-KDE applications"), this); + cbExportColors = new TQCheckBox(i18n("Apply colors to &non-KDE applications"), this); topLayout->addMultiCellWidget( cbExportColors, 2, 2, 0, 1 ); - connect(cbExportColors, SIGNAL(toggled(bool)), this, SLOT(changed())); + connect(cbExportColors, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); - QWhatsThis::add(cbExportColors, i18n("Check this box to apply the" + TQWhatsThis::add(cbExportColors, i18n("Check this box to apply the" " current color scheme to non-KDE applications.")); load(); @@ -296,7 +296,7 @@ KColorScheme::~KColorScheme() delete mSchemeList; } -void KColorScheme::setColorName( const QString &name, int id ) +void KColorScheme::setColorName( const TQString &name, int id ) { wcCombo->changeItem(name, id); cs->addToolTip( id, name ); @@ -372,7 +372,7 @@ void KColorScheme::save() // KDE-1.x support KSimpleConfig *config = - new KSimpleConfig( QDir::homeDirPath() + "/.kderc" ); + new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); config->setGroup( "General" ); config->writeEntry("background", cs->back ); config->writeEntry("selectBackground", cs->select ); @@ -388,7 +388,7 @@ void KColorScheme::save() bool exportColors = cbExportColors->isChecked(); cfg2.writeEntry("exportKDEColors", exportColors); cfg2.sync(); - QApplication::syncX(); + TQApplication::syncX(); // Notify all qt-only apps of the KDE palette changes uint flags = KRdbExportQtColors; @@ -411,7 +411,7 @@ void KColorScheme::save() int current = findSchemeByName(sCurrentScheme); sList->setCurrentItem(0); readScheme(0); - QPixmap preview = mkColorPreview(cs); + TQPixmap preview = mkColorPreview(cs); sList->changeItem(preview, sList->text(0), 0); sList->setCurrentItem(current); readScheme(current); @@ -432,7 +432,7 @@ void KColorScheme::sliderValueChanged( int val ) cs->contrast = val; cs->drawSampleWidgets(); - sCurrentScheme = QString::null; + sCurrentScheme = TQString::null; emit changed(true); } @@ -485,7 +485,7 @@ void KColorScheme::slotRemove() KColorSchemeEntry *entry = mSchemeList->at(ind-nSysSchemes); if (!entry) return; - if (unlink(QFile::encodeName(entry->path).data())) { + if (unlink(TQFile::encodeName(entry->path).data())) { KMessageBox::error( 0, i18n("This color scheme could not be removed.\n" "Perhaps you do not have permission to alter the file" @@ -508,11 +508,11 @@ void KColorScheme::slotRemove() */ void KColorScheme::slotAdd() { - QString sName; + TQString sName; if (sList->currentItem() >= nSysSchemes) sName = sList->currentText(); - QString sFile; + TQString sFile; bool valid = false; bool ok; @@ -550,8 +550,8 @@ void KColorScheme::slotAdd() valid = true; } - disconnect(sList, SIGNAL(highlighted(int)), this, - SLOT(slotPreviewScheme(int))); + disconnect(sList, TQT_SIGNAL(highlighted(int)), this, + TQT_SLOT(slotPreviewScheme(int))); if (exists != -1) { @@ -571,18 +571,18 @@ void KColorScheme::slotAdd() } slotSave(); - QPixmap preview = mkColorPreview(cs); + TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, SIGNAL(highlighted(int)), SLOT(slotPreviewScheme(int))); + connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } void KColorScheme::slotImport() { - QString location = locateLocal( "data", "kdisplay/color-schemes/" ); + TQString location = locateLocal( "data", "kdisplay/color-schemes/" ); - KURL file ( KFileDialog::getOpenFileName(QString::null, "*.kcsrc", this) ); + KURL file ( KFileDialog::getOpenFileName(TQString::null, "*.kcsrc", this) ); if ( file.isEmpty() ) return; @@ -594,23 +594,23 @@ void KColorScheme::slotImport() } else { - QString sFile = location + file.fileName( false ); + TQString sFile = location + file.fileName( false ); KSimpleConfig *config = new KSimpleConfig(sFile); config->setGroup( "Color Scheme"); - QString sName = config->readEntry("Name", i18n("Untitled Theme")); + TQString sName = config->readEntry("Name", i18n("Untitled Theme")); delete config; insertEntry(sFile, sName); - QPixmap preview = mkColorPreview(cs); + TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, SIGNAL(highlighted(int)), SLOT(slotPreviewScheme(int))); + connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } } -QColor &KColorScheme::color(int index) +TQColor &KColorScheme::color(int index) { switch(index) { case CSM_Inactive_title_bar: @@ -666,7 +666,7 @@ QColor &KColorScheme::color(int index) } -void KColorScheme::slotSelectColor(const QColor &col) +void KColorScheme::slotSelectColor(const TQColor &col) { int selection; selection = wcCombo->currentItem(); @@ -687,7 +687,7 @@ void KColorScheme::slotSelectColor(const QColor &col) cs->drawSampleWidgets(); - sCurrentScheme = QString::null; + sCurrentScheme = TQString::null; emit changed(true); } @@ -703,7 +703,7 @@ void KColorScheme::slotWidgetColor(int indx) // Do not emit KCModule::changed() colorButton->blockSignals( true ); - QColor col = color(indx); + TQColor col = color(indx); colorButton->setColor( col ); colorPushColor = col; @@ -711,7 +711,7 @@ void KColorScheme::slotWidgetColor(int indx) } -void KColorScheme::slotColorForWidget(int indx, const QColor& col) +void KColorScheme::slotColorForWidget(int indx, const TQColor& col) { if (wcCombo->currentItem() != indx) wcCombo->setCurrentItem( indx ); @@ -722,7 +722,7 @@ void KColorScheme::slotColorForWidget(int indx, const QColor& col) void KColorScheme::slotShadeSortColumnChanged(bool b) { cs->shadeSortColumn = b; - sCurrentScheme = QString::null; + sCurrentScheme = TQString::null; emit changed(true); } @@ -736,25 +736,25 @@ void KColorScheme::readScheme( int index ) { KConfigBase* config; - QColor widget(239, 239, 239); - QColor kde34Blue(103,141,178); - QColor inactiveBackground(157,170,186); - QColor activeBackground(65,142,220); - QColor inactiveForeground(221,221,221); - QColor activeBlend(107,145,184); - QColor inactiveBlend(157,170,186); - QColor activeTitleBtnBg(220,220,220); - QColor inactiveTitleBtnBg(220,220,220); - QColor alternateBackground(237,244,249); - - QColor button; - if (QPixmap::defaultDepth() > 8) + TQColor widget(239, 239, 239); + TQColor kde34Blue(103,141,178); + TQColor inactiveBackground(157,170,186); + TQColor activeBackground(65,142,220); + TQColor inactiveForeground(221,221,221); + TQColor activeBlend(107,145,184); + TQColor inactiveBlend(157,170,186); + TQColor activeTitleBtnBg(220,220,220); + TQColor inactiveTitleBtnBg(220,220,220); + TQColor alternateBackground(237,244,249); + + TQColor button; + if (TQPixmap::defaultDepth() > 8) button.setRgb(221, 223, 228 ); else button.setRgb(220, 220, 220); - QColor link(0, 0, 238); - QColor visitedLink(82, 24,139); + TQColor link(0, 0, 238); + TQColor visitedLink(82, 24,139); // note: keep default color scheme in sync with default Current Scheme if (index == 1) { @@ -818,7 +818,7 @@ void KColorScheme::readScheme( int index ) cs->buttonTxt = config->readColorEntry( "buttonForeground", &black ); cs->link = config->readColorEntry( "linkColor", &link ); cs->visitedLink = config->readColorEntry( "visitedLinkColor", &visitedLink ); - QColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window); + TQColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window); cs->alternateBackground = config->readColorEntry( "alternateBackground", &alternate ); if (index == 0) @@ -860,14 +860,14 @@ void KColorScheme::readSchemeNames() nSysSchemes = 2; // Global + local schemes - QStringList list = KGlobal::dirs()->findAllResources("data", + TQStringList list = KGlobal::dirs()->findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true); // And add them - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig *config = new KSimpleConfig(*it); config->setGroup("Color Scheme"); - QString str = config->readEntry("Name"); + TQString str = config->readEntry("Name"); if (str.isEmpty()) { str = config->readEntry("name"); if (str.isEmpty()) @@ -888,7 +888,7 @@ void KColorScheme::readSchemeNames() { sList->setCurrentItem(i); readScheme(i); - QPixmap preview = mkColorPreview(cs); + TQPixmap preview = mkColorPreview(cs); sList->changeItem(preview, sList->text(i), i); } @@ -897,14 +897,14 @@ void KColorScheme::readSchemeNames() /* * Find scheme based on filename */ -int KColorScheme::findSchemeByName(const QString &scheme) +int KColorScheme::findSchemeByName(const TQString &scheme) { if (scheme.isEmpty()) return 0; if (scheme == "<default>") return 1; - QString search = scheme; + TQString search = scheme; int i = search.findRev('/'); if (i >= 0) search = search.mid(i+1); @@ -952,23 +952,23 @@ void KColorScheme::slotPreviewScheme(int indx) /* this function should dissappear: colorscm should work directly on a Qt palette, since this will give us much more cusomization with qt-2.0. */ -QPalette KColorScheme::createPalette() +TQPalette KColorScheme::createPalette() { - QColorGroup disabledgrp(cs->windowTxt, cs->back, cs->back.light(150), + TQColorGroup disabledgrp(cs->windowTxt, cs->back, cs->back.light(150), cs->back.dark(), cs->back.dark(120), cs->back.dark(120), cs->window); - QColorGroup colgrp(cs->windowTxt, cs->back, cs->back.light(150), + TQColorGroup colgrp(cs->windowTxt, cs->back, cs->back.light(150), cs->back.dark(), cs->back.dark(120), cs->txt, cs->window); - colgrp.setColor(QColorGroup::Highlight, cs->select); - colgrp.setColor(QColorGroup::HighlightedText, cs->selectTxt); - colgrp.setColor(QColorGroup::Button, cs->button); - colgrp.setColor(QColorGroup::ButtonText, cs->buttonTxt); - return QPalette( colgrp, disabledgrp, colgrp); + colgrp.setColor(TQColorGroup::Highlight, cs->select); + colgrp.setColor(TQColorGroup::HighlightedText, cs->selectTxt); + colgrp.setColor(TQColorGroup::Button, cs->button); + colgrp.setColor(TQColorGroup::ButtonText, cs->buttonTxt); + return TQPalette( colgrp, disabledgrp, colgrp); } -void KColorScheme::insertEntry(const QString &sFile, const QString &sName) +void KColorScheme::insertEntry(const TQString &sFile, const TQString &sName) { KColorSchemeEntry *newEntry = new KColorSchemeEntry(sFile, sName, true); mSchemeList->inSort(newEntry); diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h index 23b47c6a0..1494b072d 100644 --- a/kcontrol/colors/colorscm.h +++ b/kcontrol/colors/colorscm.h @@ -8,10 +8,10 @@ #ifndef __COLORSCM_H__ #define __COLORSCM_H__ -#include <qcolor.h> -#include <qobject.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqcolor.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kcmodule.h> #include <kdialogbase.h> @@ -39,7 +39,7 @@ class KColorScheme: public KCModule Q_OBJECT public: - KColorScheme(QWidget *parent, const char *name, const QStringList &); + KColorScheme(TQWidget *parent, const char *name, const TQStringList &); ~KColorScheme(); virtual void load(); @@ -53,38 +53,38 @@ private slots: void slotAdd(); void slotRemove(); void slotImport(); - void slotSelectColor(const QColor &col); + void slotSelectColor(const TQColor &col); void slotWidgetColor(int); - void slotColorForWidget(int, const QColor &); + void slotColorForWidget(int, const TQColor &); void slotPreviewScheme(int); void slotShadeSortColumnChanged(bool); private: - void setColorName( const QString &name, int id ); + void setColorName( const TQString &name, int id ); void readScheme(int index=0); void readSchemeNames(); - void insertEntry(const QString &sFile, const QString &sName); - int findSchemeByName(const QString &scheme); - QPalette createPalette(); + void insertEntry(const TQString &sFile, const TQString &sName); + int findSchemeByName(const TQString &scheme); + TQPalette createPalette(); - QColor &color(int index); + TQColor &color(int index); int nSysSchemes; bool useRM; - QColor colorPushColor; - QSlider *sb; - QComboBox *wcCombo; - QPushButton *addBt, *removeBt, *importBt; + TQColor colorPushColor; + TQSlider *sb; + TQComboBox *wcCombo; + TQPushButton *addBt, *removeBt, *importBt; KListBox *sList; KColorSchemeList *mSchemeList; - QString sCurrentScheme; + TQString sCurrentScheme; KColorButton *colorButton; WidgetCanvas *cs; - QCheckBox *cbExportColors; - QCheckBox *cbShadeList; + TQCheckBox *cbExportColors; + TQCheckBox *cbShadeList; }; #endif diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 42adcc3bb..67e68b3a3 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -5,13 +5,13 @@ // Copyright (c) Mark Donohoe 1998 // -#include <qdrawutil.h> -#include <qpainter.h> -#include <qscrollbar.h> -#include <qbitmap.h> -#include <qtooltip.h> -#include <qstyle.h> -#include <qpopupmenu.h> +#include <tqdrawutil.h> +#include <tqpainter.h> +#include <tqscrollbar.h> +#include <tqbitmap.h> +#include <tqtooltip.h> +#include <tqstyle.h> +#include <tqpopupmenu.h> #include <kcolordrag.h> #include <kpixmapeffect.h> @@ -24,25 +24,25 @@ #include "widgetcanvas.moc" #include "stdclient_bitmaps.h" -static QPixmap* close_pix = 0; -static QPixmap* maximize_pix = 0; -static QPixmap* minimize_pix = 0; -static QPixmap* normalize_pix = 0; -static QPixmap* pinup_pix = 0; -static QPixmap* pindown_pix = 0; -static QPixmap* menu_pix = 0; - -static QPixmap* dis_close_pix = 0; -static QPixmap* dis_maximize_pix = 0; -static QPixmap* dis_minimize_pix = 0; -static QPixmap* dis_normalize_pix = 0; -static QPixmap* dis_pinup_pix = 0; -static QPixmap* dis_pindown_pix = 0; -static QPixmap* dis_menu_pix = 0; - - -WidgetCanvas::WidgetCanvas( QWidget *parent, const char *name ) - : QWidget( parent, name ), shadeSortColumn( true ) +static TQPixmap* close_pix = 0; +static TQPixmap* maximize_pix = 0; +static TQPixmap* minimize_pix = 0; +static TQPixmap* normalize_pix = 0; +static TQPixmap* pinup_pix = 0; +static TQPixmap* pindown_pix = 0; +static TQPixmap* menu_pix = 0; + +static TQPixmap* dis_close_pix = 0; +static TQPixmap* dis_maximize_pix = 0; +static TQPixmap* dis_minimize_pix = 0; +static TQPixmap* dis_normalize_pix = 0; +static TQPixmap* dis_pinup_pix = 0; +static TQPixmap* dis_pindown_pix = 0; +static TQPixmap* dis_menu_pix = 0; + + +WidgetCanvas::WidgetCanvas( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), shadeSortColumn( true ) { setMouseTracking( true ); setBackgroundMode( NoBackground ); @@ -51,17 +51,17 @@ WidgetCanvas::WidgetCanvas( QWidget *parent, const char *name ) currentHotspot = -1; } -void WidgetCanvas::addToolTip( int area, const QString &tip ) +void WidgetCanvas::addToolTip( int area, const TQString &tip ) { tips.insert(area, tip); } -void WidgetCanvas::paintEvent(QPaintEvent *) +void WidgetCanvas::paintEvent(TQPaintEvent *) { bitBlt( this, 0, 0, &smplw ); } -void WidgetCanvas::mousePressEvent( QMouseEvent *me ) +void WidgetCanvas::mousePressEvent( TQMouseEvent *me ) { for ( int i = 0; i < MAX_HOTSPOTS; i++ ) if ( hotspots[i].rect.contains( me->pos() ) ) { @@ -70,25 +70,25 @@ void WidgetCanvas::mousePressEvent( QMouseEvent *me ) } } -void WidgetCanvas::mouseMoveEvent( QMouseEvent *me ) +void WidgetCanvas::mouseMoveEvent( TQMouseEvent *me ) { for ( int i = 0; i < MAX_HOTSPOTS; i++ ) if ( hotspots[i].rect.contains( me->pos() ) ) { if ( i != currentHotspot ) { - QString tip = tips[hotspots[i].number]; - QToolTip::remove( this ); - QToolTip::add( this, tip ); + TQString tip = tips[hotspots[i].number]; + TQToolTip::remove( this ); + TQToolTip::add( this, tip ); currentHotspot = i; } return; } - QToolTip::remove( this ); + TQToolTip::remove( this ); } -void WidgetCanvas::dropEvent( QDropEvent *e) +void WidgetCanvas::dropEvent( TQDropEvent *e) { - QColor c; + TQColor c; if (KColorDrag::decode( e, c)) { for ( int i = 0; i < MAX_HOTSPOTS; i++ ) if ( hotspots[i].rect.contains( e->pos() ) ) { @@ -99,17 +99,17 @@ void WidgetCanvas::dropEvent( QDropEvent *e) } -void WidgetCanvas::dragEnterEvent( QDragEnterEvent *e) +void WidgetCanvas::dragEnterEvent( TQDragEnterEvent *e) { e->accept( KColorDrag::canDecode( e)); } -void WidgetCanvas::paletteChange(const QPalette &) +void WidgetCanvas::paletteChange(const TQPalette &) { drawSampleWidgets(); } -void WidgetCanvas::resizeEvent(QResizeEvent *) +void WidgetCanvas::resizeEvent(TQResizeEvent *) { drawSampleWidgets(); } @@ -118,13 +118,13 @@ void WidgetCanvas::resizeEvent(QResizeEvent *) * This is necessary because otherwise the scrollbar in drawSampleWidgets() * doesn't show the first time. */ -void WidgetCanvas::showEvent(QShowEvent *) +void WidgetCanvas::showEvent(TQShowEvent *) { drawSampleWidgets(); } -void WidgetCanvas::resetTitlebarPixmaps(const QColor &actMed, - const QColor &disMed) +void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed, + const TQColor &disMed) { if(close_pix) delete close_pix; if(maximize_pix) delete maximize_pix; @@ -142,133 +142,133 @@ void WidgetCanvas::resetTitlebarPixmaps(const QColor &actMed, if(dis_pindown_pix) delete dis_pindown_pix; if(dis_menu_pix) delete dis_menu_pix; - QPainter pact, pdis; - QBitmap bitmap; - QColor actHigh = actMed.light(150); - QColor actLow = actMed.dark(120); - QColor disHigh = disMed.light(150); - QColor disLow = disMed.dark(120); + TQPainter pact, pdis; + TQBitmap bitmap; + TQColor actHigh = actMed.light(150); + TQColor actLow = actMed.dark(120); + TQColor disHigh = disMed.light(150); + TQColor disLow = disMed.dark(120); - close_pix = new QPixmap(16, 16); - dis_close_pix = new QPixmap(16, 16); + close_pix = new TQPixmap(16, 16); + dis_close_pix = new TQPixmap(16, 16); pact.begin(close_pix); pdis.begin(dis_close_pix); - bitmap = QBitmap(16, 16, close_white_bits, true); + bitmap = TQBitmap(16, 16, close_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, close_dgray_bits, true); + bitmap = TQBitmap(16, 16, close_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, close_mask_bits, true); + bitmap = TQBitmap(16, 16, close_mask_bits, true); close_pix->setMask(bitmap); dis_close_pix->setMask(bitmap); - minimize_pix = new QPixmap(16, 16); - dis_minimize_pix = new QPixmap(16, 16); + minimize_pix = new TQPixmap(16, 16); + dis_minimize_pix = new TQPixmap(16, 16); pact.begin(minimize_pix); pdis.begin(dis_minimize_pix); - bitmap = QBitmap(16, 16, iconify_white_bits, true); + bitmap = TQBitmap(16, 16, iconify_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, iconify_dgray_bits, true); + bitmap = TQBitmap(16, 16, iconify_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, iconify_mask_bits, true); + bitmap = TQBitmap(16, 16, iconify_mask_bits, true); minimize_pix->setMask(bitmap); dis_minimize_pix->setMask(bitmap); - maximize_pix = new QPixmap(16, 16); - dis_maximize_pix = new QPixmap(16, 16); + maximize_pix = new TQPixmap(16, 16); + dis_maximize_pix = new TQPixmap(16, 16); pact.begin(maximize_pix); pdis.begin(dis_maximize_pix); - bitmap = QBitmap(16, 16, maximize_white_bits, true); + bitmap = TQBitmap(16, 16, maximize_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, maximize_dgray_bits, true); + bitmap = TQBitmap(16, 16, maximize_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, maximize_mask_bits, true); + bitmap = TQBitmap(16, 16, maximize_mask_bits, true); maximize_pix->setMask(bitmap); dis_maximize_pix->setMask(bitmap); - normalize_pix = new QPixmap(16, 16); - dis_normalize_pix = new QPixmap(16, 16); + normalize_pix = new TQPixmap(16, 16); + dis_normalize_pix = new TQPixmap(16, 16); pact.begin(normalize_pix); pdis.begin(dis_normalize_pix); - bitmap = QBitmap(16, 16, maximizedown_white_bits, true); + bitmap = TQBitmap(16, 16, maximizedown_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, maximizedown_dgray_bits, true); + bitmap = TQBitmap(16, 16, maximizedown_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, maximizedown_mask_bits, true); + bitmap = TQBitmap(16, 16, maximizedown_mask_bits, true); normalize_pix->setMask(bitmap); dis_normalize_pix->setMask(bitmap); - menu_pix = new QPixmap(16, 16); - dis_menu_pix = new QPixmap(16, 16); + menu_pix = new TQPixmap(16, 16); + dis_menu_pix = new TQPixmap(16, 16); pact.begin(menu_pix); pdis.begin(dis_menu_pix); - bitmap = QBitmap(16, 16, menu_white_bits, true); + bitmap = TQBitmap(16, 16, menu_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, menu_dgray_bits, true); + bitmap = TQBitmap(16, 16, menu_dgray_bits, true); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, menu_mask_bits, true); + bitmap = TQBitmap(16, 16, menu_mask_bits, true); menu_pix->setMask(bitmap); dis_menu_pix->setMask(bitmap); - pinup_pix = new QPixmap(16, 16); - dis_pinup_pix = new QPixmap(16, 16); + pinup_pix = new TQPixmap(16, 16); + dis_pinup_pix = new TQPixmap(16, 16); pact.begin(pinup_pix); pdis.begin(dis_pinup_pix); - bitmap = QBitmap(16, 16, pinup_white_bits, true); + bitmap = TQBitmap(16, 16, pinup_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, pinup_gray_bits, true); + bitmap = TQBitmap(16, 16, pinup_gray_bits, true); pact.setPen(actMed); pdis.setPen(disMed); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, pinup_dgray_bits, true); + bitmap = TQBitmap(16, 16, pinup_dgray_bits, true); bitmap.setMask(bitmap); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, pinup_mask_bits, true); + bitmap = TQBitmap(16, 16, pinup_mask_bits, true); pinup_pix->setMask(bitmap); dis_pinup_pix->setMask(bitmap); - pindown_pix = new QPixmap(16, 16); - dis_pindown_pix = new QPixmap(16, 16); + pindown_pix = new TQPixmap(16, 16); + dis_pindown_pix = new TQPixmap(16, 16); pact.begin(pindown_pix); pdis.begin(dis_pindown_pix); - bitmap = QBitmap(16, 16, pindown_white_bits, true); + bitmap = TQBitmap(16, 16, pindown_white_bits, true); bitmap.setMask(bitmap); pact.setPen(actHigh); pdis.setPen(disHigh); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, pindown_gray_bits, true); + bitmap = TQBitmap(16, 16, pindown_gray_bits, true); pact.setPen(actMed); pdis.setPen(disMed); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); - bitmap = QBitmap(16, 16, pindown_dgray_bits, true); + bitmap = TQBitmap(16, 16, pindown_dgray_bits, true); bitmap.setMask(bitmap); pact.setPen(actLow); pdis.setPen(disLow); pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = QBitmap(16, 16, pindown_mask_bits, true); + bitmap = TQBitmap(16, 16, pindown_mask_bits, true); pindown_pix->setMask(bitmap); dis_pindown_pix->setMask(bitmap); } @@ -282,15 +282,15 @@ void WidgetCanvas::drawSampleWidgets() // Keep in sync with kglobalsettings. - QFont windowFontGuess(KGlobalSettings::generalFont().family(), 12, QFont::SansSerif, true); + TQFont windowFontGuess(KGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true); windowFontGuess.setPixelSize(12); c->setGroup("WM"); - QFont windowFont = c->readFontEntry("activeFont", &windowFontGuess); + TQFont windowFont = c->readFontEntry("activeFont", &windowFontGuess); c->setGroup("General"); - QFont defaultMenuFont = KGlobalSettings::menuFont(); - QFont menuFont = c->readFontEntry("menuFont", &defaultMenuFont); + TQFont defaultMenuFont = KGlobalSettings::menuFont(); + TQFont menuFont = c->readFontEntry("menuFont", &defaultMenuFont); delete c; c = 0; @@ -301,7 +301,7 @@ void WidgetCanvas::drawSampleWidgets() highlightVal=100+(2*contrast+4)*16/10; lowlightVal=100+(2*contrast+4)*10; - QColorGroup cg( txt, back, + TQColorGroup cg( txt, back, back.light(highlightVal), back.dark(lowlightVal), back.dark(120), @@ -309,26 +309,26 @@ void WidgetCanvas::drawSampleWidgets() // We will need this brush. - QBrush brush(SolidPattern); + TQBrush brush(SolidPattern); brush.setColor( back ); // Create a scrollbar and redirect drawing into a temp. pixmap to save a // lot of fiddly drawing later. - QScrollBar *vertScrollBar = new QScrollBar( QScrollBar::Vertical, this ); - // TODO: vertScrollBar->setStyle( new QMotifStyle() ); + TQScrollBar *vertScrollBar = new TQScrollBar( TQScrollBar::Vertical, this ); + // TODO: vertScrollBar->setStyle( new TQMotifStyle() ); vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height()); vertScrollBar->setRange( 0, 0 ); - vertScrollBar->setPalette( QPalette(cg,cg,cg)); + vertScrollBar->setPalette( TQPalette(cg,cg,cg)); vertScrollBar->show(); - QPixmap pm( vertScrollBar->width(), vertScrollBar->height() ); + TQPixmap pm( vertScrollBar->width(), vertScrollBar->height() ); pm.fill( back ); #ifndef __osf__ - QPainter::redirect( vertScrollBar, &pm ); + TQPainter::redirect( vertScrollBar, &pm ); #endif vertScrollBar->repaint(); - QPainter::redirect( vertScrollBar, 0 ); + TQPainter::redirect( vertScrollBar, 0 ); vertScrollBar->hide(); // Reset the titlebar pixmaps @@ -342,7 +342,7 @@ void WidgetCanvas::drawSampleWidgets() // Actually start painting in - QPainter paint( &smplw ); + TQPainter paint( &smplw ); // Inactive window @@ -377,19 +377,19 @@ void WidgetCanvas::drawSampleWidgets() int spot = 0; hotspots[ spot++ ] = - HotSpot( QRect( 65, 25-14, textLen, 14 ), CSM_Inactive_title_text ); + HotSpot( TQRect( 65, 25-14, textLen, 14 ), CSM_Inactive_title_text ); hotspots[ spot++ ] = - HotSpot( QRect( 60, 10, (width()-160)/2, 20 ), CSM_Inactive_title_bar ); + HotSpot( TQRect( 60, 10, (width()-160)/2, 20 ), CSM_Inactive_title_bar ); hotspots[ spot++ ] = - HotSpot( QRect( 60+(width()-160)/2, 10, + HotSpot( TQRect( 60+(width()-160)/2, 10, (width()-160)/2, 20 ), CSM_Inactive_title_blend ); hotspots[spot++] = - HotSpot(QRect(20, 12, 40, 20), CSM_Inactive_title_button); + HotSpot(TQRect(20, 12, 40, 20), CSM_Inactive_title_button); hotspots[spot++] = - HotSpot(QRect(tmp, 12, 60, 20), CSM_Inactive_title_button); + HotSpot(TQRect(tmp, 12, 60, 20), CSM_Inactive_title_button); // Active window @@ -420,44 +420,44 @@ void WidgetCanvas::drawSampleWidgets() paint.drawPixmap(tmp+42, 35, *close_pix); hotspots[ spot++ ] = - HotSpot( QRect( 75, 50-14, textLen, 14 ), CSM_Active_title_text); + HotSpot( TQRect( 75, 50-14, textLen, 14 ), CSM_Active_title_text); hotspots[ spot ++] = - HotSpot( QRect( 65, 35, (width()-152)/2, 20 ), CSM_Active_title_bar ); + HotSpot( TQRect( 65, 35, (width()-152)/2, 20 ), CSM_Active_title_bar ); hotspots[ spot ++] = - HotSpot( QRect( 65+(width()-152)/2, 35, + HotSpot( TQRect( 65+(width()-152)/2, 35, (width()-152)/2, 20 ), CSM_Active_title_blend ); hotspots[spot++] = - HotSpot(QRect(25, 35, 40, 20), CSM_Active_title_button); + HotSpot(TQRect(25, 35, 40, 20), CSM_Active_title_button); hotspots[spot++] = - HotSpot(QRect(tmp, 35, 60, 20), CSM_Active_title_button); + HotSpot(TQRect(tmp, 35, 60, 20), CSM_Active_title_button); // Menu bar //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush); - kapp->style().drawPrimitive(QStyle::PE_PanelMenuBar, &paint, - QRect(QPoint(25, 55), QSize(width()-52, 28)), cg); + kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, + TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg); paint.setFont( menuFont ); paint.setPen(txt ); - QString file = i18n("File"); + TQString file = i18n("File"); textLen = paint.fontMetrics().width( file ); //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush); - kapp->style().drawPrimitive(QStyle::PE_Panel, &paint, - QRect(30, 59, textLen + 10, 21), cg); + kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint, + TQRect(30, 59, textLen + 10, 21), cg); paint.drawText( 35, 74, file ); hotspots[ spot++ ] = - HotSpot( QRect( 35, 62, textLen, 14 ), CSM_Text ); + HotSpot( TQRect( 35, 62, textLen, 14 ), CSM_Text ); hotspots[ spot++ ] = - HotSpot( QRect( 27, 57, 33, 21 ), CSM_Background ); + HotSpot( TQRect( 27, 57, 33, 21 ), CSM_Background ); paint.setFont( menuFont ); paint.setPen( txt ); paint.drawText( 35 + textLen + 20, 74, i18n("Edit") ); textLen = paint.fontMetrics().width( i18n("Edit") ); - hotspots[ spot++ ] = HotSpot( QRect( 35 + textLen + 20, 62, textLen, 14 ), CSM_Text ); + hotspots[ spot++ ] = HotSpot( TQRect( 35 + textLen + 20, 62, textLen, 14 ), CSM_Text ); // Button Rects need to go before window @@ -468,7 +468,7 @@ void WidgetCanvas::drawSampleWidgets() height(), cg, TRUE, 2, &brush); // Standard text - QFont fnt = KGlobalSettings::generalFont(); + TQFont fnt = KGlobalSettings::generalFont(); paint.setFont( fnt ); paint.setPen( windowTxt ); paint.drawText( 140, 127-20, i18n( "Standard text") ); @@ -476,7 +476,7 @@ void WidgetCanvas::drawSampleWidgets() int column2 = 120 + textLen + 40 + 16; hotspots[ spot++ ] = - HotSpot( QRect( 140, 113-20, textLen, 14 ), CSM_Standard_text ); + HotSpot( TQRect( 140, 113-20, textLen, 14 ), CSM_Standard_text ); // Selected text textLen = paint.fontMetrics().width( i18n("Selected text") ); @@ -491,9 +491,9 @@ void WidgetCanvas::drawSampleWidgets() paint.drawText( 140, 135, i18n( "Selected text") ); hotspots[ spot++ ] = - HotSpot( QRect( 140, 121, textLen, 14 ), CSM_Select_text ); + HotSpot( TQRect( 140, 121, textLen, 14 ), CSM_Select_text ); hotspots[ spot++ ] = - HotSpot( QRect( 120, 115, textLen+40, 32), CSM_Select_background ); // select bg + HotSpot( TQRect( 120, 115, textLen+40, 32), CSM_Select_background ); // select bg // Link paint.setPen( link ); @@ -502,7 +502,7 @@ void WidgetCanvas::drawSampleWidgets() paint.drawLine( column2+18, 109, column2+18+textLen, 109); hotspots[ spot++ ] = - HotSpot( QRect( column2+18, 113-20, textLen, 17 ), CSM_Link ); + HotSpot( TQRect( column2+18, 113-20, textLen, 17 ), CSM_Link ); int column3 = column2 + 25 + textLen; // Followed Link @@ -512,24 +512,24 @@ void WidgetCanvas::drawSampleWidgets() paint.drawLine( column3, 109, column3+textLen, 109); hotspots[ spot++ ] = - HotSpot( QRect( column3, 113-20, textLen, 17 ), CSM_Followed_Link ); + HotSpot( TQRect( column3, 113-20, textLen, 17 ), CSM_Followed_Link ); // Button int xpos = column2; int ypos = 115 + 2; textLen = paint.fontMetrics().width(i18n("Push Button")); hotspots[ spot++ ] = - HotSpot( QRect(xpos+16, ypos+((28-paint.fontMetrics().height())/2), + HotSpot( TQRect(xpos+16, ypos+((28-paint.fontMetrics().height())/2), textLen, paint.fontMetrics().height()), CSM_Button_text ); hotspots[ spot++ ] = - HotSpot( QRect(xpos, ypos, textLen+32, 28), CSM_Button_background ); + HotSpot( TQRect(xpos, ypos, textLen+32, 28), CSM_Button_background ); //brush.setColor( button ); - QColorGroup cg2(cg); - cg2.setColor(QColorGroup::Button, button); - cg2.setColor(QColorGroup::Background, window); + TQColorGroup cg2(cg); + cg2.setColor(TQColorGroup::Button, button); + cg2.setColor(TQColorGroup::Background, window); //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush); - kapp->style().drawPrimitive(QStyle::PE_ButtonCommand, &paint, - QRect(xpos, ypos, textLen+32, 28), cg2, QStyle::Style_Enabled | QStyle::Style_Raised); + kapp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint, + TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised); paint.setPen(buttonTxt); paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter, i18n("Push Button")); @@ -547,20 +547,20 @@ void WidgetCanvas::drawSampleWidgets() textLenNew = paint.fontMetrics().width( i18n("New") ); hotspots[ spot++ ] = - HotSpot( QRect( 56, 83, textLenNew, 14 ), CSM_Text ); + HotSpot( TQRect( 56, 83, textLenNew, 14 ), CSM_Text ); paint.setFont( menuFont ); textLenOpen = paint.fontMetrics().width( i18n("Menu item", "Open") ); hotspots[ spot++ ] = - HotSpot( QRect( 56, 105, textLenOpen, 14 ), CSM_Text ); + HotSpot( TQRect( 56, 105, textLenOpen, 14 ), CSM_Text ); paint.setFont( menuFont ); textLenSave = paint.fontMetrics().width( i18n("Menu item", "Save") ); - QPopupMenu *popup = new QPopupMenu( this ); + TQPopupMenu *popup = new TQPopupMenu( this ); popup->setFont( menuFont ); - popup->setPalette( QPalette(cg,cg,cg)); + popup->setPalette( TQPalette(cg,cg,cg)); popup->insertItem(i18n("New")); popup->insertItem(i18n("Menu item", "Open")); int id = popup->insertItem(i18n("Menu item", "Save")); @@ -571,15 +571,15 @@ void WidgetCanvas::drawSampleWidgets() //popup->sizeHint(); // Breaks with Qt 3.3 popup->resize(popup->sizeHint()); - pm = QPixmap::grabWidget( popup ); + pm = TQPixmap::grabWidget( popup ); delete popup; bitBlt(&smplw, 30, 80, &pm, 0, 0, pm.width(), pm.height()); hotspots[ spot++ ] = - HotSpot( QRect( 28, 78, 88, 77 ), CSM_Background ); + HotSpot( TQRect( 28, 78, 88, 77 ), CSM_Background ); hotspots[ spot++ ] = - HotSpot( QRect(25, 80+5-4, width()-7-45-2-16, height()), CSM_Standard_background ); + HotSpot( TQRect(25, 80+5-4, width()-7-45-2-16, height()), CSM_Standard_background ); // Valance @@ -590,7 +590,7 @@ void WidgetCanvas::drawSampleWidgets() // Stop the painting hotspots[ spot++ ] = - HotSpot( QRect( 0, 0, width(), height() ), CSM_Background ); // ? + HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? repaint( FALSE ); } diff --git a/kcontrol/colors/widgetcanvas.h b/kcontrol/colors/widgetcanvas.h index e2f9bd057..4e78d599e 100644 --- a/kcontrol/colors/widgetcanvas.h +++ b/kcontrol/colors/widgetcanvas.h @@ -8,7 +8,7 @@ #ifndef __WIDGETCANVAS_H__ #define __WIDGETCANVAS_H__ -#include <qmap.h> +#include <tqmap.h> #include <kapplication.h> #define MAX_HOTSPOTS 28 @@ -51,10 +51,10 @@ class HotSpot { public: HotSpot() {} - HotSpot( const QRect &r, int num ) + HotSpot( const TQRect &r, int num ) : rect(r), number(num) {} - QRect rect; + TQRect rect; int number; }; @@ -63,57 +63,57 @@ class WidgetCanvas : public QWidget Q_OBJECT public: - WidgetCanvas( QWidget *parent=0, const char *name=0 ); + WidgetCanvas( TQWidget *parent=0, const char *name=0 ); void drawSampleWidgets(); - void resetTitlebarPixmaps(const QColor &active, - const QColor &inactive); - void addToolTip( int area, const QString & ); - QPixmap smplw; + void resetTitlebarPixmaps(const TQColor &active, + const TQColor &inactive); + void addToolTip( int area, const TQString & ); + TQPixmap smplw; - QColor iaTitle; - QColor iaTxt; - QColor iaBlend; - QColor iaFrame; - QColor iaHandle; - QColor aTitle; - QColor aTxt; - QColor aBlend; - QColor aFrame; - QColor aHandle; - QColor back; - QColor txt; - QColor select; - QColor selectTxt; - QColor window; - QColor windowTxt; - QColor button; - QColor buttonTxt; - QColor aTitleBtn; - QColor iTitleBtn; - QColor link; - QColor visitedLink; - QColor alternateBackground; + TQColor iaTitle; + TQColor iaTxt; + TQColor iaBlend; + TQColor iaFrame; + TQColor iaHandle; + TQColor aTitle; + TQColor aTxt; + TQColor aBlend; + TQColor aFrame; + TQColor aHandle; + TQColor back; + TQColor txt; + TQColor select; + TQColor selectTxt; + TQColor window; + TQColor windowTxt; + TQColor button; + TQColor buttonTxt; + TQColor aTitleBtn; + TQColor iTitleBtn; + TQColor link; + TQColor visitedLink; + TQColor alternateBackground; int contrast; bool shadeSortColumn; signals: void widgetSelected( int ); - void colorDropped( int, const QColor&); + void colorDropped( int, const TQColor&); protected: - void redrawPopup(const QColorGroup &cg); + void redrawPopup(const TQColorGroup &cg); - virtual void paintEvent( QPaintEvent * ); - virtual void mousePressEvent( QMouseEvent * ); - virtual void mouseMoveEvent( QMouseEvent * ); - virtual void resizeEvent( QResizeEvent * ); - virtual void showEvent( QShowEvent * ); - virtual void dropEvent( QDropEvent *); - virtual void dragEnterEvent( QDragEnterEvent *); - void paletteChange( const QPalette & ); + virtual void paintEvent( TQPaintEvent * ); + virtual void mousePressEvent( TQMouseEvent * ); + virtual void mouseMoveEvent( TQMouseEvent * ); + virtual void resizeEvent( TQResizeEvent * ); + virtual void showEvent( TQShowEvent * ); + virtual void dropEvent( TQDropEvent *); + virtual void dragEnterEvent( TQDragEnterEvent *); + void paletteChange( const TQPalette & ); - QMap<int,QString> tips; + TQMap<int,TQString> tips; HotSpot hotspots[MAX_HOTSPOTS]; int currentHotspot; }; diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index 792b250a0..88fdeb165 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -19,11 +19,11 @@ #include "componentchooser.h" #include "componentchooser.moc" -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qwidgetstack.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqwidgetstack.h> #include <dcopclient.h> @@ -41,23 +41,23 @@ class MyListBoxItem: public QListBoxText { public: - MyListBoxItem(const QString& text, const QString &file):QListBoxText(text),File(file){} + MyListBoxItem(const TQString& text, const TQString &file):TQListBoxText(text),File(file){} virtual ~MyListBoxItem(){;} - QString File; + TQString File; }; //BEGIN General kpart based Component selection -CfgComponent::CfgComponent(QWidget *parent):ComponentConfig_UI(parent),CfgPlugin(){ +CfgComponent::CfgComponent(TQWidget *parent):ComponentConfig_UI(parent),CfgPlugin(){ m_lookupDict.setAutoDelete(true); m_revLookupDict.setAutoDelete(true); - connect(ComponentSelector,SIGNAL(activated(const QString&)),this,SLOT(slotComponentChanged(const QString&))); + connect(ComponentSelector,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(slotComponentChanged(const TQString&))); } CfgComponent::~CfgComponent(){} -void CfgComponent::slotComponentChanged(const QString&) { +void CfgComponent::slotComponentChanged(const TQString&) { emit changed(true); } @@ -66,7 +66,7 @@ void CfgComponent::save(KConfig *cfg) { if (!m_lookupDict[ComponentSelector->currentText()]) return; - QString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); + TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null")); store->setGroup(cfg->readEntry("valueSection")); store->writePathEntry(cfg->readEntry("valueName","kcm_componenchooser_null"),*m_lookupDict[ComponentSelector->currentText()]); @@ -81,24 +81,24 @@ void CfgComponent::load(KConfig *cfg) { m_lookupDict.clear(); m_revLookupDict.clear(); - QString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); + TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); - QString MimeTypeOfInterest=cfg->readEntry("MimeTypeOfInterest"); + TQString MimeTypeOfInterest=cfg->readEntry("MimeTypeOfInterest"); KTrader::OfferList offers = KTrader::self()->query(MimeTypeOfInterest, "'"+ServiceTypeToConfigure+"' in ServiceTypes"); for (KTrader::OfferList::Iterator tit = offers.begin(); tit != offers.end(); ++tit) { ComponentSelector->insertItem((*tit)->name()); - m_lookupDict.insert((*tit)->name(),new QString((*tit)->desktopEntryName())); - m_revLookupDict.insert((*tit)->desktopEntryName(),new QString((*tit)->name())); + m_lookupDict.insert((*tit)->name(),new TQString((*tit)->desktopEntryName())); + m_revLookupDict.insert((*tit)->desktopEntryName(),new TQString((*tit)->name())); } KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null")); store->setGroup(cfg->readEntry("valueSection")); - QString setting=store->readEntry(cfg->readEntry("valueName","kcm_componenchooser_null")); + TQString setting=store->readEntry(cfg->readEntry("valueName","kcm_componenchooser_null")); delete store; if (setting.isEmpty()) setting=cfg->readEntry("defaultImplementation"); - QString *tmp=m_revLookupDict[setting]; + TQString *tmp=m_revLookupDict[setting]; if (tmp) for (int i=0;i<ComponentSelector->count();i++) if ((*tmp)==ComponentSelector->text(i)) @@ -122,12 +122,12 @@ void CfgComponent::defaults() //BEGIN Email client config -CfgEmailClient::CfgEmailClient(QWidget *parent):EmailClientConfig_UI(parent),CfgPlugin(){ +CfgEmailClient::CfgEmailClient(TQWidget *parent):EmailClientConfig_UI(parent),CfgPlugin(){ pSettings = new KEMailSettings(); - connect(kmailCB, SIGNAL(toggled(bool)), SLOT(configChanged()) ); - connect(txtEMailClient, SIGNAL(textChanged(const QString&)), SLOT(configChanged()) ); - connect(chkRunTerminal, SIGNAL(clicked()), SLOT(configChanged()) ); + connect(kmailCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) ); + connect(txtEMailClient, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()) ); + connect(chkRunTerminal, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); } CfgEmailClient::~CfgEmailClient() { @@ -141,7 +141,7 @@ void CfgEmailClient::defaults() void CfgEmailClient::load(KConfig *) { - QString emailClient = pSettings->getSetting(KEMailSettings::ClientProgram); + TQString emailClient = pSettings->getSetting(KEMailSettings::ClientProgram); bool useKMail = (emailClient.isEmpty()); kmailCB->setChecked(useKMail); @@ -162,16 +162,16 @@ void CfgEmailClient::configChanged() void CfgEmailClient::selectEmailClient() { KURL::List urlList; - KOpenWithDlg dlg(urlList, i18n("Select preferred email client:"), QString::null, this); + KOpenWithDlg dlg(urlList, i18n("Select preferred email client:"), TQString::null, this); // hide "Do not &close when command exits" here, we don't need it for a mail client dlg.hideNoCloseOnExit(); - if (dlg.exec() != QDialog::Accepted) return; - QString client = dlg.text(); + if (dlg.exec() != TQDialog::Accepted) return; + TQString client = dlg.text(); // get the preferred Terminal Application - KConfigGroup confGroup( KGlobal::config(), QString::fromLatin1("General") ); - QString preferredTerminal = confGroup.readPathEntry("TerminalApplication", QString::fromLatin1("konsole")); - preferredTerminal += QString::fromLatin1(" -e "); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + preferredTerminal += TQString::fromLatin1(" -e "); int len = preferredTerminal.length(); bool b = client.left(len) == preferredTerminal; @@ -188,7 +188,7 @@ void CfgEmailClient::save(KConfig *) { if (kmailCB->isChecked()) { - pSettings->setSetting(KEMailSettings::ClientProgram, QString::null); + pSettings->setSetting(KEMailSettings::ClientProgram, TQString::null); pSettings->setSetting(KEMailSettings::ClientTerminal, "false"); } else @@ -198,11 +198,11 @@ void CfgEmailClient::save(KConfig *) } // insure proper permissions -- contains sensitive data - QString cfgName(KGlobal::dirs()->findResource("config", "emails")); + TQString cfgName(KGlobal::dirs()->findResource("config", "emails")); if (!cfgName.isEmpty()) - ::chmod(QFile::encodeName(cfgName), 0600); + ::chmod(TQFile::encodeName(cfgName), 0600); - kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", QByteArray()); + kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray()); emit changed(false); } @@ -214,10 +214,10 @@ void CfgEmailClient::save(KConfig *) //BEGIN Terminal Emulator Configuration -CfgTerminalEmulator::CfgTerminalEmulator(QWidget *parent):TerminalEmulatorConfig_UI(parent),CfgPlugin(){ - connect(terminalLE,SIGNAL(textChanged(const QString &)), this, SLOT(configChanged())); - connect(terminalCB,SIGNAL(toggled(bool)),this,SLOT(configChanged())); - connect(otherCB,SIGNAL(toggled(bool)),this,SLOT(configChanged())); +CfgTerminalEmulator::CfgTerminalEmulator(TQWidget *parent):TerminalEmulatorConfig_UI(parent),CfgPlugin(){ + connect(terminalLE,TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(configChanged())); + connect(terminalCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); + connect(otherCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); } CfgTerminalEmulator::~CfgTerminalEmulator() { @@ -237,7 +237,7 @@ void CfgTerminalEmulator::defaults() void CfgTerminalEmulator::load(KConfig *) { KConfig *config = new KConfig("kdeglobals", true); config->setGroup("General"); - QString terminal = config->readPathEntry("TerminalApplication","konsole"); + TQString terminal = config->readPathEntry("TerminalApplication","konsole"); if (terminal == "konsole") { terminalLE->setText("xterm"); @@ -262,7 +262,7 @@ void CfgTerminalEmulator::save(KConfig *) { delete config; KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("klauncher", "klauncher","reparseConfiguration()", QString::null); + kapp->dcopClient()->send("klauncher", "klauncher","reparseConfiguration()", TQString::null); emit changed(false); } @@ -270,11 +270,11 @@ void CfgTerminalEmulator::save(KConfig *) { void CfgTerminalEmulator::selectTerminalApp() { KURL::List urlList; - KOpenWithDlg dlg(urlList, i18n("Select preferred terminal application:"), QString::null, this); + KOpenWithDlg dlg(urlList, i18n("Select preferred terminal application:"), TQString::null, this); // hide "Run in &terminal" here, we don't need it for a Terminal Application dlg.hideRunInTerminal(); - if (dlg.exec() != QDialog::Accepted) return; - QString client = dlg.text(); + if (dlg.exec() != TQDialog::Accepted) return; + TQString client = dlg.text(); if (!client.isEmpty()) { @@ -286,10 +286,10 @@ void CfgTerminalEmulator::selectTerminalApp() //BEGIN Browser Configuration -CfgBrowser::CfgBrowser(QWidget *parent) : BrowserConfig_UI(parent),CfgPlugin(){ - connect(lineExec,SIGNAL(textChanged(const QString &)),this,SLOT(configChanged())); - connect(radioKIO,SIGNAL(toggled(bool)),this,SLOT(configChanged())); - connect(radioExec,SIGNAL(toggled(bool)),this,SLOT(configChanged())); +CfgBrowser::CfgBrowser(TQWidget *parent) : BrowserConfig_UI(parent),CfgPlugin(){ + connect(lineExec,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(configChanged())); + connect(radioKIO,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); + connect(radioExec,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); } CfgBrowser::~CfgBrowser() { @@ -309,7 +309,7 @@ void CfgBrowser::defaults() void CfgBrowser::load(KConfig *) { KConfig *config = new KConfig("kdeglobals", true); config->setGroup("General"); - QString exec = config->readEntry("BrowserApplication"); + TQString exec = config->readEntry("BrowserApplication"); if (exec.isEmpty()) { radioKIO->setChecked(true); @@ -330,7 +330,7 @@ void CfgBrowser::load(KConfig *) { if (m_browserService) m_browserExec = m_browserService->desktopEntryName(); else - m_browserExec = QString::null; + m_browserExec = TQString::null; } } @@ -344,7 +344,7 @@ void CfgBrowser::save(KConfig *) { KConfig *config = new KConfig("kdeglobals"); config->setGroup("General"); - QString exec; + TQString exec; if (radioExec->isChecked()) { exec = lineExec->text(); @@ -365,8 +365,8 @@ void CfgBrowser::save(KConfig *) { void CfgBrowser::selectBrowser() { KURL::List urlList; - KOpenWithDlg dlg(urlList, i18n("Select preferred Web browser application:"), QString::null, this); - if (dlg.exec() != QDialog::Accepted) return; + KOpenWithDlg dlg(urlList, i18n("Select preferred Web browser application:"), TQString::null, this); + if (dlg.exec() != TQDialog::Accepted) return; m_browserService = dlg.service(); if (m_browserService) m_browserExec = m_browserService->desktopEntryName(); @@ -378,16 +378,16 @@ void CfgBrowser::selectBrowser() //END Terminal Emulator Configuration -ComponentChooser::ComponentChooser(QWidget *parent, const char *name): +ComponentChooser::ComponentChooser(TQWidget *parent, const char *name): ComponentChooser_UI(parent,name), configWidget(0) { ComponentChooser_UILayout->setRowStretch(1, 1); somethingChanged=false; latestEditedService=""; - QStringList dummy; - QStringList services=KGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy); - for (QStringList::Iterator it=services.begin();it!=services.end();++it) + TQStringList dummy; + TQStringList services=KGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy); + for (TQStringList::Iterator it=services.begin();it!=services.end();++it) { KSimpleConfig cfg(*it); ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it))); @@ -395,17 +395,17 @@ ComponentChooser::ComponentChooser(QWidget *parent, const char *name): } ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width()); ServiceChooser->sort(); - connect(ServiceChooser,SIGNAL(highlighted(QListBoxItem*)),this,SLOT(slotServiceSelected(QListBoxItem*))); + connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*))); ServiceChooser->setSelected(0,true); slotServiceSelected(ServiceChooser->item(0)); } -void ComponentChooser::slotServiceSelected(QListBoxItem* it) { +void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { if (!it) return; if (somethingChanged) { - if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice. Do you want to save that change now?</qt>"),QString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save(); + if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice. Do you want to save that change now?</qt>"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save(); } KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File); @@ -413,8 +413,8 @@ void ComponentChooser::slotServiceSelected(QListBoxItem* it) { ComponentDescription->setMinimumSize(ComponentDescription->sizeHint()); - QString cfgType=cfg.readEntry("configurationType"); - QWidget *newConfigWidget = 0; + TQString cfgType=cfg.readEntry("configurationType"); + TQWidget *newConfigWidget = 0; if (cfgType.isEmpty() || (cfgType=="component")) { if (!(configWidget && configWidget->qt_cast("CfgComponent"))) @@ -460,7 +460,7 @@ void ComponentChooser::slotServiceSelected(QListBoxItem* it) { configContainer->removeWidget(configWidget); delete configWidget; configWidget=newConfigWidget; - connect(configWidget,SIGNAL(changed(bool)),this,SLOT(emitChanged(bool))); + connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool))); configContainer->setMinimumSize(configWidget->sizeHint()); } diff --git a/kcontrol/componentchooser/componentchooser.h b/kcontrol/componentchooser/componentchooser.h index fdb863344..1ac405489 100644 --- a/kcontrol/componentchooser/componentchooser.h +++ b/kcontrol/componentchooser/componentchooser.h @@ -21,8 +21,8 @@ #include "emailclientconfig_ui.h" #include "terminalemulatorconfig_ui.h" #include "browserconfig_ui.h" -#include <qdict.h> -#include <qstring.h> +#include <tqdict.h> +#include <tqstring.h> #include <kservice.h> @@ -48,17 +48,17 @@ class CfgComponent: public ComponentConfig_UI,public CfgPlugin { Q_OBJECT public: - CfgComponent(QWidget *parent); + CfgComponent(TQWidget *parent); virtual ~CfgComponent(); virtual void load(KConfig *cfg); virtual void save(KConfig *cfg); virtual void defaults(); protected: - QDict<QString> m_lookupDict,m_revLookupDict; + TQDict<TQString> m_lookupDict,m_revLookupDict; protected slots: - void slotComponentChanged(const QString&); + void slotComponentChanged(const TQString&); signals: void changed(bool); }; @@ -68,7 +68,7 @@ class CfgEmailClient: public EmailClientConfig_UI,public CfgPlugin { Q_OBJECT public: - CfgEmailClient(QWidget *parent); + CfgEmailClient(TQWidget *parent); virtual ~CfgEmailClient(); virtual void load(KConfig *cfg); virtual void save(KConfig *cfg); @@ -88,7 +88,7 @@ class CfgTerminalEmulator: public TerminalEmulatorConfig_UI,public CfgPlugin { Q_OBJECT public: - CfgTerminalEmulator(QWidget *parent); + CfgTerminalEmulator(TQWidget *parent); virtual ~CfgTerminalEmulator(); virtual void load(KConfig *cfg); virtual void save(KConfig *cfg); @@ -106,7 +106,7 @@ class CfgBrowser: public BrowserConfig_UI,public CfgPlugin { Q_OBJECT public: - CfgBrowser(QWidget *parent); + CfgBrowser(TQWidget *parent); virtual ~CfgBrowser(); virtual void load(KConfig *cfg); virtual void save(KConfig *cfg); @@ -119,7 +119,7 @@ protected slots: signals: void changed(bool); private: - QString m_browserExec; + TQString m_browserExec; KService::Ptr m_browserService; }; @@ -130,20 +130,20 @@ class ComponentChooser : public ComponentChooser_UI Q_OBJECT public: - ComponentChooser(QWidget *parent=0, const char *name=0); + ComponentChooser(TQWidget *parent=0, const char *name=0); virtual ~ComponentChooser(); void load(); void save(); void restoreDefault(); private: - QString latestEditedService; + TQString latestEditedService; bool somethingChanged; - QWidget *configWidget; - QVBoxLayout *myLayout; + TQWidget *configWidget; + TQVBoxLayout *myLayout; protected slots: void emitChanged(bool); - void slotServiceSelected(QListBoxItem *); + void slotServiceSelected(TQListBoxItem *); signals: void changed(bool); diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index 8e6ae7ba7..8bf1a026f 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <qlayout.h> +#include <tqlayout.h> #include <kaboutdata.h> #include <kglobal.h> @@ -22,12 +22,12 @@ #include "kcm_componentchooser.moc" -KCMComponentChooser::KCMComponentChooser( QWidget *parent, const char *name ): +KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ): KCModule(parent,name) { - (new QVBoxLayout(this))->setAutoAdd(true); + (new TQVBoxLayout(this))->setAutoAdd(true); m_chooser=new ComponentChooser(this,"ComponentChooser"); - connect(m_chooser,SIGNAL(changed(bool)),this,SIGNAL(changed(bool))); + connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool))); setButtons( Help | Apply ); KAboutData *about = @@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){ extern "C" { - KDE_EXPORT KCModule *create_componentchooser( QWidget *parent, const char * ) + KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * ) { KGlobal::locale()->insertCatalogue("kcmcomponentchooser"); return new KCMComponentChooser( parent, "kcmcomponentchooser" ); diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h index eac9ad055..72dab21ba 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.h +++ b/kcontrol/componentchooser/kcm_componentchooser.h @@ -26,7 +26,7 @@ class KCMComponentChooser : public KCModule { Q_OBJECT public: - KCMComponentChooser( QWidget *parent = 0, const char *name = 0 ); + KCMComponentChooser( TQWidget *parent = 0, const char *name = 0 ); void load(); void save(); diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp index 7c31bb84b..9c60d4f00 100644 --- a/kcontrol/crypto/certexport.cpp +++ b/kcontrol/crypto/certexport.cpp @@ -24,52 +24,52 @@ #endif #include "certexport.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <klineedit.h> #include <kfiledialog.h> -#include <qradiobutton.h> -#include <qvbuttongroup.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqradiobutton.h> +#include <tqvbuttongroup.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> #include <ksslall.h> -KCertExport::KCertExport(QWidget *parent, const char *name) +KCertExport::KCertExport(TQWidget *parent, const char *name) : KDialog(parent, name, true) { -QGridLayout *grid = new QGridLayout(this, 9, 6, marginHint(), spacingHint()); +TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint()); setCaption(i18n("X509 Certificate Export")); - QVButtonGroup *bg = new QVButtonGroup(i18n("Format"), this); - _pem = new QRadioButton(i18n("&PEM"), bg); - _netscape = new QRadioButton(i18n("&Netscape"), bg); - _der = new QRadioButton(i18n("&DER/ASN1"), bg); - _text = new QRadioButton(i18n("&Text"), bg); + TQVButtonGroup *bg = new TQVButtonGroup(i18n("Format"), this); + _pem = new TQRadioButton(i18n("&PEM"), bg); + _netscape = new TQRadioButton(i18n("&Netscape"), bg); + _der = new TQRadioButton(i18n("&DER/ASN1"), bg); + _text = new TQRadioButton(i18n("&Text"), bg); grid->addMultiCellWidget(bg, 0, 4, 0, 3); _pem->setChecked(true); - grid->addMultiCellWidget(new QLabel(i18n("Filename:"), this), 5, 5, 0, 3); + grid->addMultiCellWidget(new TQLabel(i18n("Filename:"), this), 5, 5, 0, 3); _filename = new KLineEdit(this); grid->addMultiCellWidget(_filename, 6, 6, 0, 4); - connect(_filename, SIGNAL(textChanged(const QString &)), this, SLOT(slotTextChanged(const QString &))); - connect(_filename, SIGNAL(returnPressed()), this, SLOT(slotExport())); + connect(_filename, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &))); + connect(_filename, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotExport())); - _choose = new QPushButton("...", this); + _choose = new TQPushButton("...", this); grid->addWidget(_choose, 6, 5); - connect(_choose, SIGNAL(clicked()), this, SLOT(slotChoose())); + connect(_choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChoose())); - _export = new QPushButton(i18n("&Export"), this); + _export = new TQPushButton(i18n("&Export"), this); grid->addWidget(_export, 8, 4); - connect(_export, SIGNAL(clicked()), this, SLOT(slotExport())); + connect(_export, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport())); _export->setEnabled(false); - _cancel = new QPushButton(i18n("&Cancel"), this); + _cancel = new TQPushButton(i18n("&Cancel"), this); grid->addWidget(_cancel, 8, 5); - connect(_cancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); } @@ -84,8 +84,8 @@ void KCertExport::setCertificate(KSSLCertificate *c) { void KCertExport::slotExport() { -QByteArray cert; -QString certt; +TQByteArray cert; +TQString certt; if (_filename->text().isEmpty()) return; @@ -110,7 +110,7 @@ QString certt; return; } - QFile outFile(_filename->text()); + TQFile outFile(_filename->text()); if (!outFile.open(IO_WriteOnly)) { KMessageBox::error(this, i18n("Error opening file for output."), i18n("SSL")); @@ -129,8 +129,8 @@ accept(); void KCertExport::slotChoose() { - //QString newFile = KFileDialog::getSaveFileName("::x509save", i18n("*.pem|Privacy Enhanced Mail Format\n*.der|DER/ASN1 Format")); - QString newFile = KFileDialog::getSaveFileName(QString::null, "application/x-x509-ca-cert"); + //TQString newFile = KFileDialog::getSaveFileName("::x509save", i18n("*.pem|Privacy Enhanced Mail Format\n*.der|DER/ASN1 Format")); + TQString newFile = KFileDialog::getSaveFileName(TQString::null, "application/x-x509-ca-cert"); // Dunno about this one yet // \n*.ncert|Netscape certificate files"); @@ -139,7 +139,7 @@ void KCertExport::slotChoose() { } -void KCertExport::slotTextChanged(const QString& x) { +void KCertExport::slotTextChanged(const TQString& x) { _export->setEnabled(!x.isEmpty()); } diff --git a/kcontrol/crypto/certexport.h b/kcontrol/crypto/certexport.h index 983cf0804..00721d109 100644 --- a/kcontrol/crypto/certexport.h +++ b/kcontrol/crypto/certexport.h @@ -33,7 +33,7 @@ class KCertExport : public KDialog { Q_OBJECT public: - KCertExport(QWidget *parent = 0L, const char *name = 0L); + KCertExport(TQWidget *parent = 0L, const char *name = 0L); virtual ~KCertExport(); void setCertificate(KSSLCertificate *c); @@ -41,11 +41,11 @@ public: protected slots: void slotExport(); void slotChoose(); - void slotTextChanged(const QString &); + void slotTextChanged(const TQString &); private: - QPushButton *_export, *_cancel, *_choose; - QRadioButton *_pem, *_netscape, *_der, *_text; + TQPushButton *_export, *_cancel, *_choose; + TQRadioButton *_pem, *_netscape, *_der, *_text; KLineEdit *_filename; KSSLCertificate *_c; diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index f5c4b0099..3f021285b 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -31,22 +31,22 @@ #include <pwd.h> #include <unistd.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qframe.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qregexp.h> -#include <qvbox.h> -#include <qvbuttongroup.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqframe.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqregexp.h> +#include <tqvbox.h> +#include <tqvbuttongroup.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> #include <kaboutdata.h> #include <kcombobox.h> @@ -93,18 +93,18 @@ using namespace KNetwork; -typedef KGenericFactory<KCryptoConfig, QWidget> KryptoFactory; +typedef KGenericFactory<KCryptoConfig, TQWidget> KryptoFactory; K_EXPORT_COMPONENT_FACTORY( kcm_crypto, KryptoFactory("kcmcrypto") ) -CipherItem::CipherItem( QListView *view, const QString& cipher, int bits, +CipherItem::CipherItem( TQListView *view, const TQString& cipher, int bits, int maxBits, KCryptoConfig *module ) - : QCheckListItem( view, QString::null, CheckBox ) + : TQCheckListItem( view, TQString::null, CheckBox ) { m_cipher = cipher; m_bits = bits; m_module = module; - QString tmp( i18n("%1 (%2 of %3 bits)") ); + TQString tmp( i18n("%1 (%2 of %3 bits)") ); setText( 0, tmp.arg( cipher ).arg( bits ).arg( maxBits )); } @@ -113,16 +113,16 @@ void CipherItem::stateChange( bool ) m_module->configChanged(); } -QString CipherItem::configName() const +TQString CipherItem::configName() const { - QString cipherName("cipher_%1"); + TQString cipherName("cipher_%1"); return cipherName.arg( m_cipher ); } -OtherCertItem::OtherCertItem( QListView *view, const QString& sub, const QString& md5, bool perm, int policy, QDateTime exp, KCryptoConfig *module ) - : QListViewItem( view, QString::null ), _sub(sub), _md5(md5), _exp(exp), _perm(perm), _policy(policy) +OtherCertItem::OtherCertItem( TQListView *view, const TQString& sub, const TQString& md5, bool perm, int policy, TQDateTime exp, KCryptoConfig *module ) + : TQListViewItem( view, TQString::null ), _sub(sub), _md5(md5), _exp(exp), _perm(perm), _policy(policy) { m_module = module; @@ -131,7 +131,7 @@ KSSLX509Map cert(sub); setText(1, cert.getValue("CN").replace("\n", ", ")); if (_exp.date().year() > 3000 || _exp.date().year() < 1900) - _exp.setDate(QDate(3000,1,1)); + _exp.setDate(TQDate(3000,1,1)); } void OtherCertItem::stateChange( bool ) @@ -139,19 +139,19 @@ void OtherCertItem::stateChange( bool ) m_module->configChanged(); } -QString OtherCertItem::configName() const +TQString OtherCertItem::configName() const { return _sub; } -YourCertItem::YourCertItem( QListView *view, QString pkcs, QString pass, QString name, KCryptoConfig *module ) - : QListViewItem( view, QString::null ) +YourCertItem::YourCertItem( TQListView *view, TQString pkcs, TQString pass, TQString name, KCryptoConfig *module ) + : TQListViewItem( view, TQString::null ) { m_module = module; KSSLX509Map cert(name); - QString tmp = cert.getValue("CN").replace("\n", ", "); + TQString tmp = cert.getValue("CN").replace("\n", ", "); setText(0, tmp); setText(1, cert.getValue("Email")); _pkcs = pkcs; @@ -164,20 +164,20 @@ void YourCertItem::stateChange( bool ) m_module->configChanged(); } -QString YourCertItem::configName() const +TQString YourCertItem::configName() const { return _name; } -CAItem::CAItem( QListView *view, QString name, QString cert, bool site, bool email, bool code, KCryptoConfig *module ) - : QListViewItem( view, QString::null ) +CAItem::CAItem( TQListView *view, TQString name, TQString cert, bool site, bool email, bool code, KCryptoConfig *module ) + : TQListViewItem( view, TQString::null ) { m_module = module; KSSLX509Map mcert(name); -QString tmp; +TQString tmp; setText(0, mcert.getValue("O")); tmp = mcert.getValue("OU"); tmp.replace("\n", ", "); @@ -199,7 +199,7 @@ void CAItem::stateChange( bool ) m_module->configChanged(); } -QString CAItem::configName() const +TQString CAItem::configName() const { return _name; } @@ -216,12 +216,12 @@ QString CAItem::configName() const -KCryptoConfig::KCryptoConfig(QWidget *parent, const char *name, const QStringList &) +KCryptoConfig::KCryptoConfig(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KryptoFactory::instance(), parent, name) { -QGridLayout *grid; -QBoxLayout *top = new QVBoxLayout(this); -QString whatstr; +TQGridLayout *grid; +TQBoxLayout *top = new TQVBoxLayout(this); +TQString whatstr; setQuickHelp( i18n("<h1>Crypto</h1> This module allows you to configure SSL for" " use with most KDE applications, as well as manage your personal" @@ -255,51 +255,51 @@ QString whatstr; // The eighth is peer [email] certificate related (unimplemented) /////////////////////////////////////////////////////////////////////////// - tabs = new QTabWidget(this); + tabs = new TQTabWidget(this); top->addWidget(tabs); /////////////////////////////////////////////////////////////////////////// // FIRST TAB /////////////////////////////////////////////////////////////////////////// - tabSSL = new QFrame(this); - grid = new QGridLayout(tabSSL, 7, 2, KDialog::marginHint(), + tabSSL = new TQFrame(this); + grid = new TQGridLayout(tabSSL, 7, 2, KDialog::marginHint(), KDialog::spacingHint() ); - mUseTLS = new QCheckBox(i18n("Enable &TLS support if supported by the server"), tabSSL); - connect(mUseTLS, SIGNAL(clicked()), SLOT(configChanged())); + mUseTLS = new TQCheckBox(i18n("Enable &TLS support if supported by the server"), tabSSL); + connect(mUseTLS, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mUseTLS, 0, 0); whatstr = i18n("TLS is the newest revision of the SSL protocol." " It integrates better with other protocols and has" " replaced SSL in protocols such as POP3 and SMTP."); - QWhatsThis::add(mUseTLS, whatstr); + TQWhatsThis::add(mUseTLS, whatstr); - mUseSSLv2 = new QCheckBox(i18n("Enable SSLv&2"), tabSSL); - connect(mUseSSLv2, SIGNAL(clicked()), SLOT(configChanged())); + mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL); + connect(mUseSSLv2, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mUseSSLv2, 1, 0); whatstr = i18n("SSL v2 is the second revision of the SSL protocol." " It is most common to enable v2 and v3."); - QWhatsThis::add(mUseSSLv2, whatstr); + TQWhatsThis::add(mUseSSLv2, whatstr); - mUseSSLv3 = new QCheckBox(i18n("Enable SSLv&3"), tabSSL); - connect(mUseSSLv3, SIGNAL(clicked()), SLOT(configChanged())); + mUseSSLv3 = new TQCheckBox(i18n("Enable SSLv&3"), tabSSL); + connect(mUseSSLv3, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mUseSSLv3, 1, 1); whatstr = i18n("SSL v3 is the third revision of the SSL protocol." " It is most common to enable v2 and v3."); - QWhatsThis::add(mUseSSLv3, whatstr); + TQWhatsThis::add(mUseSSLv3, whatstr); #ifdef HAVE_SSL - SSLv2Box = new QListView(tabSSL, "v2ciphers"); + SSLv2Box = new TQListView(tabSSL, "v2ciphers"); (void) SSLv2Box->addColumn(i18n("SSLv2 Ciphers to Use")); whatstr = i18n("Select the ciphers you wish to enable when using the" " SSL v2 protocol. The actual protocol used will be" " negotiated with the server at connection time."); - QWhatsThis::add(SSLv2Box, whatstr); - SSLv2Box->setSelectionMode(QListView::NoSelection); + TQWhatsThis::add(SSLv2Box, whatstr); + SSLv2Box->setSelectionMode(TQListView::NoSelection); grid->addWidget( SSLv2Box, 2, 0 ); - connect( mUseSSLv2, SIGNAL( toggled( bool ) ), - SSLv2Box, SLOT( setEnabled( bool ))); + connect( mUseSSLv2, TQT_SIGNAL( toggled( bool ) ), + SSLv2Box, TQT_SLOT( setEnabled( bool ))); #else - QLabel *nossllabel = new QLabel(i18n("SSL ciphers cannot be configured" + TQLabel *nossllabel = new TQLabel(i18n("SSL ciphers cannot be configured" " because this module was not linked" " with OpenSSL."), tabSSL); grid->addMultiCellWidget(nossllabel, 2, 2, 0, 1); @@ -313,28 +313,28 @@ QString whatstr; authcfg = new KSimpleConfig("ksslauthmap", false); #ifdef HAVE_SSL - SSLv3Box = new QListView(tabSSL, "v3ciphers"); + SSLv3Box = new TQListView(tabSSL, "v3ciphers"); (void) SSLv3Box->addColumn(i18n("SSLv3 Ciphers to Use")); whatstr = i18n("Select the ciphers you wish to enable when using the" " SSL v3 protocol. The actual protocol used will be" " negotiated with the server at connection time."); - QWhatsThis::add(SSLv3Box, whatstr); - SSLv3Box->setSelectionMode(QListView::NoSelection); + TQWhatsThis::add(SSLv3Box, whatstr); + SSLv3Box->setSelectionMode(TQListView::NoSelection); grid->addWidget(SSLv3Box, 2, 1); - connect( mUseSSLv3, SIGNAL( toggled( bool ) ), - SSLv3Box, SLOT( setEnabled( bool ))); + connect( mUseSSLv3, TQT_SIGNAL( toggled( bool ) ), + SSLv3Box, TQT_SLOT( setEnabled( bool ))); loadCiphers(); // // CipherWizards // - QHGroupBox *cwbg = new QHGroupBox(i18n("Cipher Wizard"), tabSSL); - QComboBox *cwcb = new QComboBox(cwbg); + TQHGroupBox *cwbg = new TQHGroupBox(i18n("Cipher Wizard"), tabSSL); + TQComboBox *cwcb = new TQComboBox(cwbg); grid->addMultiCellWidget(cwbg, 3, 3, 0, 1); - QString whatStr = i18n("<qt>Use these preconfigurations to more easily configure the SSL encryption settings. You can choose among the following modes: <ul>"); + TQString whatStr = i18n("<qt>Use these preconfigurations to more easily configure the SSL encryption settings. You can choose among the following modes: <ul>"); - cwcb->insertItem(QString::null); + cwcb->insertItem(TQString::null); cwcb->insertItem(i18n("Most Compatible")); whatStr += i18n("<li><b>Most Compatible:</b> Select the settings found to be most compatible.</li>"); cwcb->insertItem(i18n("US Ciphers Only")); @@ -344,43 +344,43 @@ QString whatstr; cwcb->insertItem(i18n("Enable All")); whatStr += i18n("<li><b>Enable All:</b> Select all SSL ciphers and methods.</li></ul>"); - QWhatsThis::add(cwcb, whatStr); + TQWhatsThis::add(cwcb, whatStr); - connect(cwcb, SIGNAL(activated(int)), SLOT(slotSelectCipher(int))); + connect(cwcb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectCipher(int))); #endif - mWarnOnEnter = new QCheckBox(i18n("Warn on &entering SSL mode"), tabSSL); - connect(mWarnOnEnter, SIGNAL(clicked()), SLOT(configChanged())); + mWarnOnEnter = new TQCheckBox(i18n("Warn on &entering SSL mode"), tabSSL); + connect(mWarnOnEnter, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mWarnOnEnter, 5, 0); whatstr = i18n("If selected, you will be notified when entering an SSL" " enabled site"); - QWhatsThis::add(mWarnOnEnter, whatstr); + TQWhatsThis::add(mWarnOnEnter, whatstr); - mWarnOnLeave = new QCheckBox(i18n("Warn on &leaving SSL mode"), tabSSL); - connect(mWarnOnLeave, SIGNAL(clicked()), SLOT(configChanged())); + mWarnOnLeave = new TQCheckBox(i18n("Warn on &leaving SSL mode"), tabSSL); + connect(mWarnOnLeave, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mWarnOnLeave, 5, 1); whatstr = i18n("If selected, you will be notified when leaving an SSL" " based site."); - QWhatsThis::add(mWarnOnLeave, whatstr); + TQWhatsThis::add(mWarnOnLeave, whatstr); - mWarnOnUnencrypted = new QCheckBox(i18n("Warn on sending &unencrypted data"), tabSSL); - connect(mWarnOnUnencrypted, SIGNAL(clicked()), SLOT(configChanged())); + mWarnOnUnencrypted = new TQCheckBox(i18n("Warn on sending &unencrypted data"), tabSSL); + connect(mWarnOnUnencrypted, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mWarnOnUnencrypted, 6, 0); whatstr = i18n("If selected, you will be notified before sending" " unencrypted data via a web browser."); - QWhatsThis::add(mWarnOnUnencrypted, whatstr); + TQWhatsThis::add(mWarnOnUnencrypted, whatstr); #if 0 // NOT IMPLEMENTED IN KDE 3.0 - mWarnOnMixed = new QCheckBox(i18n("Warn on &mixed SSL/non-SSL pages"), tabSSL); - connect(mWarnOnMixed, SIGNAL(clicked()), SLOT(configChanged())); + mWarnOnMixed = new TQCheckBox(i18n("Warn on &mixed SSL/non-SSL pages"), tabSSL); + connect(mWarnOnMixed, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addWidget(mWarnOnMixed, 6, 1); whatstr = i18n("If selected, you will be notified if you view a page" " that has both encrypted and non-encrypted parts."); - QWhatsThis::add(mWarnOnMixed, whatstr); + TQWhatsThis::add(mWarnOnMixed, whatstr); #endif /////////////////////////////////////////////////////////////////////////// @@ -388,50 +388,50 @@ QString whatstr; /////////////////////////////////////////////////////////////////////////// #ifdef HAVE_SSL - tabOSSL = new QFrame(this); - QBoxLayout *vbox = new QVBoxLayout(tabOSSL, KDialog::marginHint(), KDialog::spacingHint()); + tabOSSL = new TQFrame(this); + TQBoxLayout *vbox = new TQVBoxLayout(tabOSSL, KDialog::marginHint(), KDialog::spacingHint()); - oInfo = new QVGroupBox(i18n("Path to OpenSSL Shared Libraries"), tabOSSL); + oInfo = new TQVGroupBox(i18n("Path to OpenSSL Shared Libraries"), tabOSSL); vbox->addWidget(oInfo); oPath = new KURLRequester(oInfo); oPath->setMode(KFile::Directory); - oTest = new QPushButton(i18n("&Test"), oInfo); - connect(oTest, SIGNAL(clicked()), SLOT(slotTestOSSL())); + oTest = new TQPushButton(i18n("&Test"), oInfo); + connect(oTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTestOSSL())); - connect(oPath, SIGNAL(textChanged(const QString&)), SLOT(configChanged())); + connect(oPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged())); // // Settings for the EGD // - QFrame *eFrame = new QFrame(tabOSSL); - QVBoxLayout *egrid = new QVBoxLayout(eFrame); - mUseEGD = new QCheckBox(i18n("Use EGD"), eFrame); - connect(mUseEGD, SIGNAL(clicked()), SLOT(slotUseEGD())); - mUseEFile = new QCheckBox(i18n("Use entropy file"), eFrame); - connect(mUseEFile, SIGNAL(clicked()), SLOT(slotUseEFile())); + TQFrame *eFrame = new TQFrame(tabOSSL); + TQVBoxLayout *egrid = new TQVBoxLayout(eFrame); + mUseEGD = new TQCheckBox(i18n("Use EGD"), eFrame); + connect(mUseEGD, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEGD())); + mUseEFile = new TQCheckBox(i18n("Use entropy file"), eFrame); + connect(mUseEFile, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEFile())); vbox->addWidget(eFrame); egrid->addWidget(mUseEGD); egrid->addWidget(mUseEFile); - QFrame *egdframe = new QFrame(tabOSSL); - QGridLayout *grid2 = new QGridLayout(egdframe, 2, 2, KDialog::marginHint(), + TQFrame *egdframe = new TQFrame(tabOSSL); + TQGridLayout *grid2 = new TQGridLayout(egdframe, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); - mEGDLabel = new QLabel(i18n("Path to EGD:"), egdframe); + mEGDLabel = new TQLabel(i18n("Path to EGD:"), egdframe); grid2->addWidget(mEGDLabel, 0, 0); mEGDPath = new KURLRequester(egdframe); grid2->addWidget(mEGDPath, 0, 1); - connect(mEGDPath, SIGNAL(textChanged(const QString&)), SLOT(configChanged())); + connect(mEGDPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged())); vbox->addWidget(egdframe); whatstr = i18n("If selected, OpenSSL will be asked to use the entropy gathering" " daemon (EGD) for initializing the pseudo-random number generator."); - QWhatsThis::add(mUseEGD, whatstr); + TQWhatsThis::add(mUseEGD, whatstr); whatstr = i18n("If selected, OpenSSL will be asked to use the given file" " as entropy for initializing the pseudo-random number generator."); - QWhatsThis::add(mUseEFile, whatstr); + TQWhatsThis::add(mUseEFile, whatstr); whatstr = i18n("Enter the path to the socket created by the entropy gathering" " daemon (or the entropy file) here."); - QWhatsThis::add(mEGDPath, whatstr); + TQWhatsThis::add(mEGDPath, whatstr); whatstr = i18n("Click here to browse for the EGD socket file."); - QWhatsThis::add(mEGDPath, whatstr); + TQWhatsThis::add(mEGDPath, whatstr); vbox->addStretch(); #endif @@ -441,85 +441,85 @@ QString whatstr; /////////////////////////////////////////////////////////////////////////// // THIRD TAB /////////////////////////////////////////////////////////////////////////// - tabYourSSLCert = new QFrame(this); + tabYourSSLCert = new TQFrame(this); #ifdef HAVE_SSL - grid = new QGridLayout(tabYourSSLCert, 16, 6, KDialog::marginHint(), KDialog::spacingHint() ); + grid = new TQGridLayout(tabYourSSLCert, 16, 6, KDialog::marginHint(), KDialog::spacingHint() ); - yourSSLBox = new QListView(tabYourSSLCert); + yourSSLBox = new TQListView(tabYourSSLCert); yourSSLBox->setAllColumnsShowFocus(true); whatstr = i18n("This list box shows which certificates of yours KDE" " knows about. You can easily manage them from here."); - QWhatsThis::add(yourSSLBox, whatstr); + TQWhatsThis::add(yourSSLBox, whatstr); grid->addMultiCellWidget(yourSSLBox, 0, 5, 0, 4); yourSSLBox->addColumn(i18n("Common Name")); yourSSLBox->addColumn(i18n("Email Address")); - connect(yourSSLBox, SIGNAL(selectionChanged()), SLOT(slotYourCertSelect())); + connect(yourSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotYourCertSelect())); - yourSSLImport = new QPushButton(i18n("I&mport..."), tabYourSSLCert); - connect(yourSSLImport, SIGNAL(clicked()), SLOT(slotYourImport())); + yourSSLImport = new TQPushButton(i18n("I&mport..."), tabYourSSLCert); + connect(yourSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourImport())); grid->addWidget(yourSSLImport, 0, 5); - yourSSLExport = new QPushButton(i18n("&Export..."), tabYourSSLCert); + yourSSLExport = new TQPushButton(i18n("&Export..."), tabYourSSLCert); yourSSLExport->setEnabled(false); - connect(yourSSLExport, SIGNAL(clicked()), SLOT(slotYourExport())); + connect(yourSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourExport())); grid->addWidget(yourSSLExport, 1, 5); - yourSSLRemove = new QPushButton(i18n("Remo&ve"), tabYourSSLCert); + yourSSLRemove = new TQPushButton(i18n("Remo&ve"), tabYourSSLCert); yourSSLRemove->setEnabled(false); - connect(yourSSLRemove, SIGNAL(clicked()), SLOT(slotYourRemove())); + connect(yourSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourRemove())); grid->addWidget(yourSSLRemove, 2, 5); - yourSSLUnlock = new QPushButton(i18n("&Unlock"), tabYourSSLCert); + yourSSLUnlock = new TQPushButton(i18n("&Unlock"), tabYourSSLCert); yourSSLUnlock->setEnabled(false); - connect(yourSSLUnlock, SIGNAL(clicked()), SLOT(slotYourUnlock())); + connect(yourSSLUnlock, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourUnlock())); grid->addWidget(yourSSLUnlock, 3, 5); - yourSSLVerify = new QPushButton(i18n("Verif&y"), tabYourSSLCert); + yourSSLVerify = new TQPushButton(i18n("Verif&y"), tabYourSSLCert); yourSSLVerify->setEnabled(false); - connect(yourSSLVerify, SIGNAL(clicked()), SLOT(slotYourVerify())); + connect(yourSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourVerify())); grid->addWidget(yourSSLVerify, 4, 5); - yourSSLPass = new QPushButton(i18n("Chan&ge Password..."), tabYourSSLCert); + yourSSLPass = new TQPushButton(i18n("Chan&ge Password..."), tabYourSSLCert); yourSSLPass->setEnabled(false); - connect(yourSSLPass, SIGNAL(clicked()), SLOT(slotYourPass())); + connect(yourSSLPass, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourPass())); grid->addWidget(yourSSLPass, 5, 5); grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabYourSSLCert), 6, 6, 0, 5); - ySubject = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, QString(QString::null)); - yIssuer = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, QString(QString::null)); + ySubject = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString::null)); + yIssuer = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString::null)); grid->addMultiCellWidget(ySubject, 7, 11, 0, 2); grid->addMultiCellWidget(yIssuer, 7, 11, 3, 5); whatstr = i18n("This is the information known about the owner of the certificate."); - QWhatsThis::add(ySubject, whatstr); + TQWhatsThis::add(ySubject, whatstr); whatstr = i18n("This is the information known about the issuer of the certificate."); - QWhatsThis::add(yIssuer, whatstr); + TQWhatsThis::add(yIssuer, whatstr); - grid->addWidget(new QLabel(i18n("Valid from:"), tabYourSSLCert), 12, 0); - grid->addWidget(new QLabel(i18n("Valid until:"), tabYourSSLCert), 13, 0); - yValidFrom = new QLabel(tabYourSSLCert); + grid->addWidget(new TQLabel(i18n("Valid from:"), tabYourSSLCert), 12, 0); + grid->addWidget(new TQLabel(i18n("Valid until:"), tabYourSSLCert), 13, 0); + yValidFrom = new TQLabel(tabYourSSLCert); grid->addWidget(yValidFrom, 12, 1); - yValidUntil = new QLabel(tabYourSSLCert); + yValidUntil = new TQLabel(tabYourSSLCert); grid->addWidget(yValidUntil, 13, 1); whatstr = i18n("The certificate is valid starting at this date."); - QWhatsThis::add(yValidFrom, whatstr); + TQWhatsThis::add(yValidFrom, whatstr); whatstr = i18n("The certificate is valid until this date."); - QWhatsThis::add(yValidUntil, whatstr); - grid->addWidget(new QLabel(i18n("MD5 digest:"), tabYourSSLCert), 14, 0); - yHash = new QLabel(tabYourSSLCert); + TQWhatsThis::add(yValidUntil, whatstr); + grid->addWidget(new TQLabel(i18n("MD5 digest:"), tabYourSSLCert), 14, 0); + yHash = new TQLabel(tabYourSSLCert); grid->addWidget(yHash, 14, 1); whatstr = i18n("A hash of the certificate used to identify it quickly."); - QWhatsThis::add(yHash, whatstr); + TQWhatsThis::add(yHash, whatstr); #if 0 - QHButtonGroup *ocbg = new QHButtonGroup(i18n("On SSL Connection..."), tabYourSSLCert); - yourSSLUseDefault = new QRadioButton(i18n("&Use default certificate"), ocbg); - yourSSLList = new QRadioButton(i18n("&List upon connection"), ocbg); - yourSSLDont = new QRadioButton(i18n("&Do not use certificates"), ocbg); + TQHButtonGroup *ocbg = new TQHButtonGroup(i18n("On SSL Connection..."), tabYourSSLCert); + yourSSLUseDefault = new TQRadioButton(i18n("&Use default certificate"), ocbg); + yourSSLList = new TQRadioButton(i18n("&List upon connection"), ocbg); + yourSSLDont = new TQRadioButton(i18n("&Do not use certificates"), ocbg); grid->addMultiCellWidget(ocbg, 14, 14, 0, 5); #endif #else - nossllabel = new QLabel(i18n("SSL certificates cannot be managed" + nossllabel = new TQLabel(i18n("SSL certificates cannot be managed" " because this module was not linked" " with OpenSSL."), tabYourSSLCert); grid->addMultiCellWidget(nossllabel, 3, 3, 0, 5); @@ -529,48 +529,48 @@ QString whatstr; /////////////////////////////////////////////////////////////////////////// // FOURTH TAB /////////////////////////////////////////////////////////////////////////// - tabAuth = new QFrame(this); + tabAuth = new TQFrame(this); #ifdef HAVE_SSL - grid = new QGridLayout(tabAuth, 20, 6, KDialog::marginHint(), KDialog::spacingHint()); + grid = new TQGridLayout(tabAuth, 20, 6, KDialog::marginHint(), KDialog::spacingHint()); - grid->addMultiCellWidget(new QLabel(i18n("Default Authentication Certificate"), tabAuth), 0, 0, 0, 2); - defCertBG = new QVButtonGroup(i18n("Default Action"), tabAuth); - defSend = new QRadioButton(i18n("&Send"), defCertBG); - defPrompt = new QRadioButton(i18n("&Prompt"), defCertBG); - defDont = new QRadioButton(i18n("Do ¬ send"), defCertBG); + grid->addMultiCellWidget(new TQLabel(i18n("Default Authentication Certificate"), tabAuth), 0, 0, 0, 2); + defCertBG = new TQVButtonGroup(i18n("Default Action"), tabAuth); + defSend = new TQRadioButton(i18n("&Send"), defCertBG); + defPrompt = new TQRadioButton(i18n("&Prompt"), defCertBG); + defDont = new TQRadioButton(i18n("Do ¬ send"), defCertBG); grid->addMultiCellWidget(defCertBG, 1, 3, 0, 2); - grid->addMultiCellWidget(new QLabel(i18n("Default certificate:"), tabAuth), 1, 1, 3, 5); + grid->addMultiCellWidget(new TQLabel(i18n("Default certificate:"), tabAuth), 1, 1, 3, 5); defCertBox = new KComboBox(false, tabAuth); grid->addMultiCellWidget(defCertBox, 2, 2, 3, 5); grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabAuth), 4, 4, 0, 5); - grid->addMultiCellWidget(new QLabel(i18n("Host authentication:"), tabAuth), 5, 5, 0, 1); - hostAuthList = new QListView(tabAuth); + grid->addMultiCellWidget(new TQLabel(i18n("Host authentication:"), tabAuth), 5, 5, 0, 1); + hostAuthList = new TQListView(tabAuth); hostAuthList->setAllColumnsShowFocus(true); grid->addMultiCellWidget(hostAuthList, 6, 13, 0, 5); hostAuthList->addColumn(i18n("Host")); hostAuthList->addColumn(i18n("Certificate")); hostAuthList->addColumn(i18n("Policy")); - grid->addWidget(new QLabel(i18n("Host:"), tabAuth), 14, 0); - grid->addWidget(new QLabel(i18n("Certificate:"), tabAuth), 15, 0); + grid->addWidget(new TQLabel(i18n("Host:"), tabAuth), 14, 0); + grid->addWidget(new TQLabel(i18n("Certificate:"), tabAuth), 15, 0); - authHost = new QLineEdit(tabAuth); + authHost = new TQLineEdit(tabAuth); grid->addMultiCellWidget(authHost, 14, 14, 1, 4); hostCertBox = new KComboBox(false, tabAuth); grid->addMultiCellWidget(hostCertBox, 15, 15, 1, 4); - hostCertBG = new QHButtonGroup(i18n("Action"), tabAuth); - hostSend = new QRadioButton(i18n("Send"), hostCertBG); - hostPrompt = new QRadioButton(i18n("Prompt"), hostCertBG); - hostDont = new QRadioButton(i18n("Do not send"), hostCertBG); + hostCertBG = new TQHButtonGroup(i18n("Action"), tabAuth); + hostSend = new TQRadioButton(i18n("Send"), hostCertBG); + hostPrompt = new TQRadioButton(i18n("Prompt"), hostCertBG); + hostDont = new TQRadioButton(i18n("Do not send"), hostCertBG); grid->addMultiCellWidget(hostCertBG, 16, 16, 0, 5); - authAdd = new QPushButton(i18n("Ne&w"), tabAuth); - authRemove = new QPushButton(i18n("Remo&ve"), tabAuth); + authAdd = new TQPushButton(i18n("Ne&w"), tabAuth); + authRemove = new TQPushButton(i18n("Remo&ve"), tabAuth); grid->addWidget(authAdd, 17, 4); grid->addWidget(authRemove, 17, 5); @@ -579,17 +579,17 @@ QString whatstr; hostCertBG->setEnabled(false); authRemove->setEnabled(false); - connect(defCertBox, SIGNAL(activated(int)), this, SLOT(configChanged())); - connect(defCertBG, SIGNAL(clicked(int)), this, SLOT(configChanged())); - connect(hostAuthList, SIGNAL(selectionChanged()), this, SLOT(slotAuthItemChanged())); - connect(authAdd, SIGNAL(clicked()), this, SLOT(slotNewHostAuth())); - connect(authRemove, SIGNAL(clicked()), this, SLOT(slotRemoveHostAuth())); - connect(authHost, SIGNAL(textChanged(const QString &)), this, SLOT(slotAuthText(const QString &))); - connect(hostCertBG, SIGNAL(clicked(int)), this, SLOT(slotAuthButtons())); - connect(hostCertBox, SIGNAL(activated(int)), this, SLOT(slotAuthCombo())); + connect(defCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect(defCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged())); + connect(hostAuthList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotAuthItemChanged())); + connect(authAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewHostAuth())); + connect(authRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveHostAuth())); + connect(authHost, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotAuthText(const TQString &))); + connect(hostCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAuthButtons())); + connect(hostCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAuthCombo())); #else - nossllabel = new QLabel(i18n("SSL certificates cannot be managed" + nossllabel = new TQLabel(i18n("SSL certificates cannot be managed" " because this module was not linked" " with OpenSSL."), tabAuth); grid->addMultiCellWidget(nossllabel, 3, 3, 0, 5); @@ -600,112 +600,112 @@ QString whatstr; /////////////////////////////////////////////////////////////////////////// // FIFTH TAB /////////////////////////////////////////////////////////////////////////// - tabOtherSSLCert = new QFrame(this); + tabOtherSSLCert = new TQFrame(this); #ifdef HAVE_SSL - oGrid = grid = new QGridLayout(tabOtherSSLCert, 21, 6, KDialog::marginHint(), KDialog::spacingHint()); + oGrid = grid = new TQGridLayout(tabOtherSSLCert, 21, 6, KDialog::marginHint(), KDialog::spacingHint()); - otherSSLBox = new QListView(tabOtherSSLCert); + otherSSLBox = new TQListView(tabOtherSSLCert); otherSSLBox->setAllColumnsShowFocus(true); - connect(otherSSLBox, SIGNAL(selectionChanged()), SLOT(slotOtherCertSelect())); + connect(otherSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotOtherCertSelect())); whatstr = i18n("This list box shows which site and person certificates KDE" " knows about. You can easily manage them from here."); - QWhatsThis::add(otherSSLBox, whatstr); + TQWhatsThis::add(otherSSLBox, whatstr); otherSSLBox->addColumn(i18n("Organization")); otherSSLBox->addColumn(i18n("Common Name")); grid->addMultiCellWidget(otherSSLBox, 0, 7, 0, 4); - otherSSLExport = new QPushButton(i18n("&Export..."), tabOtherSSLCert); - connect(otherSSLExport, SIGNAL(clicked()), SLOT(slotExportCert())); + otherSSLExport = new TQPushButton(i18n("&Export..."), tabOtherSSLCert); + connect(otherSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotExportCert())); grid->addWidget(otherSSLExport, 0, 5); whatstr = i18n("This button allows you to export the selected certificate" " to a file of various formats."); - QWhatsThis::add(otherSSLExport, whatstr); + TQWhatsThis::add(otherSSLExport, whatstr); - otherSSLRemove = new QPushButton(i18n("&Remove"), tabOtherSSLCert); - connect(otherSSLRemove, SIGNAL(clicked()), SLOT(slotRemoveCert())); + otherSSLRemove = new TQPushButton(i18n("&Remove"), tabOtherSSLCert); + connect(otherSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveCert())); grid->addWidget(otherSSLRemove, 1, 5); whatstr = i18n("This button removes the selected certificate" " from the certificate cache."); - QWhatsThis::add(otherSSLRemove, whatstr); + TQWhatsThis::add(otherSSLRemove, whatstr); - otherSSLVerify = new QPushButton(i18n("&Verify"), tabOtherSSLCert); - connect(otherSSLVerify, SIGNAL(clicked()), SLOT(slotVerifyCert())); + otherSSLVerify = new TQPushButton(i18n("&Verify"), tabOtherSSLCert); + connect(otherSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotVerifyCert())); grid->addWidget(otherSSLVerify, 2, 5); whatstr = i18n("This button tests the selected certificate" " for validity."); - QWhatsThis::add(otherSSLVerify, whatstr); + TQWhatsThis::add(otherSSLVerify, whatstr); otherSSLExport->setEnabled(false); otherSSLVerify->setEnabled(false); otherSSLRemove->setEnabled(false); grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabOtherSSLCert), 8, 8, 0, 5); - oSubject = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, QString(QString::null)); - oIssuer = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, QString(QString::null)); + oSubject = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString::null)); + oIssuer = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString::null)); grid->addMultiCellWidget(oSubject, 9, 13, 0, 2); grid->addMultiCellWidget(oIssuer, 9, 13, 3, 5); whatstr = i18n("This is the information known about the owner of the certificate."); - QWhatsThis::add(oSubject, whatstr); + TQWhatsThis::add(oSubject, whatstr); whatstr = i18n("This is the information known about the issuer of the certificate."); - QWhatsThis::add(oIssuer, whatstr); + TQWhatsThis::add(oIssuer, whatstr); - fromLabel = new QLabel(i18n("Valid from:"), tabOtherSSLCert); - untilLabel = new QLabel(i18n("Valid until:"), tabOtherSSLCert); + fromLabel = new TQLabel(i18n("Valid from:"), tabOtherSSLCert); + untilLabel = new TQLabel(i18n("Valid until:"), tabOtherSSLCert); grid->addWidget(fromLabel, 14, 0); grid->addWidget(untilLabel, 15, 0); fromLabel->setEnabled(false); untilLabel->setEnabled(false); - validFrom = new QLabel(tabOtherSSLCert); + validFrom = new TQLabel(tabOtherSSLCert); grid->addWidget(validFrom, 14, 1); - validUntil = new QLabel(tabOtherSSLCert); + validUntil = new TQLabel(tabOtherSSLCert); grid->addWidget(validUntil, 15, 1); whatstr = i18n("The certificate is valid starting at this date."); - QWhatsThis::add(validFrom, whatstr); + TQWhatsThis::add(validFrom, whatstr); whatstr = i18n("The certificate is valid until this date."); - QWhatsThis::add(validUntil, whatstr); + TQWhatsThis::add(validUntil, whatstr); - cacheGroup = new QVButtonGroup(i18n("Cache"), tabOtherSSLCert); - cachePerm = new QRadioButton(i18n("Permanentl&y"), cacheGroup); - cacheUntil = new QRadioButton(i18n("&Until"), cacheGroup); - untilDate = new KURLLabel(QString::null, QString::null, cacheGroup); + cacheGroup = new TQVButtonGroup(i18n("Cache"), tabOtherSSLCert); + cachePerm = new TQRadioButton(i18n("Permanentl&y"), cacheGroup); + cacheUntil = new TQRadioButton(i18n("&Until"), cacheGroup); + untilDate = new KURLLabel(TQString::null, TQString::null, cacheGroup); cacheGroup->setEnabled(false); grid->addMultiCellWidget(cacheGroup, 16, 19, 0, 2); cachePerm->setEnabled(false); cacheUntil->setEnabled(false); untilDate->setEnabled(false); - connect(cachePerm, SIGNAL(clicked()), SLOT(slotPermanent())); - connect(cacheUntil, SIGNAL(clicked()), SLOT(slotUntil())); - connect(untilDate, SIGNAL(leftClickedURL()), SLOT(slotDatePick())); + connect(cachePerm, TQT_SIGNAL(clicked()), TQT_SLOT(slotPermanent())); + connect(cacheUntil, TQT_SIGNAL(clicked()), TQT_SLOT(slotUntil())); + connect(untilDate, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotDatePick())); whatstr = i18n("Select here to make the cache entry permanent."); - QWhatsThis::add(cachePerm, whatstr); + TQWhatsThis::add(cachePerm, whatstr); whatstr = i18n("Select here to make the cache entry temporary."); - QWhatsThis::add(cacheUntil, whatstr); + TQWhatsThis::add(cacheUntil, whatstr); whatstr = i18n("The date and time until the certificate cache entry should expire."); - QWhatsThis::add(untilDate, whatstr); + TQWhatsThis::add(untilDate, whatstr); - policyGroup = new QVButtonGroup(i18n("Policy"), tabOtherSSLCert); - policyAccept = new QRadioButton(i18n("Accep&t"), policyGroup); - policyReject = new QRadioButton(i18n("Re&ject"), policyGroup); - policyPrompt = new QRadioButton(i18n("&Prompt"), policyGroup); + policyGroup = new TQVButtonGroup(i18n("Policy"), tabOtherSSLCert); + policyAccept = new TQRadioButton(i18n("Accep&t"), policyGroup); + policyReject = new TQRadioButton(i18n("Re&ject"), policyGroup); + policyPrompt = new TQRadioButton(i18n("&Prompt"), policyGroup); policyGroup->setEnabled(false); grid->addMultiCellWidget(policyGroup, 16, 19, 3, 5); - connect(policyGroup, SIGNAL(clicked(int)), SLOT(slotPolicyChanged(int))); + connect(policyGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPolicyChanged(int))); whatstr = i18n("Select this to always accept this certificate."); - QWhatsThis::add(policyAccept, whatstr); + TQWhatsThis::add(policyAccept, whatstr); whatstr = i18n("Select this to always reject this certificate."); - QWhatsThis::add(policyReject, whatstr); + TQWhatsThis::add(policyReject, whatstr); whatstr = i18n("Select this if you wish to be prompted for action when receiving this certificate."); - QWhatsThis::add(policyPrompt, whatstr); - grid->addWidget(new QLabel(i18n("MD5 digest:"), tabOtherSSLCert), 20, 0); - pHash = new QLabel(tabOtherSSLCert); + TQWhatsThis::add(policyPrompt, whatstr); + grid->addWidget(new TQLabel(i18n("MD5 digest:"), tabOtherSSLCert), 20, 0); + pHash = new TQLabel(tabOtherSSLCert); grid->addWidget(pHash, 20, 1); whatstr = i18n("A hash of the certificate used to identify it quickly."); - QWhatsThis::add(pHash, whatstr); + TQWhatsThis::add(pHash, whatstr); #else - nossllabel = new QLabel(i18n("SSL certificates cannot be managed" + nossllabel = new TQLabel(i18n("SSL certificates cannot be managed" " because this module was not linked" " with OpenSSL."), tabOtherSSLCert); grid->addMultiCellWidget(nossllabel, 1, 1, 0, 1); @@ -715,61 +715,61 @@ QString whatstr; /////////////////////////////////////////////////////////////////////////// // SIXTH TAB /////////////////////////////////////////////////////////////////////////// - tabSSLCA = new QFrame(this); + tabSSLCA = new TQFrame(this); #ifdef HAVE_SSL - grid = new QGridLayout(tabSSLCA, 11, 8, KDialog::marginHint(), KDialog::spacingHint()); + grid = new TQGridLayout(tabSSLCA, 11, 8, KDialog::marginHint(), KDialog::spacingHint()); - caList = new QListView(tabSSLCA); + caList = new TQListView(tabSSLCA); caList->setAllColumnsShowFocus(true); whatstr = i18n("This list box shows which certificate authorities KDE" " knows about. You can easily manage them from here."); - QWhatsThis::add(caList, whatstr); + TQWhatsThis::add(caList, whatstr); grid->addMultiCellWidget(caList, 0, 3, 0, 6); caList->addColumn(i18n("Organization")); caList->addColumn(i18n("Organizational Unit")); caList->addColumn(i18n("Common Name")); - connect(caList, SIGNAL(selectionChanged()), SLOT(slotCAItemChanged())); + connect(caList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotCAItemChanged())); - caSSLImport = new QPushButton(i18n("I&mport..."), tabSSLCA); - connect(caSSLImport, SIGNAL(clicked()), SLOT(slotCAImport())); + caSSLImport = new TQPushButton(i18n("I&mport..."), tabSSLCA); + connect(caSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAImport())); grid->addWidget(caSSLImport, 0, 7); - caSSLRemove = new QPushButton(i18n("&Remove"), tabSSLCA); - connect(caSSLRemove, SIGNAL(clicked()), SLOT(slotCARemove())); + caSSLRemove = new TQPushButton(i18n("&Remove"), tabSSLCA); + connect(caSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARemove())); grid->addWidget(caSSLRemove, 1, 7); caSSLRemove->setEnabled(false); - caSSLRestore = new QPushButton(i18n("Res&tore"), tabSSLCA); - connect(caSSLRestore, SIGNAL(clicked()), SLOT(slotCARestore())); + caSSLRestore = new TQPushButton(i18n("Res&tore"), tabSSLCA); + connect(caSSLRestore, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARestore())); grid->addWidget(caSSLRestore, 2, 7); - caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, QString(QString::null)); - caIssuer = KSSLInfoDlg::certInfoWidget(tabSSLCA, QString(QString::null)); + caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString::null)); + caIssuer = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString::null)); grid->addMultiCellWidget(caSubject, 4, 6, 0, 3); grid->addMultiCellWidget(caIssuer, 4, 6, 4, 7); // Accept for Web Site Signing, Email Signing, Code Signing - caSite = new QCheckBox(i18n("Accept for site signing"), tabSSLCA); - caEmail = new QCheckBox(i18n("Accept for email signing"), tabSSLCA); - caCode = new QCheckBox(i18n("Accept for code signing"), tabSSLCA); + caSite = new TQCheckBox(i18n("Accept for site signing"), tabSSLCA); + caEmail = new TQCheckBox(i18n("Accept for email signing"), tabSSLCA); + caCode = new TQCheckBox(i18n("Accept for code signing"), tabSSLCA); grid->addMultiCellWidget(caSite, 7, 7, 0, 3); - connect(caSite, SIGNAL(clicked()), SLOT(slotCAChecked())); + connect(caSite, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked())); grid->addMultiCellWidget(caEmail, 8, 8, 0, 3); - connect(caEmail, SIGNAL(clicked()), SLOT(slotCAChecked())); + connect(caEmail, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked())); grid->addMultiCellWidget(caCode, 9, 9, 0, 3); - connect(caCode, SIGNAL(clicked()), SLOT(slotCAChecked())); + connect(caCode, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked())); caSite->setEnabled(false); caEmail->setEnabled(false); caCode->setEnabled(false); - grid->addWidget(new QLabel(i18n("MD5 digest:"), tabSSLCA), 10, 0); - cHash = new QLabel(tabSSLCA); + grid->addWidget(new TQLabel(i18n("MD5 digest:"), tabSSLCA), 10, 0); + cHash = new TQLabel(tabSSLCA); grid->addWidget(cHash, 10, 1); whatstr = i18n("A hash of the certificate used to identify it quickly."); - QWhatsThis::add(cHash, whatstr); + TQWhatsThis::add(cHash, whatstr); #else - nossllabel = new QLabel(i18n("SSL certificates cannot be managed" + nossllabel = new TQLabel(i18n("SSL certificates cannot be managed" " because this module was not linked" " with OpenSSL."), tabSSLCA); grid->addMultiCellWidget(nossllabel, 1, 1, 0, 1); @@ -780,46 +780,46 @@ QString whatstr; /////////////////////////////////////////////////////////////////////////// // SEVENTH TAB /////////////////////////////////////////////////////////////////////////// - tabSSLCOpts = new QFrame(this); + tabSSLCOpts = new TQFrame(this); #ifdef HAVE_SSL - grid = new QGridLayout(tabSSLCOpts, 9, 4, KDialog::marginHint(), KDialog::spacingHint()); - mWarnSelfSigned = new QCheckBox(i18n("Warn on &self-signed certificates or unknown CA's"), tabSSLCOpts); - connect(mWarnSelfSigned, SIGNAL(clicked()), SLOT(configChanged())); - mWarnExpired = new QCheckBox(i18n("Warn on &expired certificates"), tabSSLCOpts); - connect(mWarnExpired, SIGNAL(clicked()), SLOT(configChanged())); - mWarnRevoked = new QCheckBox(i18n("Warn on re&voked certificates"), tabSSLCOpts); - connect(mWarnRevoked, SIGNAL(clicked()), SLOT(configChanged())); + grid = new TQGridLayout(tabSSLCOpts, 9, 4, KDialog::marginHint(), KDialog::spacingHint()); + mWarnSelfSigned = new TQCheckBox(i18n("Warn on &self-signed certificates or unknown CA's"), tabSSLCOpts); + connect(mWarnSelfSigned, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + mWarnExpired = new TQCheckBox(i18n("Warn on &expired certificates"), tabSSLCOpts); + connect(mWarnExpired, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + mWarnRevoked = new TQCheckBox(i18n("Warn on re&voked certificates"), tabSSLCOpts); + connect(mWarnRevoked, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); grid->addMultiCellWidget(mWarnSelfSigned, 0, 0, 0, 3); grid->addMultiCellWidget(mWarnExpired, 1, 1, 0, 3); grid->addMultiCellWidget(mWarnRevoked, 2, 2, 0, 3); - macCert = new QLineEdit(tabSSLCOpts); + macCert = new TQLineEdit(tabSSLCOpts); grid->addMultiCellWidget(macCert, 4, 4, 0, 2); - macBox = new QListBox(tabSSLCOpts); + macBox = new TQListBox(tabSSLCOpts); whatstr = i18n("This list box shows which sites you have decided to accept" " a certificate from even though the certificate might fail" " the validation procedure."); - QWhatsThis::add(macBox, whatstr); - caSSLBox->setSelectionMode(QListBox::Single); - caSSLBox->setColumnMode(QListBox::FixedNumber); + TQWhatsThis::add(macBox, whatstr); + caSSLBox->setSelectionMode(TQListBox::Single); + caSSLBox->setColumnMode(TQListBox::FixedNumber); grid->addMultiCellWidget(macBox, 5, 8, 0, 2); - macAdd = new QPushButton(i18n("&Add"), tabSSLCOpts); - //connect(macAdd, SIGNAL(), SLOT()); + macAdd = new TQPushButton(i18n("&Add"), tabSSLCOpts); + //connect(macAdd, TQT_SIGNAL(), TQT_SLOT()); grid->addWidget(macAdd, 4, 3); - macRemove = new QPushButton(i18n("&Remove"), tabSSLCOpts); - //connect(macRemove, SIGNAL(), SLOT()); + macRemove = new TQPushButton(i18n("&Remove"), tabSSLCOpts); + //connect(macRemove, TQT_SIGNAL(), TQT_SLOT()); grid->addWidget(macRemove, 5, 3); macClear = new KPushButton(KGuiItem::clear(), tabSSLCOpts); - //connect(macAdd, SIGNAL(), SLOT()); + //connect(macAdd, TQT_SIGNAL(), TQT_SLOT()); grid->addWidget(macClear, 6, 3); #else - nossllabel = new QLabel(i18n("These options are not configurable" + nossllabel = new TQLabel(i18n("These options are not configurable" " because this module was not linked" " with OpenSSL."), tabSSLCOpts); grid->addMultiCellWidget(nossllabel, 1, 1, 0, 1); @@ -932,13 +932,13 @@ void KCryptoConfig::load( bool useDefaults ) SSLv2Box->setEnabled( mUseSSLv2->isChecked() ); SSLv3Box->setEnabled( mUseSSLv3->isChecked() ); - QStringList groups = policies->groupList(); + TQStringList groups = policies->groupList(); otherSSLBox->clear(); - for (QStringList::Iterator i = groups.begin(); i != groups.end(); ++i) { + for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) { if ((*i).isEmpty() || *i == "<default>" || *i == "General") continue; policies->setGroup(*i); - KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", QString::null).local8Bit()); + KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit()); if (cert) { new OtherCertItem(otherSSLBox, cert->getSubject(), *i, policies->readBoolEntry("Permanent", true), @@ -951,20 +951,20 @@ void KCryptoConfig::load( bool useDefaults ) groups = pcerts->groupList(); yourSSLBox->clear(); - for (QStringList::Iterator i = groups.begin(); i != groups.end(); ++i) { + for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) { if ((*i).isEmpty() || *i == "<default>") continue; pcerts->setGroup(*i); YourCertItem *j = new YourCertItem(yourSSLBox, pcerts->readEntry("PKCS12Base64"), pcerts->readEntry("Password"), *i, this ); - j->setPassCache(QString::null); + j->setPassCache(TQString::null); } setAuthCertLists(); config->setGroup("Auth"); - QString whichAuth = config->readEntry("AuthMethod", "none"); + TQString whichAuth = config->readEntry("AuthMethod", "none"); if (whichAuth == "send") defCertBG->setButton(defCertBG->id(defSend)); else if (whichAuth == "prompt") @@ -972,7 +972,7 @@ void KCryptoConfig::load( bool useDefaults ) else defCertBG->setButton(defCertBG->id(defDont)); - QString whichCert = config->readEntry("DefaultCert"); + TQString whichCert = config->readEntry("DefaultCert"); defCertBox->setCurrentItem(0); for (int i = 0; i < defCertBox->count(); i++) { if (defCertBox->text(i) == whichCert) { @@ -982,7 +982,7 @@ void KCryptoConfig::load( bool useDefaults ) } hostAuthList->clear(); groups = authcfg->groupList(); - for (QStringList::Iterator i = groups.begin(); + for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) { if ((*i).isEmpty() || *i == "<default>") continue; @@ -1003,7 +1003,7 @@ void KCryptoConfig::load( bool useDefaults ) groups = _signers->list(); KConfig sigcfg("ksslcalist", true, false); caList->clear(); - for (QStringList::Iterator i = groups.begin(); + for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) { if ((*i).isEmpty() || *i == "<default>") continue; @@ -1109,7 +1109,7 @@ void KCryptoConfig::save() // SSL Policies code for (OtherCertItem *x = otherCertDelList.first(); x != 0; x = otherCertDelList.next()) { KSSLX509Map cert(x->configName()); - QString thisCN = cert.getValue("CN"); + TQString thisCN = cert.getValue("CN"); _cc.removeByCN(thisCN); otherCertDelList.remove(x); } @@ -1119,8 +1119,8 @@ void KCryptoConfig::save() x; x = static_cast<OtherCertItem *>(x->nextSibling())) { KSSLX509Map cert(x->configName()); - QString thisCN = cert.getValue("CN"); - QDateTime expires = x->getExpires(); + TQString thisCN = cert.getValue("CN"); + TQDateTime expires = x->getExpires(); _cc.modifyByCN(thisCN, (KSSLCertificateCache::KSSLCertificatePolicy)x->getPolicy(), x->isPermanent(), expires); } @@ -1172,7 +1172,7 @@ void KCryptoConfig::save() config->setGroup("Auth"); - QString whichAuth = config->readEntry("AuthMethod", "none"); + TQString whichAuth = config->readEntry("AuthMethod", "none"); if (defCertBG->selected() == defSend) config->writeEntry("AuthMethod", "send"); else if (defCertBG->selected() == defPrompt) @@ -1181,7 +1181,7 @@ void KCryptoConfig::save() config->writeEntry("AuthMethod", "none"); if (defCertBox->currentItem() == 0) - config->writeEntry("DefaultCert", QString::null); + config->writeEntry("DefaultCert", TQString::null); else config->writeEntry("DefaultCert", defCertBox->currentText()); for (HostAuthItem *x = authDelList.first(); x != 0; x = authDelList.next()) { @@ -1215,9 +1215,9 @@ void KCryptoConfig::save() authcfg->sync(); // insure proper permissions -- contains sensitive data - QString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults")); + TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults")); if (!cfgName.isEmpty()) - ::chmod(QFile::encodeName(cfgName), 0600); + ::chmod(TQFile::encodeName(cfgName), 0600); emit changed(false); } @@ -1331,7 +1331,7 @@ void KCryptoConfig::slotExportCert() { OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem()); if (x) { policies->setGroup(x->getMD5()); - KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", QString::null).local8Bit()); + KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit()); if (cert) { KCertExport kce; kce.setCertificate(cert); @@ -1345,10 +1345,10 @@ OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem()); void KCryptoConfig::slotRemoveCert() { -QListViewItem *act = otherSSLBox->selectedItem(); +TQListViewItem *act = otherSSLBox->selectedItem(); OtherCertItem *x = static_cast<OtherCertItem *>(act); if (x) { - QListViewItem *next = act->itemBelow(); + TQListViewItem *next = act->itemBelow(); if (!next) next = act->itemAbove(); otherSSLBox->takeItem(x); otherCertDelList.append(x); @@ -1364,7 +1364,7 @@ OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem()); if (!x) return; policies->setGroup(x->getMD5()); - KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", QString::null).local8Bit()); + KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit()); if (!cert) { KMessageBox::error(this, i18n("Error obtaining the certificate."), i18n("SSL")); @@ -1445,7 +1445,7 @@ OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem()); if (!x || !untilDate->isEnabled()) return; -QDateTime qdt = x->getExpires(); +TQDateTime qdt = x->getExpires(); kdtd.setDateTime(qdt); int rc = kdtd.exec(); @@ -1460,7 +1460,7 @@ QDateTime qdt = x->getExpires(); void KCryptoConfig::slotOtherCertSelect() { OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem()); -QString iss = QString::null; +TQString iss = TQString::null; if (x) { otherSSLExport->setEnabled(true); otherSSLVerify->setEnabled(true); @@ -1474,37 +1474,37 @@ QString iss = QString::null; cacheUntil->setEnabled(true); policies->setGroup(x->getMD5()); - KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", QString::null).local8Bit()); + KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit()); if (cert) { - QPalette cspl; + TQPalette cspl; iss = cert->getIssuer(); cspl = validFrom->palette(); - if (QDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { - cspl.setColor(QColorGroup::Foreground, QColor(196,33,21)); + if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { - cspl.setColor(QColorGroup::Foreground, QColor(42,153,59)); + cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); } validFrom->setPalette(cspl); cspl = validUntil->palette(); - if (QDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { - cspl.setColor(QColorGroup::Foreground, QColor(196,33,21)); + if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { - cspl.setColor(QColorGroup::Foreground, QColor(42,153,59)); + cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); } validUntil->setPalette(cspl); validFrom->setText(cert->getNotBefore()); validUntil->setText(cert->getNotAfter()); untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires()) - : KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(Qt::UTC))); + : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC))); untilDate->setEnabled(x && !x->isPermanent()); pHash->setText(cert->getMD5DigestText()); delete cert; } else { - validFrom->setText(QString::null); - validUntil->setText(QString::null); + validFrom->setText(TQString::null); + validUntil->setText(TQString::null); pHash->clear(); } @@ -1538,15 +1538,15 @@ QString iss = QString::null; policyPrompt->setChecked(false); cachePerm->setEnabled(false); cacheUntil->setEnabled(false); - validFrom->setText(QString::null); - validUntil->setText(QString::null); - untilDate->setText(QString::null); + validFrom->setText(TQString::null); + validUntil->setText(TQString::null); + untilDate->setText(TQString::null); untilDate->setEnabled(false); pHash->clear(); } - oSubject->setValues(x ? x->getSub() : QString(QString::null)); + oSubject->setValues(x ? x->getSub() : TQString(TQString::null)); oIssuer->setValues(iss); } @@ -1554,19 +1554,19 @@ QString iss = QString::null; void KCryptoConfig::slotYourImport() { - QString certFile = KFileDialog::getOpenFileName(QString::null, "application/x-pkcs12"); + TQString certFile = KFileDialog::getOpenFileName(TQString::null, "application/x-pkcs12"); if (certFile.isEmpty()) return; #ifdef HAVE_SSL KSSLPKCS12 *cert = NULL; -QCString pass; +TQCString pass; TryImportPassAgain: int rc = KPasswordDialog::getPassword(pass, i18n("Certificate password")); if (rc != KPasswordDialog::Accepted) return; - cert = KSSLPKCS12::loadCertFile(certFile, QString(pass)); + cert = KSSLPKCS12::loadCertFile(certFile, TQString(pass)); if (!cert) { rc = KMessageBox::warningYesNo(this, i18n("The certificate file could not be loaded. Try a different password?"), i18n("SSL"),i18n("Try"),i18n("Do Not Try")); @@ -1581,7 +1581,7 @@ TryImportPassAgain: // FIXME: prompt if the user wants the password stored along with the // certificate - QString name = cert->getCertificate()->getSubject(); + TQString name = cert->getCertificate()->getSubject(); for (YourCertItem *i = static_cast<YourCertItem *>(yourSSLBox->firstChild()); i; @@ -1599,7 +1599,7 @@ TryImportPassAgain: new YourCertItem(yourSSLBox, cert->toString(), - QString::null, // the password - don't store it yet! + TQString::null, // the password - don't store it yet! name, this ); @@ -1620,8 +1620,8 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem()); if (!pkcs) pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPassCache()); if (!pkcs) { - QString pprompt = i18n("Enter the certificate password:"); - QCString oldpass; + TQString pprompt = i18n("Enter the certificate password:"); + TQCString oldpass; do { int i = KPasswordDialog::getPassword(oldpass, pprompt); if (i != KPasswordDialog::Accepted) return; @@ -1633,7 +1633,7 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem()); } // For now, we will only export to PKCS#12 - QString certFile = KFileDialog::getSaveFileName(QString::null, + TQString certFile = KFileDialog::getSaveFileName(TQString::null, "application/x-pkcs12"); if (certFile.isEmpty()) return; @@ -1645,15 +1645,15 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem()); void KCryptoConfig::slotYourVerify() { YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem()); -QString iss; +TQString iss; if (!x) return; KSSLPKCS12 *pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPass()); if (!pkcs) pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPassCache()); if (!pkcs) { - QString pprompt = i18n("Enter the certificate password:"); - QCString oldpass; + TQString pprompt = i18n("Enter the certificate password:"); + TQCString oldpass; do { int i = KPasswordDialog::getPassword(oldpass, pprompt); if (i != KPasswordDialog::Accepted) return; @@ -1693,15 +1693,15 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem()); void KCryptoConfig::slotYourUnlock() { YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem()); -QString iss; +TQString iss; if (!x || !yourSSLUnlock->isEnabled()) return; KSSLPKCS12 *pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPass()); if (!pkcs) pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPassCache()); if (!pkcs) { - QString pprompt = i18n("Enter the certificate password:"); - QCString oldpass; + TQString pprompt = i18n("Enter the certificate password:"); + TQCString oldpass; do { int i = KPasswordDialog::getPassword(oldpass, pprompt); if (i != KPasswordDialog::Accepted) return; @@ -1713,23 +1713,23 @@ QString iss; // update the info iss = pkcs->getCertificate()->getIssuer(); - ySubject->setValues(x ? x->getName() : QString(QString::null)); + ySubject->setValues(x ? x->getName() : TQString(TQString::null)); yIssuer->setValues(iss); - QPalette cspl; + TQPalette cspl; KSSLCertificate *cert = pkcs->getCertificate(); cspl = yValidFrom->palette(); - if (QDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { - cspl.setColor(QColorGroup::Foreground, QColor(196,33,21)); + if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { - cspl.setColor(QColorGroup::Foreground, QColor(42,153,59)); + cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); } yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (QDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { - cspl.setColor(QColorGroup::Foreground, QColor(196,33,21)); + if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { - cspl.setColor(QColorGroup::Foreground, QColor(42,153,59)); + cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); } yValidUntil->setPalette(cspl); @@ -1743,7 +1743,7 @@ QString iss; void KCryptoConfig::slotYourCertSelect() { YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem()); -QString iss; +TQString iss; yourSSLExport->setEnabled(x != NULL); yourSSLPass->setEnabled(x != NULL); @@ -1754,22 +1754,22 @@ QString iss; if (x) { KSSLPKCS12 *pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPass()); if (pkcs) { - QPalette cspl; + TQPalette cspl; KSSLCertificate *cert = pkcs->getCertificate(); iss = cert->getIssuer(); cspl = yValidFrom->palette(); - if (QDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { - cspl.setColor(QColorGroup::Foreground, QColor(196,33,21)); + if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { - cspl.setColor(QColorGroup::Foreground, QColor(42,153,59)); + cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); } yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (QDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { - cspl.setColor(QColorGroup::Foreground, QColor(196,33,21)); + if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { - cspl.setColor(QColorGroup::Foreground, QColor(42,153,59)); + cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); } yValidUntil->setPalette(cspl); @@ -1785,21 +1785,21 @@ QString iss; yHash->clear(); } - ySubject->setValues(x ? x->getName() : QString(QString::null)); + ySubject->setValues(x ? x->getName() : TQString(TQString::null)); yIssuer->setValues(iss); } void KCryptoConfig::slotYourPass() { YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem()); -QCString oldpass = ""; +TQCString oldpass = ""; if (!x) return; KSSLPKCS12 *pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPass()); if (!pkcs) pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPassCache()); if (!pkcs) { - QString pprompt = i18n("Enter the OLD password for the certificate:"); + TQString pprompt = i18n("Enter the OLD password for the certificate:"); do { int i = KPasswordDialog::getPassword(oldpass, pprompt); if (i != KPasswordDialog::Accepted) break; @@ -1817,8 +1817,8 @@ QCString oldpass = ""; int i = kpd->exec(); if (i == KPasswordDialog::Accepted) { - QCString pass = kpd->password(); - pkcs->changePassword(QString(oldpass), QString(pass)); + TQCString pass = kpd->password(); + pkcs->changePassword(TQString(oldpass), TQString(pass)); x->setPKCS(pkcs->toString()); x->setPassCache(pass); configChanged(); @@ -1830,7 +1830,7 @@ QCString oldpass = ""; void KCryptoConfig::slotCAImport() { - QString certFile = KFileDialog::getOpenFileName(QString::null, "application/x-x509-ca-cert"); + TQString certFile = KFileDialog::getOpenFileName(TQString::null, "application/x-x509-ca-cert"); if (certFile.isEmpty()) return; @@ -1863,7 +1863,7 @@ void KCryptoConfig::slotCAImport() { // Only import CA's if (!x || !x->x509V3Extensions().certTypeCA()) { if (x) { - QString emsg = x->getSubject() + ":\n" + + TQString emsg = x->getSubject() + ":\n" + i18n("This is not a signer certificate."); KMessageBox::error(this, emsg, @@ -1873,7 +1873,7 @@ void KCryptoConfig::slotCAImport() { continue; } - QString name = x->getSubject(); + TQString name = x->getSubject(); // search for dups for (CAItem *m = static_cast<CAItem *>(caList->firstChild()); @@ -1883,7 +1883,7 @@ void KCryptoConfig::slotCAImport() { KSSLCertificate *y = KSSLCertificate::fromString(m->getCert().local8Bit()); if (!y) continue; if (*x == *y) { - QString emsg = name + ":\n" + + TQString emsg = name + ":\n" + i18n("You already have this signer certificate installed."); KMessageBox::error(this, emsg, @@ -1911,9 +1911,9 @@ void KCryptoConfig::slotCAImport() { // Can the PEM code be wiped out now? } else { // try to load it manually as a single X.509 DER encoded // ASSUMPTION: we only read one certificate in this code - QFile qf(certFile); - QString name; - QString certtext; + TQFile qf(certFile); + TQString name; + TQString certtext; KSSLCertificate *x; qf.open(IO_ReadOnly); qf.readLine(certtext, qf.size()); @@ -1923,16 +1923,16 @@ void KCryptoConfig::slotCAImport() { if (certtext.contains("-----BEGIN CERTIFICATE-----")) { qf.reset(); - certtext = QString::null; + certtext = TQString::null; while (!qf.atEnd()) { - QString xx; + TQString xx; qf.readLine(xx, qf.size()); certtext += xx; } - certtext = certtext.replace("-----BEGIN CERTIFICATE-----", QString::null); - certtext = certtext.replace("-----END CERTIFICATE-----", QString::null); + certtext = certtext.replace("-----BEGIN CERTIFICATE-----", TQString::null); + certtext = certtext.replace("-----END CERTIFICATE-----", TQString::null); certtext = certtext.stripWhiteSpace(); - certtext = certtext.replace("\n", QString::null); + certtext = certtext.replace("\n", TQString::null); } else { // Must [could?] be DER qf.close(); @@ -1940,7 +1940,7 @@ void KCryptoConfig::slotCAImport() { char *cr; cr = new char[qf.size()+1]; qf.readBlock(cr, qf.size()); - QByteArray qba; + TQByteArray qba; qba.duplicate(cr, qf.size()); certtext = KCodecs::base64Encode(qba); delete [] cr; @@ -2001,9 +2001,9 @@ void KCryptoConfig::slotCAImport() { offerImportToKMail( certFile ); } -void KCryptoConfig::offerImportToKMail( const QString& certFile ) +void KCryptoConfig::offerImportToKMail( const TQString& certFile ) { - if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), QString::null, i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) { + if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString::null, i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) { KProcess proc; proc << "kleopatra"; proc << "--import-certificate"; @@ -2034,21 +2034,21 @@ void KCryptoConfig::slotCARestore() { // For now, we just rm the existing file and rebuild - QString path = KGlobal::dirs()->saveLocation("config"); + TQString path = KGlobal::dirs()->saveLocation("config"); path += "/ksslcalist"; - QFile::remove(path); + TQFile::remove(path); // Remove all our old work and rebuild the GUI/List caDelList.clear(); caList->clear(); - QStringList groups = _signers->list(); + TQStringList groups = _signers->list(); KConfig sigcfg("ksslcalist", true, false); - for (QStringList::Iterator i = groups.begin(); + for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) { if ((*i).isEmpty() || *i == "<default>") continue; @@ -2057,7 +2057,7 @@ void KCryptoConfig::slotCARestore() { if (!sigcfg.hasKey("x509")) continue; new CAItem(caList, (*i), - sigcfg.readEntry("x509", QString::null), + sigcfg.readEntry("x509", TQString::null), sigcfg.readBoolEntry("site", false), sigcfg.readBoolEntry("email", false), sigcfg.readBoolEntry("code", false), @@ -2073,10 +2073,10 @@ void KCryptoConfig::slotCAItemChanged() { CAItem *x = static_cast<CAItem *>(caList->selectedItem()); if (x) { caSSLRemove->setEnabled(true); - caSubject->setValues(x ? x->getName() : QString(QString::null)); + caSubject->setValues(x ? x->getName() : TQString(TQString::null)); KSSLCertificate *cert = KSSLCertificate::fromString(x->getCert().local8Bit()); if (!cert) { - caIssuer->setValues(QString(QString::null)); + caIssuer->setValues(TQString(TQString::null)); caSite->setEnabled(false); caEmail->setEnabled(false); caCode->setEnabled(false); @@ -2100,8 +2100,8 @@ CAItem *x = static_cast<CAItem *>(caList->selectedItem()); caSite->setEnabled(false); caEmail->setEnabled(false); caCode->setEnabled(false); - caSubject->setValues(QString(QString::null)); - caIssuer->setValues(QString(QString::null)); + caSubject->setValues(TQString(TQString::null)); + caIssuer->setValues(TQString(TQString::null)); cHash->clear(); } } @@ -2122,8 +2122,8 @@ CAItem *x = static_cast<CAItem *>(caList->selectedItem()); void KCryptoConfig::slotNewHostAuth() { HostAuthItem *j = new HostAuthItem(hostAuthList, - QString::null, - QString::null, + TQString::null, + TQString::null, this ); j->setAction(KSSLCertificateHome::AuthSend); hostAuthList->setSelected(j, true); @@ -2140,11 +2140,11 @@ void KCryptoConfig::slotNewHostAuth() { void KCryptoConfig::slotRemoveHostAuth() { -QListViewItem *act = hostAuthList->selectedItem(); +TQListViewItem *act = hostAuthList->selectedItem(); HostAuthItem *x = static_cast<HostAuthItem *>(act); if (x) { - QListViewItem *next = act->itemBelow(); + TQListViewItem *next = act->itemBelow(); if (!next) next = act->itemAbove(); hostAuthList->takeItem(x); authDelList.append(x); @@ -2187,7 +2187,7 @@ if (x) { ___lehack = false; hostCertBox->setCurrentItem(0); - QString theCert = x->getCertName(); + TQString theCert = x->getCertName(); for (int i = 0; i < hostCertBox->count(); i++) { if (hostCertBox->text(i) == theCert) { hostCertBox->setCurrentItem(i); @@ -2204,7 +2204,7 @@ if (x) { } -void KCryptoConfig::slotAuthText(const QString &t) { +void KCryptoConfig::slotAuthText(const TQString &t) { if (___lehack) return; HostAuthItem *x = static_cast<HostAuthItem *>(hostAuthList->selectedItem()); @@ -2241,7 +2241,7 @@ HostAuthItem *x = static_cast<HostAuthItem *>(hostAuthList->selectedItem()); if (x) { if (hostCertBox->currentItem() == 0) - x->setCertName(QString::null); + x->setCertName(TQString::null); else x->setCertName(hostCertBox->currentText()); configChanged(); } @@ -2297,7 +2297,7 @@ void KCryptoConfig::slotUseEFile() { // encompassed in a separate module quite nicely. void KCryptoConfig::slotGeneratePersonal() { #if 0 - QStringList qslCertTypes; + TQStringList qslCertTypes; qslCertTypes << i18n("Personal SSL") << i18n("Server SSL") @@ -2342,7 +2342,7 @@ SSL_METHOD *meth; if (!sc) break; // Leak of sc*? - QString scn(sc->name); + TQString scn(sc->name); if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) { continue; } @@ -2370,7 +2370,7 @@ SSL_METHOD *meth; if (!sc) break; // Leak of sc*? - QString scn(sc->name); + TQString scn(sc->name); if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) { continue; } @@ -2388,7 +2388,7 @@ return true; void KCryptoConfig::setAuthCertLists() { -QString oldDef, oldHost; +TQString oldDef, oldHost; bool noneDef, noneHost; // get the old setting @@ -2400,7 +2400,7 @@ bool noneDef, noneHost; // repopulate defCertBox->clear(); hostCertBox->clear(); - QStringList defCertStrList; // = KSSLCertificateHome::getCertificateList(); + TQStringList defCertStrList; // = KSSLCertificateHome::getCertificateList(); defCertStrList.append(i18n("None")); for (YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->firstChild()); x; @@ -2441,7 +2441,7 @@ bool noneDef, noneHost; static_cast<HostAuthItem *>(hostAuthList->firstChild()); x; x = static_cast<HostAuthItem *>(x->nextSibling())) { - QString newValue = QString::null; + TQString newValue = TQString::null; for (int i = 1; i < hostCertBox->count(); i++) { if (hostCertBox->text(i) == x->getCertName()) { newValue = x->getCertName(); diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h index 4d335570a..b9d856ceb 100644 --- a/kcontrol/crypto/crypto.h +++ b/kcontrol/crypto/crypto.h @@ -25,13 +25,13 @@ #include <config.h> #endif -#include <qcheckbox.h> -#include <qdatetime.h> -#include <qlineedit.h> -#include <qlistview.h> -#include <qptrlist.h> -#include <qtabwidget.h> -#include <qvbuttongroup.h> +#include <tqcheckbox.h> +#include <tqdatetime.h> +#include <tqlineedit.h> +#include <tqlistview.h> +#include <tqptrlist.h> +#include <tqtabwidget.h> +#include <tqvbuttongroup.h> #include <kcmodule.h> #include <ksimpleconfig.h> @@ -50,23 +50,23 @@ class KURLRequester; class CipherItem : public QCheckListItem { public: - CipherItem( QListView *view, const QString& cipher, int bits, int maxBits, + CipherItem( TQListView *view, const TQString& cipher, int bits, int maxBits, KCryptoConfig *module ); ~CipherItem() {} - void setCipher( const QString& cipher ) { m_cipher = cipher; } - const QString& cipher() const { return m_cipher; } + void setCipher( const TQString& cipher ) { m_cipher = cipher; } + const TQString& cipher() const { return m_cipher; } void setBits( int bits ) { m_bits = bits; } int bits() const { return m_bits; } - QString configName() const; + TQString configName() const; protected: virtual void stateChange( bool ); private: int m_bits; - QString m_cipher; + TQString m_cipher; KCryptoConfig *m_module; // just to call configChanged() }; @@ -75,26 +75,26 @@ private: class OtherCertItem : public QListViewItem { public: - OtherCertItem(QListView *view, const QString& sub, const QString& md5, bool perm, int policy, QDateTime exp, KCryptoConfig *module ); + OtherCertItem(TQListView *view, const TQString& sub, const TQString& md5, bool perm, int policy, TQDateTime exp, KCryptoConfig *module ); ~OtherCertItem() {} - QString configName() const; - const QString& getSub() { return _sub; } + TQString configName() const; + const TQString& getSub() { return _sub; } int getPolicy() { return _policy; } - const QString& getMD5() { return _md5; } + const TQString& getMD5() { return _md5; } bool isPermanent() { return _perm; } - QDateTime getExpires() { return _exp; } + TQDateTime getExpires() { return _exp; } void setPolicy(int x) { _policy = x; } void setPermanent(bool x) { _perm = x; } - void setExpires(QDateTime x) { _exp = x; } + void setExpires(TQDateTime x) { _exp = x; } protected: virtual void stateChange( bool ); private: - QString _sub, _md5; + TQString _sub, _md5; KCryptoConfig *m_module; // just to call configChanged() - QDateTime _exp; + TQDateTime _exp; bool _perm; int _policy; }; @@ -105,27 +105,27 @@ private: class YourCertItem : public QListViewItem { public: - YourCertItem(QListView *view, QString pkcs, QString pass, QString name, KCryptoConfig *module ); + YourCertItem(TQListView *view, TQString pkcs, TQString pass, TQString name, KCryptoConfig *module ); ~YourCertItem() {} - QString configName() const; - QString& getPKCS() { return _pkcs; } - void setPKCS(QString pkcs) { _pkcs = pkcs; } - QString& getPass() { return _pass; } - void setPass(QString pass) { _pass = pass; } - QString& getName() { return _name; } - void setName(QString name) { _name = name; } - QString& getPassCache() { return _cpass; } - void setPassCache(QString pass) { _cpass = pass; } + TQString configName() const; + TQString& getPKCS() { return _pkcs; } + void setPKCS(TQString pkcs) { _pkcs = pkcs; } + TQString& getPass() { return _pass; } + void setPass(TQString pass) { _pass = pass; } + TQString& getName() { return _name; } + void setName(TQString name) { _name = name; } + TQString& getPassCache() { return _cpass; } + void setPassCache(TQString pass) { _cpass = pass; } protected: virtual void stateChange( bool ); private: - QString _pkcs; - QString _pass; - QString _cpass; - QString _name; + TQString _pkcs; + TQString _pass; + TQString _cpass; + TQString _name; KCryptoConfig *m_module; // just to call configChanged() }; @@ -135,14 +135,14 @@ private: class CAItem : public QListViewItem { public: - CAItem(QListView *view, QString name, QString cert, bool site, bool email, bool code, KCryptoConfig *module ); + CAItem(TQListView *view, TQString name, TQString cert, bool site, bool email, bool code, KCryptoConfig *module ); ~CAItem() {} - QString configName() const; - QString& getName() { return _name; } - void setName(QString name) { _name = name; } + TQString configName() const; + TQString& getName() { return _name; } + void setName(TQString name) { _name = name; } - inline QString getCert() const { return _cert; } + inline TQString getCert() const { return _cert; } inline bool getSite() const { return _site; } inline bool getEmail() const { return _email; } inline bool getCode() const { return _code; } @@ -156,8 +156,8 @@ protected: virtual void stateChange( bool ); private: - QString _name; - QString _cert; + TQString _name; + TQString _cert; bool _site, _email, _code; KCryptoConfig *m_module; // just to call configChanged() }; @@ -169,12 +169,12 @@ private: class HostAuthItem : public QListViewItem { public: - HostAuthItem(QListView *view, QString host, QString name, KCryptoConfig *module ) : QListViewItem(view, QString::null ) { + HostAuthItem(TQListView *view, TQString host, TQString name, KCryptoConfig *module ) : TQListViewItem(view, TQString::null ) { _name = name; _host = host; m_module = module; setText(0, _host); setText(1, _name); - _oname = QString::null; + _oname = TQString::null; } ~HostAuthItem() {} @@ -195,18 +195,18 @@ public: } } KSSLCertificateHome::KSSLAuthAction getAction() const { return _aa; } - QString configName() const { return _host; } - QString getCertName() const { return _name; } - void setCertName(QString name) { _name = name; setText(1, name); } - void setHost(QString name) { _host = name; setText(0, name); } - void setOriginalName(QString oname) { _oname = oname; } - QString originalName() const { return _oname; } + TQString configName() const { return _host; } + TQString getCertName() const { return _name; } + void setCertName(TQString name) { _name = name; setText(1, name); } + void setHost(TQString name) { _host = name; setText(0, name); } + void setOriginalName(TQString oname) { _oname = oname; } + TQString originalName() const { return _oname; } protected: private: - QString _host; - QString _name, _oname; + TQString _host; + TQString _name, _oname; KSSLCertificateHome::KSSLAuthAction _aa; KCryptoConfig *m_module; // just to call configChanged() }; @@ -219,7 +219,7 @@ class KCryptoConfig : public KCModule { Q_OBJECT public: - KCryptoConfig(QWidget *parent = 0L, const char *name = 0L, const QStringList &list = QStringList()); + KCryptoConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &list = TQStringList()); virtual ~KCryptoConfig(); void load(); @@ -261,7 +261,7 @@ public slots: void slotNewHostAuth(); void slotRemoveHostAuth(); void slotAuthItemChanged(); - void slotAuthText(const QString &t); + void slotAuthText(const TQString &t); void slotAuthButtons(); void slotAuthCombo(); @@ -279,78 +279,78 @@ protected: private: - void offerImportToKMail( const QString& certFile ); + void offerImportToKMail( const TQString& certFile ); void setAuthCertLists(); void genCAList(); - QTabWidget *tabs; - QWidget *tabSSL, *tabOSSL; + TQTabWidget *tabs; + TQWidget *tabSSL, *tabOSSL; - QWidget *tabYourSSLCert, *tabOtherSSLCert, *tabSSLCA, *tabSSLCOpts, *tabAuth; + TQWidget *tabYourSSLCert, *tabOtherSSLCert, *tabSSLCA, *tabSSLCOpts, *tabAuth; - QListView *SSLv2Box, *SSLv3Box; - QCheckBox *mUseTLS, *mUseSSLv2, *mUseSSLv3; - QCheckBox *mWarnOnEnter, *mWarnOnLeave; + TQListView *SSLv2Box, *SSLv3Box; + TQCheckBox *mUseTLS, *mUseSSLv2, *mUseSSLv3; + TQCheckBox *mWarnOnEnter, *mWarnOnLeave; /* EGD stuff */ - QLabel *mEGDLabel; + TQLabel *mEGDLabel; KURLRequester *mEGDPath; - QCheckBox *mUseEGD; - QCheckBox *mUseEFile; + TQCheckBox *mUseEGD; + TQCheckBox *mUseEFile; /* CipherWizards */ - QPushButton *mCWall, *mCWus, *mCWexp, *mCWcompatible; + TQPushButton *mCWall, *mCWus, *mCWexp, *mCWcompatible; - QCheckBox *mWarnOnUnencrypted, *mWarnOnMixed; - QListView *yourSSLBox, *otherSSLBox, *caList; - QCheckBox *mWarnSelfSigned, *mWarnExpired, *mWarnRevoked; - QPushButton *macAdd, *macRemove; + TQCheckBox *mWarnOnUnencrypted, *mWarnOnMixed; + TQListView *yourSSLBox, *otherSSLBox, *caList; + TQCheckBox *mWarnSelfSigned, *mWarnExpired, *mWarnRevoked; + TQPushButton *macAdd, *macRemove; KPushButton *macClear; - QListBox *macBox; - QPushButton *otherSSLExport, *otherSSLView, *otherSSLRemove, *otherSSLVerify; - QPushButton *yourSSLImport, *yourSSLPass, *yourSSLRemove, *yourSSLExport, + TQListBox *macBox; + TQPushButton *otherSSLExport, *otherSSLView, *otherSSLRemove, *otherSSLVerify; + TQPushButton *yourSSLImport, *yourSSLPass, *yourSSLRemove, *yourSSLExport, *yourSSLUnlock, *yourSSLVerify; - QRadioButton *yourSSLUseDefault, *yourSSLList, *yourSSLDont; - QLineEdit *macCert; + TQRadioButton *yourSSLUseDefault, *yourSSLList, *yourSSLDont; + TQLineEdit *macCert; KSSLCertBox *oSubject, *oIssuer; KSSLCertBox *ySubject, *yIssuer; - QGridLayout *oGrid; - - QVButtonGroup *policyGroup; - QVButtonGroup *cacheGroup; - QRadioButton *policyAccept, *policyReject, *policyPrompt; - QRadioButton *cacheUntil, *cachePerm; - QLabel *fromLabel, *untilLabel; - QLabel *validFrom, *validUntil; - QLabel *yValidFrom, *yValidUntil; + TQGridLayout *oGrid; + + TQVButtonGroup *policyGroup; + TQVButtonGroup *cacheGroup; + TQRadioButton *policyAccept, *policyReject, *policyPrompt; + TQRadioButton *cacheUntil, *cachePerm; + TQLabel *fromLabel, *untilLabel; + TQLabel *validFrom, *validUntil; + TQLabel *yValidFrom, *yValidUntil; KURLLabel *untilDate; - QVGroupBox *oInfo; + TQVGroupBox *oInfo; KURLRequester *oPath; - QPushButton *oTest; - QPtrList<OtherCertItem> otherCertDelList; - QPtrList<YourCertItem> yourCertDelList; - QPtrList<CAItem> caDelList; + TQPushButton *oTest; + TQPtrList<OtherCertItem> otherCertDelList; + TQPtrList<YourCertItem> yourCertDelList; + TQPtrList<CAItem> caDelList; /* Personal Cert Policies tab */ KComboBox *defCertBox; KComboBox *hostCertBox; - QVButtonGroup *defCertBG; - QHButtonGroup *hostCertBG; - QRadioButton *defSend, *defPrompt, *defDont; - QRadioButton *hostSend, *hostPrompt, *hostDont; - QListView *hostAuthList; - QPushButton *authAdd, *authRemove; - QLineEdit *authHost; - QPtrList<HostAuthItem> authDelList; - QLabel *yHash, *pHash; + TQVButtonGroup *defCertBG; + TQHButtonGroup *hostCertBG; + TQRadioButton *defSend, *defPrompt, *defDont; + TQRadioButton *hostSend, *hostPrompt, *hostDont; + TQListView *hostAuthList; + TQPushButton *authAdd, *authRemove; + TQLineEdit *authHost; + TQPtrList<HostAuthItem> authDelList; + TQLabel *yHash, *pHash; /* CA stuff */ KSSLCertBox *caSubject, *caIssuer; - QPushButton *caSSLImport, *caSSLRemove, *caSSLRestore; - QCheckBox *caSite, *caEmail, *caCode; + TQPushButton *caSSLImport, *caSSLRemove, *caSSLRestore; + TQCheckBox *caSite, *caEmail, *caCode; KSSLSigners *_signers; - QLabel *cHash; + TQLabel *cHash; KConfig *config; KSimpleConfig *policies, *pcerts, *authcfg; diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp index 26001afdd..f7eae9883 100644 --- a/kcontrol/crypto/kdatetimedlg.cpp +++ b/kcontrol/crypto/kdatetimedlg.cpp @@ -23,8 +23,8 @@ #endif #include "kdatetimedlg.h" -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <klocale.h> #include <kdebug.h> #include <kdatepicker.h> @@ -32,37 +32,37 @@ #include <knuminput.h> #include <kstdguiitem.h> -KDateTimeDlg::KDateTimeDlg(QWidget *parent, const char *name) +KDateTimeDlg::KDateTimeDlg(TQWidget *parent, const char *name) : KDialog(parent, name, true) { -QGridLayout *grid = new QGridLayout(this, 9, 6, marginHint(), spacingHint()); +TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint()); setCaption(i18n("Date & Time Selector")); _date = new KDatePicker(this); grid->addMultiCellWidget(_date, 0, 5, 0, 5); - grid->addWidget(new QLabel(i18n("Hour:"), this), 7, 0); + grid->addWidget(new TQLabel(i18n("Hour:"), this), 7, 0); _hours = new KIntNumInput(this); _hours->setRange(0, 23, 1, false); grid->addWidget(_hours, 7, 1); - grid->addWidget(new QLabel(i18n("Minute:"), this), 7, 2); + grid->addWidget(new TQLabel(i18n("Minute:"), this), 7, 2); _mins = new KIntNumInput(this); _mins->setRange(0, 59, 1, false); grid->addWidget(_mins, 7, 3); - grid->addWidget(new QLabel(i18n("Second:"), this), 7, 4); + grid->addWidget(new TQLabel(i18n("Second:"), this), 7, 4); _secs = new KIntNumInput(this); _secs->setRange(0, 59, 1, false); grid->addWidget(_secs, 7, 5); _ok = new KPushButton(KStdGuiItem::ok(), this); grid->addWidget(_ok, 8, 4); - connect(_ok, SIGNAL(clicked()), SLOT(accept())); + connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); _cancel = new KPushButton(KStdGuiItem::cancel(), this); grid->addWidget(_cancel, 8, 5); - connect(_cancel, SIGNAL(clicked()), SLOT(reject())); + connect(_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); } @@ -72,20 +72,20 @@ KDateTimeDlg::~KDateTimeDlg() { } -QDate KDateTimeDlg::getDate() { +TQDate KDateTimeDlg::getDate() { return _date->date(); } -QTime KDateTimeDlg::getTime() { -QTime rc(_hours->value(), _mins->value(), _secs->value()); +TQTime KDateTimeDlg::getTime() { +TQTime rc(_hours->value(), _mins->value(), _secs->value()); return rc; } -QDateTime KDateTimeDlg::getDateTime() { -QDateTime qdt; -QTime qtime(_hours->value(), _mins->value(), _secs->value()); +TQDateTime KDateTimeDlg::getDateTime() { +TQDateTime qdt; +TQTime qtime(_hours->value(), _mins->value(), _secs->value()); qdt.setDate(_date->date()); qdt.setTime(qtime); @@ -94,19 +94,19 @@ return qdt; } -void KDateTimeDlg::setDate(const QDate& qdate) { +void KDateTimeDlg::setDate(const TQDate& qdate) { _date->setDate(qdate); } -void KDateTimeDlg::setTime(const QTime& qtime) { +void KDateTimeDlg::setTime(const TQTime& qtime) { _hours->setValue(qtime.hour()); _mins->setValue(qtime.minute()); _secs->setValue(qtime.second()); } -void KDateTimeDlg::setDateTime(const QDateTime& qdatetime) { +void KDateTimeDlg::setDateTime(const TQDateTime& qdatetime) { _date->setDate(qdatetime.date()); _hours->setValue(qdatetime.time().hour()); _mins->setValue(qdatetime.time().minute()); diff --git a/kcontrol/crypto/kdatetimedlg.h b/kcontrol/crypto/kdatetimedlg.h index 3f25cad2b..4d6cc21f0 100644 --- a/kcontrol/crypto/kdatetimedlg.h +++ b/kcontrol/crypto/kdatetimedlg.h @@ -36,16 +36,16 @@ class KDateTimeDlg : public KDialog { Q_OBJECT public: - KDateTimeDlg(QWidget *parent = 0L, const char *name = 0L); + KDateTimeDlg(TQWidget *parent = 0L, const char *name = 0L); virtual ~KDateTimeDlg(); - virtual QTime getTime(); - virtual QDate getDate(); - virtual QDateTime getDateTime(); + virtual TQTime getTime(); + virtual TQDate getDate(); + virtual TQDateTime getDateTime(); - virtual void setDate(const QDate& qdate); - virtual void setTime(const QTime& qtime); - virtual void setDateTime(const QDateTime& qdatetime); + virtual void setDate(const TQDate& qdate); + virtual void setTime(const TQTime& qtime); + virtual void setDateTime(const TQDateTime& qdatetime); protected slots: diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index bd72a1375..552afd3a3 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -1,9 +1,9 @@ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qtextbrowser.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqtextbrowser.h> #include <kapplication.h> #include <kcolorbutton.h> @@ -22,13 +22,13 @@ #include "kcmcss.h" -typedef KGenericFactory<CSSConfig, QWidget> CSSFactory; +typedef KGenericFactory<CSSConfig, TQWidget> CSSFactory; K_EXPORT_COMPONENT_FACTORY( kcm_css, CSSFactory("kcmcss") ) -CSSConfig::CSSConfig(QWidget *parent, const char *name, const QStringList &) +CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &) : KCModule(CSSFactory::instance(), parent, name) { - customDialogBase = new KDialogBase(this, "customCSSDialog", true, QString::null, + customDialogBase = new KDialogBase(this, "customCSSDialog", true, TQString::null, KDialogBase::Close, KDialogBase::Close, true ); customDialog = new CSSCustomDialog(customDialogBase); customDialogBase->setMainWidget(customDialog); @@ -46,52 +46,52 @@ CSSConfig::CSSConfig(QWidget *parent, const char *name, const QStringList &) " that are unreadable due to bad design.")); - QStringList fonts; + TQStringList fonts; KFontChooser::getFontList(fonts, 0); customDialog->fontFamily->insertStringList(fonts); - connect(configDialog->useDefault, SIGNAL(clicked()), - SLOT(changed())); - connect(configDialog->useAccess, SIGNAL(clicked()), - SLOT(changed())); - connect(configDialog->useUser, SIGNAL(clicked()), - SLOT(changed())); - connect(configDialog->urlRequester, SIGNAL(textChanged(const QString&)), - SLOT(changed())); - connect(configDialog->customize, SIGNAL(clicked()), - SLOT(slotCustomize())); - connect(customDialog->basefontsize, SIGNAL(highlighted(int)), - SLOT(changed())); - connect(customDialog->basefontsize, SIGNAL(textChanged(const QString&)), - SLOT(changed())); - connect(customDialog->dontScale, SIGNAL(clicked()), - SLOT(changed())); - connect(customDialog->blackOnWhite, SIGNAL(clicked()), - SLOT(changed())); - connect(customDialog->whiteOnBlack, SIGNAL(clicked()), - SLOT(changed())); - connect(customDialog->customColor, SIGNAL(clicked()), - SLOT(changed())); - connect(customDialog->foregroundColor, SIGNAL(changed(const QColor &)), - SLOT(changed())); - connect(customDialog->backgroundColor, SIGNAL(changed(const QColor &)), - SLOT(changed())); - connect(customDialog->fontFamily, SIGNAL(highlighted(int)), - SLOT(changed())); - connect(customDialog->fontFamily, SIGNAL(textChanged(const QString&)), - SLOT(changed())); - connect(customDialog->sameFamily, SIGNAL(clicked()), - SLOT(changed())); - connect(customDialog->preview, SIGNAL(clicked()), - SLOT(slotPreview())); - connect(customDialog->sameColor, SIGNAL(clicked()), - SLOT(changed())); - connect(customDialog->hideImages, SIGNAL(clicked()), - SLOT(changed())); - connect(customDialog->hideBackground, SIGNAL(clicked()), - SLOT(changed())); - - QVBoxLayout *vbox = new QVBoxLayout(this, 0, 0); + connect(configDialog->useDefault, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(configDialog->useAccess, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(configDialog->useUser, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(configDialog->urlRequester, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(changed())); + connect(configDialog->customize, TQT_SIGNAL(clicked()), + TQT_SLOT(slotCustomize())); + connect(customDialog->basefontsize, TQT_SIGNAL(highlighted(int)), + TQT_SLOT(changed())); + connect(customDialog->basefontsize, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(changed())); + connect(customDialog->dontScale, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(customDialog->blackOnWhite, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(customDialog->whiteOnBlack, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(customDialog->customColor, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(customDialog->foregroundColor, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(changed())); + connect(customDialog->backgroundColor, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(changed())); + connect(customDialog->fontFamily, TQT_SIGNAL(highlighted(int)), + TQT_SLOT(changed())); + connect(customDialog->fontFamily, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(changed())); + connect(customDialog->sameFamily, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(customDialog->preview, TQT_SIGNAL(clicked()), + TQT_SLOT(slotPreview())); + connect(customDialog->sameColor, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(customDialog->hideImages, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + connect(customDialog->hideBackground, TQT_SIGNAL(clicked()), + TQT_SLOT(changed())); + + TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 0); vbox->addWidget(configDialog); load(); @@ -108,17 +108,17 @@ void CSSConfig::load( bool useDefaults ) c->setReadDefaults( useDefaults ); c->setGroup("Stylesheet"); - QString u = c->readEntry("Use", "default"); + TQString u = c->readEntry("Use", "default"); configDialog->useDefault->setChecked(u == "default"); configDialog->useUser->setChecked(u == "user"); configDialog->useAccess->setChecked(u == "access"); configDialog->urlRequester->setURL(c->readEntry("SheetName")); c->setGroup("Font"); - customDialog->basefontsize->setEditText(QString::number(c->readNumEntry("BaseSize", 12))); + customDialog->basefontsize->setEditText(TQString::number(c->readNumEntry("BaseSize", 12))); customDialog->dontScale->setChecked(c->readBoolEntry("DontScale", false)); - QString fname = c->readEntry("Family", "Arial"); + TQString fname = c->readEntry("Family", "Arial"); for (int i=0; i < customDialog->fontFamily->count(); ++i) if (customDialog->fontFamily->text(i) == fname) { @@ -129,7 +129,7 @@ void CSSConfig::load( bool useDefaults ) customDialog->sameFamily->setChecked(c->readBoolEntry("SameFamily", false)); c->setGroup("Colors"); - QString m = c->readEntry("Mode", "black-on-white"); + TQString m = c->readEntry("Mode", "black-on-white"); customDialog->blackOnWhite->setChecked(m == "black-on-white"); customDialog->whiteOnBlack->setChecked(m == "white-on-black"); customDialog->customColor->setChecked(m == "custom"); @@ -187,8 +187,8 @@ void CSSConfig::save() delete c; // generate CSS template - QString templ = locate("data", "kcmcss/template.css"); - QString dest; + TQString templ = locate("data", "kcmcss/template.css"); + TQString dest; if (!templ.isEmpty()) { CSSTemplate css(templ); @@ -222,18 +222,18 @@ void CSSConfig::defaults() } -QString px(int i, double scale) +TQString px(int i, double scale) { - QString px; + TQString px; px.setNum(static_cast<int>(i * scale)); px += "px"; return px; } -QMap<QString,QString> CSSConfig::cssDict() +TQMap<TQString,TQString> CSSConfig::cssDict() { - QMap<QString,QString> dict; + TQMap<TQString,TQString> dict; // Fontsizes ------------------------------------------------------ @@ -314,10 +314,10 @@ void CSSConfig::slotCustomize() void CSSConfig::slotPreview() { - QStyleSheetItem *h1 = new QStyleSheetItem(QStyleSheet::defaultSheet(), "h1"); - QStyleSheetItem *h2 = new QStyleSheetItem(QStyleSheet::defaultSheet(), "h2"); - QStyleSheetItem *h3 = new QStyleSheetItem(QStyleSheet::defaultSheet(), "h3"); - QStyleSheetItem *text = new QStyleSheetItem(QStyleSheet::defaultSheet(), "p"); + TQStyleSheetItem *h1 = new TQStyleSheetItem(TQStyleSheet::defaultSheet(), "h1"); + TQStyleSheetItem *h2 = new TQStyleSheetItem(TQStyleSheet::defaultSheet(), "h2"); + TQStyleSheetItem *h3 = new TQStyleSheetItem(TQStyleSheet::defaultSheet(), "h3"); + TQStyleSheetItem *text = new TQStyleSheetItem(TQStyleSheet::defaultSheet(), "p"); // Fontsize @@ -338,7 +338,7 @@ void CSSConfig::slotPreview() // Colors - QColor back, fore; + TQColor back, fore; if (customDialog->blackOnWhite->isChecked()) { @@ -371,7 +371,7 @@ void CSSConfig::slotPreview() // Show the preview PreviewDialog *dlg = new PreviewDialog(this, 0, true); dlg->preview->setPaper(back); - dlg->preview->viewport()->setFont(QFont(KGlobalSettings::generalFont().family(), bfs)); + dlg->preview->viewport()->setFont(TQFont(KGlobalSettings::generalFont().family(), bfs)); dlg->exec(); diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h index decf5c3a3..164f22dae 100644 --- a/kcontrol/css/kcmcss.h +++ b/kcontrol/css/kcmcss.h @@ -19,7 +19,7 @@ #define __KCMCSS_H__ -#include <qmap.h> +#include <tqmap.h> #include <kcmodule.h> @@ -35,7 +35,7 @@ class CSSConfig : public KCModule public: - CSSConfig(QWidget *parent = 0L, const char *name = 0L, const QStringList &list =QStringList() ); + CSSConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &list =TQStringList() ); void load(); void load( bool useDefaults ); @@ -49,7 +49,7 @@ public slots: private: - QMap<QString,QString> cssDict(); + TQMap<TQString,TQString> cssDict(); CSSConfigDialog *configDialog; CSSCustomDialog *customDialog; diff --git a/kcontrol/css/template.cpp b/kcontrol/css/template.cpp index 94eba6053..e237ed796 100644 --- a/kcontrol/css/template.cpp +++ b/kcontrol/css/template.cpp @@ -1,24 +1,24 @@ -#include <qfile.h> +#include <tqfile.h> #include "template.h" -bool CSSTemplate::expand(QString destname, const QMap<QString,QString> &dict) +bool CSSTemplate::expand(TQString destname, const TQMap<TQString,TQString> &dict) { - QFile inf(_filename); + TQFile inf(_filename); if (!inf.open(IO_ReadOnly)) return false; - QTextStream is(&inf); + TQTextStream is(&inf); - QFile outf(destname); + TQFile outf(destname); if (!outf.open(IO_WriteOnly)) return false; - QTextStream os(&outf); + TQTextStream os(&outf); - QString line; + TQString line; while (!is.eof()) { line = is.readLine(); @@ -29,8 +29,8 @@ bool CSSTemplate::expand(QString destname, const QMap<QString,QString> &dict) int end = line.find('$', start+1); if (end >= 0) { - QString expr = line.mid(start+1, end-start-1); - QString res = dict[expr]; + TQString expr = line.mid(start+1, end-start-1); + TQString res = dict[expr]; line.replace(start, end-start+1, res); } diff --git a/kcontrol/css/template.h b/kcontrol/css/template.h index 2b701a238..bdcc8ad63 100644 --- a/kcontrol/css/template.h +++ b/kcontrol/css/template.h @@ -2,18 +2,18 @@ #define __TEMPLATE_H__ -#include <qstring.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqmap.h> class CSSTemplate { public: - CSSTemplate(QString fname) : _filename(fname) {}; - bool expand(QString destname, const QMap<QString,QString> &dict); + CSSTemplate(TQString fname) : _filename(fname) {}; + bool expand(TQString destname, const TQMap<TQString,TQString> &dict); protected: - QString _filename; + TQString _filename; }; diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp index 1c514810c..d7675160e 100644 --- a/kcontrol/display/display.cpp +++ b/kcontrol/display/display.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include <qapplication.h> -#include <qlayout.h> -#include <qtabwidget.h> +#include <tqapplication.h> +#include <tqlayout.h> +#include <tqtabwidget.h> #include <kcmoduleloader.h> #include <kdialog.h> @@ -27,34 +27,34 @@ #include "display.h" -typedef KGenericFactory<KCMDisplay, QWidget> DisplayFactory; +typedef KGenericFactory<KCMDisplay, TQWidget> DisplayFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_display, DisplayFactory( "display" ) ) -KCMDisplay::KCMDisplay( QWidget *parent, const char *name, const QStringList& ) +KCMDisplay::KCMDisplay( TQWidget *parent, const char *name, const TQStringList& ) : KCModule( parent, name ) , m_changed(false) { - m_tabs = new QTabWidget( this ); + m_tabs = new TQTabWidget( this ); addTab( "randr", i18n( "Size && Orientation" ) ); addTab( "nvidiadisplay", i18n( "Graphics Adaptor" ) ); addTab( "nvidia3d", i18n( "3D Options" ) ); addTab( "kgamma", i18n( "Monitor Gamma" ) ); - if ( QApplication::desktop()->isVirtualDesktop() ) + if ( TQApplication::desktop()->isVirtualDesktop() ) addTab( "xinerama", i18n( "Multiple Monitors" ) ); addTab( "energy", i18n( "Power Control" ) ); - QVBoxLayout *top = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *top = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); top->addWidget( m_tabs ); setButtons( Apply|Help ); load(); } -void KCMDisplay::addTab( const QString &name, const QString &label ) +void KCMDisplay::addTab( const TQString &name, const TQString &label ) { - QWidget *page = new QWidget( m_tabs, name.latin1() ); - QVBoxLayout *top = new QVBoxLayout( page, KDialog::marginHint() ); + TQWidget *page = new TQWidget( m_tabs, name.latin1() ); + TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() ); KCModule *kcm = KCModuleLoader::loadModule( name, page ); @@ -63,7 +63,7 @@ void KCMDisplay::addTab( const QString &name, const QString &label ) top->addWidget( kcm ); m_tabs->addTab( page, label ); - connect( kcm, SIGNAL( changed(bool) ), SLOT( moduleChanged(bool) ) ); + connect( kcm, TQT_SIGNAL( changed(bool) ), TQT_SLOT( moduleChanged(bool) ) ); m_modules.insert(kcm, false); } else @@ -72,20 +72,20 @@ void KCMDisplay::addTab( const QString &name, const QString &label ) void KCMDisplay::load() { - for (QMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) + for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) it.key()->load(); } void KCMDisplay::save() { - for (QMap<KCModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it) + for (TQMap<KCModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it) if (it.data()) it.key()->save(); } void KCMDisplay::moduleChanged( bool isChanged ) { - QMap<KCModule*, bool>::Iterator currentModule = m_modules.find(static_cast<KCModule*>(const_cast<QObject*>(sender()))); + TQMap<KCModule*, bool>::Iterator currentModule = m_modules.find(static_cast<KCModule*>(const_cast<TQObject*>(sender()))); Q_ASSERT(currentModule != m_modules.end()); if (currentModule.data() == isChanged) return; @@ -94,7 +94,7 @@ void KCMDisplay::moduleChanged( bool isChanged ) bool c = false; - for (QMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) { + for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) { if (it.data()) { c = true; break; diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h index d07695320..ec5811725 100644 --- a/kcontrol/display/display.h +++ b/kcontrol/display/display.h @@ -29,7 +29,7 @@ class KCMDisplay : public KCModule Q_OBJECT public: - KCMDisplay( QWidget *parent, const char *name, const QStringList& ); + KCMDisplay( TQWidget *parent, const char *name, const TQStringList& ); void load(); void save(); @@ -37,10 +37,10 @@ class KCMDisplay : public KCModule void moduleChanged(bool isChanged); private: - void addTab( const QString &name, const QString &label ); + void addTab( const TQString &name, const TQString &label ); - QTabWidget *m_tabs; - QMap<KCModule*, bool> m_modules; + TQTabWidget *m_tabs; + TQMap<KCModule*, bool> m_modules; bool m_changed; }; diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index d754f0025..97b532b54 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -21,16 +21,16 @@ #include <sys/stat.h> #include <config.h> -#include <qlayout.h> -#include <qfile.h> -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qtimer.h> -#include <qtabwidget.h> -#include <qcheckbox.h> -#include <qprocess.h> -#include <qcursor.h> -#include <qbuttongroup.h> +#include <tqlayout.h> +#include <tqfile.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqtimer.h> +#include <tqtabwidget.h> +#include <tqcheckbox.h> +#include <tqprocess.h> +#include <tqcursor.h> +#include <tqbuttongroup.h> #include <klocale.h> #include <kglobal.h> @@ -50,10 +50,10 @@ #define MDNSD_CONF "/etc/mdnsd.conf" #define MDNSD_PID "/var/run/mdnsd.pid" -typedef KGenericFactory<KCMDnssd, QWidget> KCMDnssdFactory; +typedef KGenericFactory<KCMDnssd, TQWidget> KCMDnssdFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd")) -KCMDnssd::KCMDnssd(QWidget *parent, const char *name, const QStringList&) +KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) : ConfigDialog(parent, name), m_wdchanged(false) { setAboutData(new KAboutData(I18N_NOOP("kcm_kdnssd"), @@ -65,13 +65,13 @@ KCMDnssd::KCMDnssd(QWidget *parent, const char *name, const QStringList&) else if (getenv("KDESU_USER")!=0) tabs->removePage(tab); addConfig(DNSSD::Configuration::self(),this); // it is host-wide setting so it has to be in global config file - domain = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kdnssdrc" )); + domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" )); domain->setGroup("publishing"); load(); - connect(hostedit,SIGNAL(textChanged(const QString&)),this,SLOT(wdchanged())); - connect(secretedit,SIGNAL(textChanged(const QString&)),this,SLOT(wdchanged())); - connect(domainedit,SIGNAL(textChanged(const QString&)),this,SLOT(wdchanged())); - connect(enableZeroconf,SIGNAL(toggled(bool)),this,SLOT(enableZeroconfChanged(bool))); + connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); + connect(secretedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); + connect(domainedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); + connect(enableZeroconf,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableZeroconfChanged(bool))); m_enableZeroconfChanged=false; if (DNSSD::Configuration::self()->publishDomain().isEmpty()) WANButton->setEnabled(false); kcfg_PublishType->hide(); //unused with Avahi @@ -84,7 +84,7 @@ KCMDnssd::~KCMDnssd() void KCMDnssd::save() { - setCursor(QCursor(Qt::BusyCursor)); + setCursor(TQCursor(Qt::BusyCursor)); KCModule::save(); if (geteuid()==0 && m_wdchanged) saveMdnsd(); domain->setFileWriteMode(0644); // this should be readable for everyone @@ -93,7 +93,7 @@ void KCMDnssd::save() KIPC::sendMessageAll((KIPC::Message)KIPCDomainsChanged); if (m_enableZeroconfChanged) { - QString scaryMessage = i18n("Enabling local network browsing will open a network port (5353) on your computer. If security problems are discovered in the zeroconf server, remote attackers could access your computer as the \"avahi\" user."); + TQString scaryMessage = i18n("Enabling local network browsing will open a network port (5353) on your computer. If security problems are discovered in the zeroconf server, remote attackers could access your computer as the \"avahi\" user."); KProcess *proc = new KProcess; @@ -112,14 +112,14 @@ void KCMDnssd::save() proc->start(KProcess::Block); } } - setCursor(QCursor(Qt::ArrowCursor)); + setCursor(TQCursor(Qt::ArrowCursor)); } void KCMDnssd::load() { if (geteuid()==0) loadMdnsd(); enableZeroconf->setChecked(false); - QProcess avahiStatus(QString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); + TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); avahiStatus.start(); while (avahiStatus.isRunning()) { kapp->processEvents(); @@ -151,14 +151,14 @@ void KCMDnssd::enableZeroconfChanged(bool) void KCMDnssd::loadMdnsd() { - QFile f(MDNSD_CONF); + TQFile f(MDNSD_CONF); if (!f.open(IO_ReadWrite)) return; - QTextStream stream(&f); - QString line; + TQTextStream stream(&f); + TQString line; while (!stream.atEnd()) { line = stream.readLine(); - mdnsdLines.insert(line.section(' ',0,0,QString::SectionSkipEmpty), - line.section(' ',1,-1,QString::SectionSkipEmpty)); + mdnsdLines.insert(line.section(' ',0,0,TQString::SectionSkipEmpty), + line.section(' ',1,-1,TQString::SectionSkipEmpty)); } if (!mdnsdLines["zone"].isNull()) domainedit->setText(mdnsdLines["zone"]); if (!mdnsdLines["hostname"].isNull()) hostedit->setText(mdnsdLines["hostname"]); @@ -169,13 +169,13 @@ bool KCMDnssd::saveMdnsd() { mdnsdLines["zone"]=domainedit->text(); mdnsdLines["hostname"]=hostedit->text(); - if (!secretedit->text().isEmpty()) mdnsdLines["secret-64"]=QString(secretedit->password()); + if (!secretedit->text().isEmpty()) mdnsdLines["secret-64"]=TQString(secretedit->password()); else mdnsdLines.remove("secret-64"); - QFile f(MDNSD_CONF); + TQFile f(MDNSD_CONF); bool newfile=!f.exists(); if (!f.open(IO_WriteOnly)) return false; - QTextStream stream(&f); - for (QMap<QString,QString>::ConstIterator it=mdnsdLines.begin();it!=mdnsdLines.end(); + TQTextStream stream(&f); + for (TQMap<TQString,TQString>::ConstIterator it=mdnsdLines.begin();it!=mdnsdLines.end(); ++it) stream << it.key() << " " << (*it) << "\n"; f.close(); // if it is new file, then make it only accessible for root as it can contain shared @@ -183,7 +183,7 @@ bool KCMDnssd::saveMdnsd() if (newfile) chmod(MDNSD_CONF,0600); f.setName(MDNSD_PID); if (!f.open(IO_ReadOnly)) return true; // it is not running so no need to signal - QString line; + TQString line; if (f.readLine(line,16)<1) return true; unsigned int pid = line.toUInt(); if (pid==0) return true; // not a pid diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h index 384f7b625..064577283 100644 --- a/kcontrol/dnssd/kcmdnssd.h +++ b/kcontrol/dnssd/kcmdnssd.h @@ -21,7 +21,7 @@ #ifndef _KCMDNSSD_H_ #define _KCMDNSSD_H_ -#include <qmap.h> +#include <tqmap.h> #include <configdialog.h> #include <kaboutdata.h> @@ -32,7 +32,7 @@ class KCMDnssd: public ConfigDialog Q_OBJECT public: - KCMDnssd( QWidget *parent=0, const char *name=0, const QStringList& = QStringList() ); + KCMDnssd( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); ~KCMDnssd(); virtual void save(); virtual void load(); @@ -42,7 +42,7 @@ private slots: private: void loadMdnsd(); bool saveMdnsd(); - QMap<QString,QString> mdnsdLines; + TQMap<TQString,TQString> mdnsdLines; bool m_wdchanged; KSimpleConfig* domain; bool m_enableZeroconfChanged; diff --git a/kcontrol/ebrowsing/filteropts.cpp b/kcontrol/ebrowsing/filteropts.cpp index ae2127380..a9c7801d6 100644 --- a/kcontrol/ebrowsing/filteropts.cpp +++ b/kcontrol/ebrowsing/filteropts.cpp @@ -21,21 +21,21 @@ #include <unistd.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <dcopclient.h> #include <klocale.h> #include "filteropts.h" -FilterOptions::FilterOptions(QWidget *parent, const char *name) +FilterOptions::FilterOptions(TQWidget *parent, const char *name) :KCModule(parent, name) { - QGridLayout *lay = new QGridLayout(this, 1, 1, 10, 5); + TQGridLayout *lay = new TQGridLayout(this, 1, 1, 10, 5); - lay->addWidget(new QLabel(i18n("Under construction..."), this), 0, 0); + lay->addWidget(new TQLabel(i18n("Under construction..."), this), 0, 0); lay->activate(); } diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h index f8a530b4a..98753e01c 100644 --- a/kcontrol/ebrowsing/filteropts.h +++ b/kcontrol/ebrowsing/filteropts.h @@ -32,7 +32,7 @@ class FilterOptions : public KCModule Q_OBJECT public: - FilterOptions(QWidget *parent = 0, const char *name = 0); + FilterOptions(TQWidget *parent = 0, const char *name = 0); void load( bool useDefaults ); void save(); @@ -42,7 +42,7 @@ protected slots: void moduleChanged(bool state); private: - QListBox* m_lbFilterList; + TQListBox* m_lbFilterList; }; #endif diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp index 8c7ab1e5d..a41ab92e3 100644 --- a/kcontrol/ebrowsing/main.cpp +++ b/kcontrol/ebrowsing/main.cpp @@ -23,9 +23,9 @@ #include <unistd.h> -#include <qlayout.h> -#include <qmap.h> -#include <qtabwidget.h> +#include <tqlayout.h> +#include <tqmap.h> +#include <tqtabwidget.h> #include <dcopclient.h> #include <kdialog.h> @@ -35,12 +35,12 @@ #include "filteropts.h" #include "main.h" -typedef KGenericFactory<KURIFilterModule, QWidget> KURIFactory; +typedef KGenericFactory<KURIFilterModule, TQWidget> KURIFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kurifilt, KURIFactory("kcmkurifilt") ) class FilterOptions; -KURIFilterModule::KURIFilterModule(QWidget *parent, const char *name, const QStringList &) +KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &) :KCModule(KURIFactory::instance(), parent, name) { @@ -56,18 +56,18 @@ KURIFilterModule::KURIFilterModule(QWidget *parent, const char *name, const QStr " Even easier: just press Alt+F2 (if you have not" " changed this shortcut) and enter the shortcut in the KDE Run Command dialog.")); - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); #if 0 opts = new FilterOptions(this); tab->addTab(opts, i18n("&Filters")); - connect(opts, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(opts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); #endif modules.setAutoDelete(true); - QMap<QString,KCModule*> helper; - QPtrListIterator<KURIFilterPlugin> it = filter->pluginsIterator(); + TQMap<TQString,KCModule*> helper; + TQPtrListIterator<KURIFilterPlugin> it = filter->pluginsIterator(); for (; it.current(); ++it) { KCModule *module = it.current()->configModule(this, 0); @@ -75,15 +75,15 @@ KURIFilterModule::KURIFilterModule(QWidget *parent, const char *name, const QStr { modules.append(module); helper.insert(it.current()->configName(), module); - connect(module, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(module, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); } } if (modules.count() > 1) { - QTabWidget *tab = new QTabWidget(this); + TQTabWidget *tab = new TQTabWidget(this); - QMapIterator<QString,KCModule*> it2; + TQMapIterator<TQString,KCModule*> it2; for (it2 = helper.begin(); it2 != helper.end(); ++it2) { tab->addTab(it2.data(), it2.key()); @@ -103,7 +103,7 @@ KURIFilterModule::KURIFilterModule(QWidget *parent, const char *name, const QStr void KURIFilterModule::load() { - QPtrListIterator<KCModule> it(modules); + TQPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) { it.current()->load(); @@ -112,7 +112,7 @@ void KURIFilterModule::load() void KURIFilterModule::save() { - QPtrListIterator<KCModule> it(modules); + TQPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) { it.current()->save(); @@ -121,7 +121,7 @@ void KURIFilterModule::save() void KURIFilterModule::defaults() { - QPtrListIterator<KCModule> it(modules); + TQPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) { it.current()->defaults(); diff --git a/kcontrol/ebrowsing/main.h b/kcontrol/ebrowsing/main.h index 6b9a0aa21..8508b0a0b 100644 --- a/kcontrol/ebrowsing/main.h +++ b/kcontrol/ebrowsing/main.h @@ -33,7 +33,7 @@ class KURIFilterModule : public KCModule { Q_OBJECT public: - KURIFilterModule(QWidget *parent, const char *name, const QStringList &); + KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &); void load(); void load(bool useDefaults ); @@ -43,9 +43,9 @@ public: private: KURIFilter *filter; - QWidget *widget; + TQWidget *widget; FilterOptions *opts; - QPtrList<KCModule> modules; + TQPtrList<KCModule> modules; }; #endif diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index ca79f0b36..6d89c3219 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -17,15 +17,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qfile.h> -#include <qgroupbox.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqfile.h> +#include <tqgroupbox.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <kdebug.h> #include <kglobal.h> @@ -52,8 +52,8 @@ class SearchProviderItem : public QCheckListItem { public: - SearchProviderItem(QListView *parent, SearchProvider *provider) - :QCheckListItem(parent, provider->name(), CheckBox), m_provider(provider) + SearchProviderItem(TQListView *parent, SearchProvider *provider) + :TQCheckListItem(parent, provider->name(), CheckBox), m_provider(provider) { update(); } @@ -75,10 +75,10 @@ private: SearchProvider *m_provider; }; -FilterOptions::FilterOptions(KInstance *instance, QWidget *parent, const char *name) +FilterOptions::FilterOptions(KInstance *instance, TQWidget *parent, const char *name) :KCModule(instance, parent, name) { - QVBoxLayout *mainLayout = new QVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint()); m_dlg = new FilterOptionsUI (this); @@ -91,7 +91,7 @@ FilterOptions::FilterOptions(KInstance *instance, QWidget *parent, const char *n load(); } -QString FilterOptions::quickHelp() const +TQString FilterOptions::quickHelp() const { return i18n("In this module you can configure the web shortcuts feature. " "Web shortcuts allow you to quickly search or lookup words on " @@ -120,7 +120,7 @@ void FilterOptions::load( bool useDefaults ) config.setGroup("General"); - QString defaultSearchEngine = config.readEntry("DefaultSearchEngine"); + TQString defaultSearchEngine = config.readEntry("DefaultSearchEngine"); m_favoriteEngines.clear(); m_favoriteEngines << "google" << "google_groups" << "google_news" << "webster" << "dmoz" << "wikipedia"; @@ -147,35 +147,35 @@ void FilterOptions::load( bool useDefaults ) m_dlg->lvSearchProviders->setSelected(m_dlg->lvSearchProviders->firstChild(), true); // Connect all the signals/slots... - connect(m_dlg->cbEnableShortcuts, SIGNAL(clicked()), this, - SLOT(setWebShortcutState())); - connect(m_dlg->cbEnableShortcuts, SIGNAL(clicked()), this, - SLOT(configChanged())); - - connect(m_dlg->lvSearchProviders, SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(updateSearchProvider())); - connect(m_dlg->lvSearchProviders, SIGNAL(doubleClicked(QListViewItem *)), - this, SLOT(changeSearchProvider())); - connect(m_dlg->lvSearchProviders, SIGNAL(returnPressed(QListViewItem *)), - this, SLOT(changeSearchProvider())); - connect(m_dlg->lvSearchProviders, SIGNAL(executed(QListViewItem *)), - this, SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, SIGNAL(spacePressed(QListViewItem *)), - this, SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, SIGNAL(pressed(QListViewItem *)), - this, SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, SIGNAL(clicked(QListViewItem *)), - this, SLOT(checkFavoritesChanged())); - - - connect(m_dlg->cmbDefaultEngine, SIGNAL(activated(const QString &)), this, - SLOT(configChanged())); - connect(m_dlg->cmbDelimiter, SIGNAL(activated(const QString &)), this, - SLOT(configChanged())); - - connect(m_dlg->pbNew, SIGNAL(clicked()), this, SLOT(addSearchProvider())); - connect(m_dlg->pbChange, SIGNAL(clicked()), this, SLOT(changeSearchProvider())); - connect(m_dlg->pbDelete, SIGNAL(clicked()), this, SLOT(deleteSearchProvider())); + connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this, + TQT_SLOT(setWebShortcutState())); + connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this, + TQT_SLOT(configChanged())); + + connect(m_dlg->lvSearchProviders, TQT_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQT_SLOT(updateSearchProvider())); + connect(m_dlg->lvSearchProviders, TQT_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQT_SLOT(changeSearchProvider())); + connect(m_dlg->lvSearchProviders, TQT_SIGNAL(returnPressed(TQListViewItem *)), + this, TQT_SLOT(changeSearchProvider())); + connect(m_dlg->lvSearchProviders, TQT_SIGNAL(executed(TQListViewItem *)), + this, TQT_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQT_SIGNAL(spacePressed(TQListViewItem *)), + this, TQT_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQT_SIGNAL(pressed(TQListViewItem *)), + this, TQT_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQT_SIGNAL(clicked(TQListViewItem *)), + this, TQT_SLOT(checkFavoritesChanged())); + + + connect(m_dlg->cmbDefaultEngine, TQT_SIGNAL(activated(const TQString &)), this, + TQT_SLOT(configChanged())); + connect(m_dlg->cmbDelimiter, TQT_SIGNAL(activated(const TQString &)), this, + TQT_SLOT(configChanged())); + + connect(m_dlg->pbNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSearchProvider())); + connect(m_dlg->pbChange, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSearchProvider())); + connect(m_dlg->pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSearchProvider())); emit changed( useDefaults ); } @@ -213,7 +213,7 @@ void FilterOptions::save() config.writeEntry("EnableWebShortcuts", m_dlg->cbEnableShortcuts->isChecked()); config.writeEntry("KeywordDelimiter", delimiter() ); - QString engine; + TQString engine; if (m_dlg->cmbDefaultEngine->currentItem() != 0) engine = m_dlg->cmbDefaultEngine->currentText(); @@ -223,11 +223,11 @@ void FilterOptions::save() // kdDebug () << "Engine: " << m_defaultEngineMap[engine] << endl; int changedProviderCount = 0; - QString path = kapp->dirs()->saveLocation("services", "searchproviders/"); + TQString path = kapp->dirs()->saveLocation("services", "searchproviders/"); m_favoriteEngines.clear(); - for (QListViewItemIterator it(m_dlg->lvSearchProviders); it.current(); ++it) + for (TQListViewItemIterator it(m_dlg->lvSearchProviders); it.current(); ++it) { SearchProviderItem *item = dynamic_cast<SearchProviderItem *>(it.current()); @@ -235,7 +235,7 @@ void FilterOptions::save() SearchProvider *provider = item->provider(); - QString name = provider->desktopEntryName(); + TQString name = provider->desktopEntryName(); if (item->isOn()) m_favoriteEngines << name; @@ -250,16 +250,16 @@ void FilterOptions::save() // Take the longest search shortcut as filename, // if such a file already exists, append a number and increase it // until the name is unique - for (QStringList::ConstIterator it = provider->keys().begin(); it != provider->keys().end(); ++it) + for (TQStringList::ConstIterator it = provider->keys().begin(); it != provider->keys().end(); ++it) { if ((*it).length() > name.length()) name = (*it).lower(); } for (int suffix = 0; ; ++suffix) { - QString located, check = name; + TQString located, check = name; if (suffix) - check += QString().setNum(suffix); + check += TQString().setNum(suffix); if ((located = locate("services", "searchproviders/" + check + ".desktop")).isEmpty()) { name = check; @@ -288,10 +288,10 @@ void FilterOptions::save() } } - for (QStringList::ConstIterator it = m_deletedProviders.begin(); + for (TQStringList::ConstIterator it = m_deletedProviders.begin(); it != m_deletedProviders.end(); ++it) { - QStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop"); + TQStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop"); // Shouldn't happen if (!matches.count()) @@ -301,7 +301,7 @@ void FilterOptions::save() { // If only the local copy existed, unlink it // TODO: error handling - QFile::remove(matches[0]); + TQFile::remove(matches[0]); continue; } KSimpleConfig service(path + *it + ".desktop"); @@ -338,8 +338,8 @@ void FilterOptions::configChanged() void FilterOptions::checkFavoritesChanged() { - QStringList currentFavoriteEngines; - for (QListViewItemIterator it(m_dlg->lvSearchProviders); it.current(); ++it) + TQStringList currentFavoriteEngines; + for (TQListViewItemIterator it(m_dlg->lvSearchProviders); it.current(); ++it) { SearchProviderItem *item = dynamic_cast<SearchProviderItem *>(it.current()); @@ -437,7 +437,7 @@ SearchProviderItem *FilterOptions::displaySearchProvider(SearchProvider *p, bool // Show the provider in the list. SearchProviderItem *item = 0L; - QListViewItemIterator it(m_dlg->lvSearchProviders); + TQListViewItemIterator it(m_dlg->lvSearchProviders); for (; it.current(); ++it) { diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h index b533fb9a7..e39997995 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h @@ -20,8 +20,8 @@ #ifndef __IKWSOPTS_H___ #define __IKWSOPTS_H___ -#include <qlayout.h> -#include <qtabwidget.h> +#include <tqlayout.h> +#include <tqtabwidget.h> #include <kcmodule.h> #include <kservice.h> @@ -35,13 +35,13 @@ class FilterOptions : public KCModule Q_OBJECT public: - FilterOptions(KInstance *instance, QWidget *parent = 0, const char *name = 0); + FilterOptions(KInstance *instance, TQWidget *parent = 0, const char *name = 0); void load(); void load( bool useDefaults ); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; protected slots: void configChanged(); @@ -63,9 +63,9 @@ private: // The names of the providers that the user deleted, // these are marked as deleted in the user's homedirectory // on save if a global service file exists for it. - QStringList m_deletedProviders; - QMap <QString, QString> m_defaultEngineMap; - QStringList m_favoriteEngines; + TQStringList m_deletedProviders; + TQMap <TQString, TQString> m_defaultEngineMap; + TQStringList m_favoriteEngines; FilterOptionsUI* m_dlg; }; diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index a7e2e5239..b91d14702 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -38,7 +38,7 @@ typedef KGenericFactory<KAutoWebSearch> KAutoWebSearchFactory; K_EXPORT_COMPONENT_FACTORY (libkuriikwsfilter, KAutoWebSearchFactory("kcmkurifilt")) -KAutoWebSearch::KAutoWebSearch(QObject *parent, const char *name, const QStringList&) +KAutoWebSearch::KAutoWebSearch(TQObject *parent, const char *name, const TQStringList&) :KURIFilterPlugin(parent, name ? name : "kuriikwsfilter", 1.0), DCOPObject("KURIIKWSFilterIface") { @@ -64,7 +64,7 @@ bool KAutoWebSearch::filterURI( KURIFilterData &data ) const KURL u = data.uri(); if ( u.pass().isEmpty() ) { - QString result = KURISearchFilterEngine::self()->autoWebSearchQuery( data.typedString() ); + TQString result = KURISearchFilterEngine::self()->autoWebSearchQuery( data.typedString() ); if( !result.isEmpty() ) { if ( KURISearchFilterEngine::self()->verbose() ) diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h index e286b3bd6..77e8c8b0f 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h @@ -34,8 +34,8 @@ class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject K_DCOP Q_OBJECT public: - KAutoWebSearch(QObject *parent = 0, const char *name = 0, - const QStringList &args = QStringList() ); + KAutoWebSearch(TQObject *parent = 0, const char *name = 0, + const TQStringList &args = TQStringList() ); ~KAutoWebSearch(); virtual bool filterURI( KURIFilterData& ) const; diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index 9cf0cf94d..9f3a245fc 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -26,8 +26,8 @@ #include <unistd.h> -#include <qregexp.h> -#include <qtextcodec.h> +#include <tqregexp.h> +#include <tqtextcodec.h> #include <kurl.h> #include <kdebug.h> @@ -57,16 +57,16 @@ KURISearchFilterEngine::KURISearchFilterEngine() loadConfig(); } -QString KURISearchFilterEngine::webShortcutQuery( const QString& typedString ) const +TQString KURISearchFilterEngine::webShortcutQuery( const TQString& typedString ) const { - QString result; + TQString result; if (m_bWebShortcutsEnabled) { - QString search = typedString; + TQString search = typedString; int pos = search.find(m_cKeywordDelimiter); - QString key; + TQString key; if (pos > -1) key = search.left(pos); else if (m_cKeywordDelimiter == ' ' && !search.isEmpty()) @@ -81,7 +81,7 @@ QString KURISearchFilterEngine::webShortcutQuery( const QString& typedString ) c if (provider) { result = formatResult(provider->query(), provider->charset(), - QString::null, search.mid(pos+1), true); + TQString::null, search.mid(pos+1), true); delete provider; } } @@ -91,9 +91,9 @@ QString KURISearchFilterEngine::webShortcutQuery( const QString& typedString ) c } -QString KURISearchFilterEngine::autoWebSearchQuery( const QString& typedString ) const +TQString KURISearchFilterEngine::autoWebSearchQuery( const TQString& typedString ) const { - QString result; + TQString result; if (m_bWebShortcutsEnabled && !m_defaultSearchEngine.isEmpty()) { @@ -107,7 +107,7 @@ QString KURISearchFilterEngine::autoWebSearchQuery( const QString& typedString ) if (provider) { result = formatResult (provider->query(), provider->charset(), - QString::null, typedString, true); + TQString::null, typedString, true); delete provider; } } @@ -116,7 +116,7 @@ QString KURISearchFilterEngine::autoWebSearchQuery( const QString& typedString ) return result; } -QCString KURISearchFilterEngine::name() const +TQCString KURISearchFilterEngine::name() const { return "kuriikwsfilter"; } @@ -128,17 +128,17 @@ KURISearchFilterEngine* KURISearchFilterEngine::self() return s_pSelf; } -QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, - const QString& query) const +TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, + const TQString& query) const { // Returns the number of query words - QString userquery = query; + TQString userquery = query; // Do some pre-encoding, before we can start the work: { int start = 0; int pos = 0; - QRegExp qsexpr("\\\"[^\\\"]*\\\""); + TQRegExp qsexpr("\\\"[^\\\"]*\\\""); // Temporary substitute spaces in quoted strings (" " -> "%20") // Needed to split user query into StringList correctly. @@ -146,7 +146,7 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, { int i = 0; int n = 0; - QString s = userquery.mid (pos, qsexpr.matchedLength()); + TQString s = userquery.mid (pos, qsexpr.matchedLength()); while ((i = s.find(" ")) != -1) { s = s.replace (i, 1, "%20"); @@ -158,7 +158,7 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, } // Split user query between spaces: - QStringList l = QStringList::split(" ", userquery.simplifyWhiteSpace()); + TQStringList l = TQStringList::split(" ", userquery.simplifyWhiteSpace()); // Back-substitute quoted strings (%20 -> " "): { @@ -166,7 +166,7 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, while ((i = userquery.find("%20")) != -1) userquery = userquery.replace(i, 3, " "); - for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it ) + for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) *it = (*it).replace("%20", " "); } @@ -176,8 +176,8 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, { int j = 0; int pos = 0; - QString v = ""; - QString nr = QString::number(i); + TQString v = ""; + TQString nr = TQString::number(i); // Add whole user query (\{0}) to substitution map: if (i==0) @@ -191,15 +191,15 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, v = v.replace(j, 3, " "); // Insert partial queries (referenced by \1 ... \n) to map: - map.replace(QString::number(i), v); + map.replace(TQString::number(i), v); PDVAR (" map['" + nr + "']", map[nr]); // Insert named references (referenced by \name) to map: j = 0; if ((i>0) && (pos = v.find("=")) > 0) { - QString s = v.mid(pos + 1); - QString k = v.left(pos); + TQString s = v.mid(pos + 1); + TQString k = v.left(pos); // Back-substitute references contained in references (e.g. '\refname' substitutes to 'thisquery=\0') while ((j = s.find("%5C")) != -1) s = s.replace(j, 3, "\\"); @@ -211,10 +211,10 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, return l; } -static QString encodeString(const QString &s, int mib) +static TQString encodeString(const TQString &s, int mib) { - QStringList l = QStringList::split(" ", s, true); - for(QStringList::Iterator it = l.begin(); + TQStringList l = TQStringList::split(" ", s, true); + for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { *it = KURL::encode_string(*it, mib); @@ -222,10 +222,10 @@ static QString encodeString(const QString &s, int mib) return l.join("+"); } -QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &map, const QString& userquery, const int encodingMib) const +TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &map, const TQString& userquery, const int encodingMib) const { - QString newurl = url; - QStringList ql = modifySubstitutionMap (map, userquery); + TQString newurl = url; + TQStringList ql = modifySubstitutionMap (map, userquery); int count = ql.count(); // Check, if old style '\1' is found and replace it with \{@} (compatibility mode): @@ -244,7 +244,7 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma // Substitute references (\{ref1,ref2,...}) with values from user query: { int pos = 0; - QRegExp reflist("\\\\\\{[^\\}]+\\}"); + TQRegExp reflist("\\\\\\{[^\\}]+\\}"); // Substitute reflists (\{ref1,ref2,...}): while ((pos = reflist.search(newurl, 0)) >= 0) @@ -252,8 +252,8 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma bool found = false; //bool rest = false; - QString v = ""; - QString rlstring = newurl.mid(pos + 2, reflist.matchedLength() - 3); + TQString v = ""; + TQString rlstring = newurl.mid(pos + 2, reflist.matchedLength() - 3); PDVAR (" reference list", rlstring); // \{@} gets a special treatment later @@ -264,13 +264,13 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma } // TODO: strip whitespaces around commas - QStringList rl = QStringList::split(",", rlstring); + TQStringList rl = TQStringList::split(",", rlstring); unsigned int i = 0; while ((i<rl.count()) && !found) { - QString rlitem = rl[i]; - QRegExp range("[0-9]*\\-[0-9]*"); + TQString rlitem = rl[i]; + TQRegExp range("[0-9]*\\-[0-9]*"); // Substitute a range of keywords if (range.search(rlitem, 0) >= 0) @@ -287,7 +287,7 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma for (int i=first; i<=last; i++) { - v += map[QString::number(i)] + " "; + v += map[TQString::number(i)] + " "; // Remove used value from ql (needed for \{@}): ql[i-1] = ""; } @@ -296,14 +296,14 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma if (!v.isEmpty()) found = true; - PDVAR (" range", QString::number(first) + "-" + QString::number(last) + " => '" + v + "'"); + PDVAR (" range", TQString::number(first) + "-" + TQString::number(last) + " => '" + v + "'"); v = encodeString(v, encodingMib); } else if ( rlitem.startsWith("\"") && rlitem.endsWith("\"") ) { // Use default string from query definition: found = true; - QString s = rlitem.mid(1, rlitem.length() - 2); + TQString s = rlitem.mid(1, rlitem.length() - 2); v = encodeString(s, encodingMib); PDVAR (" default", s); } @@ -315,11 +315,11 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma v = encodeString(map[rlitem], encodingMib); // Remove used value from ql (needed for \{@}): - QString c = rlitem.left(1); + TQString c = rlitem.left(1); if (c=="0") { // It's a numeric reference to '0' - for (QStringList::Iterator it = ql.begin(); it!=ql.end(); ++it) + for (TQStringList::Iterator it = ql.begin(); it!=ql.end(); ++it) (*it) = ""; } else if ((c>="0") && (c<="9")) @@ -331,7 +331,7 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma else { // It's a alphanumeric reference - QStringList::Iterator it = ql.begin(); + TQStringList::Iterator it = ql.begin(); while ((it != ql.end()) && ((rlitem + "=") != (*it).left(rlitem.length()+1))) ++it; if ((rlitem + "=") == (*it).left(rlitem.length()+1)) @@ -360,7 +360,7 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma { PDVAR (" newurl", newurl); // Generate list of unmatched strings: - QString v = ""; + TQString v = ""; for (unsigned int i=0; i<ql.count(); i++) { v += " " + ql[i]; } @@ -378,27 +378,27 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma return newurl; } -QString KURISearchFilterEngine::formatResult( const QString& url, - const QString& cset1, - const QString& cset2, - const QString& query, +TQString KURISearchFilterEngine::formatResult( const TQString& url, + const TQString& cset1, + const TQString& cset2, + const TQString& query, bool isMalformed ) const { SubstMap map; return formatResult (url, cset1, cset2, query, isMalformed, map); } -QString KURISearchFilterEngine::formatResult( const QString& url, - const QString& cset1, - const QString& cset2, - const QString& query, +TQString KURISearchFilterEngine::formatResult( const TQString& url, + const TQString& cset1, + const TQString& cset2, + const TQString& query, bool /* isMalformed */, SubstMap& map ) const { // Return nothing if userquery is empty and it contains // substitution strings... - if (query.isEmpty() && url.find(QRegExp(QRegExp::escape("\\{"))) > 0) - return QString::null; + if (query.isEmpty() && url.find(TQRegExp(TQRegExp::escape("\\{"))) > 0) + return TQString::null; // Debug info of map: if (!map.isEmpty()) @@ -409,19 +409,19 @@ QString KURISearchFilterEngine::formatResult( const QString& url, } // Create a codec for the desired encoding so that we can transcode the user's "url". - QString cseta = cset1; + TQString cseta = cset1; if (cseta.isEmpty()) cseta = "iso-8859-1"; - QTextCodec *csetacodec = QTextCodec::codecForName(cseta.latin1()); + TQTextCodec *csetacodec = TQTextCodec::codecForName(cseta.latin1()); if (!csetacodec) { cseta = "iso-8859-1"; - csetacodec = QTextCodec::codecForName(cseta.latin1()); + csetacodec = TQTextCodec::codecForName(cseta.latin1()); } // Decode user query: - QString userquery = KURL::decode_string(query, 106 /* utf-8*/); + TQString userquery = KURL::decode_string(query, 106 /* utf-8*/); PDVAR ("user query", userquery); PDVAR ("query definition", url); @@ -430,12 +430,12 @@ QString KURISearchFilterEngine::formatResult( const QString& url, map.replace("ikw_charset", cseta); // Add charset indicator for the fallback query to substitution map: - QString csetb = cset2; + TQString csetb = cset2; if (csetb.isEmpty()) csetb = "iso-8859-1"; map.replace("wsc_charset", csetb); - QString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum()); + TQString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum()); PDVAR ("substituted query", newurl); @@ -449,28 +449,28 @@ void KURISearchFilterEngine::loadConfig() // contains the sycoca based search provider configuration (malte). // TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time... { - KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + QString(name()) + "rc"); + KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc"); oldConfig.setGroup("General"); if (oldConfig.hasKey("SearchEngines")) { // User has an old config file in his local config dir PIDDBG << "Migrating config file to .desktop files..." << endl; - QString fallback = oldConfig.readEntry("InternetKeywordsSearchFallback"); - QStringList engines = oldConfig.readListEntry("SearchEngines"); - for (QStringList::ConstIterator it = engines.begin(); it != engines.end(); ++it) + TQString fallback = oldConfig.readEntry("InternetKeywordsSearchFallback"); + TQStringList engines = oldConfig.readListEntry("SearchEngines"); + for (TQStringList::ConstIterator it = engines.begin(); it != engines.end(); ++it) { if (!oldConfig.hasGroup(*it + " Search")) continue; oldConfig.setGroup(*it + " Search"); - QString query = oldConfig.readEntry("Query"); - QStringList keys = oldConfig.readListEntry("Keys"); - QString charset = oldConfig.readEntry("Charset"); + TQString query = oldConfig.readEntry("Query"); + TQStringList keys = oldConfig.readListEntry("Keys"); + TQString charset = oldConfig.readEntry("Charset"); oldConfig.deleteGroup(*it + " Search"); - QString name; - for (QStringList::ConstIterator key = keys.begin(); key != keys.end(); ++key) + TQString name; + for (TQStringList::ConstIterator key = keys.begin(); key != keys.end(); ++key) { // take the longest key as name for the .desktop file if ((*key).length() > name.length()) diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.h index d45c17033..35c519aec 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.h +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.h @@ -25,8 +25,8 @@ #ifndef __KURISearchFILTERENGINE_H__ #define __KURISearchFILTERENGINE_H__ -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <kservice.h> @@ -36,16 +36,16 @@ class KURL; class KURISearchFilterEngine { public: - typedef QMap <QString, QString> SubstMap; + typedef TQMap <TQString, TQString> SubstMap; KURISearchFilterEngine(); ~KURISearchFilterEngine() {}; - QCString name() const; + TQCString name() const; - QString webShortcutQuery (const QString&) const; + TQString webShortcutQuery (const TQString&) const; - QString autoWebSearchQuery (const QString&) const; + TQString autoWebSearchQuery (const TQString&) const; bool verbose() const { return m_bVerbose; } @@ -54,23 +54,23 @@ public: static KURISearchFilterEngine *self(); protected: - QString formatResult (const QString& url, const QString& cset1, const QString& cset2, - const QString& query, bool isMalformed) const; + TQString formatResult (const TQString& url, const TQString& cset1, const TQString& cset2, + const TQString& query, bool isMalformed) const; - QString formatResult (const QString& url, const QString& cset1, const QString& cset2, - const QString& query, bool isMalformed, SubstMap& map) const; + TQString formatResult (const TQString& url, const TQString& cset1, const TQString& cset2, + const TQString& query, bool isMalformed, SubstMap& map) const; private: - QStringList modifySubstitutionMap (SubstMap& map, const QString& query) const; + TQStringList modifySubstitutionMap (SubstMap& map, const TQString& query) const; - QString substituteQuery (const QString& url, SubstMap &map, - const QString& userquery, const int encodingMib) const; + TQString substituteQuery (const TQString& url, SubstMap &map, + const TQString& userquery, const int encodingMib) const; bool m_bVerbose; bool m_bWebShortcutsEnabled; char m_cKeywordDelimiter; - QString m_defaultSearchEngine; + TQString m_defaultSearchEngine; static KURISearchFilterEngine *s_pSelf; }; diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index d56220935..6280f3899 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -38,8 +38,8 @@ typedef KGenericFactory<KURISearchFilter> KURISearchFilterFactory; K_EXPORT_COMPONENT_FACTORY(libkurisearchfilter, KURISearchFilterFactory("kcmkurifilt")) -KURISearchFilter::KURISearchFilter(QObject *parent, const char *name, - const QStringList &) +KURISearchFilter::KURISearchFilter(TQObject *parent, const char *name, + const TQStringList &) :KURIFilterPlugin(parent, name ? name : "kurisearchfilter", 1.0), DCOPObject("KURISearchFilterIface") { @@ -62,7 +62,7 @@ bool KURISearchFilter::filterURI( KURIFilterData &data ) const if ( KURISearchFilterEngine::self()->verbose() ) kdDebug() << "KURISearchFilter::filterURI: '" << data.typedString() << "'" << endl; - QString result = KURISearchFilterEngine::self()->webShortcutQuery( data.typedString() ); + TQString result = KURISearchFilterEngine::self()->webShortcutQuery( data.typedString() ); if ( !result.isEmpty() ) { @@ -77,12 +77,12 @@ bool KURISearchFilter::filterURI( KURIFilterData &data ) const return false; } -KCModule *KURISearchFilter::configModule(QWidget *parent, const char *) const +KCModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const { return new FilterOptions( KURISearchFilterFactory::instance(), parent, "kcmkurifilt"); } -QString KURISearchFilter::configName() const +TQString KURISearchFilter::configName() const { return i18n("Search F&ilters"); } diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h index 0b8dd1b14..eff650902 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h @@ -34,13 +34,13 @@ class KURISearchFilter : public KURIFilterPlugin, public DCOPObject Q_OBJECT K_DCOP public: - KURISearchFilter(QObject *parent = 0, const char *name = 0, - const QStringList &args = QStringList() ); + KURISearchFilter(TQObject *parent = 0, const char *name = 0, + const TQStringList &args = TQStringList() ); ~KURISearchFilter(); virtual bool filterURI( KURIFilterData& ) const; - virtual KCModule *configModule(QWidget *parent = 0, const char *name = 0) const; - virtual QString configName() const; + virtual KCModule *configModule(TQWidget *parent = 0, const char *name = 0) const; + virtual TQString configName() const; k_dcop: virtual void configure(); diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp b/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp index c9e13dc1f..11b7ee692 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp @@ -30,7 +30,7 @@ SearchProvider::SearchProvider(const KService::Ptr service) m_charset = service->property("Charset").toString(); } -void SearchProvider::setName(const QString &name) +void SearchProvider::setName(const TQString &name) { if (m_name == name) return; @@ -38,7 +38,7 @@ void SearchProvider::setName(const QString &name) m_dirty = true; } -void SearchProvider::setQuery(const QString &query) +void SearchProvider::setQuery(const TQString &query) { if (m_query == query) return; @@ -46,7 +46,7 @@ void SearchProvider::setQuery(const QString &query) m_dirty = true; } -void SearchProvider::setKeys(const QStringList &keys) +void SearchProvider::setKeys(const TQStringList &keys) { if (m_keys == keys) return; @@ -54,7 +54,7 @@ void SearchProvider::setKeys(const QStringList &keys) m_dirty = true; } -void SearchProvider::setCharset(const QString &charset) +void SearchProvider::setCharset(const TQString &charset) { if (m_charset == charset) return; @@ -62,17 +62,17 @@ void SearchProvider::setCharset(const QString &charset) m_dirty = true; } -SearchProvider *SearchProvider::findByDesktopName(const QString &name) +SearchProvider *SearchProvider::findByDesktopName(const TQString &name) { KService::Ptr service = - KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(name)); + KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(name)); return service ? new SearchProvider(service) : 0; } -SearchProvider *SearchProvider::findByKey(const QString &key) +SearchProvider *SearchProvider::findByKey(const TQString &key) { KTrader::OfferList providers = - KTrader::self()->query("SearchProvider", QString("'%1' in Keys").arg(key)); + KTrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key)); return providers.count() ? new SearchProvider(providers[0]) : 0; } diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.h b/kcontrol/ebrowsing/plugins/ikws/searchprovider.h index b7916892c..45309939c 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.h +++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.h @@ -28,26 +28,26 @@ public: SearchProvider() : m_dirty(false) {}; SearchProvider(const KService::Ptr service); - const QString &desktopEntryName() const { return m_desktopEntryName; } - const QString &name() const { return m_name; } - const QString &query() const { return m_query; } - const QStringList &keys() const { return m_keys; } - const QString &charset() const { return m_charset; } + const TQString &desktopEntryName() const { return m_desktopEntryName; } + const TQString &name() const { return m_name; } + const TQString &query() const { return m_query; } + const TQStringList &keys() const { return m_keys; } + const TQString &charset() const { return m_charset; } bool isDirty() const { return m_dirty; } - void setName(const QString &); - void setQuery(const QString &); - void setKeys(const QStringList &); - void setCharset(const QString &); + void setName(const TQString &); + void setQuery(const TQString &); + void setKeys(const TQStringList &); + void setCharset(const TQString &); - static SearchProvider *findByDesktopName(const QString &); - static SearchProvider *findByKey(const QString &); + static SearchProvider *findByDesktopName(const TQString &); + static SearchProvider *findByKey(const TQString &); private: - QString m_desktopEntryName; - QString m_name; - QString m_query; - QStringList m_keys; - QString m_charset; + TQString m_desktopEntryName; + TQString m_name; + TQString m_query; + TQStringList m_keys; + TQString m_charset; bool m_dirty; }; diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index ca7161b1c..586f947ff 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> #include <kapplication.h> #include <klocale.h> @@ -34,8 +34,8 @@ #include "searchprovider.h" SearchProviderDialog::SearchProviderDialog(SearchProvider *provider, - QWidget *parent, const char *name) - :KDialogBase(parent, name, true, QString::null, Ok|Cancel), + TQWidget *parent, const char *name) + :KDialogBase(parent, name, true, TQString::null, Ok|Cancel), m_provider(provider) { m_dlg = new SearchProviderDlgUI (this); @@ -45,12 +45,12 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider, m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40); - connect(m_dlg->leName, SIGNAL(textChanged(const QString &)), SLOT(slotChanged())); - connect(m_dlg->leQuery, SIGNAL(textChanged(const QString &)), SLOT(slotChanged())); - connect(m_dlg->leShortcut, SIGNAL(textChanged(const QString &)), SLOT(slotChanged())); + connect(m_dlg->leName, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); + connect(m_dlg->leQuery, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); + connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); // Data init - QStringList charsets = KGlobal::charsets()->availableEncodingNames(); + TQStringList charsets = KGlobal::charsets()->availableEncodingNames(); charsets.prepend(i18n("Default")); m_dlg->cbCharset->insertStringList(charsets); @@ -86,15 +86,15 @@ void SearchProviderDialog::slotOk() i18n("The URI does not contain a \\{...} placeholder for the user query.\n" "This means that the same page is always going to be visited, " "regardless of what the user types."), - QString::null, i18n("Keep It")) == KMessageBox::Cancel) + TQString::null, i18n("Keep It")) == KMessageBox::Cancel) return; if (!m_provider) m_provider = new SearchProvider; m_provider->setName(m_dlg->leName->text().stripWhiteSpace()); m_provider->setQuery(m_dlg->leQuery->text().stripWhiteSpace()); - m_provider->setKeys(QStringList::split(",", m_dlg->leShortcut->text().stripWhiteSpace())); - m_provider->setCharset(m_dlg->cbCharset->currentItem() ? m_dlg->cbCharset->currentText() : QString::null); + m_provider->setKeys(TQStringList::split(",", m_dlg->leShortcut->text().stripWhiteSpace())); + m_provider->setCharset(m_dlg->cbCharset->currentItem() ? m_dlg->cbCharset->currentText() : TQString::null); KDialog::accept(); } diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h index 5abb2f057..2a23cbf05 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h @@ -30,7 +30,7 @@ class SearchProviderDialog : public KDialogBase Q_OBJECT public: - SearchProviderDialog(SearchProvider *provider, QWidget *parent = 0, const char *name = 0); + SearchProviderDialog(SearchProvider *provider, TQWidget *parent = 0, const char *name = 0); SearchProvider *provider() { return m_provider; } diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index 3bd247729..f0986c188 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -26,8 +26,8 @@ #include <kstandarddirs.h> #include <kdebug.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqregexp.h> +#include <tqfile.h> #define HOSTPORT_PATTERN "[a-zA-Z0-9][a-zA-Z0-9+-]*(?:\\:[0-9]{1,5})?(?:/[\\w:@&=+$,-.!~*'()]*)*" @@ -36,12 +36,12 @@ * kdelibs/kio/tests/kurifiltertest */ -LocalDomainURIFilter::LocalDomainURIFilter( QObject *parent, const char *name, - const QStringList & /*args*/ ) +LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name, + const TQStringList & /*args*/ ) : KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ), DCOPObject( "LocalDomainURIFilterIface" ), last_time( 0 ), - m_hostPortPattern( QString::fromLatin1(HOSTPORT_PATTERN) ) + m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) ) { configure(); } @@ -49,14 +49,14 @@ LocalDomainURIFilter::LocalDomainURIFilter( QObject *parent, const char *name, bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const { KURL url = data.uri(); - QString cmd = url.url(); + TQString cmd = url.url(); kdDebug() << "LocalDomainURIFilter::filterURI: " << url << endl; if( m_hostPortPattern.exactMatch( cmd ) && isLocalDomainHost( cmd ) ) { - cmd.prepend( QString::fromLatin1("http://") ); + cmd.prepend( TQString::fromLatin1("http://") ); setFilteredURI( data, KURL( cmd ) ); setURIType( data, KURIFilterData::NET_PROTOCOL ); @@ -68,24 +68,24 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const } // if it's e.g. just 'www', try if it's a hostname in the local search domain -bool LocalDomainURIFilter::isLocalDomainHost( QString& cmd ) const +bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const { // find() returns -1 when no match -> left()/truncate() are noops then - QString host( cmd.left( cmd.find( '/' ) ) ); + TQString host( cmd.left( cmd.find( '/' ) ) ); host.truncate( host.find( ':' ) ); // Remove port number if( !(host == last_host && last_time > time( NULL ) - 5 ) ) { - QString helper = KStandardDirs::findExe(QString::fromLatin1( "klocaldomainurifilterhelper" )); + TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" )); if( helper.isEmpty()) return last_result = false; - m_fullname = QString::null; + m_fullname = TQString::null; KProcess proc; proc << helper << host; - connect( &proc, SIGNAL(receivedStdout(KProcess *, char *, int)), - SLOT(receiveOutput(KProcess *, char *, int)) ); + connect( &proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + TQT_SLOT(receiveOutput(KProcess *, char *, int)) ); if( !proc.start( KProcess::NotifyOnExit, KProcess::Stdout )) return last_result = false; @@ -103,7 +103,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( QString& cmd ) const void LocalDomainURIFilter::receiveOutput( KProcess *, char *buf, int ) { - m_fullname = QFile::decodeName( buf ); + m_fullname = TQFile::decodeName( buf ); } void LocalDomainURIFilter::configure() diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h index 465214e69..0c8035d89 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h @@ -26,7 +26,7 @@ #include <dcopobject.h> #include <kgenericfactory.h> #include <kurifilter.h> -#include <qregexp.h> +#include <tqregexp.h> class KInstance; class KProcess; @@ -44,19 +44,19 @@ class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject Q_OBJECT public: - LocalDomainURIFilter( QObject* parent, const char* name, const QStringList& args ); + LocalDomainURIFilter( TQObject* parent, const char* name, const TQStringList& args ); virtual bool filterURI( KURIFilterData &data ) const; k_dcop: virtual void configure(); private: - bool isLocalDomainHost( QString& cmd ) const; - mutable QString last_host; + bool isLocalDomainHost( TQString& cmd ) const; + mutable TQString last_host; mutable bool last_result; mutable time_t last_time; - mutable QString m_fullname; - QRegExp m_hostPortPattern; + mutable TQString m_fullname; + TQRegExp m_hostPortPattern; private slots: void receiveOutput( KProcess *, char *, int ); diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index 3c0677b0f..9d15802f1 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -26,8 +26,8 @@ #include <pwd.h> #include <sys/stat.h> -#include <qdir.h> -#include <qregexp.h> +#include <tqdir.h> +#include <tqregexp.h> #include <kapplication.h> #include <kdebug.h> @@ -43,7 +43,7 @@ #define IPv6_PATTERN "^\\[.*\\]" #define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*" -#define QFL1(x) QString::fromLatin1(x) +#define QFL1(x) TQString::fromLatin1(x) /** * IMPORTANT: @@ -54,15 +54,15 @@ * test code to kdelibs/kio/tests/kurifiltertest. */ -typedef QMap<QString,QString> EntryMap; +typedef TQMap<TQString,TQString> EntryMap; -static bool isValidShortURL( const QString& cmd, bool verbose = false ) +static bool isValidShortURL( const TQString& cmd, bool verbose = false ) { // Examples of valid short URLs: // "kde.org", "foo.bar:8080", "user@foo.bar:3128" // "192.168.1.0", "127.0.0.1:3128" // "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]" - QRegExp exp; + TQRegExp exp; // Match FQDN_PATTERN exp.setPattern( QFL1(FQDN_PATTERN) ); @@ -110,9 +110,9 @@ static bool isValidShortURL( const QString& cmd, bool verbose = false ) return false; } -static QString removeArgs( const QString& _cmd ) +static TQString removeArgs( const TQString& _cmd ) { - QString cmd( _cmd ); + TQString cmd( _cmd ); if( cmd[0] != '\'' && cmd[0] != '"' ) { @@ -134,8 +134,8 @@ static QString removeArgs( const QString& _cmd ) return cmd; } -KShortURIFilter::KShortURIFilter( QObject *parent, const char *name, - const QStringList & /*args*/ ) +KShortURIFilter::KShortURIFilter( TQObject *parent, const char *name, + const TQStringList & /*args*/ ) :KURIFilterPlugin( parent, name ? name : "kshorturifilter", 1.0), DCOPObject("KShortURIFilterIface") { @@ -158,19 +158,19 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const */ KURL url = data.uri(); - QString cmd = data.typedString(); + TQString cmd = data.typedString(); bool isMalformed = !url.isValid(); //kdDebug() << "url=" << url.url() << " cmd=" << cmd << " isMalformed=" << isMalformed << endl; if (!isMalformed && (url.protocol().length() == 4) && - (url.protocol() != QString::fromLatin1("http")) && + (url.protocol() != TQString::fromLatin1("http")) && (url.protocol()[0]=='h') && (url.protocol()[1]==url.protocol()[2]) && (url.protocol()[3]=='p')) { // Handle "encrypted" URLs like: h++p://www.kde.org - url.setProtocol( QString::fromLatin1("http")); + url.setProtocol( TQString::fromLatin1("http")); setFilteredURI( data, url); setURIType( data, KURIFilterData::NET_PROTOCOL ); return true; @@ -181,7 +181,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // executable and only the argument part, if any, changed! (Dawit) // You mean caching the last filtering, to try and reuse it, to save stat()s? (David) - const QString starthere_proto = QFL1("start-here:"); + const TQString starthere_proto = QFL1("start-here:"); if (cmd.find(starthere_proto, 0, true) == 0 ) { setFilteredURI( data, KURL("system:/") ); @@ -190,8 +190,8 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const } // Handle MAN & INFO pages shortcuts... - const QString man_proto = QFL1("man:"); - const QString info_proto = QFL1("info:"); + const TQString man_proto = QFL1("man:"); + const TQString info_proto = QFL1("info:"); if( cmd[0] == '#' || cmd.find( man_proto, 0, true ) == 0 || cmd.find( info_proto, 0, true ) == 0 ) @@ -210,11 +210,11 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const } // Detect UNC style (aka windows SMB) URLs - if ( cmd.startsWith( QString::fromLatin1( "\\\\") ) ) + if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) ) { // make sure path is unix style cmd.replace('\\', '/'); - cmd.prepend( QString::fromLatin1( "smb:" ) ); + cmd.prepend( TQString::fromLatin1( "smb:" ) ); setFilteredURI( data, KURL( cmd )); setURIType( data, KURIFilterData::NET_PROTOCOL ); return true; @@ -223,12 +223,12 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const bool expanded = false; // Expanding shortcut to HOME URL... - QString path; - QString ref; - QString query; - QString nameFilter; + TQString path; + TQString ref; + TQString query; + TQString nameFilter; - if (KURL::isRelativeURL(cmd) && QDir::isRelativePath(cmd)) { + if (KURL::isRelativeURL(cmd) && TQDir::isRelativePath(cmd)) { path = cmd; } else @@ -239,7 +239,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // but not for "/tmp/a#b", if "a#b" is an existing file, // or for "/tmp/a?b" (#58990) if ( ( url.hasRef() || !url.query().isEmpty() ) // avoid the calling exists() when not needed - && QFile::exists(url.path()) + && TQFile::exists(url.path()) && !url.path().endsWith(QFL1("/")) ) // /tmp/?foo is a namefilter, not a query { path = url.path(); @@ -262,19 +262,19 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const slashPos = path.length(); if( slashPos == 1 ) // ~/ { - path.replace ( 0, 1, QDir::homeDirPath() ); + path.replace ( 0, 1, TQDir::homeDirPath() ); } else // ~username/ { - QString user = path.mid( 1, slashPos-1 ); + TQString user = path.mid( 1, slashPos-1 ); struct passwd *dir = getpwnam(user.local8Bit().data()); if( dir && strlen(dir->pw_dir) ) { - path.replace (0, slashPos, QString::fromLocal8Bit(dir->pw_dir)); + path.replace (0, slashPos, TQString::fromLocal8Bit(dir->pw_dir)); } else { - QString msg = dir ? i18n("<qt><b>%1</b> does not have a home folder.</qt>").arg(user) : + TQString msg = dir ? i18n("<qt><b>%1</b> does not have a home folder.</qt>").arg(user) : i18n("<qt>There is no user called <b>%1</b>.</qt>").arg(user); setErrorMsg( data, msg ); setURIType( data, KURIFilterData::ERROR ); @@ -287,13 +287,13 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const } else if ( path[0] == '$' ) { // Environment variable expansion. - QRegExp r (QFL1(ENV_VAR_PATTERN)); + TQRegExp r (QFL1(ENV_VAR_PATTERN)); if ( r.search( path ) == 0 ) { const char* exp = getenv( path.mid( 1, r.matchedLength() - 1 ).local8Bit().data() ); if(exp) { - path.replace( 0, r.matchedLength(), QString::fromLocal8Bit(exp) ); + path.replace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) ); expanded = true; } } @@ -318,7 +318,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // Checking for local resource match... // Determine if "uri" is an absolute path to a local resource OR // A local resource with a supplied absolute path in KURIFilterData - QString abs_path = data.absolutePath(); + TQString abs_path = data.absolutePath(); bool canBeAbsolute = (isMalformed && !abs_path.isEmpty()); bool canBeLocalAbsolute = (canBeAbsolute && abs_path[0] =='/'); @@ -330,16 +330,16 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const struct stat buff; if ( canBeLocalAbsolute ) { - QString abs = QDir::cleanDirPath( abs_path ); + TQString abs = TQDir::cleanDirPath( abs_path ); // combine absolute path (abs_path) and relative path (cmd) into abs_path int len = path.length(); if( (len==1 && path[0]=='.') || (len==2 && path[0]=='.' && path[1]=='.') ) path += '/'; //kdDebug() << "adding " << abs << " and " << path << endl; - abs = QDir::cleanDirPath(abs + '/' + path); + abs = TQDir::cleanDirPath(abs + '/' + path); //kdDebug() << "checking whether " << abs << " exists." << endl; // Check if it exists - if( stat( QFile::encodeName(abs).data(), &buff ) == 0 ) + if( stat( TQFile::encodeName(abs).data(), &buff ) == 0 ) { path = abs; // yes -> store as the new cmd exists = true; @@ -349,7 +349,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const if( isLocalFullPath && !exists ) { - exists = ( stat( QFile::encodeName(path).data() , &buff ) == 0 ); + exists = ( stat( TQFile::encodeName(path).data() , &buff ) == 0 ); if ( !exists ) { // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter @@ -357,10 +357,10 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const int lastSlash = path.findRev( '/' ); if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments { - QString fileName = path.mid( lastSlash + 1 ); - QString testPath = path.left( lastSlash + 1 ); + TQString fileName = path.mid( lastSlash + 1 ); + TQString testPath = path.left( lastSlash + 1 ); if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) - && stat( QFile::encodeName(testPath).data(), &buff ) == 0 ) + && stat( TQFile::encodeName(testPath).data(), &buff ) == 0 ) { nameFilter = fileName; kdDebug() << "Setting nameFilter to " << nameFilter << endl; @@ -379,7 +379,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const u.setRef(ref); u.setQuery(query); - if (kapp && !kapp->authorizeURLAction( QString::fromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it's a file will get // an access denied error later on. @@ -390,7 +390,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // Can be abs path to file or directory, or to executable with args bool isDir = S_ISDIR( buff.st_mode ); - if( !isDir && access ( QFile::encodeName(path).data(), X_OK) == 0 ) + if( !isDir && access ( TQFile::encodeName(path).data(), X_OK) == 0 ) { //kdDebug() << "Abs path to EXECUTABLE" << endl; setFilteredURI( data, u ); @@ -417,7 +417,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // if it is executable under the user's $PATH variable. // We try hard to avoid parsing any possible command // line arguments or options that might have been supplied. - QString exe = removeArgs( cmd ); + TQString exe = removeArgs( cmd ); //kdDebug() << k_funcinfo << "findExe with " << exe << endl; if( data.checkForExecutables() && !KStandardDirs::findExe( exe ).isNull() ) { @@ -435,8 +435,8 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // be slow things down... if ( !isMalformed && !isLocalFullPath ) { - const QStringList protocols = KProtocolInfo::protocols(); - for( QStringList::ConstIterator it = protocols.begin(); it != protocols.end(); ++it ) + const TQStringList protocols = KProtocolInfo::protocols(); + for( TQStringList::ConstIterator it = protocols.begin(); it != protocols.end(); ++it ) { if( (url.protocol() == *it) ) { @@ -455,10 +455,10 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // TODO: Make configurable at some point... if ( !cmd.contains( ' ' ) ) { - QValueList<URLHint>::ConstIterator it; + TQValueList<URLHint>::ConstIterator it; for( it = m_urlHints.begin(); it != m_urlHints.end(); ++it ) { - QRegExp match( (*it).regexp ); + TQRegExp match( (*it).regexp ); if ( match.search( cmd, 0 ) == 0 ) { //kdDebug() << "match - prepending " << (*it).prepend << endl; @@ -492,7 +492,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const u.setPath(path); u.setRef(ref); - if (kapp && !kapp->authorizeURLAction( QString::fromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it exists and will get // an access denied error later on. @@ -511,12 +511,12 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const return false; } -KCModule* KShortURIFilter::configModule( QWidget*, const char* ) const +KCModule* KShortURIFilter::configModule( TQWidget*, const char* ) const { return 0; //new KShortURIOptions( parent, name ); } -QString KShortURIFilter::configName() const +TQString KShortURIFilter::configName() const { return i18n("&ShortURLs"); } @@ -536,7 +536,7 @@ void KShortURIFilter::configure() for( EntryMap::Iterator it = patterns.begin(); it != patterns.end(); ++it ) { - QString protocol = protocols[it.key()]; + TQString protocol = protocols[it.key()]; if (!protocol.isEmpty()) { int type = config.readNumEntry(it.key(), -1); diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h index c6603da19..f2bf4654c 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h @@ -49,8 +49,8 @@ public: * @param parent the parent of this class. * @param name the internal name for this object. */ - KShortURIFilter( QObject *parent = 0, const char *name = 0, - const QStringList &args = QStringList() ); + KShortURIFilter( TQObject *parent = 0, const char *name = 0, + const TQStringList &args = TQStringList() ); /** * Destructor @@ -76,7 +76,7 @@ public: * * @return the name of the config module. */ - virtual QString configName() const; + virtual TQString configName() const; /** * Returns an instance of the module used to configure @@ -84,7 +84,7 @@ public: * * @return the config module */ - virtual KCModule* configModule( QWidget*, const char* ) const; + virtual KCModule* configModule( TQWidget*, const char* ) const; public: k_dcop: @@ -95,16 +95,16 @@ private: struct URLHint { URLHint() {} - URLHint( QString r, QString p, + URLHint( TQString r, TQString p, KURIFilterData::URITypes t = KURIFilterData::NET_PROTOCOL ) : regexp(r), prepend(p), type(t) {} - QString regexp; // if this matches, then... - QString prepend; // ...prepend this to the url + TQString regexp; // if this matches, then... + TQString prepend; // ...prepend this to the url KURIFilterData::URITypes type; }; - QValueList<URLHint> m_urlHints; - QString m_strDefaultProtocol; + TQValueList<URLHint> m_urlHints; + TQString m_strDefaultProtocol; bool m_bVerbose; }; diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index af3c4965d..1d0241914 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -22,10 +22,10 @@ #define QT_CLEAN_NAMESPACE #endif -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <kconfig.h> #include <kcursor.h> @@ -85,7 +85,7 @@ static const int DFLT_OFF = 60; extern "C" { - KDE_EXPORT KCModule *create_energy(QWidget *parent, char *) { + KDE_EXPORT KCModule *create_energy(TQWidget *parent, char *) { return new KEnergy(parent, "kcmenergy"); } @@ -131,7 +131,7 @@ extern "C" { /**** KEnergy ****/ -KEnergy::KEnergy(QWidget *parent, const char *name) +KEnergy::KEnergy(TQWidget *parent, const char *name) : KCModule(parent, name) { m_bChanged = false; @@ -156,28 +156,28 @@ KEnergy::KEnergy(QWidget *parent, const char *name) m_bDPMS = DPMSQueryExtension(qt_xdisplay(), &dummy, &dummy); #endif - QVBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QHBoxLayout *hbox = new QHBoxLayout(); + TQVBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *hbox = new TQHBoxLayout(); top->addLayout(hbox); - QLabel *lbl; + TQLabel *lbl; if (m_bDPMS) { - m_pCBEnable= new QCheckBox(i18n("&Enable display power management" ), this); - connect(m_pCBEnable, SIGNAL(toggled(bool)), SLOT(slotChangeEnable(bool))); + m_pCBEnable= new TQCheckBox(i18n("&Enable display power management" ), this); + connect(m_pCBEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeEnable(bool))); hbox->addWidget(m_pCBEnable); - QWhatsThis::add( m_pCBEnable, i18n("Check this option to enable the" + TQWhatsThis::add( m_pCBEnable, i18n("Check this option to enable the" " power saving features of your display.") ); } else { - lbl = new QLabel(i18n("Your display does not support power saving."), this); + lbl = new TQLabel(i18n("Your display does not support power saving."), this); hbox->addWidget(lbl); } KURLLabel *logo = new KURLLabel(this); logo->setURL("http://www.energystar.gov"); - logo->setPixmap(QPixmap(locate("data", "kcontrol/pics/energybig.png"))); + logo->setPixmap(TQPixmap(locate("data", "kcontrol/pics/energybig.png"))); logo->setTipText(i18n("Learn more about the Energy Star program")); logo->setUseTips(true); -connect(logo, SIGNAL(leftClickedURL(const QString&)), SLOT(openURL(const QString &))); +connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString &))); hbox->addStretch(); hbox->addWidget(logo); @@ -188,9 +188,9 @@ connect(logo, SIGNAL(leftClickedURL(const QString&)), SLOT(openURL(const QString m_pStandbySlider->setRange(0, 120, 10); m_pStandbySlider->setSuffix(i18n(" min")); m_pStandbySlider->setSpecialValueText(i18n("Disabled")); - connect(m_pStandbySlider, SIGNAL(valueChanged(int)), SLOT(slotChangeStandby(int))); + connect(m_pStandbySlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeStandby(int))); top->addWidget(m_pStandbySlider); - QWhatsThis::add( m_pStandbySlider, i18n("Choose the period of inactivity" + TQWhatsThis::add( m_pStandbySlider, i18n("Choose the period of inactivity" " after which the display should enter \"standby\" mode. This is the" " first level of power saving.") ); @@ -199,9 +199,9 @@ connect(logo, SIGNAL(leftClickedURL(const QString&)), SLOT(openURL(const QString m_pSuspendSlider->setRange(0, 120, 10); m_pSuspendSlider->setSuffix(i18n(" min")); m_pSuspendSlider->setSpecialValueText(i18n("Disabled")); - connect(m_pSuspendSlider, SIGNAL(valueChanged(int)), SLOT(slotChangeSuspend(int))); + connect(m_pSuspendSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeSuspend(int))); top->addWidget(m_pSuspendSlider); - QWhatsThis::add( m_pSuspendSlider, i18n("Choose the period of inactivity" + TQWhatsThis::add( m_pSuspendSlider, i18n("Choose the period of inactivity" " after which the display should enter \"suspend\" mode. This is the" " second level of power saving, but may not be different from the first" " level for some displays.") ); @@ -211,9 +211,9 @@ connect(logo, SIGNAL(leftClickedURL(const QString&)), SLOT(openURL(const QString m_pOffSlider->setRange(0, 120, 10); m_pOffSlider->setSuffix(i18n(" min")); m_pOffSlider->setSpecialValueText(i18n("Disabled")); - connect(m_pOffSlider, SIGNAL(valueChanged(int)), SLOT(slotChangeOff(int))); + connect(m_pOffSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeOff(int))); top->addWidget(m_pOffSlider); - QWhatsThis::add( m_pOffSlider, i18n("Choose the period of inactivity" + TQWhatsThis::add( m_pOffSlider, i18n("Choose the period of inactivity" " after which the display should be powered off. This is the" " greatest level of power saving that can be achieved while the" " display is still physically turned on.") ); @@ -434,7 +434,7 @@ void KEnergy::slotChangeOff(int value) emit changed(true); } -void KEnergy::openURL(const QString &URL) +void KEnergy::openURL(const TQString &URL) { new KRun(KURL( URL )); } diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h index d41b89e26..2625eba92 100644 --- a/kcontrol/energy/energy.h +++ b/kcontrol/energy/energy.h @@ -14,7 +14,7 @@ #ifndef __Energy_h_Included__ #define __Energy_h_Included__ -#include <qobject.h> +#include <tqobject.h> #include <kcmodule.h> class QCheckBox; @@ -31,7 +31,7 @@ class KEnergy: public KCModule Q_OBJECT public: - KEnergy(QWidget *parent, const char *name); + KEnergy(TQWidget *parent, const char *name); ~KEnergy(); virtual void load(); @@ -44,7 +44,7 @@ private slots: void slotChangeStandby(int); void slotChangeSuspend(int); void slotChangeOff(int); - void openURL(const QString &); + void openURL(const TQString &); private: void readSettings(); @@ -58,7 +58,7 @@ private: int m_Standby, m_Suspend, m_Off; int m_StandbyDesired, m_SuspendDesired, m_OffDesired; - QCheckBox *m_pCBEnable; + TQCheckBox *m_pCBEnable; KIntNumInput *m_pStandbySlider; KIntNumInput *m_pSuspendSlider; KIntNumInput *m_pOffSlider; diff --git a/kcontrol/filetypes/control.cpp b/kcontrol/filetypes/control.cpp index 55e98d95e..9736e9c9b 100644 --- a/kcontrol/filetypes/control.cpp +++ b/kcontrol/filetypes/control.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT KCModule *create_filetypes(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_filetypes(TQWidget *parent, const char *) { return new FileTypesView(parent, "filetypes"); } diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp index a8895965a..eb57f50ac 100644 --- a/kcontrol/filetypes/filegroupdetails.cpp +++ b/kcontrol/filetypes/filegroupdetails.cpp @@ -17,29 +17,29 @@ */ #include "filegroupdetails.h" #include "typeslistitem.h" -#include <qlayout.h> -#include <qvbuttongroup.h> -#include <qradiobutton.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqvbuttongroup.h> +#include <tqradiobutton.h> +#include <tqwhatsthis.h> #include <kdialog.h> #include <klocale.h> -FileGroupDetails::FileGroupDetails(QWidget *parent, const char *name ) - : QWidget( parent, name ) +FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { - QWidget * parentWidget = this; - QVBoxLayout *secondLayout = new QVBoxLayout(parentWidget, + TQWidget * parentWidget = this; + TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget, 0, KDialog::spacingHint()); - m_autoEmbed = new QVButtonGroup( i18n("Left Click Action"), parentWidget ); + m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), parentWidget ); m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() ); secondLayout->addWidget( m_autoEmbed ); // The order of those two items is very important. If you change it, fix typeslistitem.cpp ! - new QRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); - new QRadioButton( i18n("Show file in separate viewer"), m_autoEmbed ); - connect(m_autoEmbed, SIGNAL( clicked( int ) ), SLOT( slotAutoEmbedClicked( int ) )); + new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); + new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed ); + connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) )); - QWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager" + TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager" " will do when you click on a file belonging to this group. Konqueror can display the file in" " an embedded viewer or start up a separate application. You can change this setting for a" " specific file type in the 'Embedding' tab of the file type configuration.") ); diff --git a/kcontrol/filetypes/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h index 1716954f3..d52bec176 100644 --- a/kcontrol/filetypes/filegroupdetails.h +++ b/kcontrol/filetypes/filegroupdetails.h @@ -18,7 +18,7 @@ #ifndef _FILEGROUPDETAILS_H #define _FILEGROUPDETAILS_H -#include <qwidget.h> +#include <tqwidget.h> class TypesListItem; class QButtonGroup; @@ -30,7 +30,7 @@ class FileGroupDetails : public QWidget { Q_OBJECT public: - FileGroupDetails(QWidget *parent = 0, const char *name = 0); + FileGroupDetails(TQWidget *parent = 0, const char *name = 0); void setTypeItem( TypesListItem * item ); @@ -44,7 +44,7 @@ private: TypesListItem * m_item; // Embedding config - QButtonGroup *m_autoEmbed; + TQButtonGroup *m_autoEmbed; }; #endif diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index 436fd138d..a678e0eb2 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -1,8 +1,8 @@ -#include <qcheckbox.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qvbuttongroup.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqvbuttongroup.h> +#include <tqwhatsthis.h> #include <kapplication.h> #include <kconfig.h> @@ -16,102 +16,102 @@ #include "filetypedetails.h" #include "typeslistitem.h" -FileTypeDetails::FileTypeDetails( QWidget * parent, const char * name ) - : QTabWidget( parent, name ), m_item( 0L ) +FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) + : TQTabWidget( parent, name ), m_item( 0L ) { - QString wtstr; + TQString wtstr; // First tab - General - QWidget * firstWidget = new QWidget(this); - QVBoxLayout *firstLayout = new QVBoxLayout(firstWidget,KDialog::marginHint(), + TQWidget * firstWidget = new TQWidget(this); + TQVBoxLayout *firstLayout = new TQVBoxLayout(firstWidget,KDialog::marginHint(), KDialog::spacingHint()); - QHBoxLayout *hBox = new QHBoxLayout(0L, 0, KDialog::spacingHint()); + TQHBoxLayout *hBox = new TQHBoxLayout(0L, 0, KDialog::spacingHint()); firstLayout->addLayout(hBox, 1); iconButton = new KIconButton(firstWidget); iconButton->setIconType(KIcon::Desktop, KIcon::MimeType); - connect(iconButton, SIGNAL(iconChanged(QString)), SLOT(updateIcon(QString))); + connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString))); iconButton->setFixedSize(70, 70); hBox->addWidget(iconButton); - QWhatsThis::add( iconButton, i18n("This button displays the icon associated" + TQWhatsThis::add( iconButton, i18n("This button displays the icon associated" " with the selected file type. Click on it to choose a different icon.") ); - QGroupBox *gb = new QGroupBox(i18n("Filename Patterns"), firstWidget); + TQGroupBox *gb = new TQGroupBox(i18n("Filename Patterns"), firstWidget); hBox->addWidget(gb); - QGridLayout *grid = new QGridLayout(gb, 3, 2, KDialog::marginHint(), + TQGridLayout *grid = new TQGridLayout(gb, 3, 2, KDialog::marginHint(), KDialog::spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()); - extensionLB = new QListBox(gb); - connect(extensionLB, SIGNAL(highlighted(int)), SLOT(enableExtButtons(int))); + extensionLB = new TQListBox(gb); + connect(extensionLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableExtButtons(int))); grid->addMultiCellWidget(extensionLB, 1, 2, 0, 0); grid->setRowStretch(0, 0); grid->setRowStretch(1, 1); grid->setRowStretch(2, 0); - QWhatsThis::add( extensionLB, i18n("This box contains a list of patterns that can be" + TQWhatsThis::add( extensionLB, i18n("This box contains a list of patterns that can be" " used to identify files of the selected type. For example, the pattern *.txt is" " associated with the file type 'text/plain'; all files ending in '.txt' are recognized" " as plain text files.") ); - addExtButton = new QPushButton(i18n("Add..."), gb); + addExtButton = new TQPushButton(i18n("Add..."), gb); addExtButton->setEnabled(false); - connect(addExtButton, SIGNAL(clicked()), - this, SLOT(addExtension())); + connect(addExtButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(addExtension())); grid->addWidget(addExtButton, 1, 1); - QWhatsThis::add( addExtButton, i18n("Add a new pattern for the selected file type.") ); + TQWhatsThis::add( addExtButton, i18n("Add a new pattern for the selected file type.") ); - removeExtButton = new QPushButton(i18n("Remove"), gb); + removeExtButton = new TQPushButton(i18n("Remove"), gb); removeExtButton->setEnabled(false); - connect(removeExtButton, SIGNAL(clicked()), - this, SLOT(removeExtension())); + connect(removeExtButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(removeExtension())); grid->addWidget(removeExtButton, 2, 1); - QWhatsThis::add( removeExtButton, i18n("Remove the selected filename pattern.") ); + TQWhatsThis::add( removeExtButton, i18n("Remove the selected filename pattern.") ); - gb = new QGroupBox(i18n("Description"), firstWidget); + gb = new TQGroupBox(i18n("Description"), firstWidget); firstLayout->addWidget(gb); gb->setColumnLayout(1, Qt::Horizontal); description = new KLineEdit(gb); - connect(description, SIGNAL(textChanged(const QString &)), - SLOT(updateDescription(const QString &))); + connect(description, TQT_SIGNAL(textChanged(const TQString &)), + TQT_SLOT(updateDescription(const TQString &))); wtstr = i18n("You can enter a short description for files of the selected" " file type (e.g. 'HTML Page'). This description will be used by applications" " like Konqueror to display directory content."); - QWhatsThis::add( gb, wtstr ); - QWhatsThis::add( description, wtstr ); + TQWhatsThis::add( gb, wtstr ); + TQWhatsThis::add( description, wtstr ); serviceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_APPLICATIONS, firstWidget ); - connect( serviceListWidget, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); + connect( serviceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); firstLayout->addWidget(serviceListWidget, 5); // Second tab - Embedding - QWidget * secondWidget = new QWidget(this); - QVBoxLayout *secondLayout = new QVBoxLayout(secondWidget, KDialog::marginHint(), + TQWidget * secondWidget = new TQWidget(this); + TQVBoxLayout *secondLayout = new TQVBoxLayout(secondWidget, KDialog::marginHint(), KDialog::spacingHint()); - m_autoEmbed = new QVButtonGroup( i18n("Left Click Action"), secondWidget ); + m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), secondWidget ); m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() ); secondLayout->addWidget( m_autoEmbed, 1 ); - m_autoEmbed->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) ); + m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) ); // The order of those three items is very important. If you change it, fix typeslistitem.cpp ! - new QRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); - new QRadioButton( i18n("Show file in separate viewer"), m_autoEmbed ); - m_rbGroupSettings = new QRadioButton( i18n("Use settings for '%1' group"), m_autoEmbed ); - connect(m_autoEmbed, SIGNAL( clicked( int ) ), SLOT( slotAutoEmbedClicked( int ) )); + new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); + new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed ); + m_rbGroupSettings = new TQRadioButton( i18n("Use settings for '%1' group"), m_autoEmbed ); + connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) )); - m_chkAskSave = new QCheckBox( i18n("Ask whether to save to disk instead"), m_autoEmbed); - connect(m_chkAskSave, SIGNAL( toggled(bool) ), SLOT( slotAskSaveToggled(bool) )); + m_chkAskSave = new TQCheckBox( i18n("Ask whether to save to disk instead"), m_autoEmbed); + connect(m_chkAskSave, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAskSaveToggled(bool) )); - QWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager" + TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager" " will do when you click on a file of this type. Konqueror can display the file in" " an embedded viewer or start up a separate application. If set to 'Use settings for G group'," " Konqueror will behave according to the settings of the group G this type belongs to," @@ -121,7 +121,7 @@ FileTypeDetails::FileTypeDetails( QWidget * parent, const char * name ) embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget ); embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() ); - connect( embedServiceListWidget, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); + connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); secondLayout->addWidget(embedServiceListWidget, 3); addTab( firstWidget, i18n("&General") ); @@ -133,7 +133,7 @@ void FileTypeDetails::updateRemoveButton() removeExtButton->setEnabled(extensionLB->count()>0); } -void FileTypeDetails::updateIcon(QString icon) +void FileTypeDetails::updateIcon(TQString icon) { if (!m_item) return; @@ -143,7 +143,7 @@ void FileTypeDetails::updateIcon(QString icon) emit changed(true); } -void FileTypeDetails::updateDescription(const QString &desc) +void FileTypeDetails::updateDescription(const TQString &desc) { if (!m_item) return; @@ -159,11 +159,11 @@ void FileTypeDetails::addExtension() return; bool ok; - QString ext = KInputDialog::getText( i18n( "Add New Extension" ), + TQString ext = KInputDialog::getText( i18n( "Add New Extension" ), i18n( "Extension:" ), "*.", &ok, this ); if (ok) { extensionLB->insertItem(ext); - QStringList patt = m_item->patterns(); + TQStringList patt = m_item->patterns(); patt += ext; m_item->setPatterns(patt); updateRemoveButton(); @@ -177,7 +177,7 @@ void FileTypeDetails::removeExtension() return; if ( !m_item ) return; - QStringList patt = m_item->patterns(); + TQStringList patt = m_item->patterns(); patt.remove(extensionLB->text(extensionLB->currentItem())); m_item->setPatterns(patt); extensionLB->removeItem(extensionLB->currentItem()); @@ -210,9 +210,9 @@ void FileTypeDetails::updateAskSave() button = embedParent ? 0 : 1; } - QString mimeType = m_item->name(); + TQString mimeType = m_item->name(); - QString dontAskAgainName; + TQString dontAskAgainName; if (button == 0) // Embedded dontAskAgainName = "askEmbedOrSave"+mimeType; @@ -271,7 +271,7 @@ void FileTypeDetails::setTypeItem( TypesListItem * tlitem ) iconButton->setIcon(tlitem->icon()); else iconButton->resetIcon(); - description->setText(tlitem ? tlitem->comment() : QString::null); + description->setText(tlitem ? tlitem->comment() : TQString::null); if ( tlitem ) m_rbGroupSettings->setText( i18n("Use settings for '%1' group").arg( tlitem->majorType() ) ); extensionLB->clear(); diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h index 6f9a0a548..fcbe3f3d5 100644 --- a/kcontrol/filetypes/filetypedetails.h +++ b/kcontrol/filetypes/filetypedetails.h @@ -1,7 +1,7 @@ #ifndef _FILETYPEDETAILS_H #define _FILETYPEDETAILS_H -#include <qtabwidget.h> +#include <tqtabwidget.h> class TypesListItem; class KIconButton; class QLineEdit; @@ -22,7 +22,7 @@ class FileTypeDetails : public QTabWidget { Q_OBJECT public: - FileTypeDetails(QWidget *parent = 0, const char *name = 0); + FileTypeDetails(TQWidget *parent = 0, const char *name = 0); void setTypeItem( TypesListItem * item ); @@ -31,12 +31,12 @@ protected: void updateAskSave(); signals: - void embedMajor(const QString &major, bool &embed); // To adjust whether major type is being embedded + void embedMajor(const TQString &major, bool &embed); // To adjust whether major type is being embedded void changed(bool); protected slots: - void updateIcon(QString icon); - void updateDescription(const QString &desc); + void updateIcon(TQString icon); + void updateDescription(const TQString &desc); void addExtension(); void removeExtension(); void enableExtButtons(int index); @@ -48,17 +48,17 @@ private: // First tab - General KIconButton *iconButton; - QListBox *extensionLB; - QPushButton *addExtButton, *removeExtButton; - QLineEdit *description; + TQListBox *extensionLB; + TQPushButton *addExtButton, *removeExtButton; + TQLineEdit *description; KServiceListWidget *serviceListWidget; // Second tab - Embedding - QButtonGroup *m_autoEmbed; + TQButtonGroup *m_autoEmbed; KServiceListWidget *embedServiceListWidget; - QRadioButton *m_rbOpenSeparate; - QCheckBox *m_chkAskSave; - QRadioButton *m_rbGroupSettings; + TQRadioButton *m_rbOpenSeparate; + TQCheckBox *m_chkAskSave; + TQRadioButton *m_rbGroupSettings; }; #endif diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index 4088e9eee..ad60fc3de 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -1,10 +1,10 @@ -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qwhatsthis.h> -#include <qwidgetstack.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> +#include <tqwidgetstack.h> #include <dcopclient.h> @@ -24,7 +24,7 @@ #include "filetypesview.h" #include <ksycoca.h> -FileTypesView::FileTypesView(QWidget *p, const char *name) +FileTypesView::FileTypesView(TQWidget *p, const char *name) : KCModule(p, name) { m_konqConfig = KSharedConfig::openConfig("konquerorrc", false, false); @@ -50,30 +50,30 @@ FileTypesView::FileTypesView(QWidget *p, const char *name) " MIME-type by directly examining the contents of the file.")); setButtons(Help | Apply | Cancel | Ok); - QString wtstr; + TQString wtstr; - QHBoxLayout *l = new QHBoxLayout(this, 0, KDialog::marginHint()); - QGridLayout *leftLayout = new QGridLayout(0, 4, 3); + TQHBoxLayout *l = new TQHBoxLayout(this, 0, KDialog::marginHint()); + TQGridLayout *leftLayout = new TQGridLayout(0, 4, 3); leftLayout->setSpacing( KDialog::spacingHint() ); leftLayout->setColStretch(1, 1); l->addLayout( leftLayout ); - QLabel *patternFilterLBL = new QLabel(i18n("F&ind filename pattern:"), this); + TQLabel *patternFilterLBL = new TQLabel(i18n("F&ind filename pattern:"), this); leftLayout->addMultiCellWidget(patternFilterLBL, 0, 0, 0, 2); patternFilterLE = new KLineEdit(this); patternFilterLBL->setBuddy( patternFilterLE ); leftLayout->addMultiCellWidget(patternFilterLE, 1, 1, 0, 2); - connect(patternFilterLE, SIGNAL(textChanged(const QString &)), - this, SLOT(slotFilter(const QString &))); + connect(patternFilterLE, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SLOT(slotFilter(const TQString &))); wtstr = i18n("Enter a part of a filename pattern. Only file types with a " "matching file pattern will appear in the list."); - QWhatsThis::add( patternFilterLE, wtstr ); - QWhatsThis::add( patternFilterLBL, wtstr ); + TQWhatsThis::add( patternFilterLE, wtstr ); + TQWhatsThis::add( patternFilterLBL, wtstr ); typesLV = new KListView(this); typesLV->setRootIsDecorated(true); @@ -81,60 +81,60 @@ FileTypesView::FileTypesView(QWidget *p, const char *name) typesLV->addColumn(i18n("Known Types")); leftLayout->addMultiCellWidget(typesLV, 2, 2, 0, 2); - connect(typesLV, SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(updateDisplay(QListViewItem *))); - connect(typesLV, SIGNAL(doubleClicked(QListViewItem *)), - this, SLOT(slotDoubleClicked(QListViewItem *))); + connect(typesLV, TQT_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQT_SLOT(updateDisplay(TQListViewItem *))); + connect(typesLV, TQT_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQT_SLOT(slotDoubleClicked(TQListViewItem *))); - QWhatsThis::add( typesLV, i18n("Here you can see a hierarchical list of" + TQWhatsThis::add( typesLV, i18n("Here you can see a hierarchical list of" " the file types which are known on your system. Click on the '+' sign" " to expand a category, or the '-' sign to collapse it. Select a file type" " (e.g. text/html for HTML files) to view/edit the information for that" " file type using the controls on the right.") ); - QPushButton *addTypeB = new QPushButton(i18n("Add..."), this); - connect(addTypeB, SIGNAL(clicked()), SLOT(addType())); + TQPushButton *addTypeB = new TQPushButton(i18n("Add..."), this); + connect(addTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(addType())); leftLayout->addWidget(addTypeB, 3, 0); - QWhatsThis::add( addTypeB, i18n("Click here to add a new file type.") ); + TQWhatsThis::add( addTypeB, i18n("Click here to add a new file type.") ); - m_removeTypeB = new QPushButton(i18n("&Remove"), this); - connect(m_removeTypeB, SIGNAL(clicked()), SLOT(removeType())); + m_removeTypeB = new TQPushButton(i18n("&Remove"), this); + connect(m_removeTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(removeType())); leftLayout->addWidget(m_removeTypeB, 3, 2); m_removeTypeB->setEnabled(false); - QWhatsThis::add( m_removeTypeB, i18n("Click here to remove the selected file type.") ); + TQWhatsThis::add( m_removeTypeB, i18n("Click here to remove the selected file type.") ); // For the right panel, prepare a widget stack - m_widgetStack = new QWidgetStack(this); + m_widgetStack = new TQWidgetStack(this); l->addWidget( m_widgetStack ); // File Type Details m_details = new FileTypeDetails( m_widgetStack ); - connect( m_details, SIGNAL( changed(bool) ), - this, SLOT( setDirty(bool) ) ); - connect( m_details, SIGNAL( embedMajor(const QString &, bool &) ), - this, SLOT( slotEmbedMajor(const QString &, bool &))); + connect( m_details, TQT_SIGNAL( changed(bool) ), + this, TQT_SLOT( setDirty(bool) ) ); + connect( m_details, TQT_SIGNAL( embedMajor(const TQString &, bool &) ), + this, TQT_SLOT( slotEmbedMajor(const TQString &, bool &))); m_widgetStack->addWidget( m_details, 1 /*id*/ ); // File Group Details m_groupDetails = new FileGroupDetails( m_widgetStack ); - connect( m_groupDetails, SIGNAL( changed(bool) ), - this, SLOT( setDirty(bool) ) ); + connect( m_groupDetails, TQT_SIGNAL( changed(bool) ), + this, TQT_SLOT( setDirty(bool) ) ); m_widgetStack->addWidget( m_groupDetails, 2 /*id*/ ); // Widget shown on startup - m_emptyWidget = new QLabel( i18n("Select a file type by name or by extension"), m_widgetStack); + m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack); m_emptyWidget->setAlignment(AlignCenter); m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ ); m_widgetStack->raiseWidget( m_emptyWidget ); - QTimer::singleShot( 0, this, SLOT( init() ) ); // this takes some time + TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); // this takes some time - connect( KSycoca::self(), SIGNAL( databaseChanged() ), SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) ); } FileTypesView::~FileTypesView() @@ -171,14 +171,14 @@ void FileTypesView::readFileTypes() TypesListItem *groupItem; KMimeType::List mimetypes = KMimeType::allMimeTypes(); - QValueListIterator<KMimeType::Ptr> it2(mimetypes.begin()); + TQValueListIterator<KMimeType::Ptr> it2(mimetypes.begin()); for (; it2 != mimetypes.end(); ++it2) { - QString mimetype = (*it2)->name(); + TQString mimetype = (*it2)->name(); int index = mimetype.find("/"); - QString maj = mimetype.left(index); - QString min = mimetype.right(mimetype.length() - index+1); + TQString maj = mimetype.left(index); + TQString min = mimetype.right(mimetype.length() - index+1); - QMapIterator<QString,TypesListItem*> mit = m_majorMap.find( maj ); + TQMapIterator<TQString,TypesListItem*> mit = m_majorMap.find( maj ); if ( mit == m_majorMap.end() ) { groupItem = new TypesListItem( typesLV, maj ); m_majorMap.insert( maj, groupItem ); @@ -193,10 +193,10 @@ void FileTypesView::readFileTypes() } -void FileTypesView::slotEmbedMajor(const QString &major, bool &embed) +void FileTypesView::slotEmbedMajor(const TQString &major, bool &embed) { TypesListItem *groupItem; - QMapIterator<QString,TypesListItem*> mit = m_majorMap.find( major ); + TQMapIterator<TQString,TypesListItem*> mit = m_majorMap.find( major ); if ( mit == m_majorMap.end() ) return; @@ -205,11 +205,11 @@ void FileTypesView::slotEmbedMajor(const QString &major, bool &embed) embed = (groupItem->autoEmbed() == 0); } -void FileTypesView::slotFilter(const QString & patternFilter) +void FileTypesView::slotFilter(const TQString & patternFilter) { // one of the few ways to clear a listview without destroying the - // listviewitems and without making QListView crash. - QListViewItem *item; + // listviewitems and without making TQListView crash. + TQListViewItem *item; while ( (item = typesLV->firstChild()) ) { while ( item->firstChild() ) item->takeItem( item->firstChild() ); @@ -218,13 +218,13 @@ void FileTypesView::slotFilter(const QString & patternFilter) } // insert all items and their group that match the filter - QPtrListIterator<TypesListItem> it( m_itemList ); + TQPtrListIterator<TypesListItem> it( m_itemList ); while ( it.current() ) { if ( patternFilter.isEmpty() || !((*it)->patterns().grep( patternFilter, false )).isEmpty() ) { TypesListItem *group = m_majorMap[ (*it)->majorType() ]; - // QListView makes sure we don't insert a group-item more than once + // TQListView makes sure we don't insert a group-item more than once typesLV->insertItem( group ); group->insertItem( *it ); } @@ -234,8 +234,8 @@ void FileTypesView::slotFilter(const QString & patternFilter) void FileTypesView::addType() { - QStringList allGroups; - QMapIterator<QString,TypesListItem*> it = m_majorMap.begin(); + TQStringList allGroups; + TQMapIterator<TQString,TypesListItem*> it = m_majorMap.begin(); while ( it != m_majorMap.end() ) { allGroups.append( it.key() ); ++it; @@ -244,13 +244,13 @@ void FileTypesView::addType() NewTypeDialog m(allGroups, this); if (m.exec()) { - QListViewItemIterator it(typesLV); - QString loc = m.group() + "/" + m.text() + ".desktop"; + TQListViewItemIterator it(typesLV); + TQString loc = m.group() + "/" + m.text() + ".desktop"; loc = locateLocal("mime", loc); KMimeType::Ptr mimetype = new KMimeType(loc, m.group() + "/" + m.text(), - QString(), QString(), - QStringList()); + TQString(), TQString(), + TQStringList()); TypesListItem *group = m_majorMap[ m.group() ]; if ( !group ) @@ -261,7 +261,7 @@ void FileTypesView::addType() } // find out if our group has been filtered out -> insert if necessary - QListViewItem *item = typesLV->firstChild(); + TQListViewItem *item = typesLV->firstChild(); bool insert = true; while ( item ) { if ( item == group ) { @@ -297,7 +297,7 @@ void FileTypesView::removeType() if ( current->isEssential() ) return; - QListViewItem *li = current->itemAbove(); + TQListViewItem *li = current->itemAbove(); if (!li) li = current->itemBelow(); if (!li) @@ -312,13 +312,13 @@ void FileTypesView::removeType() typesLV->setSelected(li, true); } -void FileTypesView::slotDoubleClicked(QListViewItem *item) +void FileTypesView::slotDoubleClicked(TQListViewItem *item) { if ( !item ) return; item->setOpen( !item->isOpen() ); } -void FileTypesView::updateDisplay(QListViewItem *item) +void FileTypesView::updateDisplay(TQListViewItem *item) { if (!item) { @@ -348,12 +348,12 @@ void FileTypesView::updateDisplay(QListViewItem *item) setDirty(false); } -bool FileTypesView::sync( QValueList<TypesListItem *>& itemsModified ) +bool FileTypesView::sync( TQValueList<TypesListItem *>& itemsModified ) { bool didIt = false; // first, remove those items which we are asked to remove. - QStringList::Iterator it(removedList.begin()); - QString loc; + TQStringList::Iterator it(removedList.begin()); + TQString loc; for (; it != removedList.end(); ++it) { didIt = true; @@ -370,7 +370,7 @@ bool FileTypesView::sync( QValueList<TypesListItem *>& itemsModified ) // now go through all entries and sync those which are dirty. // don't use typesLV, it may be filtered - QMapIterator<QString,TypesListItem*> it1 = m_majorMap.begin(); + TQMapIterator<TQString,TypesListItem*> it1 = m_majorMap.begin(); while ( it1 != m_majorMap.end() ) { TypesListItem *tli = *it1; if (tli->isDirty()) { @@ -381,7 +381,7 @@ bool FileTypesView::sync( QValueList<TypesListItem *>& itemsModified ) } ++it1; } - QPtrListIterator<TypesListItem> it2( m_itemList ); + TQPtrListIterator<TypesListItem> it2( m_itemList ); while ( it2.current() ) { TypesListItem *tli = *it2; if (tli->isDirty()) { @@ -422,9 +422,9 @@ void FileTypesView::slotDatabaseChanged() // our 'copies' to be in sync with it. Not important for OK, but // important for Apply (how to differentiate those 2?). // See BR 35071. - QValueList<TypesListItem *>::Iterator it = m_itemsModified.begin(); + TQValueList<TypesListItem *>::Iterator it = m_itemsModified.begin(); for( ; it != m_itemsModified.end(); ++it ) { - QString name = (*it)->name(); + TQString name = (*it)->name(); if ( removedList.find( name ) == removedList.end() ) // if not deleted meanwhile (*it)->refresh(); } diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h index bc6323d85..70b6bb88d 100644 --- a/kcontrol/filetypes/filetypesview.h +++ b/kcontrol/filetypes/filetypesview.h @@ -1,8 +1,8 @@ #ifndef _FILETYPESVIEW_H #define _FILETYPESVIEW_H -#include <qptrlist.h> -#include <qmap.h> +#include <tqptrlist.h> +#include <tqmap.h> #include <kconfig.h> #include <kcmodule.h> @@ -25,7 +25,7 @@ class FileTypesView : public KCModule { Q_OBJECT public: - FileTypesView(QWidget *p = 0, const char *name = 0); + FileTypesView(TQWidget *p = 0, const char *name = 0); ~FileTypesView(); void load(); @@ -38,34 +38,34 @@ protected slots: void addType(); void removeType(); - void updateDisplay(QListViewItem *); - void slotDoubleClicked(QListViewItem *); - void slotFilter(const QString &patternFilter); + void updateDisplay(TQListViewItem *); + void slotDoubleClicked(TQListViewItem *); + void slotFilter(const TQString &patternFilter); void setDirty(bool state); void slotDatabaseChanged(); - void slotEmbedMajor(const QString &major, bool &embed); + void slotEmbedMajor(const TQString &major, bool &embed); protected: void readFileTypes(); - bool sync( QValueList<TypesListItem *>& itemsModified ); + bool sync( TQValueList<TypesListItem *>& itemsModified ); private: KListView *typesLV; - QPushButton *m_removeTypeB; + TQPushButton *m_removeTypeB; - QWidgetStack * m_widgetStack; + TQWidgetStack * m_widgetStack; FileTypeDetails * m_details; FileGroupDetails * m_groupDetails; - QLabel * m_emptyWidget; + TQLabel * m_emptyWidget; - QLineEdit *patternFilterLE; - QStringList removedList; + TQLineEdit *patternFilterLE; + TQStringList removedList; bool m_dirty; - QMap<QString,TypesListItem*> m_majorMap; - QPtrList<TypesListItem> m_itemList; + TQMap<TQString,TypesListItem*> m_majorMap; + TQPtrList<TypesListItem> m_itemList; - QValueList<TypesListItem *> m_itemsModified; + TQValueList<TypesListItem *> m_itemsModified; KSharedConfig::Ptr m_konqConfig; }; diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp index 6c5c4eb6c..48f9e14c5 100644 --- a/kcontrol/filetypes/keditfiletype.cpp +++ b/kcontrol/filetypes/keditfiletype.cpp @@ -19,7 +19,7 @@ #include "typeslistitem.h" #include "keditfiletype.h" -#include <qfile.h> +#include <tqfile.h> #include <dcopclient.h> #include <kapplication.h> @@ -35,14 +35,14 @@ #endif FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime ) - : KDialogBase( 0L, 0, false, QString::null, /* Help | */ Cancel | Apply | Ok, + : KDialogBase( 0L, 0, false, TQString::null, /* Help | */ Cancel | Apply | Ok, Ok, false ) { init( mime, false ); } FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime, bool newItem ) - : KDialogBase( 0L, 0, false, QString::null, /* Help | */ Cancel | Apply | Ok, + : KDialogBase( 0L, 0, false, TQString::null, /* Help | */ Cancel | Apply | Ok, Ok, false ) { init( mime, newItem ); @@ -51,18 +51,18 @@ FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime, bool newItem ) void FileTypeDialog::init( KMimeType::Ptr mime, bool newItem ) { m_details = new FileTypeDetails( this ); - QListView * dummyListView = new QListView( m_details ); + TQListView * dummyListView = new TQListView( m_details ); dummyListView->hide(); m_item = new TypesListItem( dummyListView, mime, newItem ); m_details->setTypeItem( m_item ); // This code is very similar to kcdialog.cpp setMainWidget( m_details ); - connect(m_details, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); + connect(m_details, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); // TODO setHelp() enableButton(Apply, false); - connect( KSycoca::self(), SIGNAL( databaseChanged() ), SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) ); } void FileTypeDialog::save() @@ -126,31 +126,31 @@ int main(int argc, char ** argv) if (args->count() == 0) KCmdLineArgs::usage(); - QString arg = args->arg(0); + TQString arg = args->arg(0); bool createType = arg.startsWith( "*" ); KMimeType::Ptr mime; if ( createType ) { - QString mimeString = "application/x-kdeuser%1"; - QString loc; + TQString mimeString = "application/x-kdeuser%1"; + TQString loc; int inc = 0; do { ++inc; loc = locateLocal( "mime", mimeString.arg( inc ) + ".desktop" ); } - while ( QFile::exists( loc ) ); + while ( TQFile::exists( loc ) ); - QStringList patterns; + TQStringList patterns; if ( arg.length() > 2 ) patterns << arg.lower() << arg.upper(); - QString comment; + TQString comment; if ( arg.startsWith( "*." ) && arg.length() >= 3 ) { - QString type = arg.mid( 3 ).prepend( arg[2].upper() ); + TQString type = arg.mid( 3 ).prepend( arg[2].upper() ); comment = i18n( "%1 File" ).arg( type ); } - mime = new KMimeType( loc, mimeString.arg( inc ), QString::null, comment, patterns ); + mime = new KMimeType( loc, mimeString.arg( inc ), TQString::null, comment, patterns ); } else { mime = KMimeType::mimeType( arg ); diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp index ed6819a37..e4363415d 100644 --- a/kcontrol/filetypes/kservicelistwidget.cpp +++ b/kcontrol/filetypes/kservicelistwidget.cpp @@ -20,9 +20,9 @@ #include <unistd.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <kapplication.h> #include <kdebug.h> @@ -38,7 +38,7 @@ #include <kstandarddirs.h> KServiceListItem::KServiceListItem( KService *pService, int kind ) - : QListBoxText(), desktopPath(pService->desktopEntryPath()) + : TQListBoxText(), desktopPath(pService->desktopEntryPath()) { if ( kind == KServiceListWidget::SERVICELIST_APPLICATIONS ) setText( pService->name() ); @@ -57,13 +57,13 @@ bool KServiceListItem::isImmutable() return !checkAccess(localPath, W_OK); } -KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *name) - : QGroupBox( kind == SERVICELIST_APPLICATIONS ? i18n("Application Preference Order") +KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *name) + : TQGroupBox( kind == SERVICELIST_APPLICATIONS ? i18n("Application Preference Order") : i18n("Services Preference Order"), parent, name ), m_kind( kind ), m_item( 0L ) { - QWidget * gb = this; - QGridLayout * grid = new QGridLayout(gb, 7, 2, KDialog::marginHint(), + TQWidget * gb = this; + TQGridLayout * grid = new TQGridLayout(gb, 7, 2, KDialog::marginHint(), KDialog::spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()); grid->setRowStretch(1, 1); @@ -73,12 +73,12 @@ KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *na grid->setRowStretch(5, 1); grid->setRowStretch(6, 1); - servicesLB = new QListBox(gb); - connect(servicesLB, SIGNAL(highlighted(int)), SLOT(enableMoveButtons(int))); + servicesLB = new TQListBox(gb); + connect(servicesLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); grid->addMultiCellWidget(servicesLB, 1, 6, 0, 0); - connect( servicesLB, SIGNAL( doubleClicked ( QListBoxItem * )), this, SLOT( editService())); + connect( servicesLB, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQT_SLOT( editService())); - QString wtstr = + TQString wtstr = (kind == SERVICELIST_APPLICATIONS ? i18n("This is a list of applications associated with files of the selected" " file type. This list is shown in Konqueror's context menus when you select" @@ -91,15 +91,15 @@ KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *na " then the list is ordered by priority with the uppermost item taking precedence" " over the others.")); - QWhatsThis::add( gb, wtstr ); - QWhatsThis::add( servicesLB, wtstr ); + TQWhatsThis::add( gb, wtstr ); + TQWhatsThis::add( servicesLB, wtstr ); - servUpButton = new QPushButton(i18n("Move &Up"), gb); + servUpButton = new TQPushButton(i18n("Move &Up"), gb); servUpButton->setEnabled(false); - connect(servUpButton, SIGNAL(clicked()), SLOT(promoteService())); + connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(promoteService())); grid->addWidget(servUpButton, 2, 1); - QWhatsThis::add( servUpButton, kind == SERVICELIST_APPLICATIONS ? + TQWhatsThis::add( servUpButton, kind == SERVICELIST_APPLICATIONS ? i18n("Assigns a higher priority to the selected\n" "application, moving it up in the list. Note: This\n" "only affects the selected application if the file type is\n" @@ -107,12 +107,12 @@ KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *na i18n("Assigns a higher priority to the selected\n" "service, moving it up in the list.")); - servDownButton = new QPushButton(i18n("Move &Down"), gb); + servDownButton = new TQPushButton(i18n("Move &Down"), gb); servDownButton->setEnabled(false); - connect(servDownButton, SIGNAL(clicked()), SLOT(demoteService())); + connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(demoteService())); grid->addWidget(servDownButton, 3, 1); - QWhatsThis::add( servDownButton, kind == SERVICELIST_APPLICATIONS ? + TQWhatsThis::add( servDownButton, kind == SERVICELIST_APPLICATIONS ? i18n("Assigns a lower priority to the selected\n" "application, moving it down in the list. Note: This \n" "only affects the selected application if the file type is\n" @@ -120,28 +120,28 @@ KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *na i18n("Assigns a lower priority to the selected\n" "service, moving it down in the list.")); - servNewButton = new QPushButton(i18n("Add..."), gb); + servNewButton = new TQPushButton(i18n("Add..."), gb); servNewButton->setEnabled(false); - connect(servNewButton, SIGNAL(clicked()), SLOT(addService())); + connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addService())); grid->addWidget(servNewButton, 1, 1); - QWhatsThis::add( servNewButton, i18n( "Add a new application for this file type." ) ); + TQWhatsThis::add( servNewButton, i18n( "Add a new application for this file type." ) ); - servEditButton = new QPushButton(i18n("Edit..."), gb); + servEditButton = new TQPushButton(i18n("Edit..."), gb); servEditButton->setEnabled(false); - connect(servEditButton, SIGNAL(clicked()), SLOT(editService())); + connect(servEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(editService())); grid->addWidget(servEditButton, 4, 1); - QWhatsThis::add( servEditButton, i18n( "Edit command line of the selected application." ) ); + TQWhatsThis::add( servEditButton, i18n( "Edit command line of the selected application." ) ); - servRemoveButton = new QPushButton(i18n("Remove"), gb); + servRemoveButton = new TQPushButton(i18n("Remove"), gb); servRemoveButton->setEnabled(false); - connect(servRemoveButton, SIGNAL(clicked()), SLOT(removeService())); + connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeService())); grid->addWidget(servRemoveButton, 5, 1); - QWhatsThis::add( servRemoveButton, i18n( "Remove the selected application from the list." ) ); + TQWhatsThis::add( servRemoveButton, i18n( "Remove the selected application from the list." ) ); } void KServiceListWidget::setTypeItem( TypesListItem * item ) @@ -163,14 +163,14 @@ void KServiceListWidget::setTypeItem( TypesListItem * item ) if ( item ) { - QStringList services = ( m_kind == SERVICELIST_APPLICATIONS ) + TQStringList services = ( m_kind == SERVICELIST_APPLICATIONS ) ? item->appServices() : item->embedServices(); if (services.count() == 0) { servicesLB->insertItem(i18n("None")); } else { - for ( QStringList::Iterator it = services.begin(); + for ( TQStringList::Iterator it = services.begin(); it != services.end(); it++ ) { KService::Ptr pService = KService::serviceByDesktopPath( *it ); @@ -196,7 +196,7 @@ void KServiceListWidget::promoteService() return; } - QListBoxItem *selItem = servicesLB->item(selIndex); + TQListBoxItem *selItem = servicesLB->item(selIndex); servicesLB->takeItem(selItem); servicesLB->insertItem(selItem, selIndex-1); servicesLB->setCurrentItem(selIndex - 1); @@ -219,7 +219,7 @@ void KServiceListWidget::demoteService() return; } - QListBoxItem *selItem = servicesLB->item(selIndex); + TQListBoxItem *selItem = servicesLB->item(selIndex); servicesLB->takeItem(selItem); servicesLB->insertItem(selItem, selIndex+1); servicesLB->setCurrentItem(selIndex + 1); @@ -237,9 +237,9 @@ void KServiceListWidget::addService() KService::Ptr service = 0L; if ( m_kind == SERVICELIST_APPLICATIONS ) { - KOpenWithDlg dlg(m_item->name(), QString::null, 0L); + KOpenWithDlg dlg(m_item->name(), TQString::null, 0L); dlg.setSaveNewApplications(true); - if (dlg.exec() != QDialog::Accepted) + if (dlg.exec() != TQDialog::Accepted) return; service = dlg.service(); @@ -250,8 +250,8 @@ void KServiceListWidget::addService() } else { - KServiceSelectDlg dlg(m_item->name(), QString::null, 0L); - if (dlg.exec() != QDialog::Accepted) + KServiceSelectDlg dlg(m_item->name(), TQString::null, 0L); + if (dlg.exec() != TQDialog::Accepted) return; service = dlg.service(); Q_ASSERT(service); @@ -294,14 +294,14 @@ void KServiceListWidget::editService() { // Just like popping up an add dialog except that we // pass the current command line as a default - QListBoxItem *selItem = servicesLB->item(selected); + TQListBoxItem *selItem = servicesLB->item(selected); KService::Ptr service = KService::serviceByDesktopPath( ((KServiceListItem*)selItem)->desktopPath ); if (!service) return; - QString path = service->desktopEntryPath(); + TQString path = service->desktopEntryPath(); // If the path to the desktop file is relative, try to get the full // path from KStdDirs. @@ -310,7 +310,7 @@ void KServiceListWidget::editService() serviceURL.setPath( path ); KFileItem item( serviceURL, "application/x-desktop", KFileItem::Unknown ); KPropertiesDialog dlg( &item, this, 0, true /*modal*/, false /*no auto-show*/ ); - if ( dlg.exec() != QDialog::Accepted ) + if ( dlg.exec() != TQDialog::Accepted ) return; // Reload service @@ -349,15 +349,15 @@ void KServiceListWidget::removeService() if (!m_item) return; // Here are some strings already so that we don't have to break translations // later on. - QString msg1 = i18n("The service <b>%1</b> can not be removed."); - QString msg2 = i18n("The service is listed here because it has been associated " + TQString msg1 = i18n("The service <b>%1</b> can not be removed."); + TQString msg2 = i18n("The service is listed here because it has been associated " "with the <b>%1</b> (%2) file type and files of type " "<b>%3</b> (%4) are per definition also of type " "<b>%5</b>."); - QString msg3 = i18n("Either select the <b>%1</b> file type to remove the " + TQString msg3 = i18n("Either select the <b>%1</b> file type to remove the " "service from there or move the service down " "to deprecate it."); - QString msg4 = i18n("Do you want to remove the service from the <b>%1</b> " + TQString msg4 = i18n("Do you want to remove the service from the <b>%1</b> " "file type or from the <b>%2</b> file type?"); int selected = servicesLB->currentItem(); @@ -398,7 +398,7 @@ void KServiceListWidget::updatePreferredServices() { if (!m_item) return; - QStringList sl; + TQStringList sl; unsigned int count = servicesLB->count(); for (unsigned int i = 0; i < count; i++) { diff --git a/kcontrol/filetypes/kservicelistwidget.h b/kcontrol/filetypes/kservicelistwidget.h index fb20d1c64..eb2590781 100644 --- a/kcontrol/filetypes/kservicelistwidget.h +++ b/kcontrol/filetypes/kservicelistwidget.h @@ -21,8 +21,8 @@ #ifndef _KSERVICELISTWIDGET_H #define _KSERVICELISTWIDGET_H -#include <qgroupbox.h> -#include <qlistbox.h> +#include <tqgroupbox.h> +#include <tqlistbox.h> class TypesListItem; class QLineEdit; class QPushButton; @@ -33,8 +33,8 @@ class KServiceListItem : public QListBoxText public: KServiceListItem( KService *pService, int kind ); bool isImmutable(); - QString desktopPath; - QString localPath; + TQString desktopPath; + TQString localPath; }; /** @@ -48,7 +48,7 @@ class KServiceListWidget : public QGroupBox Q_OBJECT public: enum { SERVICELIST_APPLICATIONS, SERVICELIST_SERVICES }; - KServiceListWidget(int kind, QWidget *parent = 0, const char *name = 0); + KServiceListWidget(int kind, TQWidget *parent = 0, const char *name = 0); void setTypeItem( TypesListItem * item ); @@ -68,9 +68,9 @@ protected: private: int m_kind; - QListBox *servicesLB; - QPushButton *servUpButton, *servDownButton; - QPushButton *servNewButton, *servEditButton, *servRemoveButton; + TQListBox *servicesLB; + TQPushButton *servUpButton, *servDownButton; + TQPushButton *servNewButton, *servEditButton, *servRemoveButton; TypesListItem *m_item; }; diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp index c3a925218..340391e32 100644 --- a/kcontrol/filetypes/kserviceselectdlg.cpp +++ b/kcontrol/filetypes/kserviceselectdlg.cpp @@ -22,17 +22,17 @@ #include <klocale.h> -#include <qvbox.h> -#include <qlabel.h> +#include <tqvbox.h> +#include <tqlabel.h> -KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const QString& /*value*/, QWidget *parent ) +KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQString& /*value*/, TQWidget *parent ) : KDialogBase( parent, "serviceSelectDlg", true, i18n( "Add Service" ), Ok|Cancel, Ok ) { - QVBox *vbox = new QVBox ( this ); + TQVBox *vbox = new TQVBox ( this ); vbox->setSpacing( KDialog::spacingHint() ); - new QLabel( i18n( "Select service:" ), vbox ); + new TQLabel( i18n( "Select service:" ), vbox ); m_listbox=new KListBox( vbox ); // Can't make a KTrader query since we don't have a servicetype to give, @@ -40,7 +40,7 @@ KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const QStr // So we have to do it the slow way // ### Why can't we query for KParts/ReadOnlyPart as the servicetype? Should work fine! KService::List allServices = KService::allServices(); - QValueListIterator<KService::Ptr> it(allServices.begin()); + TQValueListIterator<KService::Ptr> it(allServices.begin()); for ( ; it != allServices.end() ; ++it ) if ( (*it)->hasServiceType( "KParts/ReadOnlyPart" ) ) { @@ -50,7 +50,7 @@ KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const QStr m_listbox->sort(); m_listbox->setMinimumHeight(350); m_listbox->setMinimumWidth(300); - connect(m_listbox,SIGNAL(doubleClicked ( QListBoxItem * )),SLOT(slotOk())); + connect(m_listbox,TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotOk())); setMainWidget(vbox); } diff --git a/kcontrol/filetypes/kserviceselectdlg.h b/kcontrol/filetypes/kserviceselectdlg.h index 05a2d4e9d..6f9bbe568 100644 --- a/kcontrol/filetypes/kserviceselectdlg.h +++ b/kcontrol/filetypes/kserviceselectdlg.h @@ -32,7 +32,7 @@ public: * @param value is the initial service to select (not implemented currently) * @param parent parent widget */ - KServiceSelectDlg( const QString& serviceType, const QString& value = QString::null, QWidget *parent = 0L ); + KServiceSelectDlg( const TQString& serviceType, const TQString& value = TQString::null, TQWidget *parent = 0L ); ~KServiceSelectDlg(); diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp index 24760cf1d..fb358f567 100644 --- a/kcontrol/filetypes/newtypedlg.cpp +++ b/kcontrol/filetypes/newtypedlg.cpp @@ -1,39 +1,39 @@ -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> #include <klocale.h> #include <klineedit.h> #include "newtypedlg.h" -NewTypeDialog::NewTypeDialog(QStringList groups, - QWidget *parent, const char *name) +NewTypeDialog::NewTypeDialog(TQStringList groups, + TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n( "Create New File Type" ), Ok|Cancel, Ok, true) { - QFrame *main = makeMainWidget(); - QVBoxLayout *topl = new QVBoxLayout(main, 0, spacingHint()); + TQFrame *main = makeMainWidget(); + TQVBoxLayout *topl = new TQVBoxLayout(main, 0, spacingHint()); - QGridLayout *grid = new QGridLayout(2, 2); + TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); topl->addLayout(grid); - QLabel *l = new QLabel(i18n("Group:"), main); + TQLabel *l = new TQLabel(i18n("Group:"), main); grid->addWidget(l, 0, 0); - groupCombo = new QComboBox(main); + groupCombo = new TQComboBox(main); //groupCombo->setEditable( true ); M.O.: Currently, the code in filetypesview isn't capable of handling //new top level types; so better not let them be added than crash. groupCombo->insertStringList(groups); grid->addWidget(groupCombo, 0, 1); - QWhatsThis::add( groupCombo, i18n("Select the category under which" + TQWhatsThis::add( groupCombo, i18n("Select the category under which" " the new file type should be added.") ); - l = new QLabel(i18n("Type name:"), main); + l = new TQLabel(i18n("Type name:"), main); grid->addWidget(l, 1, 0); typeEd = new KLineEdit(main); @@ -45,13 +45,13 @@ NewTypeDialog::NewTypeDialog(QStringList groups, setMinimumSize( 300, 50 ); } -QString NewTypeDialog::group() const +TQString NewTypeDialog::group() const { return groupCombo->currentText(); } -QString NewTypeDialog::text() const +TQString NewTypeDialog::text() const { return typeEd->text(); } diff --git a/kcontrol/filetypes/newtypedlg.h b/kcontrol/filetypes/newtypedlg.h index 386b5fcdb..e76025ea6 100644 --- a/kcontrol/filetypes/newtypedlg.h +++ b/kcontrol/filetypes/newtypedlg.h @@ -1,8 +1,8 @@ #ifndef _NEWTYPEDLG_H #define _NEWTYPEDLG_H -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kdialogbase.h> class KLineEdit; @@ -16,13 +16,13 @@ class QComboBox; class NewTypeDialog : public KDialogBase { public: - NewTypeDialog(QStringList groups, QWidget *parent = 0, + NewTypeDialog(TQStringList groups, TQWidget *parent = 0, const char *name = 0); - QString group() const; - QString text() const; + TQString group() const; + TQString text() const; private: KLineEdit *typeEd; - QComboBox *groupCombo; + TQComboBox *groupCombo; }; #endif diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index 88f3c8035..5bef9a5d6 100644 --- a/kcontrol/filetypes/typeslistitem.cpp +++ b/kcontrol/filetypes/typeslistitem.cpp @@ -26,32 +26,32 @@ #include "typeslistitem.h" -QMap< QString, QStringList >* TypesListItem::s_changedServices; -static KStaticDeleter< QMap< QString, QStringList > > deleter; +TQMap< TQString, TQStringList >* TypesListItem::s_changedServices; +static KStaticDeleter< TQMap< TQString, TQStringList > > deleter; -TypesListItem::TypesListItem(QListView *parent, const QString & major) - : QListViewItem(parent), metaType(true), m_bNewItem(false), m_askSave(2) +TypesListItem::TypesListItem(TQListView *parent, const TQString & major) + : TQListViewItem(parent), metaType(true), m_bNewItem(false), m_askSave(2) { initMeta(major); setText(0, majorType()); } TypesListItem::TypesListItem(TypesListItem *parent, KMimeType::Ptr mimetype, bool newItem) - : QListViewItem(parent), metaType(false), m_bNewItem(newItem), m_askSave(2) + : TQListViewItem(parent), metaType(false), m_bNewItem(newItem), m_askSave(2) { init(mimetype); setText(0, minorType()); } -TypesListItem::TypesListItem(QListView *parent, KMimeType::Ptr mimetype) - : QListViewItem(parent), metaType(false), m_bNewItem(false), m_askSave(2) +TypesListItem::TypesListItem(TQListView *parent, KMimeType::Ptr mimetype) + : TQListViewItem(parent), metaType(false), m_bNewItem(false), m_askSave(2) { init(mimetype); setText(0, majorType()); } -TypesListItem::TypesListItem(QListView *parent, KMimeType::Ptr mimetype, bool newItem) - : QListViewItem(parent), metaType(false), m_bNewItem(newItem), m_askSave(2) +TypesListItem::TypesListItem(TQListView *parent, KMimeType::Ptr mimetype, bool newItem) + : TQListViewItem(parent), metaType(false), m_bNewItem(newItem), m_askSave(2) { init(mimetype); setText(0, majorType()); @@ -61,7 +61,7 @@ TypesListItem::~TypesListItem() { } -void TypesListItem::initMeta( const QString & major ) +void TypesListItem::initMeta( const TQString & major ) { m_bFullInit = true; m_mimetype = 0L; @@ -69,10 +69,10 @@ void TypesListItem::initMeta( const QString & major ) KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); bool defaultValue = defaultEmbeddingSetting( major ); - m_autoEmbed = config->readBoolEntry( QString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; } -bool TypesListItem::defaultEmbeddingSetting( const QString& major ) +bool TypesListItem::defaultEmbeddingSetting( const TQString& major ) { // embedding is false by default except for image/* return ( major=="image" ); @@ -84,7 +84,7 @@ void TypesListItem::setup() { setPixmap(0, m_mimetype->pixmap(KIcon::Small, IconSize(KIcon::Small))); } - QListViewItem::setup(); + TQListViewItem::setup(); } void TypesListItem::init(KMimeType::Ptr mimetype) @@ -101,15 +101,15 @@ void TypesListItem::init(KMimeType::Ptr mimetype) m_major = mimetype->name(); m_minor = ""; } - m_comment = mimetype->comment(QString(), false); - m_icon = mimetype->icon(QString(), false); + m_comment = mimetype->comment(TQString(), false); + m_icon = mimetype->icon(TQString(), false); m_patterns = mimetype->patterns(); m_autoEmbed = readAutoEmbed( mimetype ); } int TypesListItem::readAutoEmbed( KMimeType::Ptr mimetype ) { - QVariant v = mimetype->property( "X-KDE-AutoEmbed" ); + TQVariant v = mimetype->property( "X-KDE-AutoEmbed" ); if ( v.isValid() ) return (v.toBool() ? 0 : 1); else if ( !mimetype->property( "X-KDE-LocalProtocol" ).toString().isEmpty() ) @@ -118,7 +118,7 @@ int TypesListItem::readAutoEmbed( KMimeType::Ptr mimetype ) return 2; } -QStringList TypesListItem::appServices() const +TQStringList TypesListItem::appServices() const { if (!m_bFullInit) { @@ -129,7 +129,7 @@ QStringList TypesListItem::appServices() const return m_appServices; } -QStringList TypesListItem::embedServices() const +TQStringList TypesListItem::embedServices() const { if (!m_bFullInit) { @@ -140,13 +140,13 @@ QStringList TypesListItem::embedServices() const return m_embedServices; } -void TypesListItem::getServiceOffers( QStringList & appServices, QStringList & embedServices ) const +void TypesListItem::getServiceOffers( TQStringList & appServices, TQStringList & embedServices ) const { KServiceTypeProfile::setConfigurationMode(); KServiceTypeProfile::OfferList offerList = KServiceTypeProfile::offers(m_mimetype->name(), "Application"); - QValueListIterator<KServiceOffer> it(offerList.begin()); + TQValueListIterator<KServiceOffer> it(offerList.begin()); for (; it != offerList.end(); ++it) if ((*it).allowAsDefault()) appServices.append((*it).service()->desktopEntryPath()); @@ -168,14 +168,14 @@ bool TypesListItem::isMimeTypeDirty() const kdDebug() << "Mimetype Name Dirty: old=" << m_mimetype->name() << " name()=" << name() << endl; return true; } - if (m_mimetype->comment(QString(), false) != m_comment) + if (m_mimetype->comment(TQString(), false) != m_comment) { - kdDebug() << "Mimetype Comment Dirty: old=" << m_mimetype->comment(QString(),false) << " m_comment=" << m_comment << endl; + kdDebug() << "Mimetype Comment Dirty: old=" << m_mimetype->comment(TQString(),false) << " m_comment=" << m_comment << endl; return true; } - if (m_mimetype->icon(QString(), false) != m_icon) + if (m_mimetype->icon(TQString(), false) != m_icon) { - kdDebug() << "Mimetype Icon Dirty: old=" << m_mimetype->icon(QString(),false) << " m_icon=" << m_icon << endl; + kdDebug() << "Mimetype Icon Dirty: old=" << m_mimetype->icon(TQString(),false) << " m_icon=" << m_icon << endl; return true; } @@ -206,8 +206,8 @@ bool TypesListItem::isDirty() const if ( !isMeta() ) { - QStringList oldAppServices; - QStringList oldEmbedServices; + TQStringList oldAppServices; + TQStringList oldEmbedServices; getServiceOffers( oldAppServices, oldEmbedServices ); if (oldAppServices != m_appServices) @@ -230,7 +230,7 @@ bool TypesListItem::isDirty() const KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); bool defaultValue = defaultEmbeddingSetting(m_major); - unsigned int oldAutoEmbed = config->readBoolEntry( QString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; if ( m_autoEmbed != oldAutoEmbed ) return true; } @@ -249,7 +249,7 @@ void TypesListItem::sync() { KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); - config->writeEntry( QString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 ); + config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 ); return; } @@ -286,9 +286,9 @@ void TypesListItem::sync() config.writeEntry("Hidden", false); if ( m_autoEmbed == 2 ) - config.deleteEntry( QString::fromLatin1("X-KDE-AutoEmbed"), false ); + config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false ); else - config.writeEntry( QString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); + config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); m_bNewItem = false; } @@ -298,9 +298,9 @@ void TypesListItem::sync() // Deleting current contents in profilerc relating to // this service type // - QStringList groups = profile.groupList(); + TQStringList groups = profile.groupList(); - for (QStringList::Iterator it = groups.begin(); + for (TQStringList::Iterator it = groups.begin(); it != groups.end(); it++ ) { profile.setGroup(*it); @@ -331,7 +331,7 @@ void TypesListItem::sync() offerList += KServiceTypeProfile::offers(m_mimetype->name(), "KParts/ReadOnlyPart"); KServiceTypeProfile::unsetConfigurationMode(); - QValueListIterator<KServiceOffer> it_srv(offerList.begin()); + TQValueListIterator<KServiceOffer> it_srv(offerList.begin()); for (; it_srv != offerList.end(); ++it_srv) { @@ -350,8 +350,8 @@ void TypesListItem::sync() // create a new .desktop file without this mimetype if( s_changedServices == NULL ) - deleter.setObject( s_changedServices, new QMap< QString, QStringList > ); - QStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) + deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > ); + TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes(); if ( mimeTypeList.contains( name() ) ) { @@ -364,7 +364,7 @@ void TypesListItem::sync() } else { - QString path = pService->locateLocal(); + TQString path = pService->locateLocal(); KConfig orig(pService->desktopEntryPath(), true, false, "apps"); desktop = orig.copyTo(path); } @@ -374,7 +374,7 @@ void TypesListItem::sync() ? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';'); // Remove entry and the number that might follow. - QStringList::Iterator it; + TQStringList::Iterator it; for(;(it = mimeTypeList.find(name())) != mimeTypeList.end();) { it = mimeTypeList.remove(it); @@ -405,10 +405,10 @@ void TypesListItem::sync() // KUserProfile is concerned, but using the mimetype makes it a // bit more structured for "manual" reading while ( profile.hasGroup( - name() + " - " + QString::number(groupCount) ) ) + name() + " - " + TQString::number(groupCount) ) ) groupCount++; - profile.setGroup( name() + " - " + QString::number(groupCount) ); + profile.setGroup( name() + " - " + TQString::number(groupCount) ); profile.writeEntry("Application", pService->storageId()); profile.writeEntry("ServiceType", name()); @@ -419,9 +419,9 @@ void TypesListItem::sync() } } -static bool inheritsMimetype(KMimeType::Ptr m, const QStringList &mimeTypeList) +static bool inheritsMimetype(KMimeType::Ptr m, const TQStringList &mimeTypeList) { - for(QStringList::ConstIterator it = mimeTypeList.begin(); + for(TQStringList::ConstIterator it = mimeTypeList.begin(); it != mimeTypeList.end(); ++it) { if (m->is(*it)) @@ -431,17 +431,17 @@ static bool inheritsMimetype(KMimeType::Ptr m, const QStringList &mimeTypeList) return false; } -KMimeType::Ptr TypesListItem::findImplicitAssociation(const QString &desktop) +KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop) { KService::Ptr s = KService::serviceByDesktopPath(desktop); if (!s) return 0; // Hey, where did that one go? if( s_changedServices == NULL ) - deleter.setObject( s_changedServices, new QMap< QString, QStringList > ); - QStringList mimeTypeList = s_changedServices->contains( s->desktopEntryPath()) + deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > ); + TQStringList mimeTypeList = s_changedServices->contains( s->desktopEntryPath()) ? (*s_changedServices)[ s->desktopEntryPath() ] : s->serviceTypes(); - for(QStringList::ConstIterator it = mimeTypeList.begin(); + for(TQStringList::ConstIterator it = mimeTypeList.begin(); it != mimeTypeList.end(); ++it) { if ((m_mimetype->name() != *it) && m_mimetype->is(*it)) @@ -452,9 +452,9 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const QString &desktop) return 0; } -void TypesListItem::saveServices( KConfig & profile, QStringList services, const QString & genericServiceType ) +void TypesListItem::saveServices( KConfig & profile, TQStringList services, const TQString & genericServiceType ) { - QStringList::Iterator it(services.begin()); + TQStringList::Iterator it(services.begin()); for (int i = services.count(); it != services.end(); ++it, i--) { KService::Ptr pService = KService::serviceByDesktopPath(*it); @@ -463,10 +463,10 @@ void TypesListItem::saveServices( KConfig & profile, QStringList services, const // Find a group header. The headers are just dummy names as far as // KUserProfile is concerned, but using the mimetype makes it a // bit more structured for "manual" reading - while ( profile.hasGroup( name() + " - " + QString::number(groupCount) ) ) + while ( profile.hasGroup( name() + " - " + TQString::number(groupCount) ) ) groupCount++; - profile.setGroup( name() + " - " + QString::number(groupCount) ); + profile.setGroup( name() + " - " + TQString::number(groupCount) ); profile.writeEntry("ServiceType", name()); profile.writeEntry("GenericServiceType", genericServiceType); @@ -476,20 +476,20 @@ void TypesListItem::saveServices( KConfig & profile, QStringList services, const // merge new mimetype if( s_changedServices == NULL ) - deleter.setObject( s_changedServices, new QMap< QString, QStringList > ); - QStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) + deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > ); + TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes(); if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList)) { KConfig *desktop; - if ( pService->type() == QString("Service") ) + if ( pService->type() == TQString("Service") ) { desktop = new KConfig(pService->desktopEntryPath(), false, false, "services"); } else { - QString path = pService->locateLocal(); + TQString path = pService->locateLocal(); KConfig orig(pService->desktopEntryPath(), true, false, "apps"); desktop = orig.copyTo(path); } @@ -510,7 +510,7 @@ void TypesListItem::saveServices( KConfig & profile, QStringList services, const } } -void TypesListItem::setIcon( const QString& icon ) +void TypesListItem::setIcon( const TQString& icon ) { m_icon = icon; setPixmap( 0, SmallIcon( icon ) ); @@ -518,7 +518,7 @@ void TypesListItem::setIcon( const QString& icon ) bool TypesListItem::isEssential() const { - QString n = name(); + TQString n = name(); if ( n == "application/octet-stream" ) return true; if ( n == "inode/directory" ) diff --git a/kcontrol/filetypes/typeslistitem.h b/kcontrol/filetypes/typeslistitem.h index 5f44e9864..18dca1af6 100644 --- a/kcontrol/filetypes/typeslistitem.h +++ b/kcontrol/filetypes/typeslistitem.h @@ -20,7 +20,7 @@ #ifndef _TYPESLISTITEM_H #define _TYPESLISTITEM_H -#include <qlistview.h> +#include <tqlistview.h> #include <kmimetype.h> #include <kuserprofile.h> @@ -31,7 +31,7 @@ public: /** * Create a filetype group */ - TypesListItem(QListView *parent, const QString & major ); + TypesListItem(TQListView *parent, const TQString & major ); /** * Create a filetype item inside a group @@ -41,22 +41,22 @@ public: /** * Create a filetype item not inside a group (used by keditfiletype) */ - TypesListItem(QListView *parent, KMimeType::Ptr mimetype); + TypesListItem(TQListView *parent, KMimeType::Ptr mimetype); /** * Create a filetype item not inside a group (used by keditfiletype) * KDE4: merge with previous */ - TypesListItem(QListView *parent, KMimeType::Ptr mimetype, bool newItem); + TypesListItem(TQListView *parent, KMimeType::Ptr mimetype, bool newItem); ~TypesListItem(); - QString name() const { return m_major + "/" + m_minor; } - QString majorType() const { return m_major; } - QString minorType() const { return m_minor; } - void setMinor(QString m) { m_minor = m; } - QString comment() const { return m_comment; } - void setComment(QString c) { m_comment = c; } + TQString name() const { return m_major + "/" + m_minor; } + TQString majorType() const { return m_major; } + TQString minorType() const { return m_minor; } + void setMinor(TQString m) { m_minor = m; } + TQString comment() const { return m_comment; } + void setComment(TQString c) { m_comment = c; } /** * Returns true if "this" is a group */ @@ -66,14 +66,14 @@ public: * (see KMimeType::checkEssentialMimeTypes) */ bool isEssential() const; - QString icon() const { return m_icon; } - void setIcon(const QString& i); - QStringList patterns() const { return m_patterns; } - void setPatterns(const QStringList &p) { m_patterns = p; } - QStringList appServices() const; - void setAppServices(const QStringList &dsl) { m_appServices = dsl; } - QStringList embedServices() const; - void setEmbedServices(const QStringList &dsl) { m_embedServices = dsl; } + TQString icon() const { return m_icon; } + void setIcon(const TQString& i); + TQStringList patterns() const { return m_patterns; } + void setPatterns(const TQStringList &p) { m_patterns = p; } + TQStringList appServices() const; + void setAppServices(const TQStringList &dsl) { m_appServices = dsl; } + TQStringList embedServices() const; + void setEmbedServices(const TQStringList &dsl) { m_embedServices = dsl; } int autoEmbed() const { return m_autoEmbed; } void setAutoEmbed( int a ) { m_autoEmbed = a; } const KMimeType::Ptr& mimeType() const { return m_mimetype; } @@ -83,7 +83,7 @@ public: void setAskSave(bool); // Whether the service s lists this mimetype explicitly - KMimeType::Ptr findImplicitAssociation(const QString &desktop); + KMimeType::Ptr findImplicitAssociation(const TQString &desktop); bool isMimeTypeDirty() const; // whether the mimetype .desktop file needs saving bool isDirty() const; @@ -91,13 +91,13 @@ public: void setup(); void refresh(); // update m_mimetype from ksycoca when Apply is pressed - static bool defaultEmbeddingSetting( const QString& major ); + static bool defaultEmbeddingSetting( const TQString& major ); static void reset(); private: - void getServiceOffers( QStringList & appServices, QStringList & embedServices ) const; - void saveServices( KConfig & profile, QStringList services, const QString & servicetype2 ); - void initMeta( const QString & major ); + void getServiceOffers( TQStringList & appServices, TQStringList & embedServices ) const; + void saveServices( KConfig & profile, TQStringList services, const TQString & servicetype2 ); + void initMeta( const TQString & major ); void init(KMimeType::Ptr mimetype); static int readAutoEmbed( KMimeType::Ptr mimetype ); @@ -108,11 +108,11 @@ private: unsigned int m_bNewItem:1; unsigned int m_bFullInit:1; unsigned int m_askSave:2; // 0 yes, 1 no, 2 default - QString m_major, m_minor, m_comment, m_icon; - QStringList m_patterns; - QStringList m_appServices; - QStringList m_embedServices; - static QMap< QString, QStringList >* s_changedServices; + TQString m_major, m_minor, m_comment, m_icon; + TQStringList m_patterns; + TQStringList m_appServices; + TQStringList m_embedServices; + static TQMap< TQString, TQStringList >* s_changedServices; }; #endif diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index c50c89bc9..b082cf1fa 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -8,17 +8,17 @@ #include <config.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qdir.h> -#include <qgroupbox.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qsettings.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqdir.h> +#include <tqgroupbox.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqsettings.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <dcopclient.h> @@ -126,18 +126,18 @@ static const char *aa_vbgr_xpm[]={ static const char** aaPixmaps[]={ aa_rgb_xpm, aa_bgr_xpm, aa_vrgb_xpm, aa_vbgr_xpm }; /**** DLL Interface ****/ -typedef KGenericFactory<KFonts, QWidget> FontFactory; +typedef KGenericFactory<KFonts, TQWidget> FontFactory; K_EXPORT_COMPONENT_FACTORY( kcm_fonts, FontFactory("kcmfonts") ) /**** FontUseItem ****/ FontUseItem::FontUseItem( - QWidget * parent, - const QString &name, - const QString &grp, - const QString &key, - const QString &rc, - const QFont &default_fnt, + TQWidget * parent, + const TQString &name, + const TQString &grp, + const TQString &key, + const TQString &rc, + const TQFont &default_fnt, bool f ) : KFontRequester(parent, 0L, f), @@ -172,7 +172,7 @@ void FontUseItem::readFont( bool useDefaults ) config->setReadDefaults( useDefaults ); config->setGroup(_rcgroup); - QFont tmpFnt(_default); + TQFont tmpFnt(_default); setFont( config->readFontEntry(_rckey, &tmpFnt), isFixedOnly() ); if (deleteme) delete config; } @@ -194,9 +194,9 @@ void FontUseItem::writeFont() } } -void FontUseItem::applyFontDiff( const QFont &fnt, int fontDiffFlags ) +void FontUseItem::applyFontDiff( const TQFont &fnt, int fontDiffFlags ) { - QFont _font( font() ); + TQFont _font( font() ); if (fontDiffFlags & KFontChooser::FontDiffSize) { _font.setPointSize( fnt.pointSize() ); @@ -215,36 +215,36 @@ void FontUseItem::applyFontDiff( const QFont &fnt, int fontDiffFlags ) /**** FontAASettings ****/ -FontAASettings::FontAASettings(QWidget *parent) +FontAASettings::FontAASettings(TQWidget *parent) : KDialogBase(parent, "FontAASettings", true, i18n("Configure Anti-Alias Settings"), Ok|Cancel, Ok, true), changesMade(false) { - QWidget *mw=new QWidget(this); - QGridLayout *layout=new QGridLayout(mw, 1, 1, 0, KDialog::spacingHint()); + TQWidget *mw=new TQWidget(this); + TQGridLayout *layout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint()); - excludeRange=new QCheckBox(i18n("E&xclude range:"), mw), + excludeRange=new TQCheckBox(i18n("E&xclude range:"), mw), layout->addWidget(excludeRange, 0, 0); excludeFrom=new KDoubleNumInput(0, 72, 8.0, 1, 1, mw), excludeFrom->setSuffix(i18n(" pt")); layout->addWidget(excludeFrom, 0, 1); - excludeToLabel=new QLabel(i18n(" to "), mw); + excludeToLabel=new TQLabel(i18n(" to "), mw); layout->addWidget(excludeToLabel, 0, 2); excludeTo=new KDoubleNumInput(0, 72, 15.0, 1, 1, mw); excludeTo->setSuffix(i18n(" pt")); layout->addWidget(excludeTo, 0, 3); - useSubPixel=new QCheckBox(i18n("&Use sub-pixel hinting:"), mw); + useSubPixel=new TQCheckBox(i18n("&Use sub-pixel hinting:"), mw); layout->addWidget(useSubPixel, 1, 0); - QWhatsThis::add(useSubPixel, i18n("If you have a TFT or LCD screen you" + TQWhatsThis::add(useSubPixel, i18n("If you have a TFT or LCD screen you" " can further improve the quality of displayed fonts by selecting" " this option.<br>Sub-pixel hinting is also known as ClearType(tm).<br>" "<br><b>This will not work with CRT monitors.</b>")); - subPixelType=new QComboBox(false, mw); + subPixelType=new TQComboBox(false, mw); layout->addMultiCellWidget(subPixelType, 1, 1, 1, 3); - QWhatsThis::add(subPixelType, i18n("In order for sub-pixel hinting to" + TQWhatsThis::add(subPixelType, i18n("In order for sub-pixel hinting to" " work correctly you need to know how the sub-pixels of your display" " are aligned.<br>" " On TFT or LCD displays a single pixel is actually composed of" @@ -252,31 +252,31 @@ FontAASettings::FontAASettings(QWidget *parent) " have a linear ordering of RGB sub-pixel, some have BGR.")); for(int t=KXftConfig::SubPixel::None+1; t<=KXftConfig::SubPixel::Vbgr; ++t) - subPixelType->insertItem(QPixmap(aaPixmaps[t-1]), KXftConfig::description((KXftConfig::SubPixel::Type)t)); + subPixelType->insertItem(TQPixmap(aaPixmaps[t-1]), KXftConfig::description((KXftConfig::SubPixel::Type)t)); #ifdef HAVE_FONTCONFIG - QLabel *hintingLabel=new QLabel(i18n("Hinting style: "), mw); + TQLabel *hintingLabel=new TQLabel(i18n("Hinting style: "), mw); layout->addWidget(hintingLabel, 2, 0); - hintingStyle=new QComboBox(false, mw); + hintingStyle=new TQComboBox(false, mw); layout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3); for(int s=KXftConfig::Hint::NotSet+1; s<=KXftConfig::Hint::Full; ++s) hintingStyle->insertItem(KXftConfig::description((KXftConfig::Hint::Style)s)); - QString hintingText(i18n("Hinting is a process used to enhance the quality of fonts at small sizes.")); - QWhatsThis::add(hintingStyle, hintingText); - QWhatsThis::add(hintingLabel, hintingText); + TQString hintingText(i18n("Hinting is a process used to enhance the quality of fonts at small sizes.")); + TQWhatsThis::add(hintingStyle, hintingText); + TQWhatsThis::add(hintingLabel, hintingText); #endif load(); enableWidgets(); setMainWidget(mw); - connect(excludeRange, SIGNAL(toggled(bool)), SLOT(changed())); - connect(useSubPixel, SIGNAL(toggled(bool)), SLOT(changed())); - connect(excludeFrom, SIGNAL(valueChanged(double)), SLOT(changed())); - connect(excludeTo, SIGNAL(valueChanged(double)), SLOT(changed())); - connect(subPixelType, SIGNAL(activated(const QString &)), SLOT(changed())); + connect(excludeRange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(useSubPixel, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(excludeFrom, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed())); + connect(excludeTo, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed())); + connect(subPixelType, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); #ifdef HAVE_FONTCONFIG - connect(hintingStyle, SIGNAL(activated(const QString &)), SLOT(changed())); + connect(hintingStyle, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); #endif } @@ -375,7 +375,7 @@ bool FontAASettings::save( bool useAA ) xft.setHintStyle(hStyle); - QString hs(KXftConfig::toStr(hStyle)); + TQString hs(KXftConfig::toStr(hStyle)); if(!hs.isEmpty() && hs!=kglobals.readEntry("XftHintStyle")) { @@ -492,12 +492,12 @@ int FontAASettings::exec() /**** KFonts ****/ -static QCString desktopConfigName() +static TQCString desktopConfigName() { int desktop=0; if (qt_xdisplay()) desktop = DefaultScreen(qt_xdisplay()); - QCString name; + TQCString name; if (desktop == 0) name = "kdesktoprc"; else @@ -506,10 +506,10 @@ static QCString desktopConfigName() return name; } -KFonts::KFonts(QWidget *parent, const char *name, const QStringList &) +KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) : KCModule(FontFactory::instance(), parent, name) { - QStringList nameGroupKeyRc; + TQStringList nameGroupKeyRc; nameGroupKeyRc << i18n("General") << "General" << "font" << "" @@ -520,15 +520,15 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &) << i18n("Taskbar") << "General" << "taskbarFont" << "" << i18n("Desktop") << "FMSettings" << "StandardFont" << desktopConfigName(); - QValueList<QFont> defaultFontList; + TQValueList<TQFont> defaultFontList; // Keep in sync with kdelibs/kdecore/kglobalsettings.cpp - QFont f0("Sans Serif", 10); - QFont f1("Monospace", 10); - QFont f2("Sans Serif", 10); - QFont f3("Sans Serif", 10, QFont::Bold); - QFont f4("Sans Serif", 10); + TQFont f0("Sans Serif", 10); + TQFont f1("Monospace", 10); + TQFont f2("Sans Serif", 10); + TQFont f3("Sans Serif", 10, TQFont::Bold); + TQFont f4("Sans Serif", 10); f0.setPointSize(10); f1.setPointSize(10); @@ -538,7 +538,7 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &) defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0; - QValueList<bool> fixedList; + TQValueList<bool> fixedList; fixedList << false @@ -549,7 +549,7 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &) << false << false; - QStringList quickHelpList; + TQStringList quickHelpList; quickHelpList << i18n("Used for normal text (e.g. button labels, list items).") @@ -560,29 +560,29 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &) << i18n("Used by the taskbar.") << i18n("Used for desktop icons."); - QVBoxLayout * layout = - new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout * layout = + new TQVBoxLayout(this, 0, KDialog::spacingHint()); - QGridLayout * fontUseLayout = - new QGridLayout(layout, nameGroupKeyRc.count() / 4, 3); + TQGridLayout * fontUseLayout = + new TQGridLayout(layout, nameGroupKeyRc.count() / 4, 3); fontUseLayout->setColStretch(0, 0); fontUseLayout->setColStretch(1, 1); fontUseLayout->setColStretch(2, 0); - QValueList<QFont>::ConstIterator defaultFontIt(defaultFontList.begin()); - QValueList<bool>::ConstIterator fixedListIt(fixedList.begin()); - QStringList::ConstIterator quickHelpIt(quickHelpList.begin()); - QStringList::ConstIterator it(nameGroupKeyRc.begin()); + TQValueList<TQFont>::ConstIterator defaultFontIt(defaultFontList.begin()); + TQValueList<bool>::ConstIterator fixedListIt(fixedList.begin()); + TQStringList::ConstIterator quickHelpIt(quickHelpList.begin()); + TQStringList::ConstIterator it(nameGroupKeyRc.begin()); unsigned int count = 0; while (it != nameGroupKeyRc.end()) { - QString name = *it; it++; - QString group = *it; it++; - QString key = *it; it++; - QString file = *it; it++; + TQString name = *it; it++; + TQString group = *it; it++; + TQString key = *it; it++; + TQString file = *it; it++; FontUseItem * i = new FontUseItem( @@ -596,10 +596,10 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &) ); fontUseList.append(i); - connect(i, SIGNAL(fontSelected(const QFont &)), SLOT(fontSelected())); + connect(i, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(fontSelected())); - QLabel * fontUse = new QLabel(name+":", this); - QWhatsThis::add(fontUse, *quickHelpIt++); + TQLabel * fontUse = new TQLabel(name+":", this); + TQWhatsThis::add(fontUse, *quickHelpIt++); fontUseLayout->addWidget(fontUse, count, 0); fontUseLayout->addWidget(i, count, 1); @@ -607,40 +607,40 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &) ++count; } - QHBoxLayout *hblay = new QHBoxLayout(layout, KDialog::spacingHint()); + TQHBoxLayout *hblay = new TQHBoxLayout(layout, KDialog::spacingHint()); hblay->addStretch(); - QPushButton * fontAdjustButton = new QPushButton(i18n("Ad&just All Fonts..."), this); - QWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts")); + TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this); + TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts")); hblay->addWidget( fontAdjustButton ); - connect(fontAdjustButton, SIGNAL(clicked()), SLOT(slotApplyFontDiff())); + connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff())); layout->addSpacing(KDialog::spacingHint()); - QGridLayout* lay = new QGridLayout(layout, 2, 4, KDialog::spacingHint()); + TQGridLayout* lay = new TQGridLayout(layout, 2, 4, KDialog::spacingHint()); lay->setColStretch( 3, 10 ); - QLabel* label = new QLabel( i18n( "Use a&nti-aliasing:" ), this ); + TQLabel* label = new TQLabel( i18n( "Use a&nti-aliasing:" ), this ); lay->addWidget( label, 0, 0 ); - cbAA = new QComboBox( this ); + cbAA = new TQComboBox( this ); cbAA->insertItem( i18n( "Enabled" )); // change AASetting type if order changes cbAA->insertItem( i18n( "System settings" )); cbAA->insertItem( i18n( "Disabled" )); - QWhatsThis::add(cbAA, i18n("If this option is selected, KDE will smooth the edges of curves in " + TQWhatsThis::add(cbAA, i18n("If this option is selected, KDE will smooth the edges of curves in " "fonts.")); - aaSettingsButton = new QPushButton( i18n( "Configure..." ), this); - connect(aaSettingsButton, SIGNAL(clicked()), SLOT(slotCfgAa())); + aaSettingsButton = new TQPushButton( i18n( "Configure..." ), this); + connect(aaSettingsButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCfgAa())); label->setBuddy( cbAA ); lay->addWidget( cbAA, 0, 1 ); lay->addWidget( aaSettingsButton, 0, 2 ); - connect(cbAA, SIGNAL(activated(int)), SLOT(slotUseAntiAliasing())); + connect(cbAA, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseAntiAliasing())); - label = new QLabel( i18n( "Force fonts DPI:" ), this ); + label = new TQLabel( i18n( "Force fonts DPI:" ), this ); lay->addWidget( label, 1, 0 ); - comboForceDpi = new QComboBox( this ); + comboForceDpi = new TQComboBox( this ); label->setBuddy( comboForceDpi ); comboForceDpi->insertItem( i18n( "Disabled" )); // change DPISetti ng type if order changes comboForceDpi->insertItem( i18n( "96 DPI" )); comboForceDpi->insertItem( i18n( "120 DPI" )); - QString whatsthis = i18n( + TQString whatsthis = i18n( "<p>This option forces a specific DPI value for fonts. It may be useful" " when the real DPI of the hardware is not detected properly and it" " is also often misused when poor quality fonts are used that do not" @@ -651,8 +651,8 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &) " ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not render" " properly with real DPI value better fonts should be used or configuration" " of font hinting should be checked.</p>" ); - QWhatsThis::add(comboForceDpi, whatsthis); - connect( comboForceDpi, SIGNAL( activated( int )), SLOT( changed())); + TQWhatsThis::add(comboForceDpi, whatsthis); + connect( comboForceDpi, TQT_SIGNAL( activated( int )), TQT_SLOT( changed())); lay->addWidget( comboForceDpi, 1, 1 ); layout->addStretch(1); @@ -727,17 +727,17 @@ void KFonts::save() if( dpi == DPINone && dpi_original != DPINone ) { KProcIO proc; proc << "xrdb" << "-quiet" << "-remove" << "-nocpp"; - proc.writeStdin( QCString( "Xft.dpi" ), true ); + proc.writeStdin( TQCString( "Xft.dpi" ), true ); proc.closeWhenDone(); proc.start( KProcess::Block ); } // KDE-1.x support - KSimpleConfig* config = new KSimpleConfig( QDir::homeDirPath() + "/.kderc" ); + KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); config->setGroup( "General" ); for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) { if("font"==i->rcKey()) - QSettings().writeEntry("/qt/font", i->font().toString()); + TQSettings().writeEntry("/qt/font", i->font().toString()); kdDebug(1208) << "write entry " << i->rcKey() << endl; config->writeEntry( i->rcKey(), i->font() ); } @@ -772,7 +772,7 @@ void KFonts::save() void KFonts::slotApplyFontDiff() { - QFont font = QFont(fontUseList.first()->font()); + TQFont font = TQFont(fontUseList.first()->font()); int fontDiffFlags = 0; int ret = KFontDialog::getFontDiff(font,fontDiffFlags); diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h index ca1ab7729..0adb2565d 100644 --- a/kcontrol/fonts/fonts.h +++ b/kcontrol/fonts/fonts.h @@ -8,7 +8,7 @@ #ifndef FONTS_H #define FONTS_H -#include <qobject.h> +#include <tqobject.h> #include <kcmodule.h> #include <kdialogbase.h> @@ -27,24 +27,24 @@ class FontUseItem : public KFontRequester Q_OBJECT public: - FontUseItem(QWidget * parent, const QString &name, const QString &grp, - const QString &key, const QString &rc, const QFont &default_fnt, + FontUseItem(TQWidget * parent, const TQString &name, const TQString &grp, + const TQString &key, const TQString &rc, const TQFont &default_fnt, bool fixed = false); void readFont( bool useDefaults ); void writeFont(); void setDefault(); - void applyFontDiff(const QFont &fnt, int fontDiffFlags); + void applyFontDiff(const TQFont &fnt, int fontDiffFlags); - const QString& rcFile() { return _rcfile; } - const QString& rcGroup() { return _rcgroup; } - const QString& rcKey() { return _rckey; } + const TQString& rcFile() { return _rcfile; } + const TQString& rcGroup() { return _rcgroup; } + const TQString& rcKey() { return _rckey; } private: - QString _rcfile; - QString _rcgroup; - QString _rckey; - QFont _default; + TQString _rcfile; + TQString _rcgroup; + TQString _rckey; + TQFont _default; }; class FontAASettings : public KDialogBase @@ -53,7 +53,7 @@ class FontAASettings : public KDialogBase public: - FontAASettings(QWidget *parent); + FontAASettings(TQWidget *parent); bool save( bool useAA ); bool load(); @@ -74,15 +74,15 @@ protected slots: private: - QCheckBox *excludeRange; - QCheckBox *useSubPixel; + TQCheckBox *excludeRange; + TQCheckBox *useSubPixel; KDoubleNumInput *excludeFrom; KDoubleNumInput *excludeTo; - QComboBox *subPixelType; + TQComboBox *subPixelType; #ifdef HAVE_FONTCONFIG - QComboBox *hintingStyle; + TQComboBox *hintingStyle; #endif - QLabel *excludeToLabel; + TQLabel *excludeToLabel; bool changesMade; }; @@ -94,7 +94,7 @@ class KFonts : public KCModule Q_OBJECT public: - KFonts(QWidget *parent, const char *name, const QStringList &); + KFonts(TQWidget *parent, const char *name, const TQStringList &); ~KFonts(); virtual void load(); @@ -113,10 +113,10 @@ private: enum DPISetting { DPINone, DPI96, DPI120 }; AASetting useAA, useAA_original; DPISetting dpi_original; - QComboBox *cbAA; - QComboBox* comboForceDpi; - QPushButton *aaSettingsButton; - QPtrList <FontUseItem> fontUseList; + TQComboBox *cbAA; + TQComboBox* comboForceDpi; + TQPushButton *aaSettingsButton; + TQPtrList <FontUseItem> fontUseList; FontAASettings *aaSettings; }; diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp index 22621f5e6..682672a7a 100644 --- a/kcontrol/fonts/kxftconfig.cpp +++ b/kcontrol/fonts/kxftconfig.cpp @@ -23,14 +23,14 @@ #include <ctype.h> #include <stdlib.h> #include <sys/stat.h> -#include <qregexp.h> -#include <qfile.h> -#include <qpaintdevice.h> +#include <tqregexp.h> +#include <tqfile.h> +#include <tqpaintdevice.h> #include <klocale.h> #include <klargefile.h> -#include <qdir.h> -#include <qsettings.h> -#include <qfont.h> +#include <tqdir.h> +#include <tqsettings.h> +#include <tqfont.h> #ifdef HAVE_FONTCONFIG #include <stdarg.h> @@ -41,40 +41,40 @@ using namespace std; -QString KXftConfig::contractHome(QString path) +TQString KXftConfig::contractHome(TQString path) { if (!path.isEmpty() && '/'==path[0]) { - QString home(QDir::homeDirPath()); + TQString home(TQDir::homeDirPath()); if(path.startsWith(home)) { unsigned int len = home.length(); if(path.length() == len || path[len] == '/') - return path.replace(0, len, QString::fromLatin1("~")); + return path.replace(0, len, TQString::fromLatin1("~")); } } return path; } -QString KXftConfig::expandHome(QString path) +TQString KXftConfig::expandHome(TQString path) { if(!path.isEmpty() && '~'==path[0]) - return 1==path.length() ? QDir::homeDirPath() : path.replace(0, 1, QDir::homeDirPath()); + return 1==path.length() ? TQDir::homeDirPath() : path.replace(0, 1, TQDir::homeDirPath()); return path; } static int point2Pixel(double point) { - return (int)(((point*QPaintDevice::x11AppDpiY())/72.0)+0.5); + return (int)(((point*TQPaintDevice::x11AppDpiY())/72.0)+0.5); } static int pixel2Point(double pixel) { - return (int)(((pixel*72.0)/(double)QPaintDevice::x11AppDpiY())+0.5); + return (int)(((pixel*72.0)/(double)TQPaintDevice::x11AppDpiY())+0.5); } static bool equal(double d1, double d2) @@ -82,11 +82,11 @@ static bool equal(double d1, double d2) return (fabs(d1 - d2) < 0.0001); } -static QString dirSyntax(const QString &d) +static TQString dirSyntax(const TQString &d) { if(!d.isNull()) { - QString ds(d); + TQString ds(d); ds.replace("//", "/"); @@ -101,11 +101,11 @@ static QString dirSyntax(const QString &d) return d; } -static QString xDirSyntax(const QString &d) +static TQString xDirSyntax(const TQString &d) { if(!d.isNull()) { - QString ds(d); + TQString ds(d); int slashPos=ds.findRev('/'); if(slashPos==(((int)ds.length())-1)) @@ -116,32 +116,32 @@ static QString xDirSyntax(const QString &d) return d; } -static bool check(const QString &path, unsigned int fmt, bool checkW=false) +static bool check(const TQString &path, unsigned int fmt, bool checkW=false) { KDE_struct_stat info; - QCString pathC(QFile::encodeName(path)); + TQCString pathC(TQFile::encodeName(path)); return 0==KDE_lstat(pathC, &info) && (info.st_mode&S_IFMT)==fmt && (!checkW || 0==::access(pathC, W_OK)); } -inline bool fExists(const QString &p) +inline bool fExists(const TQString &p) { return check(p, S_IFREG, false); } -inline bool dWritable(const QString &p) +inline bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); } -inline bool dExists(const QString &p) +inline bool dExists(const TQString &p) { return check(p, S_IFDIR, false); } -static QString getDir(const QString &f) +static TQString getDir(const TQString &f) { - QString d(f); + TQString d(f); int slashPos=d.findRev('/'); @@ -151,16 +151,16 @@ static QString getDir(const QString &f) return dirSyntax(d); } -static time_t getTimeStamp(const QString &item) +static time_t getTimeStamp(const TQString &item) { KDE_struct_stat info; - return !item.isNull() && 0==KDE_lstat(QFile::encodeName(item), &info) ? info.st_mtime : 0; + return !item.isNull() && 0==KDE_lstat(TQFile::encodeName(item), &info) ? info.st_mtime : 0; } #ifdef HAVE_FONTCONFIG -inline QString fileSyntax(const QString &f) { return xDirSyntax(f); } +inline TQString fileSyntax(const TQString &f) { return xDirSyntax(f); } // // Obtain location of config file to use. // @@ -174,20 +174,20 @@ inline QString fileSyntax(const QString &f) { return xDirSyntax(f); } // $HOME/<...>/.fonts.conf // $HOME/<...>/fonts.conf // -QString getConfigFile(bool system) +TQString getConfigFile(bool system) { #if (FC_VERSION>=20300) static const char * constKdeRootFcFile="00kde.conf"; #endif FcStrList *list=FcConfigGetConfigFiles(FcConfigGetCurrent()); - QStringList files; + TQStringList files; FcChar8 *file; - QString home(dirSyntax(QDir::homeDirPath())); + TQString home(dirSyntax(TQDir::homeDirPath())); while((file=FcStrListNext(list))) { - QString f((const char *)file); + TQString f((const char *)file); if(fExists(f)) { @@ -195,7 +195,7 @@ QString getConfigFile(bool system) files.append(f); } #if (FC_VERSION>=20300) - if(system && dExists(f) && (-1!=f.find(QRegExp("/conf\\.d/?$")) || -1!=f.find(QRegExp("/conf\\.d?$"))) ) + if(system && dExists(f) && (-1!=f.find(TQRegExp("/conf\\.d/?$")) || -1!=f.find(TQRegExp("/conf\\.d?$"))) ) return dirSyntax(f)+constKdeRootFcFile; // This ones good enough for me! #endif } @@ -204,11 +204,11 @@ QString getConfigFile(bool system) // Go through list of files, looking for the preferred one... if(files.count()) { - QStringList::Iterator it(files.begin()), + TQStringList::Iterator it(files.begin()), end(files.end()); for(; it!=end; ++it) - if(-1!=(*it).find(QRegExp(system ? "/local\\.conf$" : "/\\.?fonts\\.conf$"))) + if(-1!=(*it).find(TQRegExp(system ? "/local\\.conf$" : "/\\.?fonts\\.conf$"))) return *it; return files.front(); // Just return the 1st one... } @@ -216,7 +216,7 @@ QString getConfigFile(bool system) return system ? "/etc/fonts/local.conf" : fileSyntax(home+"/.fonts.conf"); // Hmmm... no known files? } -static QString getEntry(QDomElement element, const char *type, unsigned int numAttributes, ...) +static TQString getEntry(TQDomElement element, const char *type, unsigned int numAttributes, ...) { if(numAttributes==element.attributes().length()) { @@ -239,11 +239,11 @@ static QString getEntry(QDomElement element, const char *type, unsigned int numA if(ok) { - QDomNode n=element.firstChild(); + TQDomNode n=element.firstChild(); if(!n.isNull()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if(!e.isNull() && type==e.tagName()) return e.text(); @@ -251,7 +251,7 @@ static QString getEntry(QDomElement element, const char *type, unsigned int numA } } - return QString::null; + return TQString::null; } static KXftConfig::SubPixel::Type strToType(const char *str) @@ -379,7 +379,7 @@ static bool readNum(char **ptr, double *num) return false; } -static KXftConfig::ListItem * getFirstItem(QPtrList<KXftConfig::ListItem> &list) +static KXftConfig::ListItem * getFirstItem(TQPtrList<KXftConfig::ListItem> &list) { KXftConfig::ListItem *cur; @@ -390,7 +390,7 @@ static KXftConfig::ListItem * getFirstItem(QPtrList<KXftConfig::ListItem> &list) } #endif -static KXftConfig::ListItem * getLastItem(QPtrList<KXftConfig::ListItem> &list) +static KXftConfig::ListItem * getLastItem(TQPtrList<KXftConfig::ListItem> &list) { KXftConfig::ListItem *cur; @@ -401,16 +401,16 @@ static KXftConfig::ListItem * getLastItem(QPtrList<KXftConfig::ListItem> &list) } #ifndef HAVE_FONTCONFIG -static const QString defaultPath("/usr/X11R6/lib/X11/XftConfig"); -static const QString defaultUserFile(".xftconfig"); +static const TQString defaultPath("/usr/X11R6/lib/X11/XftConfig"); +static const TQString defaultUserFile(".xftconfig"); static const char * constSymEnc="\"glyphs-fontspecific\""; -static const QString constConfigFiles[]= +static const TQString constConfigFiles[]= { defaultPath, "/etc/X11/XftConfig", - QString::null + TQString::null }; #endif @@ -441,7 +441,7 @@ KXftConfig::KXftConfig(int required, bool system) m_file=defaultPath; } else - m_file= QString(QDir::homeDirPath()+"/"+defaultUserFile); + m_file= TQString(TQDir::homeDirPath()+"/"+defaultUserFile); #endif #ifndef HAVE_FONTCONFIG m_symbolFamilies.setAutoDelete(true); @@ -475,7 +475,7 @@ bool KXftConfig::reset() m_subPixel.reset(); #ifdef HAVE_FONTCONFIG - QFile f(m_file); + TQFile f(m_file); if(f.open(IO_ReadOnly)) { @@ -493,7 +493,7 @@ bool KXftConfig::reset() if(m_doc.documentElement().isNull()) m_doc.appendChild(m_doc.createElement("fontconfig")); #else - QFile f(m_file); + TQFile f(m_file); m_size=0; delete [] m_data; @@ -563,8 +563,8 @@ bool KXftConfig::apply() if(fExists(m_file) && getTimeStamp(m_file)!=m_time) { KXftConfig newConfig(m_required, m_system); - QStringList list; - QStringList::Iterator it; + TQStringList list; + TQStringList::Iterator it; if(m_required&Dirs) { @@ -607,7 +607,7 @@ bool KXftConfig::apply() } #ifdef HAVE_FONTCONFIG - FcAtomic *atomic=FcAtomicCreate((const unsigned char *)((const char *)(QFile::encodeName(m_file)))); + FcAtomic *atomic=FcAtomicCreate((const unsigned char *)((const char *)(TQFile::encodeName(m_file)))); ok=false; if(atomic) @@ -642,7 +642,7 @@ bool KXftConfig::apply() const char qtDocTypeLine[] = "<!DOCTYPE fontconfig>"; const char docTypeLine[] = "<!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">"; - QString str(m_doc.toString()); + TQString str(m_doc.toString()); int idx; if(0!=str.find("<?xml")) @@ -671,7 +671,7 @@ bool KXftConfig::apply() FcAtomicDestroy(atomic); } #else - std::ofstream f(QFile::encodeName(m_file)); + std::ofstream f(TQFile::encodeName(m_file)); if(f) { @@ -852,22 +852,22 @@ void KXftConfig::setExcludeRange(double from, double to) } } -void KXftConfig::addDir(const QString &d) +void KXftConfig::addDir(const TQString &d) { - QString dir(dirSyntax(d)); + TQString dir(dirSyntax(d)); if(dExists(dir) && !hasDir(dir)) addItem(m_dirs, dir); } -void KXftConfig::removeDir(const QString &d) +void KXftConfig::removeDir(const TQString &d) { - QString dir(dirSyntax(d)); + TQString dir(dirSyntax(d)); removeItem(m_dirs, dir); } -QString KXftConfig::description(SubPixel::Type t) +TQString KXftConfig::description(SubPixel::Type t) { switch(t) { @@ -904,7 +904,7 @@ const char * KXftConfig::toStr(SubPixel::Type t) } #ifdef HAVE_FONTCONFIG -QString KXftConfig::description(Hint::Style s) +TQString KXftConfig::description(Hint::Style s) { switch(s) { @@ -939,9 +939,9 @@ const char * KXftConfig::toStr(Hint::Style s) } #endif -bool KXftConfig::hasDir(const QString &d) +bool KXftConfig::hasDir(const TQString &d) { - QString dir(dirSyntax(d)); + TQString dir(dirSyntax(d)); #ifdef HAVE_FONTCONFIG ListItem *item; @@ -956,7 +956,7 @@ bool KXftConfig::hasDir(const QString &d) #endif } -KXftConfig::ListItem * KXftConfig::findItem(QPtrList<ListItem> &list, const QString &i) +KXftConfig::ListItem * KXftConfig::findItem(TQPtrList<ListItem> &list, const TQString &i) { ListItem *item; @@ -967,7 +967,7 @@ KXftConfig::ListItem * KXftConfig::findItem(QPtrList<ListItem> &list, const QStr return item; } -void KXftConfig::clearList(QPtrList<ListItem> &list) +void KXftConfig::clearList(TQPtrList<ListItem> &list) { ListItem *item; @@ -975,9 +975,9 @@ void KXftConfig::clearList(QPtrList<ListItem> &list) removeItem(list, item); } -QStringList KXftConfig::getList(QPtrList<ListItem> &list) +TQStringList KXftConfig::getList(TQPtrList<ListItem> &list) { - QStringList res; + TQStringList res; ListItem *item; for(item=list.first(); item; item=list.next()) @@ -987,7 +987,7 @@ QStringList KXftConfig::getList(QPtrList<ListItem> &list) return res; } -void KXftConfig::addItem(QPtrList<ListItem> &list, const QString &i) +void KXftConfig::addItem(TQPtrList<ListItem> &list, const TQString &i) { ListItem *item=findItem(list, i); @@ -1004,7 +1004,7 @@ void KXftConfig::addItem(QPtrList<ListItem> &list, const QString &i) item->toBeRemoved=false; } -void KXftConfig::removeItem(QPtrList<ListItem> &list, ListItem *item) +void KXftConfig::removeItem(TQPtrList<ListItem> &list, ListItem *item) { if(item) { @@ -1019,11 +1019,11 @@ void KXftConfig::removeItem(QPtrList<ListItem> &list, ListItem *item) void KXftConfig::readContents() { #ifdef HAVE_FONTCONFIG - QDomNode n = m_doc.documentElement().firstChild(); + TQDomNode n = m_doc.documentElement().firstChild(); while(!n.isNull()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if(!e.isNull()) if("dir"==e.tagName()) @@ -1033,14 +1033,14 @@ void KXftConfig::readContents() } else if("match"==e.tagName()) { - QString str; + TQString str; switch(e.childNodes().count()) { case 1: if(m_required&SubPixelType && "font"==e.attribute("target")) { - QDomElement ene=e.firstChild().toElement(); + TQDomElement ene=e.firstChild().toElement(); if(!ene.isNull() && "edit"==ene.tagName()) if(!(str=getEntry(ene, "const", 2, "name", "rgba", "mode", "assign")).isNull()) @@ -1069,8 +1069,8 @@ void KXftConfig::readContents() if(m_required&ExcludeRange && "font"==e.attribute("target")) // CPD: Is target "font" or "pattern" ???? { bool foundFalse=false; - QDomNode en=e.firstChild(); - QString family; + TQDomNode en=e.firstChild(); + TQString family; double from=-1.0, to=-1.0, pixelFrom=-1.0, @@ -1078,7 +1078,7 @@ void KXftConfig::readContents() while(!en.isNull()) { - QDomElement ene=en.toElement(); + TQDomElement ene=en.toElement(); if(!ene.isNull()) if("test"==ene.tagName()) @@ -1263,8 +1263,8 @@ void KXftConfig::applyDirs() for(item=m_dirs.first(); item; item=m_dirs.next()) if(!item->toBeRemoved && item->node.isNull()) { - QDomElement newNode = m_doc.createElement("dir"); - QDomText text = m_doc.createTextNode(contractHome(xDirSyntax(item->str))); + TQDomElement newNode = m_doc.createElement("dir"); + TQDomText text = m_doc.createTextNode(contractHome(xDirSyntax(item->str))); newNode.appendChild(text); @@ -1277,10 +1277,10 @@ void KXftConfig::applyDirs() void KXftConfig::applySubPixelType() { - QDomElement matchNode = m_doc.createElement("match"), + TQDomElement matchNode = m_doc.createElement("match"), typeNode = m_doc.createElement("const"), editNode = m_doc.createElement("edit"); - QDomText typeText = m_doc.createTextNode(toStr(m_subPixel.type)); + TQDomText typeText = m_doc.createTextNode(toStr(m_subPixel.type)); matchNode.setAttribute("target", "font"); editNode.setAttribute("mode", "assign"); @@ -1309,10 +1309,10 @@ void KXftConfig::applyHintStyle() } else { - QDomElement matchNode = m_doc.createElement("match"), + TQDomElement matchNode = m_doc.createElement("match"), typeNode = m_doc.createElement("const"), editNode = m_doc.createElement("edit"); - QDomText typeText = m_doc.createTextNode(toStr(m_hint.style)); + TQDomText typeText = m_doc.createTextNode(toStr(m_hint.style)); matchNode.setAttribute("target", "font"); editNode.setAttribute("mode", "assign"); @@ -1330,10 +1330,10 @@ void KXftConfig::applyHintStyle() void KXftConfig::applyHinting() { - QDomElement matchNode = m_doc.createElement("match"), + TQDomElement matchNode = m_doc.createElement("match"), typeNode = m_doc.createElement("bool"), editNode = m_doc.createElement("edit"); - QDomText typeText = m_doc.createTextNode(m_hinting.set ? "true" : "false"); + TQDomText typeText = m_doc.createTextNode(m_hinting.set ? "true" : "false"); matchNode.setAttribute("target", "font"); editNode.setAttribute("mode", "assign"); @@ -1362,20 +1362,20 @@ void KXftConfig::applyExcludeRange(bool pixel) } else { - QString fromString, + TQString fromString, toString; fromString.setNum(range.from); toString.setNum(range.to); - QDomElement matchNode = m_doc.createElement("match"), + TQDomElement matchNode = m_doc.createElement("match"), fromTestNode = m_doc.createElement("test"), fromNode = m_doc.createElement("double"), toTestNode = m_doc.createElement("test"), toNode = m_doc.createElement("double"), editNode = m_doc.createElement("edit"), boolNode = m_doc.createElement("bool"); - QDomText fromText = m_doc.createTextNode(fromString), + TQDomText fromText = m_doc.createTextNode(fromString), toText = m_doc.createTextNode(toString), boolText = m_doc.createTextNode("false"); @@ -1405,17 +1405,17 @@ void KXftConfig::applyExcludeRange(bool pixel) } } -void KXftConfig::removeItems(QPtrList<ListItem> &list) +void KXftConfig::removeItems(TQPtrList<ListItem> &list) { ListItem *item; - QDomElement docElem = m_doc.documentElement(); + TQDomElement docElem = m_doc.documentElement(); for(item=list.first(); item; item=list.next()) if(item->toBeRemoved && !item->node.isNull()) docElem.removeChild(item->node); } #else -void KXftConfig::outputDir(std::ofstream &f, const QString &str) +void KXftConfig::outputDir(std::ofstream &f, const TQString &str) { f << "dir \"" << contractHome(xDirSyntax(str)).local8Bit() << "\"" << endl; } @@ -1430,7 +1430,7 @@ void KXftConfig::outputNewDirs(std::ofstream &f) m_dirs.clear(); } -void KXftConfig::outputSymbolFamily(std::ofstream &f, const QString &str) +void KXftConfig::outputSymbolFamily(std::ofstream &f, const TQString &str) { f << "match any family == \"" << str.local8Bit() << "\" edit encoding = " << constSymEnc << ';' << endl; } @@ -1491,10 +1491,10 @@ void KXftConfig::setAntiAliasing( bool set ) void KXftConfig::applyAntiAliasing() { - QDomElement matchNode = m_doc.createElement("match"), + TQDomElement matchNode = m_doc.createElement("match"), typeNode = m_doc.createElement("bool"), editNode = m_doc.createElement("edit"); - QDomText typeText = m_doc.createTextNode(m_antiAliasing.set ? "true" : "false"); + TQDomText typeText = m_doc.createTextNode(m_antiAliasing.set ? "true" : "false"); matchNode.setAttribute("target", "font"); editNode.setAttribute("mode", "assign"); @@ -1530,14 +1530,14 @@ bool KXftConfig::aliasingEnabled() void KXftConfig::setAntiAliasing( bool set ) { - QSettings().writeEntry("/qt/useXft", set); + TQSettings().writeEntry("/qt/useXft", set); if (set) - QSettings().writeEntry("/qt/enableXft", set); + TQSettings().writeEntry("/qt/enableXft", set); } bool KXftConfig::getAntiAliasing() const { - return QSettings().readBoolEntry("/qt/useXft"); + return TQSettings().readBoolEntry("/qt/useXft"); } diff --git a/kcontrol/fonts/kxftconfig.h b/kcontrol/fonts/kxftconfig.h index 6828f1d88..cb5cd71f5 100644 --- a/kcontrol/fonts/kxftconfig.h +++ b/kcontrol/fonts/kxftconfig.h @@ -24,15 +24,15 @@ #include "config.h" #endif -#include <qstringlist.h> -#include <qstring.h> -#include <qptrlist.h> +#include <tqstringlist.h> +#include <tqstring.h> +#include <tqptrlist.h> #include <stdio.h> #include <fstream> #include <time.h> #ifdef HAVE_FONTCONFIG -#include <qdom.h> +#include <tqdom.h> #endif class KXftConfig @@ -61,12 +61,12 @@ class KXftConfig struct Item { #ifdef HAVE_FONTCONFIG - Item(QDomNode &n) : node(n), toBeRemoved(false) {} + Item(TQDomNode &n) : node(n), toBeRemoved(false) {} Item() : toBeRemoved(false) {} virtual void reset() { node.clear(); toBeRemoved=false; } bool added() { return node.isNull(); } - QDomNode node; + TQDomNode node; #else Item(char *s, char *e) : start(s), end(e), toBeRemoved(false) {} virtual void reset() { start=end=NULL; toBeRemoved=false; } @@ -82,13 +82,13 @@ class KXftConfig struct ListItem : public Item { #ifdef HAVE_FONTCONFIG - ListItem(const QString &st, QDomNode &n) : Item(n), str(st) {} - ListItem(const QString &st) : str(st) {} + ListItem(const TQString &st, TQDomNode &n) : Item(n), str(st) {} + ListItem(const TQString &st) : str(st) {} #else - ListItem(const QString &st, char *s=NULL, char *e=NULL) : Item(s, e), str(st) {} + ListItem(const TQString &st, char *s=NULL, char *e=NULL) : Item(s, e), str(st) {} #endif - QString str; + TQString str; }; struct SubPixel : public Item @@ -103,7 +103,7 @@ class KXftConfig }; #ifdef HAVE_FONTCONFIG - SubPixel(Type t, QDomNode &n) : Item(n), type(t) {} + SubPixel(Type t, TQDomNode &n) : Item(n), type(t) {} SubPixel(Type t=None) : type(t) {} #else SubPixel(Type t=None, char *s=NULL, char *e=NULL) : Item(s, e), type(t) {} @@ -116,7 +116,7 @@ class KXftConfig struct Exclude : public Item { #ifdef HAVE_FONTCONFIG - Exclude(double f, double t, QDomNode &n) : Item(n), from(f), to(t) {} + Exclude(double f, double t, TQDomNode &n) : Item(n), from(f), to(t) {} Exclude(double f=0, double t=0) : from(f), to(t) {} #else Exclude(double f=0, double t=0, char *s=NULL, char *e=NULL) : Item(s, e), from(f), to(t) {} @@ -139,7 +139,7 @@ class KXftConfig Full }; - Hint(Style s, QDomNode &n) : Item(n), style(s) {} + Hint(Style s, TQDomNode &n) : Item(n), style(s) {} Hint(Style s=NotSet) : style(s) {} void reset() { Item::reset(); style=NotSet; } @@ -149,7 +149,7 @@ class KXftConfig struct Hinting : public Item { - Hinting(bool s, QDomNode &n) : Item(n), set(s) {} + Hinting(bool s, TQDomNode &n) : Item(n), set(s) {} Hinting(bool s=true) : set(s) {} void reset() { Item::reset(); set=true; } @@ -159,7 +159,7 @@ class KXftConfig struct AntiAliasing : public Item { - AntiAliasing(bool s, QDomNode &n) : Item(n), set(s) {} + AntiAliasing(bool s, TQDomNode &n) : Item(n), set(s) {} AntiAliasing(bool s=true) : set(s) {} void reset() { Item::reset(); set=true; } @@ -170,8 +170,8 @@ class KXftConfig public: - static QString contractHome(QString path); - static QString expandHome(QString path); + static TQString contractHome(TQString path); + static TQString expandHome(TQString path); // // Constructor @@ -193,38 +193,38 @@ class KXftConfig void setSubPixelType(SubPixel::Type type); // SubPixel::None => turn off sub-pixel hinting bool getExcludeRange(double &from, double &to); void setExcludeRange(double from, double to); // from:0, to:0 => turn off exclude range - void addDir(const QString &d); - void removeDir(const QString &d); + void addDir(const TQString &d); + void removeDir(const TQString &d); void clearDirs() { clearList(m_dirs); } - QStringList getDirs() { return getList(m_dirs); } + TQStringList getDirs() { return getList(m_dirs); } #ifdef HAVE_FONTCONFIG bool getHintStyle(Hint::Style &style); void setHintStyle(Hint::Style style); #else - void addSymbolFamily(const QString &f) { addItem(m_symbolFamilies, f); } - void removeSymbolFamily(const QString &f) { removeItem(m_symbolFamilies, f); } + void addSymbolFamily(const TQString &f) { addItem(m_symbolFamilies, f); } + void removeSymbolFamily(const TQString &f) { removeItem(m_symbolFamilies, f); } void clearSymbolFamilies() { clearList(m_symbolFamilies); } - QStringList getSymbolFamilies() { return getList(m_symbolFamilies); } + TQStringList getSymbolFamilies() { return getList(m_symbolFamilies); } #endif void setAntiAliasing(bool set); bool getAntiAliasing() const; bool changed() { return m_madeChanges; } - static QString description(SubPixel::Type t); + static TQString description(SubPixel::Type t); static const char * toStr(SubPixel::Type t); #ifdef HAVE_FONTCONFIG - static QString description(Hint::Style s); + static TQString description(Hint::Style s); static const char * toStr(Hint::Style s); #endif - bool hasDir(const QString &d); + bool hasDir(const TQString &d); private: - ListItem * findItem(QPtrList<ListItem> &list, const QString &i); - void clearList(QPtrList<ListItem> &list); - static QStringList getList(QPtrList<ListItem> &list); - void addItem(QPtrList<ListItem> &list, const QString &i); - void removeItem(QPtrList<ListItem> &list, ListItem *item); - void removeItem(QPtrList<ListItem> &list, const QString &i) { removeItem(list, findItem(list, i)); } + ListItem * findItem(TQPtrList<ListItem> &list, const TQString &i); + void clearList(TQPtrList<ListItem> &list); + static TQStringList getList(TQPtrList<ListItem> &list); + void addItem(TQPtrList<ListItem> &list, const TQString &i); + void removeItem(TQPtrList<ListItem> &list, ListItem *item); + void removeItem(TQPtrList<ListItem> &list, const TQString &i) { removeItem(list, findItem(list, i)); } void readContents(); #ifdef HAVE_FONTCONFIG void applyDirs(); @@ -237,11 +237,11 @@ class KXftConfig void setHinting(bool set); void applyHinting(); void applyExcludeRange(bool pixel); - void removeItems(QPtrList<ListItem> &list); + void removeItems(TQPtrList<ListItem> &list); #else - void outputDir(std::ofstream &f, const QString &str); + void outputDir(std::ofstream &f, const TQString &str); void outputNewDirs(std::ofstream &f); - void outputSymbolFamily(std::ofstream &f, const QString &str); + void outputSymbolFamily(std::ofstream &f, const TQString &str); void outputNewSymbolFamilies(std::ofstream &f); void outputSubPixelType(std::ofstream &f, bool ifNew); void outputExcludeRange(std::ofstream &f, bool ifNew, bool pixel); @@ -258,13 +258,13 @@ class KXftConfig AntiAliasing m_antiAliasing; bool aliasingEnabled(); #else - QPtrList<ListItem> m_symbolFamilies; + TQPtrList<ListItem> m_symbolFamilies; #endif - QPtrList<ListItem> m_dirs; - QString m_file; + TQPtrList<ListItem> m_dirs; + TQString m_file; int m_required; #ifdef HAVE_FONTCONFIG - QDomDocument m_doc; + TQDomDocument m_doc; #else int m_size; char *m_data; diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 05ea09cac..41ddfe8e3 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpushbutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> #include <dcopclient.h> @@ -45,14 +45,14 @@ #include <ksimpleconfig.h> #include <string> #include <stdio.h> -#include <qstring.h> +#include <tqstring.h> #include "iccconfig.h" using namespace std; /**** DLL Interface ****/ -typedef KGenericFactory<KICCConfig, QWidget> KICCCFactory; +typedef KGenericFactory<KICCConfig, TQWidget> KICCCFactory; K_EXPORT_COMPONENT_FACTORY( kcm_iccconfig, KICCCFactory("kcmiccconfig") ) KSimpleConfig *config; @@ -60,13 +60,13 @@ KSimpleConfig *systemconfig; /**** KICCConfig ****/ -KICCConfig::KICCConfig(QWidget *parent, const char *name, const QStringList &) +KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KICCCFactory::instance(), parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - config = new KSimpleConfig( QString::fromLatin1( "kiccconfigrc" )); - systemconfig = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); KAboutData *about = new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"), @@ -82,23 +82,23 @@ KICCConfig::KICCConfig(QWidget *parent, const char *name, const QStringList &) setRootOnlyMsg(i18n("<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below.")); setUseRootOnlyMsg(true); - connect(base->systemEnableSupport, SIGNAL(clicked()), SLOT(changed())); - connect(base->systemEnableSupport, SIGNAL(toggled(bool)), base->systemIccFile, SLOT(setEnabled(bool))); - connect(base->enableSupport, SIGNAL(clicked()), SLOT(changed())); - connect(base->enableSupport, SIGNAL(toggled(bool)), base->iccFile, SLOT(setEnabled(bool))); - connect(base->enableSupport, SIGNAL(toggled(bool)), base->randrScreenList, SLOT(setEnabled(bool))); - connect(base->enableSupport, SIGNAL(toggled(bool)), base->iccProfileList, SLOT(setEnabled(bool))); - connect(base->enableSupport, SIGNAL(toggled(bool)), base->addProfileButton, SLOT(setEnabled(bool))); - connect(base->enableSupport, SIGNAL(toggled(bool)), base->renameProfileButton, SLOT(setEnabled(bool))); - connect(base->enableSupport, SIGNAL(toggled(bool)), base->deleteProfileButton, SLOT(setEnabled(bool))); - connect(base->iccProfileList, SIGNAL(activated(int)), this, SLOT(selectProfile(int))); - connect(base->randrScreenList, SIGNAL(activated(int)), this, SLOT(selectScreen(int))); - connect(base->iccFile, SIGNAL(textChanged(const QString&)), SLOT(updateArray())); - connect(base->systemIccFile, SIGNAL(textChanged(const QString&)), SLOT(changed())); - - connect(base->addProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); - connect(base->renameProfileButton, SIGNAL(clicked()), this, SLOT(renameProfile())); - connect(base->deleteProfileButton, SIGNAL(clicked()), this, SLOT(deleteProfile())); + connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->systemIccFile, TQT_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccFile, TQT_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->randrScreenList, TQT_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccProfileList, TQT_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->addProfileButton, TQT_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->renameProfileButton, TQT_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->deleteProfileButton, TQT_SLOT(setEnabled(bool))); + connect(base->iccProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int))); + connect(base->randrScreenList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectScreen(int))); + connect(base->iccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateArray())); + connect(base->systemIccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + + connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile())); + connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile())); + connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile())); load(); @@ -127,7 +127,7 @@ KICCConfig::~KICCConfig() void KICCConfig::deleteProfile () { int i; - QString *iccFileArrayNew; + TQString *iccFileArrayNew; // Delete the profile config->deleteGroup(base->iccProfileList->currentText()); @@ -146,24 +146,24 @@ void KICCConfig::deleteProfile () { void KICCConfig::renameProfile () { int i; - QString *iccFileArrayNew; + TQString *iccFileArrayNew; // Pop up a text entry box asking for the name of the new profile bool _ok = false; bool _end = false; - QString _new; - QString _text = i18n("Please enter the new profile name below:"); - QString _error; + TQString _new; + TQString _text = i18n("Please enter the new profile name below:"); + TQString _error; while (!_end) { - _new = KInputDialog::getText( i18n("ICC Profile Configuration"), _error + _text, QString::null, &_ok, this); + _new = KInputDialog::getText( i18n("ICC Profile Configuration"), _error + _text, TQString::null, &_ok, this); if (!_ok ) { _end = true; } else { - _error = QString(); + _error = TQString(); if (!_new.isEmpty()) { if (findProfileIndex(_new) != -1) - _error = i18n("Error: A profile with that name already exists") + QString("\n"); + _error = i18n("Error: A profile with that name already exists") + TQString("\n"); else _end = true; } @@ -180,24 +180,24 @@ void KICCConfig::renameProfile () { void KICCConfig::addProfile () { int i; - QString *iccFileArrayNew; + TQString *iccFileArrayNew; // Pop up a text entry box asking for the name of the new profile bool _ok = false; bool _end = false; - QString _new; - QString _text = i18n("Please enter the new profile name below:"); - QString _error; + TQString _new; + TQString _text = i18n("Please enter the new profile name below:"); + TQString _error; while (!_end) { - _new = KInputDialog::getText( i18n("ICC Profile Configuration"), _error + _text, QString::null, &_ok, this); + _new = KInputDialog::getText( i18n("ICC Profile Configuration"), _error + _text, TQString::null, &_ok, this); if (!_ok ) { _end = true; } else { - _error = QString(); + _error = TQString(); if (!_new.isEmpty()) { if (findProfileIndex(_new) != -1) - _error = i18n("Error: A profile with that name already exists") + QString("\n"); + _error = i18n("Error: A profile with that name already exists") + TQString("\n"); else _end = true; } @@ -250,11 +250,11 @@ void KICCConfig::updateDisplayedInformation () { base->iccFile->setURL(iccFileArray[((base->iccProfileList->currentItem())*(base->randrScreenList->count()))+(base->randrScreenList->currentItem())]); } -QString KICCConfig::extractFileName(QString displayName, QString profileName) { +TQString KICCConfig::extractFileName(TQString displayName, TQString profileName) { // } -int KICCConfig::findProfileIndex(QString profileName) { +int KICCConfig::findProfileIndex(TQString profileName) { int i; for (i=0;i<numberOfProfiles;i++) { if (base->iccProfileList->text(i) == profileName) { @@ -264,7 +264,7 @@ int KICCConfig::findProfileIndex(QString profileName) { return -1; } -int KICCConfig::findScreenIndex(QString screenName) { +int KICCConfig::findScreenIndex(TQString screenName) { int i; for (i=0;i<(base->randrScreenList->count());i++) { if (base->randrScreenList->text(i) == screenName) { @@ -317,7 +317,7 @@ void KICCConfig::load(bool useDefaults ) // Find all profile names numberOfProfiles = 0; cfgProfiles = config->groupList(); - for (QStringList::Iterator i(cfgProfiles.begin()); i != cfgProfiles.end(); ++i) { + for (TQStringList::Iterator i(cfgProfiles.begin()); i != cfgProfiles.end(); ++i) { base->iccProfileList->insertItem((*i), -1); numberOfProfiles++; } @@ -379,7 +379,7 @@ void KICCConfig::save() config->sync(); systemconfig->sync(); - QString errorstr; + TQString errorstr; if (base->enableSupport->isChecked() == true) { errorstr = randrsimple->applyIccConfiguration(base->iccProfileList->currentText(), KDE_CONFDIR); } @@ -390,7 +390,7 @@ void KICCConfig::save() errorstr = randrsimple->clearIccConfiguration(); } if (errorstr != "") { - KMessageBox::error(this, QString("Unable to apply ICC configuration:\n\r%1").arg(errorstr)); + KMessageBox::error(this, TQString("Unable to apply ICC configuration:\n\r%1").arg(errorstr)); } emit changed(false); @@ -401,7 +401,7 @@ void KICCConfig::defaults() load( true ); } -QString KICCConfig::quickHelp() const +TQString KICCConfig::quickHelp() const { return i18n("<h1>ICC Profile Configuration</h1> This module allows you to configure KDE support" " for ICC profiles. This allows you to easily color correct your monitor" diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h index a12c9a49d..e3b91e34d 100644 --- a/kcontrol/iccconfig/iccconfig.h +++ b/kcontrol/iccconfig/iccconfig.h @@ -42,8 +42,8 @@ class KICCConfig : public KCModule, public DCOPObject public: - //KICCConfig(QWidget *parent = 0L, const char *name = 0L); - KICCConfig(QWidget *parent, const char *name, const QStringList &); + //KICCConfig(TQWidget *parent = 0L, const char *name = 0L); + KICCConfig(TQWidget *parent, const char *name, const TQStringList &); virtual ~KICCConfig(); ICCConfigBase *base; @@ -54,7 +54,7 @@ public: void defaults(); int buttons(); - QString quickHelp() const; + TQString quickHelp() const; k_dcop: @@ -66,14 +66,14 @@ private: ScreenInfo *randr_screen_info; int numberOfProfiles; int numberOfScreens; - QStringList cfgScreenInfo; - QStringList cfgProfiles; + TQStringList cfgScreenInfo; + TQStringList cfgProfiles; void updateDisplayedInformation (); - QString extractFileName(QString displayName, QString profileName); - QString *iccFileArray; - int findProfileIndex(QString profileName); - int findScreenIndex(QString screenName); - QString m_defaultProfile; + TQString extractFileName(TQString displayName, TQString profileName); + TQString *iccFileArray; + int findProfileIndex(TQString profileName); + int findScreenIndex(TQString screenName); + TQString m_defaultProfile; private slots: void selectProfile (int slotNumber); diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 4ce1e4d98..84b6efac3 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -11,12 +11,12 @@ #include <stdlib.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qslider.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqslider.h> #include <kcolorbutton.h> #include <kconfig.h> @@ -32,71 +32,71 @@ /**** KIconConfig ****/ -KIconConfig::KIconConfig(QWidget *parent, const char *name) +KIconConfig::KIconConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - QGridLayout *top = new QGridLayout(this, 4, 2, + TQGridLayout *top = new TQGridLayout(this, 4, 2, KDialog::marginHint(), KDialog::spacingHint()); top->setColStretch(0, 1); top->setColStretch(1, 1); // Use of Icon at (0,0) - (1, 0) - QGroupBox *gbox = new QGroupBox(i18n("Use of Icon"), this); + TQGroupBox *gbox = new TQGroupBox(i18n("Use of Icon"), this); top->addMultiCellWidget(gbox, 0, 1, 0, 0); - QBoxLayout *g_vlay = new QVBoxLayout(gbox, + TQBoxLayout *g_vlay = new TQVBoxLayout(gbox, KDialog::marginHint(), KDialog::spacingHint()); g_vlay->addSpacing(fontMetrics().lineSpacing()); - mpUsageList = new QListBox(gbox); - connect(mpUsageList, SIGNAL(highlighted(int)), SLOT(slotUsage(int))); + mpUsageList = new TQListBox(gbox); + connect(mpUsageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsage(int))); g_vlay->addWidget(mpUsageList); KSeparator *sep = new KSeparator( KSeparator::HLine, this ); top->addWidget(sep, 1, 1); // Preview at (2,0) - (2, 1) - QGridLayout *g_lay = new QGridLayout(4, 3, KDialog::marginHint(), 0); + TQGridLayout *g_lay = new TQGridLayout(4, 3, KDialog::marginHint(), 0); top->addMultiCellLayout(g_lay, 2, 2, 0, 1); g_lay->addRowSpacing(0, fontMetrics().lineSpacing()); - QPushButton *push; + TQPushButton *push; mPreviewButton1 = addPreviewIcon(0, i18n("Default"), this, g_lay); - connect(mPreviewButton1, SIGNAL(clicked()), SLOT(slotEffectSetup0())); + connect(mPreviewButton1, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup0())); mPreviewButton2 = addPreviewIcon(1, i18n("Active"), this, g_lay); - connect(mPreviewButton2, SIGNAL(clicked()), SLOT(slotEffectSetup1())); + connect(mPreviewButton2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup1())); mPreviewButton3 = addPreviewIcon(2, i18n("Disabled"), this, g_lay); - connect(mPreviewButton3, SIGNAL(clicked()), SLOT(slotEffectSetup2())); + connect(mPreviewButton3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup2())); - m_pTab1 = new QWidget(this, "General Tab"); + m_pTab1 = new TQWidget(this, "General Tab"); top->addWidget(m_pTab1, 0, 1); - QGridLayout *grid = new QGridLayout(m_pTab1, 4, 3, 10, 10); + TQGridLayout *grid = new TQGridLayout(m_pTab1, 4, 3, 10, 10); grid->setColStretch(1, 1); grid->setColStretch(2, 1); // Size - QLabel *lbl = new QLabel(i18n("Size:"), m_pTab1); + TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1); lbl->setFixedSize(lbl->sizeHint()); grid->addWidget(lbl, 0, 0, Qt::AlignLeft); - mpSizeBox = new QComboBox(m_pTab1); - connect(mpSizeBox, SIGNAL(activated(int)), SLOT(slotSize(int))); + mpSizeBox = new TQComboBox(m_pTab1); + connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int))); lbl->setBuddy(mpSizeBox); grid->addWidget(mpSizeBox, 0, 1, Qt::AlignLeft); - mpDPCheck = new QCheckBox(i18n("Double-sized pixels"), m_pTab1); - connect(mpDPCheck, SIGNAL(toggled(bool)), SLOT(slotDPCheck(bool))); + mpDPCheck = new TQCheckBox(i18n("Double-sized pixels"), m_pTab1); + connect(mpDPCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDPCheck(bool))); grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, Qt::AlignLeft); - mpAnimatedCheck = new QCheckBox(i18n("Animate icons"), m_pTab1); - connect(mpAnimatedCheck, SIGNAL(toggled(bool)), SLOT(slotAnimatedCheck(bool))); + mpAnimatedCheck = new TQCheckBox(i18n("Animate icons"), m_pTab1); + connect(mpAnimatedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnimatedCheck(bool))); grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, Qt::AlignLeft); top->activate(); - mpSystrayConfig = new KSimpleConfig( QString::fromLatin1( "systemtray_panelappletrc" )); - mpKickerConfig = new KSimpleConfig( QString::fromLatin1( "kickerrc" )); + mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" )); + mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); init(); read(); @@ -110,15 +110,15 @@ KIconConfig::~KIconConfig() delete mpEffect; } -QPushButton *KIconConfig::addPreviewIcon(int i, const QString &str, QWidget *parent, QGridLayout *lay) +TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay) { - QLabel *lab = new QLabel(str, parent); + TQLabel *lab = new TQLabel(str, parent); lay->addWidget(lab, 1, i, AlignCenter); - mpPreview[i] = new QLabel(parent); + mpPreview[i] = new TQLabel(parent); mpPreview[i]->setAlignment(AlignCenter); mpPreview[i]->setMinimumSize(105, 105); lay->addWidget(mpPreview[i], 2, i); - QPushButton *push = new QPushButton(i18n("Set Effect..."), parent); + TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent); lay->addWidget(push, 3, i, AlignCenter); return push; } @@ -166,17 +166,17 @@ void KIconConfig::initDefaults() mDefaultEffect[0].value = 1.0; mDefaultEffect[1].value = 1.0; mDefaultEffect[2].value = 1.0; - mDefaultEffect[0].color = QColor(144,128,248); - mDefaultEffect[1].color = QColor(169,156,255); - mDefaultEffect[2].color = QColor(34,202,0); - mDefaultEffect[0].color2 = QColor(0,0,0); - mDefaultEffect[1].color2 = QColor(0,0,0); - mDefaultEffect[2].color2 = QColor(0,0,0); + mDefaultEffect[0].color = TQColor(144,128,248); + mDefaultEffect[1].color = TQColor(169,156,255); + mDefaultEffect[2].color = TQColor(34,202,0); + mDefaultEffect[0].color2 = TQColor(0,0,0); + mDefaultEffect[1].color2 = TQColor(0,0,0); + mDefaultEffect[2].color2 = TQColor(0,0,0); const int defDefSizes[] = { 32, 22, 22, 16, 32 }; KIcon::Group i; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for(it=mGroups.begin(), i=KIcon::FirstGroup; it!=mGroups.end(); ++it, i++) { mbDP[i] = false; @@ -229,16 +229,16 @@ void KIconConfig::read() else { for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) - mAvSizes[i] = QValueList<int>(); + mAvSizes[i] = TQValueList<int>(); - mTheme = QString::null; - mExample = QString::null; + mTheme = TQString::null; + mExample = TQString::null; } initDefaults(); int i, j, effect; - QStringList::ConstIterator it, it2; + TQStringList::ConstIterator it, it2; for (it=mGroups.begin(), i=0; it!=mGroups.end(); ++it, i++) { mbChanged[i] = false; @@ -250,7 +250,7 @@ void KIconConfig::read() for (it2=mStates.begin(), j=0; it2!=mStates.end(); ++it2, j++) { - QString tmp = mpConfig->readEntry(*it2 + "Effect"); + TQString tmp = mpConfig->readEntry(*it2 + "Effect"); if (tmp == "togray") effect = KIconEffect::ToGray; else if (tmp == "colorize") @@ -288,40 +288,40 @@ void KIconConfig::apply() if (mpUsageList->currentText() == i18n("Panel Buttons")) { mpSizeBox->clear(); - mpSizeBox->insertItem(QString().setNum(16)); - mpSizeBox->insertItem(QString().setNum(22)); - mpSizeBox->insertItem(QString().setNum(32)); - mpSizeBox->insertItem(QString().setNum(48)); - mpSizeBox->insertItem(QString().setNum(64)); - mpSizeBox->insertItem(QString().setNum(128)); + mpSizeBox->insertItem(TQString().setNum(16)); + mpSizeBox->insertItem(TQString().setNum(22)); + mpSizeBox->insertItem(TQString().setNum(32)); + mpSizeBox->insertItem(TQString().setNum(48)); + mpSizeBox->insertItem(TQString().setNum(64)); + mpSizeBox->insertItem(TQString().setNum(128)); for (i=0;i<(mpSizeBox->count());i++) { - if (mpSizeBox->text(i) == QString().setNum(mQuickLaunchSize)) { + if (mpSizeBox->text(i) == TQString().setNum(mQuickLaunchSize)) { mpSizeBox->setCurrentItem(i); } } } else if (mpUsageList->currentText() == i18n("System Tray Icons")) { mpSizeBox->clear(); - mpSizeBox->insertItem(QString().setNum(16)); - mpSizeBox->insertItem(QString().setNum(22)); - mpSizeBox->insertItem(QString().setNum(32)); - mpSizeBox->insertItem(QString().setNum(48)); - mpSizeBox->insertItem(QString().setNum(64)); - mpSizeBox->insertItem(QString().setNum(128)); + mpSizeBox->insertItem(TQString().setNum(16)); + mpSizeBox->insertItem(TQString().setNum(22)); + mpSizeBox->insertItem(TQString().setNum(32)); + mpSizeBox->insertItem(TQString().setNum(48)); + mpSizeBox->insertItem(TQString().setNum(64)); + mpSizeBox->insertItem(TQString().setNum(128)); for (i=0;i<(mpSizeBox->count());i++) { - if (mpSizeBox->text(i) == QString().setNum(mSysTraySize)) { + if (mpSizeBox->text(i) == TQString().setNum(mSysTraySize)) { mpSizeBox->setCurrentItem(i); } } } else { int delta = 1000, dw, index = -1, size = 0, i; - QValueList<int>::Iterator it; + TQValueList<int>::Iterator it; mpSizeBox->clear(); if (mUsage < KIcon::LastGroup) { for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++) { - mpSizeBox->insertItem(QString().setNum(*it)); + mpSizeBox->insertItem(TQString().setNum(*it)); dw = abs(mSizes[mUsage] - *it); if (dw < delta) { @@ -357,7 +357,7 @@ void KIconConfig::preview(int i) viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage; } - QPixmap pm; + TQPixmap pm; if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) { pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mQuickLaunchSize); } @@ -367,7 +367,7 @@ void KIconConfig::preview(int i) else { pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]); } - QImage img = pm.convertToImage(); + TQImage img = pm.convertToImage(); if (mbDP[viewedGroup]) { int w = img.width() * 2; @@ -410,7 +410,7 @@ void KIconConfig::load( bool useDefaults ) void KIconConfig::save() { int i, j; - QStringList::ConstIterator it, it2; + TQStringList::ConstIterator it, it2; for (it=mGroups.begin(), i=0; it!=mGroups.end(); ++it, i++) { mpConfig->setGroup(*it + "Icons"); @@ -419,7 +419,7 @@ void KIconConfig::save() mpConfig->writeEntry("Animated", mbAnimated[i], true, true); for (it2=mStates.begin(), j=0; it2!=mStates.end(); ++it2, j++) { - QString tmp; + TQString tmp; switch (mEffects[i][j].type) { case KIconEffect::ToGray: @@ -476,10 +476,10 @@ void KIconConfig::save() } // Signal kicker to reload icon configuration - kapp->dcopClient()->send("kicker", "kicker", "configure()", QByteArray()); + kapp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray()); // Signal system tray to reload icon configuration - kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", QByteArray()); + kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray()); } void KIconConfig::defaults() @@ -544,15 +544,15 @@ void KIconConfig::EffectSetup(int state) return; } - QPixmap pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]); - QImage img = pm.convertToImage(); + TQPixmap pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]); + TQImage img = pm.convertToImage(); if (mbDP[viewedGroup]) { int w = img.width() * 2; img = img.smoothScale(w, w); } - QString caption; + TQString caption; switch (state) { case 0 : caption = i18n("Setup Default Icon Effect"); break; @@ -562,7 +562,7 @@ void KIconConfig::EffectSetup(int state) KIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img); - if (dlg.exec() == QDialog::Accepted) + if (dlg.exec() == TQDialog::Accepted) { if (mUsage == KIcon::LastGroup) { for (int i=0; i<KIcon::LastGroup; i++) @@ -633,8 +633,8 @@ void KIconConfig::slotAnimatedCheck(bool check) KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, const Effect &defaultEffect, - const QString &caption, const QImage &image, - QWidget *parent, char *name) + const TQString &caption, const TQImage &image, + TQWidget *parent, char *name) : KDialogBase(parent, name, true, caption, Default|Ok|Cancel, Ok, true), mEffect(effect), @@ -643,23 +643,23 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, { mpEffect = new KIconEffect; - QLabel *lbl; - QGroupBox *frame; - QGridLayout *grid; + TQLabel *lbl; + TQGroupBox *frame; + TQGridLayout *grid; - QWidget *page = new QWidget(this); + TQWidget *page = new TQWidget(this); setMainWidget(page); - QGridLayout *top = new QGridLayout(page, 4, 2, 0, spacingHint()); + TQGridLayout *top = new TQGridLayout(page, 4, 2, 0, spacingHint()); top->setColStretch(0,1); top->addColSpacing(1,10); top->setColStretch(2,2); top->setRowStretch(1,1); - lbl = new QLabel(i18n("&Effect:"), page); + lbl = new TQLabel(i18n("&Effect:"), page); lbl->setFixedSize(lbl->sizeHint()); top->addWidget(lbl, 0, 0, Qt::AlignLeft); - mpEffectBox = new QListBox(page); + mpEffectBox = new TQListBox(page); mpEffectBox->insertItem(i18n("No Effect")); mpEffectBox->insertItem(i18n("To Gray")); mpEffectBox->insertItem(i18n("Colorize")); @@ -667,51 +667,51 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, mpEffectBox->insertItem(i18n("Desaturate")); mpEffectBox->insertItem(i18n("To Monochrome")); mpEffectBox->setMinimumWidth( 100 ); - connect(mpEffectBox, SIGNAL(highlighted(int)), SLOT(slotEffectType(int))); + connect(mpEffectBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotEffectType(int))); top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, Qt::AlignLeft); lbl->setBuddy(mpEffectBox); - mpSTCheck = new QCheckBox(i18n("&Semi-transparent"), page); - connect(mpSTCheck, SIGNAL(toggled(bool)), SLOT(slotSTCheck(bool))); + mpSTCheck = new TQCheckBox(i18n("&Semi-transparent"), page); + connect(mpSTCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSTCheck(bool))); top->addWidget(mpSTCheck, 3, 0, Qt::AlignLeft); - frame = new QGroupBox(i18n("Preview"), page); + frame = new TQGroupBox(i18n("Preview"), page); top->addMultiCellWidget(frame, 0, 1, 1, 1); - grid = new QGridLayout(frame, 2, 1, marginHint(), spacingHint()); + grid = new TQGridLayout(frame, 2, 1, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()); grid->setRowStretch(1, 1); - mpPreview = new QLabel(frame); + mpPreview = new TQLabel(frame); mpPreview->setAlignment(AlignCenter); mpPreview->setMinimumSize(105, 105); grid->addWidget(mpPreview, 1, 0); - mpEffectGroup = new QGroupBox(i18n("Effect Parameters"), page); + mpEffectGroup = new TQGroupBox(i18n("Effect Parameters"), page); top->addMultiCellWidget(mpEffectGroup, 2, 3, 1, 1); - grid = new QGridLayout(mpEffectGroup, 3, 2, marginHint(), spacingHint()); + grid = new TQGridLayout(mpEffectGroup, 3, 2, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()); - mpEffectLabel = new QLabel(i18n("&Amount:"), mpEffectGroup); + mpEffectLabel = new TQLabel(i18n("&Amount:"), mpEffectGroup); grid->addWidget(mpEffectLabel, 1, 0); - mpEffectSlider = new QSlider(0, 100, 5, 10, QSlider::Horizontal, mpEffectGroup); + mpEffectSlider = new TQSlider(0, 100, 5, 10, TQSlider::Horizontal, mpEffectGroup); mpEffectLabel->setBuddy( mpEffectSlider ); - connect(mpEffectSlider, SIGNAL(valueChanged(int)), SLOT(slotEffectValue(int))); + connect(mpEffectSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotEffectValue(int))); grid->addWidget(mpEffectSlider, 1, 1); - mpEffectColor = new QLabel(i18n("Co&lor:"), mpEffectGroup); + mpEffectColor = new TQLabel(i18n("Co&lor:"), mpEffectGroup); grid->addWidget(mpEffectColor, 2, 0); mpEColButton = new KColorButton(mpEffectGroup); mpEffectColor->setBuddy( mpEColButton ); - connect(mpEColButton, SIGNAL(changed(const QColor &)), - SLOT(slotEffectColor(const QColor &))); + connect(mpEColButton, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotEffectColor(const TQColor &))); grid->addWidget(mpEColButton, 2, 1); - mpEffectColor2 = new QLabel(i18n("&Second color:"), mpEffectGroup); + mpEffectColor2 = new TQLabel(i18n("&Second color:"), mpEffectGroup); grid->addWidget(mpEffectColor2, 3, 0); mpECol2Button = new KColorButton(mpEffectGroup); mpEffectColor2->setBuddy( mpECol2Button ); - connect(mpECol2Button, SIGNAL(changed(const QColor &)), - SLOT(slotEffectColor2(const QColor &))); + connect(mpECol2Button, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotEffectColor2(const TQColor &))); grid->addWidget(mpECol2Button, 3, 1); init(); @@ -741,13 +741,13 @@ void KIconEffectSetupDialog::slotEffectValue(int value) preview(); } -void KIconEffectSetupDialog::slotEffectColor(const QColor &col) +void KIconEffectSetupDialog::slotEffectColor(const TQColor &col) { mEffect.color = col; preview(); } -void KIconEffectSetupDialog::slotEffectColor2(const QColor &col) +void KIconEffectSetupDialog::slotEffectColor2(const TQColor &col) { mEffect.color2 = col; preview(); @@ -780,8 +780,8 @@ void KIconEffectSetupDialog::slotDefault() void KIconEffectSetupDialog::preview() { - QPixmap pm; - QImage img = mExample.copy(); + TQPixmap pm; + TQImage img = mExample.copy(); img = mpEffect->apply(img, mEffect.type, mEffect.value, mEffect.color, mEffect.color2, mEffect.transparant); pm.convertFromImage(img); diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h index 6fa27eee3..13f20b264 100644 --- a/kcontrol/icons/icons.h +++ b/kcontrol/icons/icons.h @@ -12,9 +12,9 @@ #ifndef __icons_h__ #define __icons_h__ -#include <qcolor.h> -#include <qimage.h> -#include <qvaluelist.h> +#include <tqcolor.h> +#include <tqimage.h> +#include <tqvaluelist.h> #include <kcmodule.h> #include <kdialogbase.h> @@ -43,8 +43,8 @@ struct Effect { int type; float value; - QColor color; - QColor color2; + TQColor color; + TQColor color2; bool transparant; }; @@ -57,7 +57,7 @@ class KIconConfig: public KCModule Q_OBJECT public: - KIconConfig(QWidget *parent, const char *name=0); + KIconConfig(TQWidget *parent, const char *name=0); ~KIconConfig(); virtual void load(); @@ -80,7 +80,7 @@ private slots: private: void preview(int i); void EffectSetup(int state); - QPushButton *addPreviewIcon(int i, const QString &str, QWidget *parent, QGridLayout *lay); + TQPushButton *addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay); void init(); void initDefaults(); void read(); @@ -89,14 +89,14 @@ private: bool mbDP[6], mbChanged[6], mbAnimated[6]; int mSizes[6]; - QValueList<int> mAvSizes[6]; + TQValueList<int> mAvSizes[6]; Effect mEffects[6][3]; Effect mDefaultEffect[3]; int mUsage; - QString mTheme, mExample; - QStringList mGroups, mStates; + TQString mTheme, mExample; + TQStringList mGroups, mStates; int mSysTraySize; int mQuickLaunchSize; @@ -107,15 +107,15 @@ private: KSimpleConfig *mpSystrayConfig; KSimpleConfig *mpKickerConfig; - typedef QLabel *QLabelPtr; + typedef TQLabel *QLabelPtr; QLabelPtr mpPreview[3]; - QListBox *mpUsageList; - QComboBox *mpSizeBox; - QCheckBox *mpDPCheck, *wordWrapCB, *underlineCB, *mpAnimatedCheck; - QTabWidget *m_pTabWidget; - QWidget *m_pTab1; - QPushButton *mPreviewButton1, *mPreviewButton2, *mPreviewButton3; + TQListBox *mpUsageList; + TQComboBox *mpSizeBox; + TQCheckBox *mpDPCheck, *wordWrapCB, *underlineCB, *mpAnimatedCheck; + TQTabWidget *m_pTabWidget; + TQWidget *m_pTab1; + TQPushButton *mPreviewButton1, *mPreviewButton2, *mPreviewButton3; }; class KIconEffectSetupDialog: public KDialogBase @@ -124,8 +124,8 @@ class KIconEffectSetupDialog: public KDialogBase public: KIconEffectSetupDialog(const Effect &, const Effect &, - const QString &, const QImage &, - QWidget *parent=0L, char *name=0L); + const TQString &, const TQImage &, + TQWidget *parent=0L, char *name=0L); ~KIconEffectSetupDialog(); Effect effect() { return mEffect; } @@ -135,24 +135,24 @@ protected: protected slots: void slotEffectValue(int value); - void slotEffectColor(const QColor &col); - void slotEffectColor2(const QColor &col); + void slotEffectColor(const TQColor &col); + void slotEffectColor2(const TQColor &col); void slotEffectType(int type); void slotSTCheck(bool b); void slotDefault(); private: KIconEffect *mpEffect; - QListBox *mpEffectBox; - QCheckBox *mpSTCheck; - QSlider *mpEffectSlider; + TQListBox *mpEffectBox; + TQCheckBox *mpSTCheck; + TQSlider *mpEffectSlider; KColorButton *mpEColButton; KColorButton *mpECol2Button; Effect mEffect; Effect mDefaultEffect; - QImage mExample; - QGroupBox *mpEffectGroup; - QLabel *mpPreview, *mpEffectLabel, *mpEffectColor, *mpEffectColor2; + TQImage mExample; + TQGroupBox *mpEffectGroup; + TQLabel *mpPreview, *mpEffectLabel, *mpEffectColor, *mpEffectColor2; }; #endif diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index a79ad6ddf..5d7f924a9 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -21,10 +21,10 @@ #include <stdlib.h> #include <unistd.h> -#include <qfileinfo.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqfileinfo.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <kdebug.h> #include <kapplication.h> @@ -51,21 +51,21 @@ #include "iconthemes.h" -IconThemesConfig::IconThemesConfig(QWidget *parent, const char *name) +IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - QVBoxLayout *topLayout = new QVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QFrame *m_preview=new QFrame(this); + TQFrame *m_preview=new TQFrame(this); m_preview->setMinimumHeight(50); - QHBoxLayout *lh2=new QHBoxLayout( m_preview ); - m_previewExec=new QLabel(m_preview); + TQHBoxLayout *lh2=new TQHBoxLayout( m_preview ); + m_previewExec=new TQLabel(m_preview); m_previewExec->setPixmap(DesktopIcon("exec")); - m_previewFolder=new QLabel(m_preview); + m_previewFolder=new TQLabel(m_preview); m_previewFolder->setPixmap(DesktopIcon("folder")); - m_previewDocument=new QLabel(m_preview); + m_previewDocument=new TQLabel(m_preview); m_previewDocument->setPixmap(DesktopIcon("document")); lh2->addStretch(10); @@ -82,21 +82,21 @@ IconThemesConfig::IconThemesConfig(QWidget *parent, const char *name) m_iconThemes->addColumn(i18n("Description")); m_iconThemes->setAllColumnsShowFocus( true ); m_iconThemes->setFullWidth(true); - connect(m_iconThemes,SIGNAL(selectionChanged(QListViewItem *)), - SLOT(themeSelected(QListViewItem *))); + connect(m_iconThemes,TQT_SIGNAL(selectionChanged(TQListViewItem *)), + TQT_SLOT(themeSelected(TQListViewItem *))); - QPushButton *installButton=new QPushButton( i18n("Install New Theme..."), + TQPushButton *installButton=new TQPushButton( i18n("Install New Theme..."), this, "InstallNewTheme"); - connect(installButton,SIGNAL(clicked()),SLOT(installNewTheme())); - m_removeButton=new QPushButton( i18n("Remove Theme"), + connect(installButton,TQT_SIGNAL(clicked()),TQT_SLOT(installNewTheme())); + m_removeButton=new TQPushButton( i18n("Remove Theme"), this, "RemoveTheme"); - connect(m_removeButton,SIGNAL(clicked()),SLOT(removeSelectedTheme())); + connect(m_removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeSelectedTheme())); topLayout->addWidget( - new QLabel(i18n("Select the icon theme you want to use:"), this)); + new TQLabel(i18n("Select the icon theme you want to use:"), this)); topLayout->addWidget(m_preview); topLayout->addWidget(m_iconThemes); - QHBoxLayout *lg = new QHBoxLayout(topLayout, KDialog::spacingHint()); + TQHBoxLayout *lg = new TQHBoxLayout(topLayout, KDialog::spacingHint()); lg->addWidget(installButton); lg->addWidget(m_removeButton); @@ -111,9 +111,9 @@ IconThemesConfig::~IconThemesConfig() { } -QListViewItem *IconThemesConfig::iconThemeItem(const QString &name) +TQListViewItem *IconThemesConfig::iconThemeItem(const TQString &name) { - QListViewItem *item; + TQListViewItem *item; for ( item=m_iconThemes->firstChild(); item ; item=item->nextSibling() ) if (m_themeNames[item->text(0)]==name) return item; @@ -124,10 +124,10 @@ void IconThemesConfig::loadThemes() { m_iconThemes->clear(); m_themeNames.clear(); - QStringList themelist(KIconTheme::list()); - QString name; - QString tname; - QStringList::Iterator it; + TQStringList themelist(KIconTheme::list()); + TQString name; + TQString tname; + TQStringList::Iterator it; for (it=themelist.begin(); it != themelist.end(); ++it) { KIconTheme icontheme(*it); @@ -139,9 +139,9 @@ void IconThemesConfig::loadThemes() // Just in case we have duplicated icon theme names on separate directories for (int i=2; m_themeNames.find(tname)!=m_themeNames.end() ; i++) - tname=QString("%1-%2").arg(name).arg(i); + tname=TQString("%1-%2").arg(name).arg(i); - m_iconThemes->insertItem(new QListViewItem(m_iconThemes,name, + m_iconThemes->insertItem(new TQListViewItem(m_iconThemes,name, icontheme.description())); m_themeNames.insert(name,*it); @@ -151,17 +151,17 @@ void IconThemesConfig::loadThemes() void IconThemesConfig::installNewTheme() { - KURL themeURL = KURLRequesterDlg::getURL(QString::null, this, + KURL themeURL = KURLRequesterDlg::getURL(TQString::null, this, i18n("Drag or Type Theme URL")); kdDebug() << themeURL.prettyURL() << endl; if (themeURL.url().isEmpty()) return; - QString themeTmpFile; + TQString themeTmpFile; // themeTmpFile contains the name of the downloaded file if (!KIO::NetAccess::download(themeURL, themeTmpFile, this)) { - QString sorryText; + TQString sorryText; if (themeURL.isLocalFile()) sorryText = i18n("Unable to find the icon theme archive %1."); else @@ -171,9 +171,9 @@ void IconThemesConfig::installNewTheme() return; } - QStringList themesNames = findThemeDirs(themeTmpFile); + TQStringList themesNames = findThemeDirs(themeTmpFile); if (themesNames.isEmpty()) { - QString invalidArch(i18n("The file is not a valid icon theme archive.")); + TQString invalidArch(i18n("The file is not a valid icon theme archive.")); KMessageBox::error(this, invalidArch); KIO::NetAccess::removeTempFile(themeTmpFile); @@ -182,8 +182,8 @@ void IconThemesConfig::installNewTheme() if (!installThemes(themesNames, themeTmpFile)) { //FIXME: make me able to know what is wrong.... - // QStringList instead of bool? - QString somethingWrong = + // TQStringList instead of bool? + TQString somethingWrong = i18n("A problem occurred during the installation process; " "however, most of the themes in the archive have been installed"); KMessageBox::error(this, somethingWrong); @@ -194,19 +194,19 @@ void IconThemesConfig::installNewTheme() KGlobal::instance()->newIconLoader(); loadThemes(); - QListViewItem *item=iconThemeItem(KIconTheme::current()); + TQListViewItem *item=iconThemeItem(KIconTheme::current()); m_iconThemes->setSelected(item, true); updateRemoveButton(); } -bool IconThemesConfig::installThemes(const QStringList &themes, const QString &archiveName) +bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString &archiveName) { bool everythingOk = true; - QString localThemesDir(locateLocal("icon", "./")); + TQString localThemesDir(locateLocal("icon", "./")); KProgressDialog progressDiag(this, "themeinstallprogress", i18n("Installing icon themes"), - QString::null, + TQString::null, true); progressDiag.setAutoClose(true); progressDiag.progressBar()->setTotalSteps(themes.count()); @@ -219,7 +219,7 @@ bool IconThemesConfig::installThemes(const QStringList &themes, const QString &a const KArchiveDirectory* rootDir = archive.directory(); KArchiveDirectory* currentTheme; - for (QStringList::ConstIterator it = themes.begin(); + for (TQStringList::ConstIterator it = themes.begin(); it != themes.end(); ++it) { progressDiag.setLabel( @@ -248,9 +248,9 @@ bool IconThemesConfig::installThemes(const QStringList &themes, const QString &a return everythingOk; } -QStringList IconThemesConfig::findThemeDirs(const QString &archiveName) +TQStringList IconThemesConfig::findThemeDirs(const TQString &archiveName) { - QStringList foundThemes; + TQStringList foundThemes; KTar archive(archiveName); archive.open(IO_ReadOnly); @@ -260,8 +260,8 @@ QStringList IconThemesConfig::findThemeDirs(const QString &archiveName) KArchiveDirectory* subDir = 0L; // iterate all the dirs looking for an index.theme or index.desktop file - QStringList entries = themeDir->entries(); - for (QStringList::Iterator it = entries.begin(); + TQStringList entries = themeDir->entries(); + for (TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { possibleDir = const_cast<KArchiveEntry*>(themeDir->entry(*it)); @@ -279,11 +279,11 @@ QStringList IconThemesConfig::findThemeDirs(const QString &archiveName) void IconThemesConfig::removeSelectedTheme() { - QListViewItem *selected = m_iconThemes->selectedItem(); + TQListViewItem *selected = m_iconThemes->selectedItem(); if (!selected) return; - QString question=i18n("<qt>Are you sure you want to remove the " + TQString question=i18n("<qt>Are you sure you want to remove the " "<strong>%1</strong> icon theme?<br>" "<br>" "This will delete the files installed by this theme.</qt>"). @@ -298,15 +298,15 @@ void IconThemesConfig::removeSelectedTheme() // delete the index file before the async KIO::del so loadThemes() will // ignore that dir. - unlink(QFile::encodeName(icontheme.dir()+"/index.theme").data()); - unlink(QFile::encodeName(icontheme.dir()+"/index.desktop").data()); + unlink(TQFile::encodeName(icontheme.dir()+"/index.theme").data()); + unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data()); KIO::del(KURL( icontheme.dir() )); KGlobal::instance()->newIconLoader(); loadThemes(); - QListViewItem *item=0L; + TQListViewItem *item=0L; //Fallback to the default if we've deleted the current theme if (!deletingCurrentTheme) item=iconThemeItem(KIconTheme::current()); @@ -322,12 +322,12 @@ void IconThemesConfig::removeSelectedTheme() void IconThemesConfig::updateRemoveButton() { - QListViewItem *selected = m_iconThemes->selectedItem(); + TQListViewItem *selected = m_iconThemes->selectedItem(); bool enabled = false; if (selected) { KIconTheme icontheme(m_themeNames[selected->text(0)]); - QFileInfo fi(icontheme.dir()); + TQFileInfo fi(icontheme.dir()); enabled = fi.isWritable(); // Don't let users remove the current theme. if(m_themeNames[selected->text(0)] == KIconTheme::current() || @@ -337,12 +337,12 @@ void IconThemesConfig::updateRemoveButton() m_removeButton->setEnabled(enabled); } -void IconThemesConfig::themeSelected(QListViewItem *item) +void IconThemesConfig::themeSelected(TQListViewItem *item) { #ifdef HAVE_LIBART KSVGIconEngine engine; #endif - QString dirName(m_themeNames[item->text(0)]); + TQString dirName(m_themeNames[item->text(0)]); KIconTheme icontheme(dirName); if (!icontheme.isValid()) kdDebug() << "notvalid\n"; @@ -363,7 +363,7 @@ void IconThemesConfig::themeSelected(QListViewItem *item) #endif } else - m_previewExec->setPixmap(QPixmap(icon.path)); + m_previewExec->setPixmap(TQPixmap(icon.path)); icon=icontheme.iconPath("folder.png",size,KIcon::MatchBest); if (!icon.isValid()) { @@ -379,7 +379,7 @@ void IconThemesConfig::themeSelected(QListViewItem *item) #endif } else - m_previewFolder->setPixmap(QPixmap(icon.path)); + m_previewFolder->setPixmap(TQPixmap(icon.path)); icon=icontheme.iconPath("txt.png",size,KIcon::MatchBest); if (!icon.isValid()) { @@ -395,7 +395,7 @@ void IconThemesConfig::themeSelected(QListViewItem *item) #endif } else - m_previewDocument->setPixmap(QPixmap(icon.path)); + m_previewDocument->setPixmap(TQPixmap(icon.path)); emit changed(true); m_bChanged = true; @@ -415,7 +415,7 @@ void IconThemesConfig::save() { if (!m_bChanged) return; - QListViewItem *selected = m_iconThemes->selectedItem(); + TQListViewItem *selected = m_iconThemes->selectedItem(); if (!selected) return; diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h index d6d1a9e91..622cedb19 100644 --- a/kcontrol/icons/iconthemes.h +++ b/kcontrol/icons/iconthemes.h @@ -20,7 +20,7 @@ #define ICONTHEMES_H #include <kcmodule.h> -#include <qmap.h> +#include <tqmap.h> #include <klistview.h> class QPushButton; @@ -34,12 +34,12 @@ class IconThemesConfig : public KCModule Q_OBJECT public: - IconThemesConfig(QWidget *parent = 0L, const char *name = 0L); + IconThemesConfig(TQWidget *parent = 0L, const char *name = 0L); virtual ~IconThemesConfig(); void loadThemes(); - bool installThemes(const QStringList &themes, const QString &archiveName); - QStringList findThemeDirs(const QString &archiveName); + bool installThemes(const TQStringList &themes, const TQString &archiveName); + TQStringList findThemeDirs(const TQString &archiveName); void updateRemoveButton(); @@ -50,21 +50,21 @@ public: int buttons(); protected slots: - void themeSelected(QListViewItem *item); + void themeSelected(TQListViewItem *item); void installNewTheme(); void removeSelectedTheme(); private: - QListViewItem *iconThemeItem(const QString &name); + TQListViewItem *iconThemeItem(const TQString &name); KListView *m_iconThemes; - QPushButton *m_removeButton; + TQPushButton *m_removeButton; - QLabel *m_previewExec; - QLabel *m_previewFolder; - QLabel *m_previewDocument; - QListViewItem *m_defaultTheme; - QMap <QString, QString>m_themeNames; + TQLabel *m_previewExec; + TQLabel *m_previewFolder; + TQLabel *m_previewDocument; + TQListViewItem *m_defaultTheme; + TQMap <TQString, TQString>m_themeNames; bool m_bChanged; }; diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp index fe8c8c1b3..396a6ee4f 100644 --- a/kcontrol/icons/main.cpp +++ b/kcontrol/icons/main.cpp @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> +#include <tqlayout.h> #include <kgenericfactory.h> #include <kaboutdata.h> @@ -31,25 +31,25 @@ #include "main.h" /**** DLL Interface ****/ -typedef KGenericFactory<IconModule, QWidget> IconsFactory; +typedef KGenericFactory<IconModule, TQWidget> IconsFactory; K_EXPORT_COMPONENT_FACTORY( kcm_icons, IconsFactory("kcmicons") ) /**** IconModule ****/ -IconModule::IconModule(QWidget *parent, const char *name, const QStringList &) +IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(IconsFactory::instance(), parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this); - tab = new QTabWidget(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); + tab = new TQTabWidget(this); layout->addWidget(tab); tab1 = new IconThemesConfig(this, "themes"); tab->addTab(tab1, i18n("&Theme")); - connect(tab1, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); tab2 = new KIconConfig(this, "effects"); tab->addTab(tab2, i18n("Ad&vanced")); - connect(tab2, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); KAboutData* about = new KAboutData("kcmicons", I18N_NOOP("Icons"), "3.0", I18N_NOOP("Icons Control Panel Module"), @@ -88,7 +88,7 @@ void IconModule::moduleChanged(bool state) emit changed(state); } -QString IconModule::quickHelp() const +TQString IconModule::quickHelp() const { return i18n("<h1>Icons</h1>" "This module allows you to choose the icons for your desktop.<p>" diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h index 90892351f..f9c1efc27 100644 --- a/kcontrol/icons/main.h +++ b/kcontrol/icons/main.h @@ -26,7 +26,7 @@ #define __MAIN_H__ -#include <qtabwidget.h> +#include <tqtabwidget.h> #include <kcmodule.h> class IconModule : public KCModule @@ -34,18 +34,18 @@ class IconModule : public KCModule Q_OBJECT public: - IconModule(QWidget *parent, const char *name, const QStringList &); + IconModule(TQWidget *parent, const char *name, const TQStringList &); void load(); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; protected slots: void moduleChanged(bool state); private: - QTabWidget *tab; + TQTabWidget *tab; KCModule *tab1; KCModule *tab2; diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index ea74ed9ac..770b2cdf3 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -27,9 +27,9 @@ be copied to kde/applnk/Settings/Information !! */ -#include <qheader.h> -#include <qwhatsthis.h> -#include <qlayout.h> +#include <tqheader.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> #include <kglobalsettings.h> #include <kiconloader.h> @@ -45,16 +45,16 @@ DEFAULT_ERRORSTRING will be used... */ -static QString *GetInfo_ErrorString; /* should always point to: +static TQString *GetInfo_ErrorString; /* should always point to: KInfoListWidget::ErrorString */ static bool sorting_allowed; /* is sorting allowed by user ? */ #if defined(__linux__) -# define DEFAULT_ERRORSTRING QString::null /* i18n("Maybe the proc-filesystem is not enabled in Linux-Kernel.") */ +# define DEFAULT_ERRORSTRING TQString::null /* i18n("Maybe the proc-filesystem is not enabled in Linux-Kernel.") */ #elif defined(__hpux) -# define DEFAULT_ERRORSTRING QString::null +# define DEFAULT_ERRORSTRING TQString::null #else #define DEFAULT_ERRORSTRING i18n("Maybe this system is not completely supported yet :-(") #endif @@ -71,16 +71,16 @@ static bool sorting_allowed; /* is sorting allowed by user ? */ #define HEXDIGITS (sizeof(int)*8/4) /* 4 Bytes = 32 Bits = 8 Hex-Digits */ -static const QString Value( int val, int numbers=1 ) +static const TQString Value( int val, int numbers=1 ) { return KGlobal::locale()->formatNumber(val, 0).rightJustify(numbers); } -static const QString HexStr(unsigned long val, int digits ) +static const TQString HexStr(unsigned long val, int digits ) { - QString hexstr; + TQString hexstr; int i; - hexstr = QString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); + hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); for (i=hexstr.length()-1; i>0; --i) if (hexstr[i]==' ') hexstr[i] = '0'; @@ -119,7 +119,7 @@ static struct _event_table { { 0L, 0 }}; -static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewItem *last, +static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListViewItem *last, Display *dpy, int scr, int default_scr) { unsigned width, height; @@ -128,7 +128,7 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt ndepths, *depths; Screen *s = ScreenOfDisplay(dpy,scr); /* opaque structure */ - QListViewItem *item; + TQListViewItem *item; /* * there are 2.54 centimeters to an inch; so there are 25.4 millimeters. @@ -141,19 +141,19 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt xres = ((double)(DisplayWidth(dpy,scr) *25.4)/DisplayWidthMM(dpy,scr) ); yres = ((double)(DisplayHeight(dpy,scr)*25.4)/DisplayHeightMM(dpy,scr)); - item = new QListViewItem(lBox,last, i18n("Screen # %1").arg((int)scr,-1), - (scr==default_scr) ? i18n("(Default Screen)") : QString::null ); + item = new TQListViewItem(lBox,last, i18n("Screen # %1").arg((int)scr,-1), + (scr==default_scr) ? i18n("(Default Screen)") : TQString::null ); item->setExpandable(true); if (scr==default_scr) item->setOpen(true); - last = new QListViewItem(item, i18n("Dimensions"), + last = new TQListViewItem(item, i18n("Dimensions"), i18n("%1 x %2 Pixel (%3 x %4 mm)") .arg( (int)DisplayWidth(dpy,scr) ) .arg( (int)DisplayHeight(dpy,scr) ) .arg( (int)DisplayWidthMM(dpy,scr) ) .arg( (int)DisplayHeightMM (dpy,scr) )); - last = new QListViewItem(item, last, i18n("Resolution"), + last = new TQListViewItem(item, last, i18n("Resolution"), i18n("%1 x %2 dpi") .arg( (int)(xres+0.5) ) .arg( (int)(yres+0.5) )); @@ -162,39 +162,39 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt depths = 0; depths = XListDepths (dpy, scr, &ndepths); if (depths) { - QString txt; + TQString txt; for (i = 0; i < ndepths; i++) { txt = txt + Value(depths[i]); if (i < ndepths - 1) - txt = txt + QString::fromLatin1(", "); + txt = txt + TQString::fromLatin1(", "); } - last = new QListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt); + last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt); XFree((char *) depths); } - last = new QListViewItem(item, last, i18n("Root Window ID"), + last = new TQListViewItem(item, last, i18n("Root Window ID"), HexStr((unsigned long)RootWindow(dpy,scr),HEXDIGITS)); - last = new QListViewItem(item, last, i18n("Depth of Root Window"), + last = new TQListViewItem(item, last, i18n("Depth of Root Window"), (DisplayPlanes (dpy, scr) == 1) ? i18n("%1 plane").arg(DisplayPlanes(dpy,scr)) /*singular*/ : i18n("%1 planes").arg(DisplayPlanes(dpy,scr)));/*plural*/ - last = new QListViewItem(item, last, i18n("Number of Colormaps"), + last = new TQListViewItem(item, last, i18n("Number of Colormaps"), i18n("minimum %1, maximum %2") .arg((int)MinCmapsOfScreen(s)).arg((int)MaxCmapsOfScreen(s))); - last = new QListViewItem(item, last, i18n("Default Colormap"), + last = new TQListViewItem(item, last, i18n("Default Colormap"), Value((int)DefaultColormap(dpy,scr))); - last = new QListViewItem(item, last, i18n("Default Number of Colormap Cells"), + last = new TQListViewItem(item, last, i18n("Default Number of Colormap Cells"), Value((int)DisplayCells(dpy, scr))); - last = new QListViewItem(item, last, i18n("Preallocated Pixels"), + last = new TQListViewItem(item, last, i18n("Preallocated Pixels"), i18n("Black %1, White %2") .arg(KGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0)) .arg(KGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0))); - QString YES(i18n("Yes")); - QString NO(i18n("No")); - last = new QListViewItem(item, last, i18n("Options"), + TQString YES(i18n("Yes")); + TQString NO(i18n("No")); + last = new TQListViewItem(item, last, i18n("Options"), i18n("backing-store: %1, save-unders: %2") .arg( (DoesBackingStore(s) == NotUseful) ? NO : ((DoesBackingStore(s) == Always) ? YES : i18n("When mapped")) ) @@ -202,17 +202,17 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt XQueryBestSize (dpy, CursorShape, RootWindow(dpy,scr), 65535, 65535, &width, &height); - last = new QListViewItem(item, last, i18n("Largest Cursor"), + last = new TQListViewItem(item, last, i18n("Largest Cursor"), (width == 65535 && height == 65535) - ? i18n("unlimited") : QString::fromLatin1("%1 x %2").arg(width).arg(height)); + ? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height)); - last = new QListViewItem(item, last, i18n("Current Input Event Mask"), + last = new TQListViewItem(item, last, i18n("Current Input Event Mask"), HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS)); item = last; struct _event_table *etp; for (etp=event_table; etp->name; etp++) { if (EventMaskOfScreen(s) & etp->value) - item = new QListViewItem(last, item, + item = new TQListViewItem(last, item, i18n("Event = %1").arg(HexStr(etp->value,HEXDIGITS)), etp->name ); } @@ -220,19 +220,19 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt return item; } -static const QString Order( int order ) +static const TQString Order( int order ) { if (order==LSBFirst) return i18n("LSBFirst"); else if (order==MSBFirst) return i18n("MSBFirst"); else return i18n("Unknown Order %1").arg(order); } -static const QString BitString( unsigned long n ) +static const TQString BitString( unsigned long n ) { return i18n("1 Bit", "%n Bits", n); // singular & plural form of "%d Bit" } -static const QString ByteString( unsigned long n ) +static const TQString ByteString( unsigned long n ) { /* explanation in BR #52640 (http://bugs.kde.org/show_bug.cgi?id=52640) */ if (n == 1) @@ -242,7 +242,7 @@ static const QString ByteString( unsigned long n ) .arg(KGlobal::locale()->formatNumber(n,0)); } -static bool GetInfo_XServer_Generic( QListView *lBox ) +static bool GetInfo_XServer_Generic( TQListView *lBox ) { /* Many parts of this source are taken from the X11-program "xdpyinfo" */ @@ -252,8 +252,8 @@ static bool GetInfo_XServer_Generic( QListView *lBox ) Display *dpy; XPixmapFormatValues *pmf; - QString str,txt; - QListViewItem *last, *item, *next; + TQString str,txt; + TQListViewItem *last, *item, *next; dpy = XOpenDisplay(0); if (!dpy) @@ -263,24 +263,24 @@ static bool GetInfo_XServer_Generic( QListView *lBox ) lBox->addColumn(i18n("Value") ); sorting_allowed = false; - next = new QListViewItem(lBox, i18n("Server Information")); + next = new TQListViewItem(lBox, i18n("Server Information")); next->setPixmap(0, SmallIcon("kcmx")); next->setOpen(true); next->setSelectable(false); next->setExpandable(false); - last = new QListViewItem(next, i18n("Name of the Display"), + last = new TQListViewItem(next, i18n("Name of the Display"), DisplayString(dpy)); - last = new QListViewItem(next, last, i18n("Vendor String"), QString::fromLatin1(ServerVendor(dpy))); - last = new QListViewItem(next, last, i18n("Vendor Release Number"), + last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy))); + last = new TQListViewItem(next, last, i18n("Vendor Release Number"), Value((int)VendorRelease(dpy))); - last = new QListViewItem(next, last, i18n("Version Number"), - QString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) + last = new TQListViewItem(next, last, i18n("Version Number"), + TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) .arg((int)ProtocolRevision(dpy))); - last = item = new QListViewItem(next, last, i18n("Available Screens")); + last = item = new TQListViewItem(next, last, i18n("Available Screens")); last->setOpen(true); last->setExpandable(true); for (i=0; i<ScreenCount(dpy); i++) { @@ -288,22 +288,22 @@ static bool GetInfo_XServer_Generic( QListView *lBox ) if (i==0) item->setOpen(true); } - last = new QListViewItem( next, last, i18n("Supported Extensions") ); + last = new TQListViewItem( next, last, i18n("Supported Extensions") ); item = last; int extCount; char **extensions = XListExtensions( dpy, &extCount ); for ( i = 0; i < extCount; i++ ) { - item = new QListViewItem( last, item, QString::fromLatin1( extensions[i] ) ); + item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) ); } XFreeExtensionList( extensions ); pmf = XListPixmapFormats(dpy, &n); - last = item = new QListViewItem(next, last, i18n("Supported Pixmap Formats")); + last = item = new TQListViewItem(next, last, i18n("Supported Pixmap Formats")); if (pmf) { last->setExpandable(true); for (i=0; i<n; i++) { - item = new QListViewItem(last, item, + item = new TQListViewItem(last, item, i18n("Pixmap Format #%1").arg(i+1), i18n("%1 BPP, Depth: %2, Scanline padding: %3") .arg(pmf[i].bits_per_pixel) @@ -315,21 +315,21 @@ static bool GetInfo_XServer_Generic( QListView *lBox ) req_size = XExtendedMaxRequestSize(dpy); if (!req_size) req_size = XMaxRequestSize(dpy); - last = new QListViewItem(next, last, i18n("Maximum Request Size"), + last = new TQListViewItem(next, last, i18n("Maximum Request Size"), ByteString(req_size*4)); - last = new QListViewItem(next, last, i18n("Motion Buffer Size"), + last = new TQListViewItem(next, last, i18n("Motion Buffer Size"), ByteString(XDisplayMotionBufferSize(dpy))); - last = item = new QListViewItem(next, last, i18n("Bitmap")); + last = item = new TQListViewItem(next, last, i18n("Bitmap")); last->setExpandable(true); - item = new QListViewItem(last, item, i18n("Unit"), + item = new TQListViewItem(last, item, i18n("Unit"), Value(BitmapUnit(dpy)) ); - item = new QListViewItem(last, item, i18n("Order"), + item = new TQListViewItem(last, item, i18n("Order"), Order(BitmapBitOrder(dpy))); - item = new QListViewItem(last, item, i18n("Padding"), + item = new TQListViewItem(last, item, i18n("Padding"), Value(BitmapPad(dpy))); - last = new QListViewItem(next, last, i18n("Image Byte Order"), + last = new TQListViewItem(next, last, i18n("Image Byte Order"), Order(ImageByteOrder(dpy))); XCloseDisplay (dpy); @@ -356,7 +356,7 @@ void KInfoListWidget::load() retrieve-function. If the function wants the widget to show another string, then it change *GetInfo_ErrorString ! */ ErrorString = i18n("No information available about %1.").arg(title) - + QString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING; + + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING; GetInfo_ErrorString = &ErrorString; /* save the address of ErrorString */ sorting_allowed = true; /* the functions may set that */ @@ -387,7 +387,7 @@ void KInfoListWidget::load() } -QString KInfoListWidget::quickHelp() const +TQString KInfoListWidget::quickHelp() const { return i18n("<h1>System Information</h1>" " All the information modules return information about a certain" @@ -397,8 +397,8 @@ QString KInfoListWidget::quickHelp() const } -KInfoListWidget::KInfoListWidget(const QString &_title, QWidget *parent, const char *name, - bool _getlistbox(QListView *lbox)) +KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name, + bool _getlistbox(TQListView *lbox)) : KCModule(parent, name), title(_title) { @@ -414,16 +414,16 @@ KInfoListWidget::KInfoListWidget(const QString &_title, QWidget *parent, const c setButtons(KCModule::Help); getlistbox = _getlistbox; GetInfo_ErrorString = 0; - QHBoxLayout *layout = new QHBoxLayout(this, 0, KDialog::spacingHint()); - widgetStack = new QWidgetStack(this); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + widgetStack = new TQWidgetStack(this); layout->addWidget(widgetStack); - lBox = new QListView(widgetStack); + lBox = new TQListView(widgetStack); widgetStack->addWidget(lBox, 0); lBox->setMinimumSize(200,120); lBox->setFont(KGlobalSettings::generalFont()); /* default font */ lBox->setAllColumnsShowFocus(true); - QWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) ); - NoInfoText = new QLabel(widgetStack); + TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) ); + NoInfoText = new TQLabel(widgetStack); widgetStack->addWidget(NoInfoText, 1); NoInfoText->setAlignment(AlignCenter | WordBreak); widgetStack->raiseWidget(NoInfoText); @@ -433,24 +433,24 @@ KInfoListWidget::KInfoListWidget(const QString &_title, QWidget *parent, const c /* Helper-function to read output from an external program */ -static int GetInfo_ReadfromPipe( QListView *lBox, const char *FileName, bool WithEmptyLines = true ) +static int GetInfo_ReadfromPipe( TQListView *lBox, const char *FileName, bool WithEmptyLines = true ) { FILE *pipe; - QListViewItem* olditem = 0L; - QString s; + TQListViewItem* olditem = 0L; + TQString s; if ((pipe = popen(FileName, "r")) == NULL) { pclose(pipe); return 0; } - QTextStream t(pipe, IO_ReadOnly); + TQTextStream t(pipe, IO_ReadOnly); while (!t.atEnd()) { s = t.readLine(); if (!WithEmptyLines && s.length()==0) continue; - olditem = new QListViewItem(lBox, olditem, s); + olditem = new TQListViewItem(lBox, olditem, s); } pclose(pipe); diff --git a/kcontrol/info/info.h b/kcontrol/info/info.h index c55c1b2a5..723d35df5 100644 --- a/kcontrol/info/info.h +++ b/kcontrol/info/info.h @@ -1,16 +1,16 @@ #ifndef _INFO_H_ #define _INFO_H_ -#include <qwidget.h> -#include <qwidgetstack.h> -#include <qframe.h> -#include <qlabel.h> -#include <qtabdialog.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qlistview.h> -#include <qfile.h> -#include <qevent.h> +#include <tqwidget.h> +#include <tqwidgetstack.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqtabdialog.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqlistview.h> +#include <tqfile.h> +#include <tqevent.h> #include <kcmodule.h> #include <kaboutdata.h> @@ -19,35 +19,35 @@ /* function call-back-prototypes... */ -bool GetInfo_CPU( QListView *lBox ); -bool GetInfo_IRQ( QListView *lBox ); -bool GetInfo_DMA( QListView *lBox ); -bool GetInfo_PCI( QListView *lBox ); -bool GetInfo_IO_Ports( QListView *lBox ); -bool GetInfo_Sound( QListView *lBox ); -bool GetInfo_Devices( QListView *lBox ); -bool GetInfo_SCSI( QListView *lBox ); -bool GetInfo_Partitions( QListView *lBox ); -bool GetInfo_XServer_and_Video( QListView *lBox ); -bool GetInfo_CD_ROM( QListView *lBox ); /* New CD-ROM Info */ -extern bool GetInfo_OpenGL( QListView *lBox ); +bool GetInfo_CPU( TQListView *lBox ); +bool GetInfo_IRQ( TQListView *lBox ); +bool GetInfo_DMA( TQListView *lBox ); +bool GetInfo_PCI( TQListView *lBox ); +bool GetInfo_IO_Ports( TQListView *lBox ); +bool GetInfo_Sound( TQListView *lBox ); +bool GetInfo_Devices( TQListView *lBox ); +bool GetInfo_SCSI( TQListView *lBox ); +bool GetInfo_Partitions( TQListView *lBox ); +bool GetInfo_XServer_and_Video( TQListView *lBox ); +bool GetInfo_CD_ROM( TQListView *lBox ); /* New CD-ROM Info */ +extern bool GetInfo_OpenGL( TQListView *lBox ); class KInfoListWidget : public KCModule { public: - KInfoListWidget(const QString &_title, QWidget *parent, const char *name=0, bool _getlistbox (QListView *)=0); + KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name=0, bool _getlistbox (TQListView *)=0); virtual void load(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; private: - QListView *lBox; - bool (*getlistbox) (QListView *); - QString title; + TQListView *lBox; + bool (*getlistbox) (TQListView *); + TQString title; QLabel *NoInfoText; QString ErrorString; - QWidgetStack *widgetStack; + TQWidgetStack *widgetStack; }; #endif diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp index 8aaee4f6d..9aa0d3767 100644 --- a/kcontrol/info/info_aix.cpp +++ b/kcontrol/info/info_aix.cpp @@ -60,14 +60,14 @@ device_description(struct CuDv *cudv) } bool -list_devices(QListView *lBox, char *criteria) +list_devices(TQListView *lBox, char *criteria) { struct CuDv *cudv; /* Customized Devices */ struct listinfo info; int i; char *cudv_desc; - QString cudv_status; - QListViewItem *lastitem = NULL; + TQString cudv_status; + TQListViewItem *lastitem = NULL; lBox->addColumn(i18n("Name")); lBox->addColumn(i18n("Status")); @@ -98,18 +98,18 @@ list_devices(QListView *lBox, char *criteria) { switch(cudv[i].status) { - case DEFINED: cudv_status = QString("Defined"); break; - case AVAILABLE: cudv_status = QString("Available"); break; - case STOPPED: cudv_status = QString("Stopped"); break; - default: cudv_status = QString("Unknown"); + case DEFINED: cudv_status = TQString("Defined"); break; + case AVAILABLE: cudv_status = TQString("Available"); break; + case STOPPED: cudv_status = TQString("Stopped"); break; + default: cudv_status = TQString("Unknown"); } cudv_desc = device_description(&cudv[i]); - lastitem = new QListViewItem(lBox, lastitem, - QString(cudv[i].name), + lastitem = new TQListViewItem(lBox, lastitem, + TQString(cudv[i].name), cudv_status, - QString(cudv[i].location), - QString(cudv_desc ? cudv_desc : "N/A") ); + TQString(cudv[i].location), + TQString(cudv_desc ? cudv_desc : "N/A") ); if (cudv_desc) free(cudv_desc); } @@ -271,7 +271,7 @@ struct model _4C_models[] = */ bool -GetInfo_XServer_and_Video( QListView *lBox ) +GetInfo_XServer_and_Video( TQListView *lBox ) { return GetInfo_XServer_Generic( lBox ); } @@ -286,14 +286,14 @@ GetInfo_XServer_and_Video( QListView *lBox ) * */ bool -GetInfo_CPU( QListView *lBox ) +GetInfo_CPU( TQListView *lBox ) { struct utsname info; struct model *table = _models; /* table of model information */ char model_ID[21] = ""; /* information for table lookup */ char cpu_ID[7] = ""; /* unique CPU ID */ int i; - QListViewItem *lastitem = NULL; + TQListViewItem *lastitem = NULL; lBox->addColumn(i18n("Information")); lBox->addColumn(i18n("Value")); @@ -326,57 +326,57 @@ GetInfo_CPU( QListView *lBox ) } } - lastitem = new QListViewItem(lBox, lastitem, QString("CPU ID"), QString(cpu_ID)); - lastitem = new QListViewItem(lBox, lastitem, QString("Node"), QString(info.nodename)); - lastitem = new QListViewItem(lBox, lastitem, QString("OS"), QString(info.sysname) + - QString(" ") + QString(info.version) + QString(".") + QString(info.release)); + lastitem = new TQListViewItem(lBox, lastitem, TQString("CPU ID"), TQString(cpu_ID)); + lastitem = new TQListViewItem(lBox, lastitem, TQString("Node"), TQString(info.nodename)); + lastitem = new TQListViewItem(lBox, lastitem, TQString("OS"), TQString(info.sysname) + + TQString(" ") + TQString(info.version) + TQString(".") + TQString(info.release)); for (i=0; *(table[i].model_ID); i++) if (strcmp(model_ID, table[i].model_ID) == 0) { - lastitem = new QListViewItem(lBox, lastitem, QString("Machine Type"), QString(table[i].machine_type)); - lastitem = new QListViewItem(lBox, lastitem, QString("Architecture"), QString(chip_name[table[i].architecture])); - lastitem = new QListViewItem(lBox, lastitem, QString("Speed"), QString(table[i].processor_speed) + QString(" Mhz")); + lastitem = new TQListViewItem(lBox, lastitem, TQString("Machine Type"), TQString(table[i].machine_type)); + lastitem = new TQListViewItem(lBox, lastitem, TQString("Architecture"), TQString(chip_name[table[i].architecture])); + lastitem = new TQListViewItem(lBox, lastitem, TQString("Speed"), TQString(table[i].processor_speed) + TQString(" Mhz")); break; } return(true); } -bool GetInfo_IRQ( QListView * ) +bool GetInfo_IRQ( TQListView * ) { return false; } -bool GetInfo_DMA( QListView * ) +bool GetInfo_DMA( TQListView * ) { return false; } bool -GetInfo_PCI( QListView *lBox ) +GetInfo_PCI( TQListView *lBox ) { return list_devices(lBox, (char *)"PdDvLn like '*/pci/*'"); } -bool GetInfo_IO_Ports( QListView * ) +bool GetInfo_IO_Ports( TQListView * ) { return false; } -bool GetInfo_Sound( QListView * ) +bool GetInfo_Sound( TQListView * ) { return false; } bool -GetInfo_Devices( QListView *lBox ) +GetInfo_Devices( TQListView *lBox ) { return list_devices(lBox, (char *)"PdDvLn like '*'"); } bool -GetInfo_SCSI( QListView *lBox ) +GetInfo_SCSI( TQListView *lBox ) { return list_devices(lBox, (char *)"PdDvLn like '*/scsi/*'"); } @@ -432,17 +432,17 @@ static int get_fs_usage (char *path, long *l_total, long *l_avail) // Some Ideas taken from garbazo from his source in info_fbsd.cpp bool -GetInfo_Partitions ( QListView *lbox ) +GetInfo_Partitions ( TQListView *lbox ) { #define NUMCOLS 5 - QString Title[NUMCOLS]; + TQString Title[NUMCOLS]; int n; struct fstab *fstab_ent; struct statvfs svfs; long total,avail; - QString str; - QString MB(i18n("MB")+ " "); // International Text for MB=Mega-Byte + TQString str; + TQString MB(i18n("MB")+ " "); // International Text for MB=Mega-Byte if (setfsent() != 1) // Try to open fstab return false; @@ -467,16 +467,16 @@ GetInfo_Partitions ( QListView *lbox ) svfs.f_basetype[0] = 0; if(svfs.f_basetype[0]) { - new QListViewItem(lbox, QString(fstab_ent->fs_spec), - QString(fstab_ent->fs_file) + QString(" "), - (svfs.f_basetype[0] ? QString(svfs.f_basetype) : i18n("n/a")), + new TQListViewItem(lbox, TQString(fstab_ent->fs_spec), + TQString(fstab_ent->fs_file) + TQString(" "), + (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a")), Value((total+512)/1024,6) + MB, Value((avail+512)/1024,6) + MB); } else { - new QListViewItem(lbox, QString(fstab_ent->fs_spec), - QString(fstab_ent->fs_file) + QString(" "), - (svfs.f_basetype[0] ? QString(svfs.f_basetype) : i18n("n/a"))); + new TQListViewItem(lbox, TQString(fstab_ent->fs_spec), + TQString(fstab_ent->fs_file) + TQString(" "), + (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a"))); } } diff --git a/kcontrol/info/info_fbsd.cpp b/kcontrol/info/info_fbsd.cpp index 6e936801a..3ccd1c086 100644 --- a/kcontrol/info/info_fbsd.cpp +++ b/kcontrol/info/info_fbsd.cpp @@ -49,22 +49,22 @@ #include <fstab.h> #include <string.h> -#include <qdict.h> -#include <qfile.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qtextstream.h> +#include <tqdict.h> +#include <tqfile.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqtextstream.h> class Device { public: - Device (QString n=QString::null, QString d=QString::null) + Device (TQString n=TQString::null, TQString d=TQString::null) {name=n; description=d;} - QString name, description; + TQString name, description; }; -void ProcessChildren(QString name); -QString GetController(const QString &line); -Device *GetDevice(const QString &line); +void ProcessChildren(TQString name); +TQString GetController(const TQString &line); +Device *GetDevice(const TQString &line); #ifdef HAVE_DEVINFO_H extern "C" { @@ -75,7 +75,7 @@ extern "C" { } #endif -bool GetInfo_CPU (QListView *lBox) +bool GetInfo_CPU (TQListView *lBox) { // Modified 13 July 2000 for SMP by Brad Hughes - bhughes@trolltech.com @@ -85,7 +85,7 @@ bool GetInfo_CPU (QListView *lBox) len = sizeof(ncpu); sysctlbyname("hw.ncpu", &ncpu, &len, NULL, 0); - QString cpustring; + TQString cpustring; for (int i = ncpu; i > 0; i--) { /* Stuff for sysctl */ char *buf; @@ -105,7 +105,7 @@ bool GetInfo_CPU (QListView *lBox) } /* Put everything in the listbox */ - new QListViewItem(lBox, cpustring); + new TQListViewItem(lBox, cpustring); /* Clean up after ourselves, this time I mean it ;-) */ delete buf; @@ -114,7 +114,7 @@ bool GetInfo_CPU (QListView *lBox) return true; } -bool GetInfo_IRQ (QListView *lbox) +bool GetInfo_IRQ (TQListView *lbox) { #ifdef HAVE_DEVINFO_H /* systat lists the interrupts assigned to devices as well as how many were @@ -131,7 +131,7 @@ bool GetInfo_IRQ (QListView *lbox) #endif } -bool GetInfo_DMA (QListView *lbox) +bool GetInfo_DMA (TQListView *lbox) { #ifdef HAVE_DEVINFO_H /* Oh neat, current now has a neat little utility called devinfo */ @@ -144,7 +144,7 @@ bool GetInfo_DMA (QListView *lbox) #endif } -bool GetInfo_IO_Ports (QListView *lbox) +bool GetInfo_IO_Ports (TQListView *lbox) { #ifdef HAVE_DEVINFO_H /* Oh neat, current now has a neat little utility called devinfo */ @@ -157,21 +157,21 @@ bool GetInfo_IO_Ports (QListView *lbox) #endif } -bool GetInfo_Sound (QListView *lbox) +bool GetInfo_Sound (TQListView *lbox) { - QFile *sndstat = new QFile("/dev/sndstat"); - QTextStream *t; - QString s; - QListViewItem *olditem = 0; + TQFile *sndstat = new TQFile("/dev/sndstat"); + TQTextStream *t; + TQString s; + TQListViewItem *olditem = 0; if (!sndstat->exists() || !sndstat->open(IO_ReadOnly)) { s = i18n("Your sound system could not be queried. /dev/sndstat does not exist or is not readable."); - olditem = new QListViewItem(lbox, olditem, s); + olditem = new TQListViewItem(lbox, olditem, s); } else { - t = new QTextStream(sndstat); + t = new TQTextStream(sndstat); while (!(s=t->readLine()).isNull()) { - olditem = new QListViewItem(lbox, olditem, s); + olditem = new TQListViewItem(lbox, olditem, s); } delete t; @@ -182,32 +182,32 @@ bool GetInfo_Sound (QListView *lbox) return true; } -bool GetInfo_SCSI (QListView *lbox) +bool GetInfo_SCSI (TQListView *lbox) { FILE *pipe; - QFile *camcontrol = new QFile("/sbin/camcontrol"); - QTextStream *t; - QString s; - QListViewItem *olditem = 0; + TQFile *camcontrol = new TQFile("/sbin/camcontrol"); + TQTextStream *t; + TQString s; + TQListViewItem *olditem = 0; if (!camcontrol->exists()) { s = i18n ("SCSI subsystem could not be queried: /sbin/camcontrol could not be found"); - olditem = new QListViewItem(lbox, olditem, s); + olditem = new TQListViewItem(lbox, olditem, s); } else if ((pipe = popen("/sbin/camcontrol devlist 2>&1", "r")) == NULL) { s = i18n ("SCSI subsystem could not be queried: /sbin/camcontrol could not be executed"); - olditem = new QListViewItem(lbox, olditem, s); + olditem = new TQListViewItem(lbox, olditem, s); } else { /* This prints out a list of all the scsi devies, perhaps eventually we could parse it as opposed to schlepping it into a listbox */ - t = new QTextStream(pipe, IO_ReadOnly); + t = new TQTextStream(pipe, IO_ReadOnly); while (true) { s = t->readLine(); if ( s.isEmpty() ) break; - olditem = new QListViewItem(lbox, olditem, s); + olditem = new TQListViewItem(lbox, olditem, s); } delete t; @@ -222,25 +222,25 @@ bool GetInfo_SCSI (QListView *lbox) return true; } -bool GetInfo_PCI (QListView *lbox) +bool GetInfo_PCI (TQListView *lbox) { FILE *pipe; - QFile *pcicontrol; - QString s, cmd; - QListViewItem *olditem = 0; + TQFile *pcicontrol; + TQString s, cmd; + TQListViewItem *olditem = 0; - pcicontrol = new QFile("/usr/sbin/pciconf"); + pcicontrol = new TQFile("/usr/sbin/pciconf"); if (!pcicontrol->exists()) { delete pcicontrol; - pcicontrol = new QFile("/usr/X11R6/bin/scanpci"); + pcicontrol = new TQFile("/usr/X11R6/bin/scanpci"); if (!pcicontrol->exists()) { delete pcicontrol; - pcicontrol = new QFile("/usr/X11R6/bin/pcitweak"); + pcicontrol = new TQFile("/usr/X11R6/bin/pcitweak"); if (!pcicontrol->exists()) { - QString s; + TQString s; s = i18n("Could not find any programs with which to query your system's PCI information"); - (void) new QListViewItem(lbox, 0, s); + (void) new TQListViewItem(lbox, 0, s); delete pcicontrol; return true; } else { @@ -256,7 +256,7 @@ bool GetInfo_PCI (QListView *lbox) if ((pipe = popen(cmd.latin1(), "r")) == NULL) { s = i18n ("PCI subsystem could not be queried: %1 could not be executed").arg(cmd); - olditem = new QListViewItem(lbox, olditem, s); + olditem = new TQListViewItem(lbox, olditem, s); } else { /* This prints out a list of all the pci devies, perhaps eventually we could @@ -268,23 +268,23 @@ bool GetInfo_PCI (QListView *lbox) if (!lbox->childCount()) { s = i18n("The PCI subsystem could not be queried, this may need root privileges."); - olditem = new QListViewItem(lbox, olditem, s); + olditem = new TQListViewItem(lbox, olditem, s); return true; } return true; } -bool GetInfo_Partitions (QListView *lbox) +bool GetInfo_Partitions (TQListView *lbox) { struct fstab *fstab_ent; if (setfsent() != 1) /* Try to open fstab */ { int s_err = errno; - QString s; + TQString s; s = i18n("Could not check filesystem info: "); s += strerror(s_err); - (void)new QListViewItem(lbox, 0, s); + (void)new TQListViewItem(lbox, 0, s); } else { lbox->addColumn(i18n("Device")); lbox->addColumn(i18n("Mount Point")); @@ -292,7 +292,7 @@ bool GetInfo_Partitions (QListView *lbox) lbox->addColumn(i18n("Mount Options")); while ((fstab_ent=getfsent())!=NULL) { - new QListViewItem(lbox, fstab_ent->fs_spec, + new TQListViewItem(lbox, fstab_ent->fs_spec, fstab_ent->fs_file, fstab_ent->fs_vfstype, fstab_ent->fs_mntops); } @@ -305,19 +305,19 @@ bool GetInfo_Partitions (QListView *lbox) return true; } -bool GetInfo_XServer_and_Video (QListView *lBox) +bool GetInfo_XServer_and_Video (TQListView *lBox) { return GetInfo_XServer_Generic( lBox ); } -bool GetInfo_Devices (QListView *lbox) +bool GetInfo_Devices (TQListView *lbox) { - QFile *f = new QFile("/var/run/dmesg.boot"); + TQFile *f = new TQFile("/var/run/dmesg.boot"); if (f->open(IO_ReadOnly)) { - QTextStream qts(f); - QDict<QListViewItem> lv_items; + TQTextStream qts(f); + TQDict<TQListViewItem> lv_items; Device *dev; - QString line, controller; + TQString line, controller; lbox->setRootIsDecorated(true); lbox->addColumn("Device"); lbox->addColumn("Description"); @@ -331,12 +331,12 @@ bool GetInfo_Devices (QListView *lbox) // Ewww assuing motherboard is the only toplevel controller is rather gross if (controller == "motherboard") { if (!lv_items[dev->name]) { - lv_items.insert(dev->name, new QListViewItem(lbox, dev->name, dev->description) ); + lv_items.insert(dev->name, new TQListViewItem(lbox, dev->name, dev->description) ); } } else { - QListViewItem *parent=lv_items[controller]; + TQListViewItem *parent=lv_items[controller]; if (parent && !lv_items[dev->name]) { - lv_items.insert(dev->name, new QListViewItem(parent, dev->name, dev->description) ); + lv_items.insert(dev->name, new TQListViewItem(parent, dev->name, dev->description) ); } } } @@ -345,32 +345,32 @@ bool GetInfo_Devices (QListView *lbox) return false; } -QString GetController(const QString &line) +TQString GetController(const TQString &line) { if ( ( (line.startsWith("ad")) || (line.startsWith("afd")) || (line.startsWith("acd")) ) && (line.find(":") < 6) ) { - QString controller = line; + TQString controller = line; controller.remove(0, controller.find(" at ")+4); if (controller.find("-slave") != -1) { controller.remove(controller.find("-slave"), controller.length()); } else if (controller.find("-master") != -1) { controller.remove(controller.find("-master"), controller.length()); } else - controller=QString::null; + controller=TQString::null; if (!controller.isNull()) return controller; } if (line.find(" on ") != -1) { - QString controller; + TQString controller; controller = line; controller.remove(0, controller.find(" on ")+4); if (controller.find(" ") != -1) controller.remove(controller.find(" "), controller.length()); return controller; } - return QString::null; + return TQString::null; } -Device *GetDevice(const QString &line) +Device *GetDevice(const TQString &line) { Device *dev; int colon = line.find(":"); @@ -387,9 +387,9 @@ Device *GetDevice(const QString &line) int print_irq(struct devinfo_rman *rman, void *arg) { - QListView *lbox = (QListView *)arg; + TQListView *lbox = (TQListView *)arg; if (strcmp(rman->dm_desc, "Interrupt request lines")==0) { - (void)new QListViewItem(lbox, 0, rman->dm_desc); + (void)new TQListViewItem(lbox, 0, rman->dm_desc); devinfo_foreach_rman_resource(rman, print_resource, arg); } return(0); @@ -397,9 +397,9 @@ int print_irq(struct devinfo_rman *rman, void *arg) int print_dma(struct devinfo_rman *rman, void *arg) { - QListView *lbox = (QListView *)arg; + TQListView *lbox = (TQListView *)arg; if (strcmp(rman->dm_desc, "DMA request lines")==0) { - (void)new QListViewItem(lbox, lbox->lastItem(), rman->dm_desc); + (void)new TQListViewItem(lbox, lbox->lastItem(), rman->dm_desc); devinfo_foreach_rman_resource(rman, print_resource, arg); } return(0); @@ -407,14 +407,14 @@ int print_dma(struct devinfo_rman *rman, void *arg) int print_ioports(struct devinfo_rman *rman, void *arg) { - QListView *lbox = (QListView *)arg; + TQListView *lbox = (TQListView *)arg; if (strcmp(rman->dm_desc, "I/O ports")==0) { - (void)new QListViewItem(lbox, lbox->lastItem(), rman->dm_desc); + (void)new TQListViewItem(lbox, lbox->lastItem(), rman->dm_desc); devinfo_foreach_rman_resource(rman, print_resource, arg); } else if (strcmp(rman->dm_desc, "I/O memory addresses")==0) { - (void)new QListViewItem(lbox, lbox->lastItem(), rman->dm_desc); + (void)new TQListViewItem(lbox, lbox->lastItem(), rman->dm_desc); devinfo_foreach_rman_resource(rman, print_resource, arg); } return(0); @@ -426,11 +426,11 @@ int print_resource(struct devinfo_res *res, void *arg) struct devinfo_rman *rman; int hexmode; - QListView *lbox; + TQListView *lbox; - lbox = (QListView *)arg; + lbox = (TQListView *)arg; - QString s, tmp; + TQString s, tmp; rman = devinfo_handle_to_rman(res->dr_rman); hexmode = (rman->dm_size > 100) || (rman->dm_size == 0); @@ -450,7 +450,7 @@ int print_resource(struct devinfo_res *res, void *arg) } s += tmp; - (void)new QListViewItem(lbox, lbox->lastItem(), s); + (void)new TQListViewItem(lbox, lbox->lastItem(), s); return(0); } diff --git a/kcontrol/info/info_generic.cpp b/kcontrol/info/info_generic.cpp index 5ef80dcca..367e1657b 100644 --- a/kcontrol/info/info_generic.cpp +++ b/kcontrol/info/info_generic.cpp @@ -31,58 +31,58 @@ */ -bool GetInfo_CPU( QListView * ) +bool GetInfo_CPU( TQListView * ) { return false; } -bool GetInfo_IRQ( QListView * ) +bool GetInfo_IRQ( TQListView * ) { return false; } -bool GetInfo_DMA( QListView * ) +bool GetInfo_DMA( TQListView * ) { return false; } -bool GetInfo_PCI( QListView * ) +bool GetInfo_PCI( TQListView * ) { return false; } -bool GetInfo_IO_Ports( QListView * ) +bool GetInfo_IO_Ports( TQListView * ) { return false; } -bool GetInfo_Sound( QListView * ) +bool GetInfo_Sound( TQListView * ) { return false; } -bool GetInfo_Devices( QListView * ) +bool GetInfo_Devices( TQListView * ) { return false; } -bool GetInfo_SCSI( QListView * ) +bool GetInfo_SCSI( TQListView * ) { return false; } -bool GetInfo_Partitions( QListView * ) +bool GetInfo_Partitions( TQListView * ) { return false; } -bool GetInfo_XServer_and_Video( QListView *lBox ) +bool GetInfo_XServer_and_Video( TQListView *lBox ) { return GetInfo_XServer_Generic( lBox ); } /* Generic GetInfo? ~Jahshan */ -bool GetInfo_CD_ROM(QListView * lBox) +bool GetInfo_CD_ROM(TQListView * lBox) { return false; } diff --git a/kcontrol/info/info_hpux.cpp b/kcontrol/info/info_hpux.cpp index dc0684ab5..82c7cbdad 100644 --- a/kcontrol/info/info_hpux.cpp +++ b/kcontrol/info/info_hpux.cpp @@ -25,9 +25,9 @@ #include <sys/vfs.h> #include <fstab.h> #include <stdlib.h> -#include <qfile.h> -#include <qfontmetrics.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqfontmetrics.h> +#include <tqtextstream.h> #define INFO_CPU_AVAILABLE @@ -306,12 +306,12 @@ static const struct _type_LOOKUPTABLE PA_LOOKUPTABLE[] = { // Value() is defined in info.cpp !!! -static bool Find_in_LOOKUPTABLE( QListView *lBox, char *machine ) +static bool Find_in_LOOKUPTABLE( TQListView *lBox, char *machine ) { char *Machine; int len; const struct _type_LOOKUPTABLE *Entry = PA_LOOKUPTABLE; - QString str; - QListViewItem* olditem = 0; + TQString str; + TQListViewItem* olditem = 0; Machine = machine; // machine is like: "9000/715/D" @@ -328,10 +328,10 @@ static bool Find_in_LOOKUPTABLE( QListView *lBox, char *machine ) while (Entry->Name[0]) { if (strncmp(Entry->Name,Machine,len)==0) { - olditem = new QListViewItem(lBox, olditem, i18n("PA-RISC Processor"), - QString(PA_NAME[Entry->parisc_name])); - olditem = new QListViewItem(lBox, olditem, i18n("PA-RISC Revision"), - QString("PA-RISC ") + QString(PA_REVISION[Entry->parisc_rev])); + olditem = new TQListViewItem(lBox, olditem, i18n("PA-RISC Processor"), + TQString(PA_NAME[Entry->parisc_name])); + olditem = new TQListViewItem(lBox, olditem, i18n("PA-RISC Revision"), + TQString("PA-RISC ") + TQString(PA_REVISION[Entry->parisc_rev])); return true; } else @@ -348,17 +348,17 @@ static bool Find_in_LOOKUPTABLE( QListView *lBox, char *machine ) */ -bool GetInfo_CPU( QListView *lBox ) +bool GetInfo_CPU( TQListView *lBox ) { FILE *pipe; - QFile *model; + TQFile *model; struct pst_dynamic psd; struct pst_static pst; struct pst_processor pro; struct utsname info; - QString str,str2; - QListViewItem* olditem = 0; + TQString str,str2; + TQListViewItem* olditem = 0; int maxwidth,i; if((pstat_getstatic(&pst, sizeof(pst), (size_t)1, 0) == -1) || @@ -373,31 +373,31 @@ bool GetInfo_CPU( QListView *lBox ) uname(&info); - olditem = new QListViewItem(lBox, olditem, i18n("Machine"), info.machine); + olditem = new TQListViewItem(lBox, olditem, i18n("Machine"), info.machine); - model = new QFile(INFO_CPU_MODEL); + model = new TQFile(INFO_CPU_MODEL); if (model->exists()) { if ((pipe = popen(INFO_CPU_MODEL, "r"))) - { QTextStream *t = new QTextStream(pipe, IO_ReadOnly); + { TQTextStream *t = new TQTextStream(pipe, IO_ReadOnly); str = t->readLine(); - olditem = new QListViewItem(lBox, olditem, i18n("Model"), str); + olditem = new TQListViewItem(lBox, olditem, i18n("Model"), str); delete t; } delete pipe; } delete model; - olditem = new QListViewItem(lBox, olditem, i18n("Machine Identification Number"), - strlen(info.__idnumber) ? QString(info.__idnumber) : i18n("(none)") ); + olditem = new TQListViewItem(lBox, olditem, i18n("Machine Identification Number"), + strlen(info.__idnumber) ? TQString(info.__idnumber) : i18n("(none)") ); if (psd.psd_proc_cnt<=0) psd.psd_proc_cnt=1; // Minimum one CPU ! - olditem = new QListViewItem(lBox, olditem, i18n("Number of Active Processors"), + olditem = new TQListViewItem(lBox, olditem, i18n("Number of Active Processors"), Value(psd.psd_proc_cnt)); pstat_getprocessor( &pro, sizeof(pro), 1, 0 ); - olditem = new QListViewItem(lBox, olditem, i18n("CPU Clock"), + olditem = new TQListViewItem(lBox, olditem, i18n("CPU Clock"), Value(pro.psp_iticksperclktick/10000) + " " + i18n("MHz")); switch(sysconf(_SC_CPU_VERSION)) @@ -420,39 +420,39 @@ bool GetInfo_CPU( QListView *lBox ) default: str2 = i18n("(unknown)"); break; } - olditem = new QListViewItem(lBox, olditem, i18n("CPU Architecture"), str2); + olditem = new TQListViewItem(lBox, olditem, i18n("CPU Architecture"), str2); Find_in_LOOKUPTABLE( lBox, info.machine );// try to get extended Information. for (i=PS_PA83_FPU; i<=PS_PA89_FPU; ++i) { if ((1<<(i-1)) & pro.psp_coprocessor.psc_present) { - str = QString( (i==PS_PA83_FPU) ? "PS_PA83_FPU":"PS_PA89_FPU" ) - + QString(" (") - + QString(((1<<(i-1))&pro.psp_coprocessor.psc_enabled) ? + str = TQString( (i==PS_PA83_FPU) ? "PS_PA83_FPU":"PS_PA89_FPU" ) + + TQString(" (") + + TQString(((1<<(i-1))&pro.psp_coprocessor.psc_enabled) ? i18n("enabled") : i18n("disabled") ) - + QString(")"); + + TQString(")"); - olditem = new QListViewItem(lBox, olditem, i18n("Numerical Coprocessor (FPU)"), str); + olditem = new TQListViewItem(lBox, olditem, i18n("Numerical Coprocessor (FPU)"), str); } }// for(coprocessor..) str = Value(((pst.physical_memory*pst.page_size)/1024/1024)) - + QString(" ") + + TQString(" ") + i18n("MB"); // Mega-Byte - olditem = new QListViewItem(lBox, olditem, i18n("Total Physical Memory"), str); + olditem = new TQListViewItem(lBox, olditem, i18n("Total Physical Memory"), str); - str = Value(pst.page_size) + QString(" ") + i18n("Bytes"); - olditem = new QListViewItem(lBox, olditem, i18n("Size of One Page"), str); + str = Value(pst.page_size) + TQString(" ") + i18n("Bytes"); + olditem = new TQListViewItem(lBox, olditem, i18n("Size of One Page"), str); return true; } -bool GetInfo_ReadfromFile( QListView *lBox, const char *Name ) +bool GetInfo_ReadfromFile( TQListView *lBox, const char *Name ) { char buf[2048]; - QFile *file = new QFile(Name); - QListViewItem* olditem = 0; + TQFile *file = new TQFile(Name); + TQListViewItem* olditem = 0; if(!file->open(IO_ReadOnly)) { delete file; @@ -461,7 +461,7 @@ bool GetInfo_ReadfromFile( QListView *lBox, const char *Name ) while (file->readLine(buf,sizeof(buf)-1) >= 0) { if (strlen(buf)) - olditem = new QListViewItem(lBox, olditem, QString::fromLocal8Bit(buf)); + olditem = new TQListViewItem(lBox, olditem, TQString::fromLocal8Bit(buf)); } file->close(); @@ -470,23 +470,23 @@ bool GetInfo_ReadfromFile( QListView *lBox, const char *Name ) } -bool GetInfo_IRQ( QListView * ) +bool GetInfo_IRQ( TQListView * ) { return false; } -bool GetInfo_DMA( QListView * ) +bool GetInfo_DMA( TQListView * ) { return false; } -bool GetInfo_PCI( QListView *lBox ) +bool GetInfo_PCI( TQListView *lBox ) { return( GetInfo_ReadfromFile(lBox,INFO_PCI) + GetInfo_ReadfromFile(lBox,INFO_PCI_EISA) ); } -bool GetInfo_IO_Ports( QListView *lBox ) +bool GetInfo_IO_Ports( TQListView *lBox ) { if (GetInfo_ReadfromPipe( lBox, INFO_IOPORTS_1, false )) return true; @@ -495,12 +495,12 @@ bool GetInfo_IO_Ports( QListView *lBox ) } -bool GetInfo_Devices( QListView *lBox ) +bool GetInfo_Devices( TQListView *lBox ) { return GetInfo_ReadfromPipe( lBox, INFO_DEVICES, false ); } -bool GetInfo_SCSI( QListView *lBox ) +bool GetInfo_SCSI( TQListView *lBox ) { return GetInfo_Devices( lBox ); } @@ -554,17 +554,17 @@ static int get_fs_usage (char *path, long *l_total, long *l_avail) // Some Ideas taken from garbazo from his source in info_fbsd.cpp -bool GetInfo_Partitions (QListView *lbox) +bool GetInfo_Partitions (TQListView *lbox) { #define NUMCOLS 5 - QString Title[NUMCOLS]; + TQString Title[NUMCOLS]; int n; struct fstab *fstab_ent; struct statvfs svfs; long total,avail; - QString str; - QString MB(i18n("MB")+ " "); // International Text for MB=Mega-Byte + TQString str; + TQString MB(i18n("MB")+ " "); // International Text for MB=Mega-Byte if (setfsent() != 1) // Try to open fstab return false; @@ -589,16 +589,16 @@ bool GetInfo_Partitions (QListView *lbox) svfs.f_basetype[0] = 0; if(svfs.f_basetype[0]) { - new QListViewItem(lbox, QString(fstab_ent->fs_spec), - QString(fstab_ent->fs_file) + QString(" "), - (svfs.f_basetype[0] ? QString(svfs.f_basetype) : i18n("n/a")), + new TQListViewItem(lbox, TQString(fstab_ent->fs_spec), + TQString(fstab_ent->fs_file) + TQString(" "), + (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a")), Value((total+512)/1024,6) + MB, Value((avail+512)/1024,6) + MB); } else { - new QListViewItem(lbox, QString(fstab_ent->fs_spec), - QString(fstab_ent->fs_file) + QString(" "), - (svfs.f_basetype[0] ? QString(svfs.f_basetype) : i18n("n/a"))); + new TQListViewItem(lbox, TQString(fstab_ent->fs_spec), + TQString(fstab_ent->fs_file) + TQString(" "), + (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a"))); } } @@ -608,7 +608,7 @@ bool GetInfo_Partitions (QListView *lbox) } -bool GetInfo_XServer_and_Video( QListView *lBox ) +bool GetInfo_XServer_and_Video( TQListView *lBox ) { lBox = lBox; return GetInfo_XServer_Generic( lBox ); @@ -620,7 +620,7 @@ bool GetInfo_XServer_and_Video( QListView *lBox ) #ifndef HAVE_ALIB_H -bool GetInfo_Sound( QListView *lBox ) +bool GetInfo_Sound( TQListView *lBox ) { lBox = lBox; *GetInfo_ErrorString = i18n("Audio-Support (Alib) was disabled during configuration and compile-time."); return false; @@ -640,15 +640,15 @@ static const char formatNames[6][15] = { #endif -bool GetInfo_Sound( QListView *lBox ) +bool GetInfo_Sound( TQListView *lBox ) { Audio *audio; long status; char server[80]; int i; - QString str,str2; - QListViewItem* olditem = 0; + TQString str,str2; + TQListViewItem* olditem = 0; // server = Hostname.... server[0] = 0; @@ -661,120 +661,120 @@ bool GetInfo_Sound( QListView *lBox ) lBox->addColumn(i18n("Information") ); lBox->addColumn(i18n("Value") ); - olditem = new QListViewItem(lBox, olditem, i18n("Audio Name"), QString(audio->audio_name)); - olditem = new QListViewItem(lBox, olditem, i18n("Vendor"), QString(audio->vendor)); - olditem = new QListViewItem(lBox, olditem, i18n("Alib Version"), - Value(audio->alib_major_version) + QString(".") + + olditem = new TQListViewItem(lBox, olditem, i18n("Audio Name"), TQString(audio->audio_name)); + olditem = new TQListViewItem(lBox, olditem, i18n("Vendor"), TQString(audio->vendor)); + olditem = new TQListViewItem(lBox, olditem, i18n("Alib Version"), + Value(audio->alib_major_version) + TQString(".") + Value(audio->alib_minor_version)); - olditem = new QListViewItem(lBox, olditem, i18n("Protocol Revision"), - Value(audio->proto_major_version) + QString(".") + + olditem = new TQListViewItem(lBox, olditem, i18n("Protocol Revision"), + Value(audio->proto_major_version) + TQString(".") + Value(audio->proto_minor_version)); - olditem = new QListViewItem(lBox, olditem, i18n("Vendor Number"), + olditem = new TQListViewItem(lBox, olditem, i18n("Vendor Number"), Value(audio->vnumber)); - olditem = new QListViewItem(lBox, olditem, i18n("Release"), + olditem = new TQListViewItem(lBox, olditem, i18n("Release"), Value(audio->release)); - olditem = new QListViewItem(lBox, olditem, i18n("Byte Order"), - QString((audio->byte_order==ALSBFirst)? i18n("ALSBFirst (LSB)"): + olditem = new TQListViewItem(lBox, olditem, i18n("Byte Order"), + TQString((audio->byte_order==ALSBFirst)? i18n("ALSBFirst (LSB)"): ((audio->byte_order==AMSBFirst)? i18n("AMSBFirst (MSB)"): i18n("Invalid Byteorder.")) )); - olditem = new QListViewItem(lBox, olditem, i18n("Bit Order"), - QString((audio->sound_bit_order==ALeastSignificant)? + olditem = new TQListViewItem(lBox, olditem, i18n("Bit Order"), + TQString((audio->sound_bit_order==ALeastSignificant)? i18n("ALeastSignificant (LSB)") : ((audio->sound_bit_order==AMostSignificant) ? i18n("AMostSignificant (MSB)"):i18n("Invalid Bitorder.")) )); - olditem = new QListViewItem(lBox, olditem, i18n("Data Formats")); + olditem = new TQListViewItem(lBox, olditem, i18n("Data Formats")); for ( i = 0; i < audio->n_data_format; i++ ) { if (audio->data_format_list[i] <= ADFLin8Offset) - new QListViewItem(olditem, QString(formatNames[audio->data_format_list[i]])); + new TQListViewItem(olditem, TQString(formatNames[audio->data_format_list[i]])); } olditem->setOpen(true); - olditem = new QListViewItem(lBox, olditem, i18n("Sampling Rates")); + olditem = new TQListViewItem(lBox, olditem, i18n("Sampling Rates")); for ( i = 0; i < audio->n_sampling_rate; i++ ) { - new QListViewItem(olditem, Value(audio->sampling_rate_list[i])); + new TQListViewItem(olditem, Value(audio->sampling_rate_list[i])); } olditem->setOpen(true); - olditem = new QListViewItem(lBox, olditem, i18n("Input Sources")); + olditem = new TQListViewItem(lBox, olditem, i18n("Input Sources")); if ( audio->input_sources & AMonoMicrophoneMask ) - new QListViewItem(olditem, i18n("Mono-Microphone")); + new TQListViewItem(olditem, i18n("Mono-Microphone")); if ( audio->input_sources & AMonoAuxiliaryMask ) - new QListViewItem(olditem, i18n("Mono-Auxiliary")); + new TQListViewItem(olditem, i18n("Mono-Auxiliary")); if ( audio->input_sources & ALeftMicrophoneMask ) - new QListViewItem(olditem, i18n("Left-Microphone")); + new TQListViewItem(olditem, i18n("Left-Microphone")); if ( audio->input_sources & ARightMicrophoneMask ) - new QListViewItem(olditem, i18n("Right-Microphone")); + new TQListViewItem(olditem, i18n("Right-Microphone")); if ( audio->input_sources & ALeftAuxiliaryMask ) - new QListViewItem(olditem, i18n("Left-Auxiliary")); + new TQListViewItem(olditem, i18n("Left-Auxiliary")); if ( audio->input_sources & ARightAuxiliaryMask ) - new QListViewItem(olditem, i18n("Right-Auxiliary")); + new TQListViewItem(olditem, i18n("Right-Auxiliary")); olditem->setOpen(true); - olditem = new QListViewItem(lBox, olditem,i18n("Input Channels")); + olditem = new TQListViewItem(lBox, olditem,i18n("Input Channels")); if ( audio->input_channels & AMonoInputChMask ) - new QListViewItem(olditem, i18n("Mono-Channel")); + new TQListViewItem(olditem, i18n("Mono-Channel")); if ( audio->input_channels & ALeftInputChMask ) - new QListViewItem(olditem, i18n("Left-Channel")); + new TQListViewItem(olditem, i18n("Left-Channel")); if ( audio->input_channels & ARightInputChMask ) - new QListViewItem(olditem, i18n("Right-Channel")); + new TQListViewItem(olditem, i18n("Right-Channel")); olditem->setOpen(true); - olditem = new QListViewItem(lBox, olditem, i18n("Output Destinations")); + olditem = new TQListViewItem(lBox, olditem, i18n("Output Destinations")); if ( audio->output_destinations & AMonoIntSpeakerMask ) - new QListViewItem(olditem, i18n("Mono-InternalSpeaker")); + new TQListViewItem(olditem, i18n("Mono-InternalSpeaker")); if ( audio->output_destinations & AMonoJackMask ) - new QListViewItem(olditem, i18n("Mono-Jack")); + new TQListViewItem(olditem, i18n("Mono-Jack")); if ( audio->output_destinations & ALeftIntSpeakerMask ) - new QListViewItem(olditem, i18n("Left-InternalSpeaker")); + new TQListViewItem(olditem, i18n("Left-InternalSpeaker")); if ( audio->output_destinations & ARightIntSpeakerMask ) - new QListViewItem(olditem, i18n("Right-InternalSpeaker")); + new TQListViewItem(olditem, i18n("Right-InternalSpeaker")); if ( audio->output_destinations & ALeftJackMask ) - new QListViewItem(olditem, i18n("Left-Jack")); + new TQListViewItem(olditem, i18n("Left-Jack")); if ( audio->output_destinations & ARightJackMask ) - new QListViewItem(olditem, i18n("Right-Jack")); + new TQListViewItem(olditem, i18n("Right-Jack")); olditem->setOpen(true); - olditem = new QListViewItem(lBox, olditem, i18n("Output Channels")); + olditem = new TQListViewItem(lBox, olditem, i18n("Output Channels")); if ( audio->output_channels & AMonoOutputChMask ) - new QListViewItem(olditem, i18n("Mono-Channel")); + new TQListViewItem(olditem, i18n("Mono-Channel")); if ( audio->output_channels & ALeftOutputChMask ) - new QListViewItem(olditem, i18n("Left-Channel")); + new TQListViewItem(olditem, i18n("Left-Channel")); if ( audio->output_channels & ARightOutputChMask ) - new QListViewItem(olditem, i18n("Right-Channel")); + new TQListViewItem(olditem, i18n("Right-Channel")); olditem->setOpen(true); - olditem = new QListViewItem(lBox, olditem, i18n("Gain")); - new QListViewItem(olditem, i18n("Input Gain Limits"), + olditem = new TQListViewItem(lBox, olditem, i18n("Gain")); + new TQListViewItem(olditem, i18n("Input Gain Limits"), Value(audio->max_input_gain)); - new QListViewItem(olditem,i18n("Output Gain Limits"), - Value(audio->min_output_gain) + QString(" ") + new TQListViewItem(olditem,i18n("Output Gain Limits"), + Value(audio->min_output_gain) + TQString(" ") + Value(audio->max_output_gain)); - new QListViewItem(olditem, i18n("Monitor Gain Limits"), - Value(audio->min_monitor_gain) + QString(" ") + new TQListViewItem(olditem, i18n("Monitor Gain Limits"), + Value(audio->min_monitor_gain) + TQString(" ") + Value(audio->max_monitor_gain)); - new QListViewItem(olditem, i18n("Gain Restricted"), + new TQListViewItem(olditem, i18n("Gain Restricted"), Value(audio->gm_gain_restricted)); olditem->setOpen(true); - olditem = new QListViewItem(lBox, olditem,i18n("Lock"), + olditem = new TQListViewItem(lBox, olditem,i18n("Lock"), Value(audio->lock)); - olditem = new QListViewItem(lBox, olditem, i18n("Queue Length"), + olditem = new TQListViewItem(lBox, olditem, i18n("Queue Length"), Value(audio->qlen)); - olditem = new QListViewItem(lBox, olditem, i18n("Block Size"), + olditem = new TQListViewItem(lBox, olditem, i18n("Block Size"), Value(audio->block_size)); - olditem = new QListViewItem(lBox, olditem, i18n("Stream Port (decimal)"), + olditem = new TQListViewItem(lBox, olditem, i18n("Stream Port (decimal)"), Value(audio->stream_port)); - olditem = new QListViewItem(lBox, olditem, i18n("Ev Buffer Size"), + olditem = new TQListViewItem(lBox, olditem, i18n("Ev Buffer Size"), Value(audio->ev_buf_size)); - olditem = new QListViewItem(lBox, olditem, i18n("Ext Number"), + olditem = new TQListViewItem(lBox, olditem, i18n("Ext Number"), Value(audio->ext_number)); ACloseAudio( audio, &status ); diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp index 9d29e890e..18287c45f 100644 --- a/kcontrol/info/info_linux.cpp +++ b/kcontrol/info/info_linux.cpp @@ -36,7 +36,7 @@ # undef INFO_PARTITIONS_FULL_INFO /* no partitions-info */ #endif -#include <qregexp.h> +#include <tqregexp.h> #include <kapplication.h> #include <kiconloader.h> @@ -82,13 +82,13 @@ #define MAXCOLUMNWIDTH 600 -bool GetInfo_ReadfromFile(QListView * lbox, const char *FileName, - const QChar& splitChar, - QListViewItem * lastitem = 0, - QListViewItem ** newlastitem = 0) +bool GetInfo_ReadfromFile(TQListView * lbox, const char *FileName, + const TQChar& splitChar, + TQListViewItem * lastitem = 0, + TQListViewItem ** newlastitem = 0) { bool added = false; - QFile file(FileName); + TQFile file(FileName); if (!file.exists()) { return false; @@ -101,11 +101,11 @@ bool GetInfo_ReadfromFile(QListView * lbox, const char *FileName, */ return false; } - QTextStream stream(&file); - QString line; + TQTextStream stream(&file); + TQString line; while (!stream.atEnd()) { - QString s1, s2; + TQString s1, s2; line = stream.readLine(); if (!line.isEmpty()) { if (!splitChar.isNull()) { @@ -116,7 +116,7 @@ bool GetInfo_ReadfromFile(QListView * lbox, const char *FileName, else s1 = line; } - lastitem = new QListViewItem(lbox, lastitem, s1, s2); + lastitem = new TQListViewItem(lbox, lastitem, s1, s2); added = true; } @@ -130,7 +130,7 @@ bool GetInfo_ReadfromFile(QListView * lbox, const char *FileName, -bool GetInfo_CPU(QListView * lBox) +bool GetInfo_CPU(TQListView * lBox) { lBox->addColumn(i18n("Information")); lBox->addColumn(i18n("Value")); @@ -138,30 +138,30 @@ bool GetInfo_CPU(QListView * lBox) } -bool GetInfo_IRQ(QListView * lBox) +bool GetInfo_IRQ(TQListView * lBox) { lBox->setFont(KGlobalSettings::fixedFont()); return GetInfo_ReadfromFile(lBox, INFO_IRQ, 0); } -bool GetInfo_DMA(QListView * lBox) +bool GetInfo_DMA(TQListView * lBox) { - QFile file(INFO_DMA); + TQFile file(INFO_DMA); lBox->addColumn(i18n("DMA-Channel")); lBox->addColumn(i18n("Used By")); if (file.exists() && file.open(IO_ReadOnly)) { - QTextStream stream(&file); - QString line; - QListViewItem *child=0L; + TQTextStream stream(&file); + TQString line; + TQListViewItem *child=0L; while (!stream.atEnd()) { line = stream.readLine(); if (!line.isEmpty()) { - QRegExp rx("^\\s*(\\S+)\\s*:\\s*(\\S+)"); + TQRegExp rx("^\\s*(\\S+)\\s*:\\s*(\\S+)"); if (-1 != rx.search(line)) { - child = new QListViewItem(lBox,child,rx.cap(1),rx.cap(2)); + child = new TQListViewItem(lBox,child,rx.cap(1),rx.cap(2)); } } } @@ -173,7 +173,7 @@ bool GetInfo_DMA(QListView * lBox) return true; } -bool GetInfo_PCI(QListView * lBox) +bool GetInfo_PCI(TQListView * lBox) { int num; sorting_allowed = false; /* no sorting by user */ @@ -189,14 +189,14 @@ bool GetInfo_PCI(QListView * lBox) return GetInfo_ReadfromFile(lBox, INFO_PCI, 0); } -bool GetInfo_IO_Ports(QListView * lBox) +bool GetInfo_IO_Ports(TQListView * lBox) { lBox->addColumn(i18n("I/O-Range")); lBox->addColumn(i18n("Used By")); return GetInfo_ReadfromFile(lBox, INFO_IOPORTS, ':'); } -bool GetInfo_Sound(QListView * lBox) +bool GetInfo_Sound(TQListView * lBox) { sorting_allowed = false; /* no sorting by user */ if (GetInfo_ReadfromFile(lBox, INFO_DEV_SNDSTAT, 0)) @@ -209,10 +209,10 @@ bool GetInfo_Sound(QListView * lBox) return GetInfo_ReadfromFile(lBox, INFO_ASOUND09, 0); } -bool GetInfo_Devices(QListView * lBox) +bool GetInfo_Devices(TQListView * lBox) { - QFile file; - QListViewItem *misc=0L; + TQFile file; + TQListViewItem *misc=0L; lBox->setRootIsDecorated(true); lBox->addColumn(i18n("Devices")); @@ -221,28 +221,28 @@ bool GetInfo_Devices(QListView * lBox) file.setName(INFO_DEVICES); if (file.exists() && file.open(IO_ReadOnly)) { - QTextStream stream(&file); - QString line; - QListViewItem *parent=0L, *child=0L; + TQTextStream stream(&file); + TQString line; + TQListViewItem *parent=0L, *child=0L; while (!stream.atEnd()) { line = stream.readLine(); if (!line.isEmpty()) { if (-1 != line.find("character device",0,false)) { - parent = new QListViewItem(lBox,parent,i18n("Character Devices")); + parent = new TQListViewItem(lBox,parent,i18n("Character Devices")); parent->setPixmap(0,SmallIcon("chardevice")); parent->setOpen(true); } else if (-1 != line.find("block device",0,false)) { - parent = new QListViewItem(lBox,parent,i18n("Block Devices")); + parent = new TQListViewItem(lBox,parent,i18n("Block Devices")); parent->setPixmap(0,SmallIcon("blockdevice")); parent->setOpen(true); } else { - QRegExp rx("^\\s*(\\S+)\\s+(\\S+)"); + TQRegExp rx("^\\s*(\\S+)\\s+(\\S+)"); if (-1 != rx.search(line)) { if (parent) { - child = new QListViewItem(parent,child,rx.cap(2),rx.cap(1)); + child = new TQListViewItem(parent,child,rx.cap(2),rx.cap(1)); } else { - child = new QListViewItem(lBox,parent,rx.cap(2),rx.cap(1)); + child = new TQListViewItem(lBox,parent,rx.cap(2),rx.cap(1)); } if (rx.cap(2)=="misc") { misc=child; @@ -258,9 +258,9 @@ bool GetInfo_Devices(QListView * lBox) file.setName(INFO_MISC); if (misc && file.exists() && file.open(IO_ReadOnly)) { - QTextStream stream(&file); - QString line; - QListViewItem *child=0L; + TQTextStream stream(&file); + TQString line; + TQListViewItem *child=0L; misc->setText(0,i18n("Miscellaneous Devices")); misc->setPixmap(0,SmallIcon("memory")); @@ -269,9 +269,9 @@ bool GetInfo_Devices(QListView * lBox) while (!stream.atEnd()) { line = stream.readLine(); if (!line.isEmpty()) { - QRegExp rx("^\\s*(\\S+)\\s+(\\S+)"); + TQRegExp rx("^\\s*(\\S+)\\s+(\\S+)"); if (-1 != rx.search(line)) { - child = new QListViewItem(misc,child,rx.cap(2),"10",rx.cap(1)); + child = new TQListViewItem(misc,child,rx.cap(2),"10",rx.cap(1)); } } } @@ -281,15 +281,15 @@ bool GetInfo_Devices(QListView * lBox) return true; } -bool GetInfo_SCSI(QListView * lBox) +bool GetInfo_SCSI(TQListView * lBox) { return GetInfo_ReadfromFile(lBox, INFO_SCSI, 0); } -static void cleanPassword(QString & str) +static void cleanPassword(TQString & str) { int index = 0; - QString passwd("password="); + TQString passwd("password="); while (index >= 0) { @@ -305,7 +305,7 @@ static void cleanPassword(QString & str) #ifndef INFO_PARTITIONS_FULL_INFO -bool GetInfo_Partitions(QListView * lBox) +bool GetInfo_Partitions(TQListView * lBox) { return GetInfo_ReadfromFile(lBox, INFO_PARTITIONS, 0); } @@ -341,13 +341,13 @@ bool GetInfo_Partitions(QListView * lBox) /* * get raw device bindings and information */ -void Get_LinuxRawDevices(QListView *lbox) +void Get_LinuxRawDevices(TQListView *lbox) { int f, i, err; int new_raw_devs = 1; struct raw_config_request rq; - QString devname; - QString MB(i18n("MB")); /* "MB" = "Mega-Byte" */ + TQString devname; + TQString MB(i18n("MB")); /* "MB" = "Mega-Byte" */ /* try to open the raw device control file */ f = open("/dev/rawctl", O_RDWR); @@ -371,8 +371,8 @@ void Get_LinuxRawDevices(QListView *lbox) /* IDE drives */ case 3: first_letter = 'a'; set_ide_name: - devname = QString("/dev/hd%1%2") - .arg(QChar(first_letter + minor/64)) + devname = TQString("/dev/hd%1%2") + .arg(TQChar(first_letter + minor/64)) .arg(minor&63); break; case 22:first_letter = 'c'; goto set_ide_name; @@ -388,8 +388,8 @@ void Get_LinuxRawDevices(QListView *lbox) /* SCSI drives */ case 8: first_letter = 'a'; set_scsi_name: - devname = QString("/dev/sd%1%2") - .arg(QChar(first_letter + minor/16)) + devname = TQString("/dev/sd%1%2") + .arg(TQChar(first_letter + minor/16)) .arg(minor&15); break; case 65:first_letter = 'q'; goto set_scsi_name; @@ -397,7 +397,7 @@ void Get_LinuxRawDevices(QListView *lbox) /* Compaq /dev/cciss devices */ case 104: case 105: case 106: case 107: case 108: case 109: - devname = QString("/dev/cciss/c%1d%2") + devname = TQString("/dev/cciss/c%1d%2") .arg((int)rq.block_major-104) .arg(minor&15); break; @@ -405,22 +405,22 @@ void Get_LinuxRawDevices(QListView *lbox) /* Compaq Intelligent Drive Array (ida) */ case 72: case 73: case 74: case 75: case 76: case 77: case 78: case 79: - devname = QString("/dev/ida/c%1d%2") + devname = TQString("/dev/ida/c%1d%2") .arg((int)rq.block_major-72) .arg(minor&15); break; - default: devname = QString("%1/%2") + default: devname = TQString("%1/%2") .arg((int)rq.block_major) .arg(minor); } /* TODO: get device size */ - QString size = ""; + TQString size = ""; - new QListViewItem(lbox, devname, - QString(new_raw_devs ? "/dev/raw/raw%1" : "/dev/raw%1").arg(i), + new TQListViewItem(lbox, devname, + TQString(new_raw_devs ? "/dev/raw/raw%1" : "/dev/raw%1").arg(i), "raw", size, " ", ""); } close(f); @@ -429,11 +429,11 @@ void Get_LinuxRawDevices(QListView *lbox) #define Get_LinuxRawDevices(x) /* nothing */ #endif -bool GetInfo_Partitions(QListView * lbox) +bool GetInfo_Partitions(TQListView * lbox) { #define NUMCOLS 6 - QString Title[NUMCOLS]; - QStringList Mounted_Partitions; + TQString Title[NUMCOLS]; + TQStringList Mounted_Partitions; bool found_in_List; int n; @@ -454,8 +454,8 @@ bool GetInfo_Partitions(QListView * lbox) struct statfs sfs; LONG_TYPE total, avail; - QString str, mountopts; - QString MB(i18n("MB")); /* "MB" = "Mega-Byte" */ + TQString str, mountopts; + TQString MB(i18n("MB")); /* "MB" = "Mega-Byte" */ #ifdef HAVE_FSTAB_H @@ -467,11 +467,11 @@ bool GetInfo_Partitions(QListView * lbox) #endif /* read the list of already mounted file-systems.. */ - QFile *file = new QFile(INFO_MOUNTED_PARTITIONS); + TQFile *file = new TQFile(INFO_MOUNTED_PARTITIONS); if (file->open(IO_ReadOnly)) { char buf[1024]; while (file->readLine(buf, sizeof( buf )) > 0) { - str = QString::fromLocal8Bit(buf); + str = TQString::fromLocal8Bit(buf); if (str.length()) { int p = str.find(' '); /* find first space. */ if (p) @@ -484,7 +484,7 @@ bool GetInfo_Partitions(QListView * lbox) delete file; /* create the header-tables */ - MB = QString(" ") + MB; + MB = TQString(" ") + MB; Title[0] = i18n("Device"); Title[1] = i18n("Mount Point"); Title[2] = i18n("FS Type"); @@ -518,16 +518,16 @@ bool GetInfo_Partitions(QListView * lbox) mountopts = FS_MNTOPS; cleanPassword(mountopts); if (total) - new QListViewItem(lbox, QString(FS_NAME) + " ", - QString(FS_FILE) + " ", - QString(FS_TYPE) + " ", + new TQListViewItem(lbox, TQString(FS_NAME) + " ", + TQString(FS_FILE) + " ", + TQString(FS_TYPE) + " ", Value((int) (((total / 1024) + 512) / 1024), 6) + MB, Value((int) (((avail / 1024) + 512) / 1024), 6) + MB, mountopts); else - new QListViewItem(lbox, QString(FS_NAME), QString(FS_FILE), - QString(FS_TYPE), " ", " ", mountopts); + new TQListViewItem(lbox, TQString(FS_NAME), TQString(FS_FILE), + TQString(FS_TYPE), " ", " ", mountopts); } #ifdef HAVE_FSTAB_H @@ -549,40 +549,40 @@ bool GetInfo_Partitions(QListView * lbox) -bool GetInfo_XServer_and_Video(QListView * lBox) +bool GetInfo_XServer_and_Video(TQListView * lBox) { return GetInfo_XServer_Generic(lBox); } /* GetInfo for CD-ROM Info by Jahshan Bhatti */ -bool GetInfo_CD_ROM(QListView * lBox) +bool GetInfo_CD_ROM(TQListView * lBox) { - QFile file(INFO_CD_ROM); + TQFile file(INFO_CD_ROM); lBox->addColumn(i18n("Information")); lBox->addColumn(i18n("Value")); if (file.exists() && file.open(IO_ReadOnly)) { - QRegExp rx("(.+):\\s+(\\S.*)"); - QTextStream stream(&file); - QString line; - QListViewItem *child = NULL; + TQRegExp rx("(.+):\\s+(\\S.*)"); + TQTextStream stream(&file); + TQString line; + TQListViewItem *child = NULL; while (!stream.atEnd()) { line = stream.readLine(); if (!line.isEmpty()) { if (-1 != rx.search(line)) { - QString text = rx.cap(1); - QString value = rx.cap(2); + TQString text = rx.cap(1); + TQString value = rx.cap(2); if (!text.contains('#')) { if (value == "0") value = KStdGuiItem::no().plainText(); if (value == "1") value = KStdGuiItem::yes().plainText(); } - child = new QListViewItem(lBox,child,text,value); + child = new TQListViewItem(lBox,child,text,value); } } else { - child = new QListViewItem(lBox,child,QString::null,QString::null); + child = new TQListViewItem(lBox,child,TQString::null,TQString::null); } } file.close(); diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index 228e32fb0..02fd98b1d 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -37,10 +37,10 @@ #include <stdlib.h> /* for malloc(3) */ #include <fstab.h> -#include <qfile.h> -#include <qfontmetrics.h> -#include <qstrlist.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqfontmetrics.h> +#include <tqstrlist.h> +#include <tqtextstream.h> #include <kdebug.h> #include <kio/global.h> /* for KIO::convertSize() */ @@ -52,7 +52,7 @@ typedef struct const char *title; } hw_info_mib_list_t; -bool GetInfo_CPU(QListView *lBox) +bool GetInfo_CPU(TQListView *lBox) { static hw_info_mib_list_t hw_info_mib_list[]= { { 1, HW_MODEL, "Model" }, @@ -67,7 +67,7 @@ bool GetInfo_CPU(QListView *lBox) int mib[2], num; char *buf; size_t len; - QString value; + TQString value; lBox->addColumn(i18n("Information")); lBox->addColumn(i18n("Value")); @@ -80,19 +80,19 @@ bool GetInfo_CPU(QListView *lBox) sysctl(mib,2,NULL,&len,NULL,0); if ( (buf = (char*)malloc(len)) ) { sysctl(mib,2,buf,&len,NULL,0); - value = QString::fromLocal8Bit(buf); + value = TQString::fromLocal8Bit(buf); free(buf); } else { - value = QString("Unknown"); + value = TQString("Unknown"); } } else { len = sizeof(num); sysctl(mib,2,&num,&len,NULL,0); - value = QString::number(num); + value = TQString::number(num); } - new QListViewItem(lBox, hw_info_mib->title, value); + new TQListViewItem(lBox, hw_info_mib->title, value); } return true; @@ -100,29 +100,29 @@ bool GetInfo_CPU(QListView *lBox) // this is used to find out which devices are currently // on system -static bool GetDmesgInfo(QListView *lBox, const char *filter, - void func(QListView *, QString s)) +static bool GetDmesgInfo(TQListView *lBox, const char *filter, + void func(TQListView *, TQString s)) { - QFile *dmesg = new QFile("/var/run/dmesg.boot"); + TQFile *dmesg = new TQFile("/var/run/dmesg.boot"); bool usepipe = false; FILE *pipe = NULL; - QTextStream *t; + TQTextStream *t; bool seencpu = false; - QString s; + TQString s; bool found = false; if (dmesg->exists() && dmesg->open(IO_ReadOnly)) { - t = new QTextStream(dmesg); + t = new TQTextStream(dmesg); } else { delete dmesg; pipe = popen("/sbin/dmesg", "r"); if (!pipe) return false; usepipe = true; - t = new QTextStream(pipe, IO_ReadOnly); + t = new TQTextStream(pipe, IO_ReadOnly); } - QListViewItem *olditem = NULL; + TQListViewItem *olditem = NULL; while(!(s = t->readLine().local8Bit()).isEmpty()) { if (!seencpu) { if (s.contains("cpu")) @@ -140,7 +140,7 @@ static bool GetDmesgInfo(QListView *lBox, const char *filter, if (func) func(lBox, s); else - olditem = new QListViewItem(lBox, olditem, s); + olditem = new TQListViewItem(lBox, olditem, s); found = true; } } @@ -158,7 +158,7 @@ static bool GetDmesgInfo(QListView *lBox, const char *filter, void -AddIRQLine(QListView *lBox, QString s) +AddIRQLine(TQListView *lBox, TQString s) { int pos, irqnum; char numstr[3]; @@ -172,10 +172,10 @@ AddIRQLine(QListView *lBox, QString s) strcpy(numstr, "??"); } - new QListViewItem(lBox, numstr, s); + new TQListViewItem(lBox, numstr, s); } -bool GetInfo_IRQ (QListView *lBox) +bool GetInfo_IRQ (TQListView *lBox) { lBox->addColumn(i18n("IRQ")); lBox->addColumn(i18n("Device")); @@ -185,36 +185,36 @@ bool GetInfo_IRQ (QListView *lBox) return true; } -bool GetInfo_DMA (QListView *) +bool GetInfo_DMA (TQListView *) { return false; } -bool GetInfo_PCI (QListView *lbox) +bool GetInfo_PCI (TQListView *lbox) { if (!GetDmesgInfo(lbox, "at pci", NULL)) - new QListViewItem(lbox, i18n("No PCI devices found.")); + new TQListViewItem(lbox, i18n("No PCI devices found.")); return true; } -bool GetInfo_IO_Ports (QListView *lbox) +bool GetInfo_IO_Ports (TQListView *lbox) { if (!GetDmesgInfo(lbox, "port 0x", NULL)) - new QListViewItem(lbox, i18n("No I/O port devices found.")); + new TQListViewItem(lbox, i18n("No I/O port devices found.")); return true; } -bool GetInfo_Sound (QListView *lbox) +bool GetInfo_Sound (TQListView *lbox) { lbox->setSorting(false); if (!GetDmesgInfo(lbox, "audio", NULL)) - new QListViewItem(lbox, i18n("No audio devices found.")); + new TQListViewItem(lbox, i18n("No audio devices found.")); // append information for each audio devices found - QListViewItem *lvitem = lbox->firstChild(); + TQListViewItem *lvitem = lbox->firstChild(); for(; lvitem; lvitem = lvitem->nextSibling()) { - QString s; + TQString s; int pos, len; const char *start; char *dev; @@ -237,21 +237,21 @@ bool GetInfo_Sound (QListView *lbox) return true; } -bool GetInfo_Devices (QListView *lBox) +bool GetInfo_Devices (TQListView *lBox) { (void) GetDmesgInfo(lBox, NULL, NULL); return true; } -bool GetInfo_SCSI (QListView *lbox) +bool GetInfo_SCSI (TQListView *lbox) { if (!GetDmesgInfo(lbox, "scsibus", NULL)) - new QListViewItem(lbox, i18n("No SCSI devices found.")); + new TQListViewItem(lbox, i18n("No SCSI devices found.")); // remove the 'waiting %d seconds for devices to settle' message - QListViewItem *lvitem = lbox->firstChild(); + TQListViewItem *lvitem = lbox->firstChild(); for(; lvitem; lvitem = lvitem->nextSibling()) { - QString s = lvitem->text(0); + TQString s = lvitem->text(0); if (s.contains("seconds for devices to settle")) { lbox->removeItem(lvitem); @@ -262,7 +262,7 @@ bool GetInfo_SCSI (QListView *lbox) return true; } -bool GetInfo_Partitions (QListView *lbox) +bool GetInfo_Partitions (TQListView *lbox) { int num; // number of mounts // FIXME: older pkgsrc patches checked ST_RDONLY for this declaration @@ -288,7 +288,7 @@ bool GetInfo_Partitions (QListView *lbox) // mnt points into a static array (no need to free it) for(; num--; ++mnt) { unsigned long long big[2]; - QString vv[5]; + TQString vv[5]; big[0] = big[1] = mnt->f_bsize; // coerce the product big[0] *= mnt->f_blocks; @@ -296,18 +296,18 @@ bool GetInfo_Partitions (QListView *lbox) // convert to strings vv[0] = KIO::convertSize(big[0]); - vv[1] = QString::fromLatin1("%1 (%2%%)") + vv[1] = TQString::fromLatin1("%1 (%2%%)") .arg(KIO::convertSize(big[1])) .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0); // FIXME: these two are large enough to punctuate - vv[2] = QString::number(mnt->f_files); - vv[3] = QString::fromLatin1("%1 (%2%%) ") + vv[2] = TQString::number(mnt->f_files); + vv[3] = TQString::fromLatin1("%1 (%2%%) ") .arg(mnt->f_ffree) .arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0); - vv[4] = QString::null; -#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += QString::fromLatin1(#x " "); + vv[4] = TQString::null; +#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " "); MNTF(ASYNC) MNTF(DEFEXPORTED) MNTF(EXKERB) @@ -335,7 +335,7 @@ bool GetInfo_Partitions (QListView *lbox) // put it in the table // FIXME: there're more data but we have limited args (this is wrong! just add!) - new QListViewItem(lbox, + new TQListViewItem(lbox, // FIXME: names need pad space mnt->f_mntfromname, mnt->f_mntonname, @@ -347,7 +347,7 @@ bool GetInfo_Partitions (QListView *lbox) return true; } -bool GetInfo_XServer_and_Video (QListView *lBox) +bool GetInfo_XServer_and_Video (TQListView *lBox) { return GetInfo_XServer_Generic( lBox ); } diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp index 92995fd78..12ec8ee2d 100644 --- a/kcontrol/info/info_openbsd.cpp +++ b/kcontrol/info/info_openbsd.cpp @@ -35,10 +35,10 @@ #include <stdio.h> /* for NULL */ #include <stdlib.h> /* for malloc(3) */ -#include <qfile.h> -#include <qfontmetrics.h> -#include <qstrlist.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqfontmetrics.h> +#include <tqstrlist.h> +#include <tqtextstream.h> #include <kdebug.h> @@ -49,7 +49,7 @@ typedef struct const char *title; } hw_info_mib_list_t; -bool GetInfo_CPU(QListView *lBox) +bool GetInfo_CPU(TQListView *lBox) { static hw_info_mib_list_t hw_info_mib_list[]= { { 1, HW_MODEL, "Model" }, @@ -63,7 +63,7 @@ bool GetInfo_CPU(QListView *lBox) int mib[2], num; char *buf; size_t len; - QString value; + TQString value; lBox->addColumn(i18n("Information")); lBox->addColumn(i18n("Value")); @@ -76,11 +76,11 @@ bool GetInfo_CPU(QListView *lBox) sysctl(mib,2,NULL,&len,NULL,0); if ( (buf = (char*)malloc(len)) ) { sysctl(mib,2,buf,&len,NULL,0); - value = QString::fromLocal8Bit(buf); + value = TQString::fromLocal8Bit(buf); free(buf); } else { - value = QString("Unknown"); + value = TQString("Unknown"); } } else { @@ -88,7 +88,7 @@ bool GetInfo_CPU(QListView *lBox) sysctl(mib,2,&num,&len,NULL,0); value.sprintf("%d", num); } - new QListViewItem(lBox, hw_info_mib->title, value); + new TQListViewItem(lBox, hw_info_mib->title, value); } return true; @@ -96,30 +96,30 @@ bool GetInfo_CPU(QListView *lBox) // this is used to find out which devices are currently // on system -static bool GetDmesgInfo(QListView *lBox, const char *filter, - void func(QListView *, QString s, void **, bool)) +static bool GetDmesgInfo(TQListView *lBox, const char *filter, + void func(TQListView *, TQString s, void **, bool)) { - QFile *dmesg = new QFile("/var/run/dmesg.boot"); + TQFile *dmesg = new TQFile("/var/run/dmesg.boot"); bool usepipe=false; FILE *pipe=NULL; - QTextStream *t; + TQTextStream *t; bool seencpu=false; void *opaque=NULL; - QString s; + TQString s; bool found=false; if (dmesg->exists() && dmesg->open(IO_ReadOnly)) { - t = new QTextStream(dmesg); + t = new TQTextStream(dmesg); } else { delete dmesg; pipe = popen("/sbin/dmesg", "r"); if (!pipe) return false; usepipe = true; - t = new QTextStream(pipe, IO_ReadOnly); + t = new TQTextStream(pipe, IO_ReadOnly); } - QListViewItem *olditem = NULL; + TQListViewItem *olditem = NULL; while(!(s = t->readLine()).isNull()) { if (!seencpu) { if (s.contains("cpu")) @@ -136,7 +136,7 @@ static bool GetDmesgInfo(QListView *lBox, const char *filter, func(lBox, s, &opaque, false); } else { - olditem = new QListViewItem(lBox, olditem, s); + olditem = new TQListViewItem(lBox, olditem, s); } found = true; } @@ -159,22 +159,22 @@ static bool GetDmesgInfo(QListView *lBox, const char *filter, } -void AddIRQLine(QListView *lBox, QString s, void **opaque, bool ending) +void AddIRQLine(TQListView *lBox, TQString s, void **opaque, bool ending) { - QStrList *strlist = (QStrList *) *opaque; + TQStrList *strlist = (TQStrList *) *opaque; const char *str; int pos, irqnum=0; const char *p; p = s.latin1(); if (!strlist) { - strlist = new QStrList(); + strlist = new TQStrList(); *opaque = (void *) strlist; } if (ending) { str = strlist->first(); for(;str; str = strlist->next()) { - new QListViewItem(lBox, str); + new TQListViewItem(lBox, str); } delete strlist; return; @@ -191,7 +191,7 @@ void AddIRQLine(QListView *lBox, QString s, void **opaque, bool ending) strlist->inSort(s.latin1()); } -bool GetInfo_IRQ (QListView *lBox) +bool GetInfo_IRQ (TQListView *lBox) { lBox->addColumn(i18n("IRQ")); lBox->addColumn(i18n("Device")); @@ -199,34 +199,34 @@ bool GetInfo_IRQ (QListView *lBox) return true; } -bool GetInfo_DMA (QListView *) +bool GetInfo_DMA (TQListView *) { return false; } -bool GetInfo_PCI (QListView *lbox) +bool GetInfo_PCI (TQListView *lbox) { if (!GetDmesgInfo(lbox, "at pci", NULL)) - new QListViewItem(lbox, i18n("No PCI devices found.")); + new TQListViewItem(lbox, i18n("No PCI devices found.")); return true; } -bool GetInfo_IO_Ports (QListView *lbox) +bool GetInfo_IO_Ports (TQListView *lbox) { if (!GetDmesgInfo(lbox, "port 0x", NULL)) - new QListViewItem(lbox, i18n("No I/O port devices found.")); + new TQListViewItem(lbox, i18n("No I/O port devices found.")); return true; } -bool GetInfo_Sound (QListView *lbox) +bool GetInfo_Sound (TQListView *lbox) { if (!GetDmesgInfo(lbox, "audio", NULL)) - new QListViewItem(lbox, i18n("No audio devices found.")); + new TQListViewItem(lbox, i18n("No audio devices found.")); // append information on any audio devices found - QListViewItem *lvitem = lbox->firstChild(); + TQListViewItem *lvitem = lbox->firstChild(); for(; lvitem; lvitem = lvitem->nextSibling()) { - QString s; + TQString s; int pos, len; const char *start, *end; char *dev; @@ -250,39 +250,39 @@ bool GetInfo_Sound (QListView *lbox) return true; } -bool GetInfo_Devices (QListView *lBox) +bool GetInfo_Devices (TQListView *lBox) { (void) GetDmesgInfo(lBox, NULL, NULL); return true; } -bool GetInfo_SCSI (QListView *lbox) +bool GetInfo_SCSI (TQListView *lbox) { if (!GetDmesgInfo(lbox, "scsibus", NULL)) - new QListViewItem(lbox, i18n("No SCSI devices found.")); + new TQListViewItem(lbox, i18n("No SCSI devices found.")); return true; } -bool GetInfo_Partitions (QListView *lbox) +bool GetInfo_Partitions (TQListView *lbox) { - QString s; + TQString s; char *line, *orig_line; const char *device, *mountpoint, *type, *flags; FILE *pipe = popen("/sbin/mount", "r"); - QTextStream *t; + TQTextStream *t; if (!pipe) { kdError(0) << i18n("Unable to run /sbin/mount.") << endl; return false; } - t = new QTextStream(pipe, IO_ReadOnly); + t = new TQTextStream(pipe, IO_ReadOnly); lbox->addColumn(i18n("Device")); lbox->addColumn(i18n("Mount Point")); lbox->addColumn(i18n("FS Type")); lbox->addColumn(i18n("Mount Options")); - QListViewItem *olditem = 0; + TQListViewItem *olditem = 0; while (!(s = t->readLine()).isNull()) { orig_line = line = strdup(s.latin1()); @@ -296,7 +296,7 @@ bool GetInfo_Partitions (QListView *lbox) flags = line; - olditem = new QListViewItem(lbox, olditem, device, mountpoint, + olditem = new TQListViewItem(lbox, olditem, device, mountpoint, type, flags); free(orig_line); @@ -307,7 +307,7 @@ bool GetInfo_Partitions (QListView *lbox) return true; } -bool GetInfo_XServer_and_Video (QListView *lBox) +bool GetInfo_XServer_and_Video (TQListView *lBox) { return GetInfo_XServer_Generic( lBox ); } diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp index 25f23c2d9..5f18aebea 100644 --- a/kcontrol/info/info_osx.cpp +++ b/kcontrol/info/info_osx.cpp @@ -45,12 +45,12 @@ #include <iostream.h> -#include <qdict.h> -#include <qfile.h> -#include <qfontmetrics.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qtextstream.h> +#include <tqdict.h> +#include <tqfile.h> +#include <tqfontmetrics.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqtextstream.h> #include <kdebug.h> @@ -63,10 +63,10 @@ #include <machine/limits.h> -bool GetInfo_CPU (QListView *lBox) +bool GetInfo_CPU (TQListView *lBox) { - QString cpustring; + TQString cpustring; kern_return_t ret; struct host_basic_info basic_info; @@ -81,37 +81,37 @@ bool GetInfo_CPU (QListView *lBox) kdDebug() << "got Host Info: (" << basic_info.avail_cpus << ") CPUs available" << endl; const NXArchInfo *archinfo; archinfo=NXGetArchInfoFromCpuType(basic_info.cpu_type, basic_info.cpu_subtype); - new QListViewItem(lBox, i18n("Kernel is configured for %1 CPUs").arg(basic_info.max_cpus)); + new TQListViewItem(lBox, i18n("Kernel is configured for %1 CPUs").arg(basic_info.max_cpus)); for (int i = 1; i <= basic_info.avail_cpus; i++) { cpustring = i18n("CPU %1: %2").arg(i).arg(archinfo->description); - new QListViewItem(lBox, cpustring); + new TQListViewItem(lBox, cpustring); } return true; } return false; } -bool GetInfo_IRQ (QListView *) +bool GetInfo_IRQ (TQListView *) { return false; } -bool GetInfo_DMA (QListView *) +bool GetInfo_DMA (TQListView *) { return false; } -bool GetInfo_PCI (QListView *) +bool GetInfo_PCI (TQListView *) { return false; } -bool GetInfo_IO_Ports (QListView *) +bool GetInfo_IO_Ports (TQListView *) { return false; } -bool GetInfo_Sound (QListView *lBox) +bool GetInfo_Sound (TQListView *lBox) { #ifdef HAVE_COREAUDIO #define kMaxStringSize 1024 @@ -137,7 +137,7 @@ bool GetInfo_Sound (QListView *lBox) kdDebug() << "get device name failed, status = " << (int)status << endl; return false; } - new QListViewItem(lBox, i18n("Device Name: %1").arg(deviceName)); + new TQListViewItem(lBox, i18n("Device Name: %1").arg(deviceName)); /* Manufacturer */ status = AudioDeviceGetProperty(gOutputDeviceID, 1, 0, kAudioDevicePropertyDeviceManufacturer, &propertySize, manufacturer); @@ -145,7 +145,7 @@ bool GetInfo_Sound (QListView *lBox) kdDebug() << "get manufacturer failed, status = " << (int)status << endl; return false; } - new QListViewItem(lBox, i18n("Manufacturer: %1").arg(manufacturer)); + new TQListViewItem(lBox, i18n("Manufacturer: %1").arg(manufacturer)); return true; } else { return false; @@ -155,22 +155,22 @@ bool GetInfo_Sound (QListView *lBox) #endif } -bool GetInfo_SCSI (QListView *lbox) +bool GetInfo_SCSI (TQListView *lbox) { return false; } -bool GetInfo_Partitions (QListView *lbox) +bool GetInfo_Partitions (TQListView *lbox) { return false; } -bool GetInfo_XServer_and_Video (QListView *lBox) +bool GetInfo_XServer_and_Video (TQListView *lBox) { return GetInfo_XServer_Generic( lBox ); } -bool GetInfo_Devices (QListView *lbox) +bool GetInfo_Devices (TQListView *lbox) { return false; } diff --git a/kcontrol/info/info_sgi.cpp b/kcontrol/info/info_sgi.cpp index 2cd1a1e30..7961d4e16 100644 --- a/kcontrol/info/info_sgi.cpp +++ b/kcontrol/info/info_sgi.cpp @@ -23,59 +23,59 @@ #include <sys/systeminfo.h> -bool GetInfo_CPU( QListView *lBox ) +bool GetInfo_CPU( TQListView *lBox ) { - QString str; + TQString str; char buf[256]; sysinfo(SI_ARCHITECTURE, buf, sizeof(buf)); - str = QString::fromLocal8Bit(buf); - new QListViewItem(lBox, str); + str = TQString::fromLocal8Bit(buf); + new TQListViewItem(lBox, str); return true; } -bool GetInfo_IRQ( QListView * ) +bool GetInfo_IRQ( TQListView * ) { return false; } -bool GetInfo_DMA( QListView * ) +bool GetInfo_DMA( TQListView * ) { return false; } -bool GetInfo_PCI( QListView * ) +bool GetInfo_PCI( TQListView * ) { return false; } -bool GetInfo_IO_Ports( QListView * ) +bool GetInfo_IO_Ports( TQListView * ) { return false; } -bool GetInfo_Sound( QListView * ) +bool GetInfo_Sound( TQListView * ) { return false; } -bool GetInfo_Devices( QListView * ) +bool GetInfo_Devices( TQListView * ) { return false; } -bool GetInfo_SCSI( QListView * ) +bool GetInfo_SCSI( TQListView * ) { return false; } -bool GetInfo_Partitions( QListView * ) +bool GetInfo_Partitions( TQListView * ) { return false; } -bool GetInfo_XServer_and_Video( QListView *lBox ) +bool GetInfo_XServer_and_Video( TQListView *lBox ) { return GetInfo_XServer_Generic( lBox ); } diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp index 761200e75..9f2b17e1b 100644 --- a/kcontrol/info/info_solaris.cpp +++ b/kcontrol/info/info_solaris.cpp @@ -34,7 +34,7 @@ #define INFO_XSERVER_AVAILABLE -bool GetInfo_CPU( QListView *lBox ) { +bool GetInfo_CPU( TQListView *lBox ) { kstat_ctl_t *kctl; kstat_t *ksp; @@ -114,7 +114,7 @@ bool GetInfo_CPU( QListView *lBox ) { } kdata = (kstat_named_t *) kstat_data_lookup( ksp, "state" ); if( kdata != NULL ) { - state = QString( kdata->value.c ); + state = TQString( kdata->value.c ); } else { state = "???"; } @@ -124,11 +124,11 @@ bool GetInfo_CPU( QListView *lBox ) { if( (timetxt = ctime( (time_t *) &state_begin )) != NULL ) { ptr = strrchr( timetxt, '\n' ); *ptr = '\0'; - state += " since " + QString( timetxt ); + state += " since " + TQString( timetxt ); } } - new QListViewItem( lBox, inst, cputype, fputype, mhz, state ); + new TQListViewItem( lBox, inst, cputype, fputype, mhz, state ); } // sorting_allowed = true; @@ -137,31 +137,31 @@ bool GetInfo_CPU( QListView *lBox ) { return true; } -bool GetInfo_IRQ( QListView * ) { +bool GetInfo_IRQ( TQListView * ) { return false; } -bool GetInfo_DMA( QListView * ) { +bool GetInfo_DMA( TQListView * ) { return false; } -bool GetInfo_PCI( QListView * ) { +bool GetInfo_PCI( TQListView * ) { return false; } -bool GetInfo_IO_Ports( QListView * ) { +bool GetInfo_IO_Ports( TQListView * ) { return false; } -bool GetInfo_Sound( QListView * ) { +bool GetInfo_Sound( TQListView * ) { return false; } -bool GetInfo_SCSI( QListView * ) { +bool GetInfo_SCSI( TQListView * ) { return false; } -bool GetInfo_Partitions( QListView *lBox ) { +bool GetInfo_Partitions( TQListView *lBox ) { FILE *mnttab; struct mnttab mnt; @@ -268,14 +268,14 @@ bool GetInfo_Partitions( QListView *lBox ) { *ptr = '\0'; } - new QListViewItem( + new TQListViewItem( lBox, mnt.mnt_special, mnt.mnt_mountp, mnt.mnt_fstype, total, avail, - QString( timetxt ), + TQString( timetxt ), mnt.mnt_mntopts ); } @@ -287,7 +287,7 @@ bool GetInfo_Partitions( QListView *lBox ) { return true; } -bool GetInfo_XServer_and_Video( QListView *lBox ) { +bool GetInfo_XServer_and_Video( TQListView *lBox ) { return GetInfo_XServer_Generic( lBox ); } @@ -313,7 +313,7 @@ bool GetInfo_XServer_and_Video( QListView *lBox ) { * mktree() -- break up the device path and place its components * into the tree widget */ -QListViewItem *mktree( QListViewItem *top, const char *path ) { +TQListViewItem *mktree( TQListViewItem *top, const char *path ) { QListViewItem *parent, *previous, @@ -348,7 +348,7 @@ QListViewItem *mktree( QListViewItem *top, const char *path ) { /* * we haven't found the node, create a new one */ - result = new QListViewItem( parent, + result = new TQListViewItem( parent, previous, token ); } else { @@ -453,21 +453,21 @@ int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) { char *type; dev_t dev; - item = new QListViewItem( (QListViewItem *) arg, + item = new TQListViewItem( (TQListViewItem *) arg, di_minor_name( minor )); item->setExpandable( true ); item->setOpen( false ); - new QListViewItem( item, i18n( "Spectype:" ), + new TQListViewItem( item, i18n( "Spectype:" ), (di_minor_spectype( minor ) == S_IFCHR) ? i18n( "character special" ) : i18n( "block special" )); type = di_minor_nodetype( minor ); - new QListViewItem( item, i18n( "Nodetype:" ), + new TQListViewItem( item, i18n( "Nodetype:" ), (type == NULL) ? "NULL" : type ); if( (dev = di_minor_devt( minor )) != DDI_DEV_T_NONE ) { majmin.sprintf( "%ld/%ld", major( dev ), minor( dev )); - new QListViewItem( item, i18n( "Major/Minor:" ), majmin ); + new TQListViewItem( item, i18n( "Major/Minor:" ), majmin ); } if( di_minor_next( node, minor ) == DI_MINOR_NIL ) @@ -479,7 +479,7 @@ int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) { /* * propvalue() -- return the property value */ -QString propvalue( di_prop_t prop ) { +TQString propvalue( di_prop_t prop ) { int type; int i, n; @@ -518,7 +518,7 @@ QString propvalue( di_prop_t prop ) { result = "(error)"; } else { for( i = 0; i < n; i++ ) { - QString tmp; + TQString tmp; tmp.setNum( intp[i] ); result += tmp; result += " "; @@ -542,7 +542,7 @@ QString propvalue( di_prop_t prop ) { } result = "0x"; for( i = 0; i < n; i++ ) { - QString tmp; + TQString tmp; unsigned byte = (unsigned) bytep[i]; tmp.sprintf( "%2.2x", byte ); result += tmp; @@ -562,7 +562,7 @@ QString propvalue( di_prop_t prop ) { */ int dump_node( di_node_t node, void *arg ) { - QListViewItem *top = (QListViewItem *) arg, + QListViewItem *top = (TQListViewItem *) arg, *parent, *previous; char *path; @@ -578,7 +578,7 @@ int dump_node( di_node_t node, void *arg ) { * if this is the root node ("/"), initialize the tree */ if( strlen( path ) == 1 ) { - top->setText( 0, QString( di_binding_name( node ))); + top->setText( 0, TQString( di_binding_name( node ))); top->setPixmap( 0, SmallIcon( "kcmdevices" )); top->setOpen( true ); top->setSelectable( false ); @@ -605,12 +605,12 @@ int dump_node( di_node_t node, void *arg ) { * node name and physical device path */ drivername = di_driver_name( node ); - previous = new QListViewItem( parent, + previous = new TQListViewItem( parent, i18n( "Driver Name:" ), (drivername == NULL) ? i18n( "(driver not attached)" ) : drivername ); - previous = new QListViewItem( parent, previous, + previous = new TQListViewItem( parent, previous, i18n( "Binding Name:" ), di_binding_name( node )); n = di_compatible_names( node, &names ); @@ -624,17 +624,17 @@ int dump_node( di_node_t node, void *arg ) { } } - previous = new QListViewItem( parent, previous, + previous = new TQListViewItem( parent, previous, i18n( "Compatible Names:" ), compatnames ); - previous = new QListViewItem( parent, previous, - i18n( "Physical Path:" ), QString( path )); + previous = new TQListViewItem( parent, previous, + i18n( "Physical Path:" ), TQString( path )); /* * dump the node's property list (if any) */ if( (prop = di_prop_next( node, DI_PROP_NIL )) != DI_PROP_NIL ) { - previous = new QListViewItem( parent, previous, i18n( "Properties" )); + previous = new TQListViewItem( parent, previous, i18n( "Properties" )); previous->setExpandable( true ); previous->setOpen( false ); do { @@ -643,12 +643,12 @@ int dump_node( di_node_t node, void *arg ) { */ QListViewItem *tmp, *prev; - tmp = new QListViewItem( previous, di_prop_name( prop )); + tmp = new TQListViewItem( previous, di_prop_name( prop )); tmp->setExpandable( true ); tmp->setOpen( false ); - prev = new QListViewItem( tmp, i18n( "Type:" ), + prev = new TQListViewItem( tmp, i18n( "Type:" ), prop_type_str( prop )); - new QListViewItem( tmp, prev, i18n( "Value:" ), + new TQListViewItem( tmp, prev, i18n( "Value:" ), propvalue( prop )); } while( (prop = di_prop_next( node, prop )) != DI_PROP_NIL ); } @@ -657,7 +657,7 @@ int dump_node( di_node_t node, void *arg ) { * if there are minor nodes, expand the tree appropriately */ if( di_minor_next( node, DI_MINOR_NIL ) != DI_MINOR_NIL ) { - previous = new QListViewItem( parent, previous, i18n( "Minor Nodes" )); + previous = new TQListViewItem( parent, previous, i18n( "Minor Nodes" )); previous->setExpandable( true ); previous->setOpen( false ); di_walk_minor( node, NULL, 0, previous, dump_minor_node ); @@ -666,7 +666,7 @@ int dump_node( di_node_t node, void *arg ) { return( DI_WALK_CONTINUE ); } -bool GetInfo_Devices( QListView *lBox ) { +bool GetInfo_Devices( TQListView *lBox ) { QListViewItem *top; di_node_t root_node; @@ -685,7 +685,7 @@ bool GetInfo_Devices( QListView *lBox ) { lBox->addColumn( i18n( "Device Information" )); lBox->addColumn( i18n( "Value" )); - top = new QListViewItem( lBox ); + top = new TQListViewItem( lBox ); /* * traverse the device tree @@ -699,7 +699,7 @@ bool GetInfo_Devices( QListView *lBox ) { } #else /* ! HAVE_LIBDEVINFO_H */ -bool GetInfo_Devices( QListView * ) { +bool GetInfo_Devices( TQListView * ) { return false; } #endif /* ! HAVE_LIBDEVINFO_H */ diff --git a/kcontrol/info/info_svr4.cpp b/kcontrol/info/info_svr4.cpp index 2509aa062..ba491a50e 100644 --- a/kcontrol/info/info_svr4.cpp +++ b/kcontrol/info/info_svr4.cpp @@ -27,13 +27,13 @@ returning false indicates, that information was not available. */ -bool GetInfo_ReadfromFile( QListView *lBox, char *Name, char splitchar ) +bool GetInfo_ReadfromFile( TQListView *lBox, char *Name, char splitchar ) { - QString str; + TQString str; char buf[512]; - QFile *file = new QFile(Name); - QListViewItem* olditem = 0; + TQFile *file = new TQFile(Name); + TQListViewItem* olditem = 0; if(!file->open(IO_ReadOnly)) { delete file; @@ -54,12 +54,12 @@ bool GetInfo_ReadfromFile( QListView *lBox, char *Name, char splitchar ) else ++p; } - QString s1 = QString::fromLocal8Bit(buf); - QString s2 = s1.mid(s1.find(splitchar)+1); + TQString s1 = TQString::fromLocal8Bit(buf); + TQString s2 = s1.mid(s1.find(splitchar)+1); s1.truncate(s1.find(splitchar)); if(!(s1.isEmpty() || s2.isEmpty())) - olditem = new QListViewItem(lBox, olditem, s1, s2); + olditem = new TQListViewItem(lBox, olditem, s1, s2); } } file->close(); @@ -68,41 +68,41 @@ bool GetInfo_ReadfromFile( QListView *lBox, char *Name, char splitchar ) return true; } -bool GetInfo_CPU( QListView *lBox ) +bool GetInfo_CPU( TQListView *lBox ) { char buf[256]; sysinfo(SI_ARCHITECTURE, buf, sizeof(buf)); - new QListViewItem(lBox, QString::fromLocal8Bit(buf)); + new TQListViewItem(lBox, TQString::fromLocal8Bit(buf)); return true; } -bool GetInfo_IRQ( QListView * ) +bool GetInfo_IRQ( TQListView * ) { return false; } -bool GetInfo_DMA( QListView * ) +bool GetInfo_DMA( TQListView * ) { return false; } -bool GetInfo_PCI( QListView *lBox ) +bool GetInfo_PCI( TQListView *lBox ) { char buf[256]; sysinfo(SI_BUSTYPES, buf, sizeof(buf)); - new QListViewItem(lBox, QString::fromLocal8Bit(buf)); + new TQListViewItem(lBox, TQString::fromLocal8Bit(buf)); return true; } -bool GetInfo_IO_Ports( QListView * ) +bool GetInfo_IO_Ports( TQListView * ) { return false; } -bool GetInfo_Sound( QListView *lBox ) +bool GetInfo_Sound( TQListView *lBox ) { if ( GetInfo_ReadfromFile( lBox, INFO_DEV_SNDSTAT, 0 )) return true; @@ -110,22 +110,22 @@ bool GetInfo_Sound( QListView *lBox ) return false; } -bool GetInfo_Devices( QListView * ) +bool GetInfo_Devices( TQListView * ) { return false; } -bool GetInfo_SCSI( QListView * ) +bool GetInfo_SCSI( TQListView * ) { return false; } -bool GetInfo_Partitions( QListView * ) +bool GetInfo_Partitions( TQListView * ) { return false; } -bool GetInfo_XServer_and_Video( QListView *lBox ) +bool GetInfo_XServer_and_Video( TQListView *lBox ) { return GetInfo_XServer_Generic( lBox ); } diff --git a/kcontrol/info/main.cpp b/kcontrol/info/main.cpp index 7992fbc37..689ac25b7 100644 --- a/kcontrol/info/main.cpp +++ b/kcontrol/info/main.cpp @@ -34,7 +34,7 @@ extern "C" { - KDE_EXPORT KCModule *create_cpu(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_cpu(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CPU_AVAILABLE return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU); @@ -43,7 +43,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_irq(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_irq(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IRQ_AVAILABLE return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ); @@ -52,7 +52,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_pci(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_pci(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PCI_AVAILABLE return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI); @@ -61,7 +61,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_dma(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_dma(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DMA_AVAILABLE return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA); @@ -70,7 +70,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_ioports(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_ioports(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IOPORTS_AVAILABLE return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports); @@ -79,7 +79,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_sound(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_sound(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SOUND_AVAILABLE return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound); @@ -88,7 +88,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_scsi(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_scsi(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SCSI_AVAILABLE return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI); @@ -97,7 +97,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_devices(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_devices(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DEVICES_AVAILABLE return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices); @@ -106,7 +106,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_partitions(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_partitions(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PARTITIONS_AVAILABLE return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions); @@ -115,7 +115,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_xserver(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_xserver(TQWidget *parent, const char * /*name*/) { #ifdef INFO_XSERVER_AVAILABLE return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video); @@ -124,12 +124,12 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_memory(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_memory(TQWidget *parent, const char * /*name*/) { return new KMemoryWidget(parent, "kcminfo"); } - KDE_EXPORT KCModule *create_opengl(QWidget *parent, const char * ) + KDE_EXPORT KCModule *create_opengl(TQWidget *parent, const char * ) { #ifdef INFO_OPENGL_AVAILABLE return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL); @@ -139,7 +139,7 @@ extern "C" } /* create_cdinfo function for CD-ROM Info ~Jahshan */ - KDE_EXPORT KCModule *create_cdinfo(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_cdinfo(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CD_ROM_AVAILABLE return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM); diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 9743087dd..df7bcc6fa 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -24,10 +24,10 @@ #include <sys/param.h> /* for BSD */ -#include <qlayout.h> -#include <qpainter.h> -#include <qdrawutil.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqdrawutil.h> +#include <tqtooltip.h> #include <kglobal.h> #include <kdialog.h> @@ -68,15 +68,15 @@ static t_memsize Memory_Info[MEM_LAST_ENTRY]; /* Implementation */ /******************/ -static QLabel *MemSizeLabel[MEM_LAST_ENTRY][2]; +static TQLabel *MemSizeLabel[MEM_LAST_ENTRY][2]; enum { MEM_RAM_AND_HDD, MEM_RAM, MEM_HDD, MEM_LAST }; -static QWidget *Graph[MEM_LAST]; -static QLabel *GraphLabel[MEM_LAST]; +static TQWidget *Graph[MEM_LAST]; +static TQLabel *GraphLabel[MEM_LAST]; #define SPACING 16 -static QString formatted_unit(t_memsize value) +static TQString formatted_unit(t_memsize value) { if (value > (1024 * 1024)) if (value > (1024 * 1024 * 1024)) @@ -87,7 +87,7 @@ static QString formatted_unit(t_memsize value) return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, 2)); } -KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name) +KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) : KCModule(parent, name) { @@ -100,8 +100,8 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name) about->addAuthor("Helge Deller", 0, "deller@gmx.de"); setAboutData( about ); - QString title, initial_str; - QLabel *Widget = 0; + TQString title, initial_str; + TQLabel *Widget = 0; int i, j; ram_colors_initialized = @@ -113,16 +113,16 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name) /* default string for no Information... */ Not_Available_Text = i18n("Not available."); - QVBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - QHBoxLayout *hbox = new QHBoxLayout(); + TQHBoxLayout *hbox = new TQHBoxLayout(); top->addLayout(hbox); /* stretch the left side */ hbox->addStretch(); /* first create the Informationtext-Widget */ - QVBoxLayout *vbox = new QVBoxLayout(hbox, 0); + TQVBoxLayout *vbox = new TQVBoxLayout(hbox, 0); for (i = TOTAL_MEM; i < MEM_LAST_ENTRY; ++i) { switch (i) { case TOTAL_MEM: @@ -162,18 +162,18 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name) title = ""; break; }; - Widget = new QLabel(title, this); + Widget = new TQLabel(title, this); Widget->setAlignment(AlignLeft); vbox->addWidget(Widget, 1); } /* then the memory-content-widgets */ for (j = 0; j < 2; j++) { - vbox = new QVBoxLayout(hbox, 0); + vbox = new TQVBoxLayout(hbox, 0); for (i = TOTAL_MEM; i < MEM_LAST_ENTRY; ++i) { if (i == SWAP_MEM) vbox->addSpacing(SPACING); - Widget = new QLabel(this); + Widget = new TQLabel(this); Widget->setAlignment(AlignRight); MemSizeLabel[i][j] = Widget; vbox->addWidget(Widget, 1); @@ -187,11 +187,11 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name) top->addWidget(line); /* now the Graphics */ - QString hint; - hbox = new QHBoxLayout(top, 1); + TQString hint; + hbox = new TQHBoxLayout(top, 1); for (i = MEM_RAM_AND_HDD; i < MEM_LAST; i++) { hbox->addSpacing(SPACING); - vbox = new QVBoxLayout(hbox); + vbox = new TQVBoxLayout(hbox); switch (i) { case MEM_RAM_AND_HDD: @@ -221,40 +221,40 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name) "through one or more swap partitions and/or swap files."); break; default: - hint = title = QString::null; + hint = title = TQString::null; break; }; if (hint.length()) hint = "<qt>" + hint + "</qt>"; - Widget = new QLabel("<b>" + title + "</b>", this); + Widget = new TQLabel("<b>" + title + "</b>", this); Widget->setAlignment(AlignCenter); - QToolTip::add(Widget, hint); + TQToolTip::add(Widget, hint); vbox->addWidget(Widget); vbox->addSpacing(SPACING / 2); - QWidget *g = new QWidget(this); + TQWidget *g = new TQWidget(this); g->setMinimumWidth(2 * SPACING); g->setMinimumHeight(3 * SPACING); g->setBackgroundMode(NoBackground); - QToolTip::add(g, hint); // add the tooltip + TQToolTip::add(g, hint); // add the tooltip Graph[i] = g; vbox->addWidget(g, 2); vbox->addSpacing(SPACING / 2); - Widget = new QLabel(this); /* xx MB used. */ + Widget = new TQLabel(this); /* xx MB used. */ Widget->setAlignment(AlignCenter); - QToolTip::add(Widget, hint); + TQToolTip::add(Widget, hint); GraphLabel[i] = Widget; vbox->addWidget(Widget); } hbox->addSpacing(SPACING); - timer = new QTimer(this); + timer = new TQTimer(this); timer->start(100); - QObject::connect(timer, SIGNAL(timeout()), this, - SLOT(update_Values())); + TQObject::connect(timer, TQT_SIGNAL(timeout()), this, + TQT_SLOT(update_Values())); update(); } @@ -266,7 +266,7 @@ KMemoryWidget::~KMemoryWidget() } -QString KMemoryWidget::quickHelp() const +TQString KMemoryWidget::quickHelp() const { return i18n("<h1>Memory Information</h1>" " This display shows you the current memory usage of your system." @@ -280,22 +280,22 @@ bool KMemoryWidget::Display_Graph(int widgetindex, int count, t_memsize total, t_memsize * used, - QColor * color, - QString *text) + TQColor * color, + TQString *text) { - QWidget *graph = Graph[widgetindex]; + TQWidget *graph = Graph[widgetindex]; int width = graph->width(); int height = graph->height(); - QPixmap pm(width, height); - QPainter paint; + TQPixmap pm(width, height); + TQPainter paint; paint.begin(&pm, this); - QPen pen(QColor(0, 0, 0)); + TQPen pen(TQColor(0, 0, 0)); if (! ZERO_IF_NO_INFO(total)) { paint.fillRect(1, 1, width - 2, height - 2, - QBrush(QColor(128, 128, 128))); + TQBrush(TQColor(128, 128, 128))); paint.setPen(pen); paint.drawRect(graph->rect()); GraphLabel[widgetindex]->setText(Not_Available_Text); @@ -329,7 +329,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex, if (localheight >= SPACING) { paint.drawText(0, startline-localheight, width, localheight, AlignCenter | WordBreak, - QString("%1 %2%").arg(*text).arg(percent)); + TQString("%1 %2%").arg(*text).arg(percent)); } } @@ -342,7 +342,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex, /* draw surrounding box */ paint.setPen(pen); - QRect r = graph->rect(); + TQRect r = graph->rect(); qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), palette().active(), true, 1); paint.end(); bitBlt(graph, 0, 0, &pm); @@ -357,7 +357,7 @@ void KMemoryWidget::update_Values() { int i; bool ok1; - QLabel *label; + TQLabel *label; t_memsize used[5]; update(); /* get the Information from memory_linux, memory_fbsd */ @@ -402,9 +402,9 @@ void KMemoryWidget::update_Values() ram_text[0] = i18n("Application Data"); ram_colors[0] = COLOR_USED_MEMORY; /* used+shared */ ram_text[1] = i18n("Disk Buffers"); - ram_colors[1] = QColor(24,131,5); /* buffer */ + ram_colors[1] = TQColor(24,131,5); /* buffer */ ram_text[2] = i18n("Disk Cache"); - ram_colors[2] = QColor(33,180,7); /* cached */ + ram_colors[2] = TQColor(33,180,7); /* cached */ ram_text[3] = i18n("Free Physical Memory"); ram_colors[3] = COLOR_FREE_MEMORY; /* free */ } diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h index 7f6778c75..975b851f5 100644 --- a/kcontrol/info/memory.h +++ b/kcontrol/info/memory.h @@ -1,12 +1,12 @@ #ifndef _MEMORY_H_KDEINFO_INCLUDED_ #define _MEMORY_H_KDEINFO_INCLUDED_ -#include <qwidget.h> -#include <qframe.h> -#include <qlabel.h> -#include <qtabdialog.h> -#include <qpushbutton.h> -#include <qtimer.h> +#include <tqwidget.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqtabdialog.h> +#include <tqpushbutton.h> +#include <tqtimer.h> #include <kcmodule.h> #include <kaboutdata.h> @@ -20,35 +20,35 @@ typedef unsigned long long t_memsize; typedef unsigned long t_memsize; #endif -#define COLOR_USED_MEMORY QColor(255,0,0) -#define COLOR_USED_SWAP QColor(255,134,64) -#define COLOR_FREE_MEMORY QColor(127,255,212) +#define COLOR_USED_MEMORY TQColor(255,0,0) +#define COLOR_USED_SWAP TQColor(255,134,64) +#define COLOR_FREE_MEMORY TQColor(127,255,212) class KMemoryWidget:public KCModule { Q_OBJECT public: - KMemoryWidget(QWidget * parent, const char *name = 0); + KMemoryWidget(TQWidget * parent, const char *name = 0); ~KMemoryWidget(); - QString quickHelp() const; + TQString quickHelp() const; private: - QString Not_Available_Text; - QTimer *timer; + TQString Not_Available_Text; + TQTimer *timer; bool ram_colors_initialized, swap_colors_initialized, all_colors_initialized; - QColor ram_colors[4]; - QString ram_text[4]; + TQColor ram_colors[4]; + TQString ram_text[4]; - QColor swap_colors[2]; - QString swap_text[2]; + TQColor swap_colors[2]; + TQString swap_text[2]; - QColor all_colors[3]; - QString all_text[3]; + TQColor all_colors[3]; + TQString all_text[3]; void update(); @@ -56,8 +56,8 @@ class KMemoryWidget:public KCModule { int count, t_memsize total, t_memsize *used, - QColor *color, - QString *text); + TQColor *color, + TQString *text); public slots: void update_Values(); }; diff --git a/kcontrol/info/memory_linux.cpp b/kcontrol/info/memory_linux.cpp index c393c01e7..175b2a617 100644 --- a/kcontrol/info/memory_linux.cpp +++ b/kcontrol/info/memory_linux.cpp @@ -1,7 +1,7 @@ #include <sys/sysinfo.h> #include <unistd.h> #include <stdlib.h> -#include <qfile.h> +#include <tqfile.h> void KMemoryWidget::update() { @@ -23,7 +23,7 @@ void KMemoryWidget::update() Memory_Info[SWAP_MEM] = MEMORY(info.totalswap) * mem_unit; // total size of all swap-partitions Memory_Info[FREESWAP_MEM] = MEMORY(info.freeswap) * mem_unit; // free memory in swap-partitions - QFile file("/proc/meminfo"); + TQFile file("/proc/meminfo"); if (file.open(IO_ReadOnly)) { char buf[512]; while (file.readLine(buf, sizeof(buf) - 1) > 0) { diff --git a/kcontrol/info/memory_osx.cpp b/kcontrol/info/memory_osx.cpp index 9c18c4a6e..b1ae7f529 100644 --- a/kcontrol/info/memory_osx.cpp +++ b/kcontrol/info/memory_osx.cpp @@ -21,7 +21,7 @@ #include <unistd.h> #include <stdlib.h> -#include <qfile.h> +#include <tqfile.h> #include <mach/mach_init.h> #include <mach/mach_host.h> #include <mach/host_info.h> diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp index 66266abdf..061e368e6 100644 --- a/kcontrol/info/opengl.cpp +++ b/kcontrol/info/opengl.cpp @@ -24,10 +24,10 @@ #define KCMGL_DO_GLU -#include <qregexp.h> -#include <qlistview.h> -#include <qfile.h> -#include <qstring.h> +#include <tqregexp.h> +#include <tqlistview.h> +#include <tqfile.h> +#include <tqstring.h> #include <klocale.h> #include <kmessagebox.h> @@ -68,7 +68,7 @@ static struct glinfo { } gli; static struct { - QString module, + TQString module, pci, vendor, device, @@ -76,7 +76,7 @@ static struct { rev; } dri_info; -static int ReadPipe(QString FileName, QStringList &list) +static int ReadPipe(TQString FileName, TQStringList &list) { FILE *pipe; @@ -85,7 +85,7 @@ static int ReadPipe(QString FileName, QStringList &list) return 0; } - QTextStream t(pipe, IO_ReadOnly); + TQTextStream t(pipe, IO_ReadOnly); while (!t.atEnd()) list.append(t.readLine()); @@ -99,20 +99,20 @@ static int ReadPipe(QString FileName, QStringList &list) static bool get_dri_device() { - QFile file; + TQFile file; file.setName(INFO_DRI); if (!file.exists() || !file.open(IO_ReadOnly)) return false; - QTextStream stream(&file); - QString line = stream.readLine(); + TQTextStream stream(&file); + TQString line = stream.readLine(); if (!line.isEmpty()) { dri_info.module = line.mid(0, line.find(0x20)); // possible formats, for regression testing // line = " PCI:01:00:0"; // line = " pci:0000:01:00.0" - QRegExp rx = QRegExp("\\b[Pp][Cc][Ii][:]([0-9a-fA-F]+[:])?([0-9a-fA-F]+[:][0-9a-fA-F]+[:.][0-9a-fA-F]+)\\b"); + TQRegExp rx = TQRegExp("\\b[Pp][Cc][Ii][:]([0-9a-fA-F]+[:])?([0-9a-fA-F]+[:][0-9a-fA-F]+[:.][0-9a-fA-F]+)\\b"); if (rx.search(line)>0) { dri_info.pci = rx.cap(2); int end = dri_info.pci.findRev(':'); @@ -120,8 +120,8 @@ static bool get_dri_device() if (end2>end) end=end2; dri_info.pci[end]='.'; - QString cmd = QString("lspci -m -v -s ") + dri_info.pci; - QStringList pci_info; + TQString cmd = TQString("lspci -m -v -s ") + dri_info.pci; + TQStringList pci_info; int num; if (((num = ReadPipe(cmd, pci_info)) || (num = ReadPipe("/sbin/"+cmd, pci_info)) || @@ -129,7 +129,7 @@ static bool get_dri_device() (num = ReadPipe("/usr/local/sbin/"+cmd, pci_info))) && num>=7) { for (int i=2; i<=6; i++) { line = pci_info[i]; - line.remove(QRegExp("[^:]*:[ ]*")); + line.remove(TQRegExp("[^:]*:[ ]*")); switch (i){ case 2: dri_info.vendor = line; break; case 3: dri_info.device = line; break; @@ -149,7 +149,7 @@ static bool get_dri_device() static bool get_dri_device() { - QStringList pci_info; + TQStringList pci_info; if (ReadPipe("sysctl -n hw.dri.0.name",pci_info)) { dri_info.module = pci_info[0].mid(0, pci_info[0].find(0x20)); } @@ -188,14 +188,14 @@ mesa_hack(Display *dpy, int scrnum) static void -print_extension_list(const char *ext, QListViewItem *l1) +print_extension_list(const char *ext, TQListViewItem *l1) { int i, j; if (!ext || !ext[0]) return; - QString qext = QString::fromLatin1(ext); - QListViewItem *l2 = NULL; + TQString qext = TQString::fromLatin1(ext); + TQListViewItem *l2 = NULL; i = j = 0; while (1) { @@ -203,8 +203,8 @@ print_extension_list(const char *ext, QListViewItem *l1) /* found end of an extension name */ const int len = j - i; /* print the extension name between ext[i] and ext[j] */ - if (!l2) l2 = new QListViewItem(l1, qext.mid(i, len)); - else l2 = new QListViewItem(l1, l2, qext.mid(i, len)); + if (!l2) l2 = new TQListViewItem(l1, qext.mid(i, len)); + else l2 = new TQListViewItem(l1, l2, qext.mid(i, len)); i=j; if (ext[j] == 0) { break; @@ -227,7 +227,7 @@ extern "C" { #endif static void -print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress) +print_limits(TQListViewItem *l1, const char * glExtensions, bool GetProcAddress) { /* TODO GL_SAMPLE_BUFFERS @@ -241,18 +241,18 @@ print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress) struct token_name { GLuint type; // count and flags, !!! count must be <=2 for now GLenum token; - const QString name; + const TQString name; }; struct token_group { int count; int type; const token_name *group; - const QString descr; + const TQString descr; const char *ext; }; - QListViewItem *l2 = NULL, *l3 = NULL; + TQListViewItem *l2 = NULL, *l3 = NULL; #if defined(PFNGLGETPROGRAMIVARBPROC) PFNGLGETPROGRAMIVARBPROC kcm_glGetProgramivARB = NULL; #endif @@ -433,8 +433,8 @@ print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress) for (uint i = 0; i<KCMGL_SIZE(groups); i++) { if (groups[i].ext && !strstr(glExtensions, groups[i].ext)) continue; - if (l2) l2 = new QListViewItem(l1, l2, groups[i].descr); - else l2 = new QListViewItem(l1, groups[i].descr); + if (l2) l2 = new TQListViewItem(l1, l2, groups[i].descr); + else l2 = new TQListViewItem(l1, groups[i].descr); l3 = NULL; const struct token_name *cur_token; for (cur_token = groups[i].group; cur_token->type; cur_token++) { @@ -454,13 +454,13 @@ print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress) else glGetIntegerv(cur_token->token, max); if (glGetError() == GL_NONE) { - QString s; - if (!tfloat && count == 1) s = QString::number(max[0]); else - if (!tfloat && count == 2) s = QString("%1, %2").arg(max[0]).arg(max[1]); else - if (tfloat && count == 2) s = QString("%1 - %2").arg(fmax[0],0,'f',6).arg(fmax[1],0,'f',6); else - if (tfloat && count == 1) s = QString::number(fmax[0],'f',6); - if (l3) l3 = new QListViewItem(l2, l3, cur_token->name, s); - else l3 = new QListViewItem(l2, cur_token->name, s); + TQString s; + if (!tfloat && count == 1) s = TQString::number(max[0]); else + if (!tfloat && count == 2) s = TQString("%1, %2").arg(max[0]).arg(max[1]); else + if (tfloat && count == 2) s = TQString("%1 - %2").arg(fmax[0],0,'f',6).arg(fmax[1],0,'f',6); else + if (tfloat && count == 1) s = TQString::number(fmax[0],'f',6); + if (l3) l3 = new TQListViewItem(l2, l3, cur_token->name, s); + else l3 = new TQListViewItem(l2, cur_token->name, s); } } @@ -469,71 +469,71 @@ print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress) } -static QListViewItem *print_screen_info(QListViewItem *l1, QListViewItem *after) +static TQListViewItem *print_screen_info(TQListViewItem *l1, TQListViewItem *after) { - QListViewItem *l2 = NULL, *l3 = NULL; + TQListViewItem *l2 = NULL, *l3 = NULL; - if (after) l1= new QListViewItem(l1,after,IsDirect ? i18n("Direct Rendering") : i18n("Indirect Rendering")); - else l1= new QListViewItem(l1,IsDirect ? i18n("Direct Rendering") : i18n("Indirect Rendering")); + if (after) l1= new TQListViewItem(l1,after,IsDirect ? i18n("Direct Rendering") : i18n("Indirect Rendering")); + else l1= new TQListViewItem(l1,IsDirect ? i18n("Direct Rendering") : i18n("Indirect Rendering")); if (IsDirect) if (get_dri_device()) { - l2 = new QListViewItem(l1, i18n("3D Accelerator")); + l2 = new TQListViewItem(l1, i18n("3D Accelerator")); l2->setOpen(true); - l3 = new QListViewItem(l2, l3, i18n("Vendor"), dri_info.vendor); - l3 = new QListViewItem(l2, l3, i18n("Device"), dri_info.device); - l3 = new QListViewItem(l2, l3, i18n("Subvendor"), dri_info.subvendor); - l3 = new QListViewItem(l2, l3, i18n("Revision"), dri_info.rev); + l3 = new TQListViewItem(l2, l3, i18n("Vendor"), dri_info.vendor); + l3 = new TQListViewItem(l2, l3, i18n("Device"), dri_info.device); + l3 = new TQListViewItem(l2, l3, i18n("Subvendor"), dri_info.subvendor); + l3 = new TQListViewItem(l2, l3, i18n("Revision"), dri_info.rev); } - else l2=new QListViewItem(l1, l2, i18n("3D Accelerator"),i18n("unknown")); - if (l2) l2 = new QListViewItem(l1, l2, i18n("Driver")); - else l2 = new QListViewItem(l1, i18n("Driver")); + else l2=new TQListViewItem(l1, l2, i18n("3D Accelerator"),i18n("unknown")); + if (l2) l2 = new TQListViewItem(l1, l2, i18n("Driver")); + else l2 = new TQListViewItem(l1, i18n("Driver")); l2->setOpen(true); - l3 = new QListViewItem(l2, i18n("Vendor"),gli.glVendor); - l3 = new QListViewItem(l2, l3, i18n("Renderer"), gli.glRenderer); - l3 = new QListViewItem(l2, l3, i18n("OpenGL version"), gli.glVersion); + l3 = new TQListViewItem(l2, i18n("Vendor"),gli.glVendor); + l3 = new TQListViewItem(l2, l3, i18n("Renderer"), gli.glRenderer); + l3 = new TQListViewItem(l2, l3, i18n("OpenGL version"), gli.glVersion); if (IsDirect) { if (!dri_info.module) dri_info.module = i18n("unknown"); - l3 = new QListViewItem(l2, l3, i18n("Kernel module"), dri_info.module); + l3 = new TQListViewItem(l2, l3, i18n("Kernel module"), dri_info.module); } - l3 = new QListViewItem(l2, l3, i18n("OpenGL extensions")); + l3 = new TQListViewItem(l2, l3, i18n("OpenGL extensions")); print_extension_list(gli.glExtensions,l3); - l3 = new QListViewItem(l2, l3, i18n("Implementation specific")); + l3 = new TQListViewItem(l2, l3, i18n("Implementation specific")); print_limits(l3, gli.glExtensions, strstr(gli.clientExtensions, "GLX_ARB_get_proc_address") != NULL); return l1; } -void print_glx_glu(QListViewItem *l1, QListViewItem *l2) +void print_glx_glu(TQListViewItem *l1, TQListViewItem *l2) { - QListViewItem *l3; + TQListViewItem *l3; - l2=new QListViewItem(l1, l2, i18n("GLX")); - l3 = new QListViewItem(l2, i18n("server GLX vendor"),gli.serverVendor); - l3 = new QListViewItem(l2, l3, i18n("server GLX version"),gli.serverVersion); - l3 = new QListViewItem(l2, l3, i18n("server GLX extensions")); + l2=new TQListViewItem(l1, l2, i18n("GLX")); + l3 = new TQListViewItem(l2, i18n("server GLX vendor"),gli.serverVendor); + l3 = new TQListViewItem(l2, l3, i18n("server GLX version"),gli.serverVersion); + l3 = new TQListViewItem(l2, l3, i18n("server GLX extensions")); print_extension_list(gli.serverExtensions,l3); - l3 = new QListViewItem(l2, l3, i18n("client GLX vendor"),gli.clientVendor); - l3 = new QListViewItem(l2, l3, i18n("client GLX version"),gli.clientVersion); - l3 = new QListViewItem(l2, l3, i18n("client GLX extensions")); + l3 = new TQListViewItem(l2, l3, i18n("client GLX vendor"),gli.clientVendor); + l3 = new TQListViewItem(l2, l3, i18n("client GLX version"),gli.clientVersion); + l3 = new TQListViewItem(l2, l3, i18n("client GLX extensions")); print_extension_list(gli.clientExtensions,l3); - l3 = new QListViewItem(l2, l3, i18n("GLX extensions")); + l3 = new TQListViewItem(l2, l3, i18n("GLX extensions")); print_extension_list(gli.glxExtensions,l3); #ifdef KCMGL_DO_GLU - l2 = new QListViewItem(l1, l2, i18n("GLU")); - l3 = new QListViewItem(l2, i18n("GLU version"), gli.gluVersion); - l3 = new QListViewItem(l2, l3, i18n("GLU extensions")); + l2 = new TQListViewItem(l1, l2, i18n("GLU")); + l3 = new TQListViewItem(l2, i18n("GLU version"), gli.gluVersion); + l3 = new TQListViewItem(l2, l3, i18n("GLU extensions")); print_extension_list(gli.gluExtensions,l3); #endif } -static QListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,QListViewItem *l1, QListViewItem *after) +static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQListViewItem *l1, TQListViewItem *after) { Window win; int attribSingle[] = { @@ -556,7 +556,7 @@ static QListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,QLi GLXContext ctx; XVisualInfo *visinfo; int width = 100, height = 100; - QListViewItem *result = after; + TQListViewItem *result = after; root = RootWindow(dpy, scrnum); @@ -617,9 +617,9 @@ static QListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,QLi } -static bool GetInfo_OpenGL_Generic( QListView *lBox ) +static bool GetInfo_OpenGL_Generic( TQListView *lBox ) { - QListViewItem *l1, *l2 = NULL; + TQListViewItem *l1, *l2 = NULL; char *displayName = NULL; Display *dpy; @@ -634,7 +634,7 @@ static bool GetInfo_OpenGL_Generic( QListView *lBox ) lBox->addColumn(i18n("Information") ); lBox->addColumn(i18n("Value") ); - l1 = new QListViewItem(lBox, i18n("Name of the Display"), DisplayString(dpy)); + l1 = new TQListViewItem(lBox, i18n("Name of the Display"), DisplayString(dpy)); l1->setOpen(true); l1->setSelectable(false); l1->setExpandable(false); @@ -664,7 +664,7 @@ static bool GetInfo_OpenGL_Generic( QListView *lBox ) return true; } -bool GetInfo_OpenGL(QListView * lBox) +bool GetInfo_OpenGL(TQListView * lBox) { return GetInfo_OpenGL_Generic(lBox); } diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index d83b28cb7..a2b5f1b86 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -31,11 +31,11 @@ #include <klistview.h> #include <kdialog.h> -#include <qlayout.h> -#include <qdir.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqdir.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqlabel.h> #include "themepage.h" #include "themepage.moc" @@ -49,15 +49,15 @@ namespace { } -ThemePage::ThemePage( QWidget* parent, const char* name ) - : QWidget( parent, name ) +ThemePage::ThemePage( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { - QBoxLayout *layout = new QVBoxLayout( this ); + TQBoxLayout *layout = new TQVBoxLayout( this ); layout->setAutoAdd( true ); layout->setMargin( KDialog::marginHint() ); layout->setSpacing( KDialog::spacingHint() ); - new QLabel( i18n("Select the cursor theme you want to use:"), this ); + new TQLabel( i18n("Select the cursor theme you want to use:"), this ); // Create the theme list view listview = new KListView( this ); @@ -66,8 +66,8 @@ ThemePage::ThemePage( QWidget* parent, const char* name ) listview->addColumn( i18n("Name") ); listview->addColumn( i18n("Description") ); - connect( listview, SIGNAL(selectionChanged(QListViewItem*)), - SLOT(selectionChanged(QListViewItem*)) ); + connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + TQT_SLOT(selectionChanged(TQListViewItem*)) ); insertThemes(); } @@ -78,7 +78,7 @@ ThemePage::~ThemePage() } -void ThemePage::selectionChanged( QListViewItem *item ) +void ThemePage::selectionChanged( TQListViewItem *item ) { selectedTheme = item->text( DirColumn ); emit changed( selectedTheme != currentTheme ); @@ -130,7 +130,7 @@ void ThemePage::load( bool useDefaults ) currentTheme = whiteCursor ? "SmallWhite" : "SmallBlack"; selectedTheme = currentTheme; - QListViewItem *item = listview->findItem( currentTheme, DirColumn ); + TQListViewItem *item = listview->findItem( currentTheme, DirColumn ); item->setSelected( true ); } @@ -147,22 +147,22 @@ void ThemePage::insertThemes() item = new KListViewItem( listview, i18n("Small black"), i18n("Small black cursors"), "SmallBlack" ); - item->setPixmap( 0, QPixmap( arrow_small_black_xpm ) ); + item->setPixmap( 0, TQPixmap( arrow_small_black_xpm ) ); listview->insertItem( item ); item = new KListViewItem( listview, i18n("Large black"), i18n("Large black cursors"), "LargeBlack" ); - item->setPixmap( 0, QPixmap( arrow_large_black_xpm ) ); + item->setPixmap( 0, TQPixmap( arrow_large_black_xpm ) ); listview->insertItem( item ); item = new KListViewItem( listview, i18n("Small white"), i18n("Small white cursors"), "SmallWhite" ); - item->setPixmap( 0, QPixmap( arrow_small_white_xpm ) ); + item->setPixmap( 0, TQPixmap( arrow_small_white_xpm ) ); listview->insertItem( item ); item = new KListViewItem( listview, i18n("Large white"), i18n("Large white cursors"), "LargeWhite" ); - item->setPixmap( 0, QPixmap( arrow_large_white_xpm ) ); + item->setPixmap( 0, TQPixmap( arrow_large_white_xpm ) ); listview->insertItem( item ); } @@ -179,8 +179,8 @@ void ThemePage::fixCursorFile() // Run mkfontdir to update fonts.dir in that dir. KGlobal::dirs()->addResourceType( "font", "share/fonts/" ); - KIO::mkdir( KURL::fromPathOrURL(QDir::homeDirPath() + "/.fonts/kde-override") ); - QString overrideDir = QDir::homeDirPath() + "/.fonts/kde-override/"; + KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") ); + TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/"; KURL installedFont; installedFont.setPath( overrideDir + "cursor.pcf.gz" ); @@ -200,7 +200,7 @@ void ThemePage::fixCursorFile() KIO::NetAccess::file_copy( source, installedFont, -1, true ); } - QString cmd = KGlobal::dirs()->findExe( "mkfontdir" ); + TQString cmd = KGlobal::dirs()->findExe( "mkfontdir" ); if ( !cmd.isEmpty() ) { KProcess p; diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h index 491c11f75..b4c964037 100644 --- a/kcontrol/input/core/themepage.h +++ b/kcontrol/input/core/themepage.h @@ -27,7 +27,7 @@ class ThemePage : public QWidget Q_OBJECT public: - ThemePage( QWidget* parent = 0, const char* name = 0 ); + ThemePage( TQWidget* parent = 0, const char* name = 0 ); ~ThemePage(); // Called by the KCM @@ -40,14 +40,14 @@ class ThemePage : public QWidget void changed( bool ); private slots: - void selectionChanged( QListViewItem * ); + void selectionChanged( TQListViewItem * ); private: void insertThemes(); void fixCursorFile(); KListView *listview; - QString currentTheme, selectedTheme; + TQString currentTheme, selectedTheme; }; #endif // __THEMEPAGE_H diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index 1b8132a7e..9fc8daf32 100644 --- a/kcontrol/input/logitechmouse.cpp +++ b/kcontrol/input/logitechmouse.cpp @@ -19,15 +19,15 @@ */ -#include <qdialog.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qwidget.h> -#include <qlayout.h> -#include <qprogressbar.h> -#include <qtimer.h> +#include <tqdialog.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqprogressbar.h> +#include <tqtimer.h> #include <kdebug.h> #include <kdialog.h> @@ -41,7 +41,7 @@ #include "logitechmouse.h" -LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, QWidget* parent, const char* name ) +LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent, const char* name ) : LogitechMouseBase( parent, name, 0 ) { if ( !name ) @@ -70,8 +70,8 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag updateResolution(); resolutionSelector->setEnabled( TRUE ); - connect( button400cpi, SIGNAL( clicked() ), parent, SLOT( changed() ) ); - connect( button800cpi, SIGNAL( clicked() ), parent, SLOT( changed() ) ); + connect( button400cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); + connect( button800cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); if ( 4 == resolution() ) { button800cpi->setChecked( TRUE ); @@ -100,12 +100,12 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag // if the channel is changed, we need to turn off the timer, otherwise it // just resets the button to reflect the current status. The timer is // started again when we applyChanges() - connect( channel1, SIGNAL( clicked() ), this, SLOT( stopTimerForNow() ) ); - connect( channel1, SIGNAL( clicked() ), parent, SLOT( changed() ) ); + connect( channel1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) ); + connect( channel1, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); if ( isDualChannelCapable() ) { channel2->setEnabled( TRUE ); - connect( channel2, SIGNAL( clicked() ), this, SLOT( stopTimerForNow() ) ); - connect( channel2, SIGNAL( clicked() ), parent, SLOT( changed() ) ); + connect( channel2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) ); + connect( channel2, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); } updateGUI(); @@ -121,14 +121,14 @@ LogitechMouse::~LogitechMouse() void LogitechMouse::initCordlessStatusReporting() { updateCordlessStatus(); - doUpdate = new QTimer( this ); // will be automatically deleted - connect( doUpdate, SIGNAL( timeout() ), this, SLOT( updateGUI() ) ); + doUpdate = new TQTimer( this ); // will be automatically deleted + connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) ); doUpdate->start( 20000 ); } void LogitechMouse::updateCordlessStatus() { - QByteArray status(8); + TQByteArray status(8); int result = usb_control_msg( m_usbDeviceHandle, USB_TYPE_VENDOR | USB_ENDPOINT_IN,0x09, @@ -349,7 +349,7 @@ void LogitechMouse::setChannel2() } -QString LogitechMouse::cordlessName() +TQString LogitechMouse::cordlessName() { switch ( m_cordlessNameIndex ) { case 0x00: diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h index 8c7ef06d3..4ea296725 100644 --- a/kcontrol/input/logitechmouse.h +++ b/kcontrol/input/logitechmouse.h @@ -22,11 +22,11 @@ #ifndef __LOGITECHMOUSE_H__ #define __LOGITECHMOUSE_H__ -#include <qdialog.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> +#include <tqdialog.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> #include <kconfig.h> @@ -49,7 +49,7 @@ class LogitechMouse : public LogitechMouseBase Q_OBJECT public: - LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, QWidget* parent = 0, const char* name = 0 ); + LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent = 0, const char* name = 0 ); ~LogitechMouse(); void applyChanges(); void save(KConfig *config); @@ -67,14 +67,14 @@ private: void setLogitechTo400(); void setLogitechTo800(); - QString cordlessName(); + TQString cordlessName(); Q_UINT8 resolution(); void updateResolution(); Q_UINT8 batteryLevel(); Q_UINT8 channel(); bool isDualChannelCapable(); - QTimer *doUpdate; + TQTimer *doUpdate; struct usb_dev_handle *m_usbDeviceHandle; bool m_connectStatus; // true if the CONNECT button on the mouse is pressed @@ -85,7 +85,7 @@ private: // CONNECT button on the receiver was pressed Q_UINT8 m_batteryLevel; Q_UINT8 m_channel; - Q_UINT8 m_cordlessNameIndex; // this gets convered into a QString in cordlessName() + Q_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName() Q_UINT16 m_cordlessSecurity; Q_UINT16 m_useSecondChannel; Q_UINT8 m_caseShape; diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index f0a464adc..f42498aab 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -29,7 +29,7 @@ #include <kglobal.h> #include <kconfig.h> #include <dcopref.h> -#include <qfile.h> +#include <tqfile.h> #include <X11/Xlib.h> @@ -41,7 +41,7 @@ extern "C" { - KDE_EXPORT KCModule *create_mouse(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_mouse(TQWidget *parent, const char *) { return new MouseConfig(parent, "kcminput"); } @@ -55,15 +55,15 @@ extern "C" #ifdef HAVE_XCURSOR config->setGroup("Mouse"); - QCString theme = QFile::encodeName(config->readEntry("cursorTheme", QString())); - QCString size = config->readEntry("cursorSize", QString()).local8Bit(); + TQCString theme = TQFile::encodeName(config->readEntry("cursorTheme", TQString())); + TQCString size = config->readEntry("cursorSize", TQString()).local8Bit(); // Note: If you update this code, update kapplymousetheme as well. // use a default value for theme only if it's not configured at all, not even in X resources if( theme.isEmpty() - && QCString( XGetDefault( qt_xdisplay(), "Xcursor", "theme" )).isEmpty() - && QCString( XcursorGetTheme( qt_xdisplay())).isEmpty()) + && TQCString( XGetDefault( qt_xdisplay(), "Xcursor", "theme" )).isEmpty() + && TQCString( XcursorGetTheme( qt_xdisplay())).isEmpty()) { theme = "default"; } @@ -84,9 +84,9 @@ extern "C" // variables when launching applications. DCOPRef klauncher("klauncher"); if( !theme.isEmpty()) - klauncher.send("setLaunchEnv", QCString("XCURSOR_THEME"), theme); + klauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme); if( !size.isEmpty()) - klauncher.send("setLaunchEnv", QCString("XCURSOR_SIZE"), size); + klauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size); #endif delete config; diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 56e737135..68f376474 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -47,14 +47,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqcheckbox.h> #undef Below #undef Above -#include <qslider.h> -#include <qwhatsthis.h> -#include <qtabwidget.h> -#include <qradiobutton.h> +#include <tqslider.h> +#include <tqwhatsthis.h> +#include <tqtabwidget.h> +#include <tqradiobutton.h> #include <klocale.h> #include <kdialog.h> @@ -74,7 +74,7 @@ #undef Below -MouseConfig::MouseConfig (QWidget * parent, const char *name) +MouseConfig::MouseConfig (TQWidget * parent, const char *name) : KCModule(parent, name) { @@ -84,15 +84,15 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) " pointing device may be a mouse, trackball, or some other hardware" " that performs a similar function.")); - QString wtstr; + TQString wtstr; - QBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - tabwidget = new QTabWidget(this); + tabwidget = new TQTabWidget(this); top->addWidget(tabwidget); tab1 = new KMouseDlg(this); - QButtonGroup *group = new QButtonGroup( tab1 ); + TQButtonGroup *group = new TQButtonGroup( tab1 ); group->setExclusive( true ); group->hide(); group->insert( tab1->singleClick ); @@ -100,8 +100,8 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) tabwidget->addTab(tab1, i18n("&General")); - connect(tab1->handedBox, SIGNAL(clicked(int)), this, SLOT(changed())); - connect(tab1->handedBox, SIGNAL(clicked(int)), this, SLOT(slotHandedChanged(int))); + connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); + connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotHandedChanged(int))); wtstr = i18n("If you are left-handed, you may prefer to swap the" " functions of the left and right buttons on your pointing device" @@ -109,9 +109,9 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) " has more than two buttons, only those that function as the" " left and right buttons are affected. For example, if you have" " a three-button mouse, the middle button is unaffected."); - QWhatsThis::add( tab1->handedBox, wtstr ); + TQWhatsThis::add( tab1->handedBox, wtstr ); - connect(tab1->doubleClick, SIGNAL(clicked()), SLOT(changed())); + connect(tab1->doubleClick, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); wtstr = i18n("The default behavior in KDE is to select and activate" " icons with a single click of the left button on your pointing" @@ -119,44 +119,44 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) " when you click links in most web browsers. If you would prefer" " to select with a single click, and activate with a double click," " check this option."); - QWhatsThis::add( tab1->doubleClick, wtstr ); + TQWhatsThis::add( tab1->doubleClick, wtstr ); wtstr = i18n("Activates and opens a file or folder with a single click."); - QWhatsThis::add( tab1->singleClick, wtstr ); + TQWhatsThis::add( tab1->singleClick, wtstr ); - connect(tab1->cbAutoSelect, SIGNAL(clicked()), this, SLOT(changed())); + connect(tab1->cbAutoSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); wtstr = i18n("If you check this option, pausing the mouse pointer" " over an icon on the screen will automatically select that icon." " This may be useful when single clicks activate icons, and you" " want only to select the icon without activating it."); - QWhatsThis::add( tab1->cbAutoSelect, wtstr ); + TQWhatsThis::add( tab1->cbAutoSelect, wtstr ); -// slAutoSelect = new QSlider(0, 2000, 10, 0, QSlider::Horizontal, tab1); +// slAutoSelect = new TQSlider(0, 2000, 10, 0, TQSlider::Horizontal, tab1); tab1->slAutoSelect->setSteps( 125, 125 ); - tab1->slAutoSelect->setTickmarks( QSlider::Below ); + tab1->slAutoSelect->setTickmarks( TQSlider::Below ); tab1->slAutoSelect->setTickInterval( 250 ); tab1->slAutoSelect->setTracking( true ); wtstr = i18n("If you have checked the option to automatically select" " icons, this slider allows you to select how long the mouse pointer" " must be paused over the icon before it is selected."); - QWhatsThis::add( tab1->slAutoSelect, wtstr ); + TQWhatsThis::add( tab1->slAutoSelect, wtstr ); wtstr = i18n("Show feedback when clicking an icon"); - QWhatsThis::add( tab1->cbVisualActivate, wtstr ); + TQWhatsThis::add( tab1->cbVisualActivate, wtstr ); - connect(tab1->slAutoSelect, SIGNAL(valueChanged(int)), this, SLOT(changed())); - connect(tab1->cbVisualActivate, SIGNAL(clicked()), this, SLOT(changed())); + connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(tab1->cb_pointershape, SIGNAL(clicked()), this, SLOT(changed())); + connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(tab1->singleClick, SIGNAL(clicked()), this, SLOT(changed())); - connect(tab1->singleClick, SIGNAL(clicked()), this, SLOT(slotClick())); + connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick())); - connect( tab1->doubleClick, SIGNAL( clicked() ), this, SLOT( slotClick() ) ); - connect( tab1->cbAutoSelect, SIGNAL( clicked() ), this, SLOT( slotClick() ) ); + connect( tab1->doubleClick, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) ); + connect( tab1->cbAutoSelect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) ); // Only allow setting reversing scroll polarity if we have scroll buttons unsigned char map[20]; @@ -170,26 +170,26 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) tab1->cbScrollPolarity->setEnabled( false ); tab1->cbScrollPolarity->hide(); } - connect(tab1->cbScrollPolarity, SIGNAL(clicked()), this, SLOT(changed())); - connect(tab1->cbScrollPolarity, SIGNAL(clicked()), this, SLOT(slotScrollPolarityChanged())); + connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScrollPolarityChanged())); // Cursor theme tab themetab = new ThemePage(this); - connect(themetab, SIGNAL(changed(bool)), SLOT(changed())); + connect(themetab, TQT_SIGNAL(changed(bool)), TQT_SLOT(changed())); tabwidget->addTab(themetab, i18n("&Cursor Theme")); // Advanced tab - tab2 = new QWidget(0, "Advanced Tab"); + tab2 = new TQWidget(0, "Advanced Tab"); tabwidget->addTab(tab2, i18n("Advanced")); - QBoxLayout *lay = new QVBoxLayout(tab2, KDialog::marginHint(), + TQBoxLayout *lay = new TQVBoxLayout(tab2, KDialog::marginHint(), KDialog::spacingHint()); accel = new KDoubleNumInput(1, 20, 2, 0.1, 1, tab2); accel->setLabel(i18n("Pointer acceleration:")); accel->setSuffix("x"); lay->addWidget(accel); - connect(accel, SIGNAL(valueChanged(double)), this, SLOT(changed())); + connect(accel, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed())); wtstr = i18n("This option allows you to change the relationship" " between the distance that the mouse pointer moves on the" @@ -201,15 +201,15 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) " you only make a small movement with the physical device." " Selecting very high values may result in the mouse pointer" " flying across the screen, making it hard to control."); - QWhatsThis::add( accel, wtstr ); + TQWhatsThis::add( accel, wtstr ); thresh = new KIntNumInput(accel, 20, tab2); thresh->setLabel(i18n("Pointer threshold:")); thresh->setRange(0,20,1); thresh->setSteps(1,1); lay->addWidget(thresh); - connect(thresh, SIGNAL(valueChanged(int)), this, SLOT(changed())); - connect(thresh, SIGNAL(valueChanged(int)), this, SLOT(slotThreshChanged(int))); + connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotThreshChanged(int))); slotThreshChanged(thresh->value()); wtstr = i18n("The threshold is the smallest distance that the" @@ -221,7 +221,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) " of control over the mouse pointer. With larger movements of" " the physical device, you can move the mouse pointer" " rapidly to different areas on the screen."); - QWhatsThis::add( thresh, wtstr ); + TQWhatsThis::add( thresh, wtstr ); // It would be nice if the user had a test field. // Selecting such values in milliseconds is not intuitive @@ -231,7 +231,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) doubleClickInterval->setSuffix(i18n(" msec")); doubleClickInterval->setSteps(100, 100); lay->addWidget(doubleClickInterval); - connect(doubleClickInterval, SIGNAL(valueChanged(int)), this, SLOT(changed())); + connect(doubleClickInterval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); wtstr = i18n("The double click interval is the maximal time" " (in milliseconds) between two mouse clicks which" @@ -239,7 +239,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) " click happens later than this time interval after" " the first click, they are recognized as two" " separate clicks."); - QWhatsThis::add( doubleClickInterval, wtstr ); + TQWhatsThis::add( doubleClickInterval, wtstr ); lay->addSpacing(15); @@ -249,54 +249,54 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) dragStartTime->setSuffix(i18n(" msec")); dragStartTime->setSteps(100, 100); lay->addWidget(dragStartTime); - connect(dragStartTime, SIGNAL(valueChanged(int)), this, SLOT(changed())); + connect(dragStartTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); wtstr = i18n("If you click with the mouse (e.g. in a multi-line" " editor) and begin to move the mouse within the" " drag start time, a drag operation will be initiated."); - QWhatsThis::add( dragStartTime, wtstr ); + TQWhatsThis::add( dragStartTime, wtstr ); dragStartDist = new KIntNumInput(dragStartTime, 20, tab2); dragStartDist->setLabel(i18n("Drag start distance:")); dragStartDist->setRange(1, 20, 1); dragStartDist->setSteps(1,1); lay->addWidget(dragStartDist); - connect(dragStartDist, SIGNAL(valueChanged(int)), this, SLOT(changed())); - connect(dragStartDist, SIGNAL(valueChanged(int)), this, SLOT(slotDragStartDistChanged(int))); + connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDragStartDistChanged(int))); slotDragStartDistChanged(dragStartDist->value()); wtstr = i18n("If you click with the mouse and begin to move the" " mouse at least the drag start distance, a drag" " operation will be initiated."); - QWhatsThis::add( dragStartDist, wtstr); + TQWhatsThis::add( dragStartDist, wtstr); wheelScrollLines = new KIntNumInput(dragStartDist, 3, tab2); wheelScrollLines->setLabel(i18n("Mouse wheel scrolls by:")); wheelScrollLines->setRange(1, 12, 1); wheelScrollLines->setSteps(1,1); lay->addWidget(wheelScrollLines); - connect(wheelScrollLines, SIGNAL(valueChanged(int)), this, SLOT(changed())); - connect(wheelScrollLines, SIGNAL(valueChanged(int)), SLOT(slotWheelScrollLinesChanged(int))); + connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWheelScrollLinesChanged(int))); slotWheelScrollLinesChanged(wheelScrollLines->value()); wtstr = i18n("If you use the wheel of a mouse, this value determines the number of lines to scroll for each wheel movement. Note that if this number exceeds the number of visible lines, it will be ignored and the wheel movement will be handled as a page up/down movement."); - QWhatsThis::add( wheelScrollLines, wtstr); + TQWhatsThis::add( wheelScrollLines, wtstr); lay->addStretch(); { - QWidget *mouse = new QWidget(this, "Mouse Navigation"); + TQWidget *mouse = new TQWidget(this, "Mouse Navigation"); tabwidget->addTab(mouse, i18n("Mouse Navigation")); - QBoxLayout *vbox = new QVBoxLayout(mouse, KDialog::marginHint(), + TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(), KDialog::spacingHint()); - QVBoxLayout *vvbox = new QVBoxLayout(mouse->layout(), KDialog::spacingHint()); + TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint()); - mouseKeys = new QCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse); + mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse); vvbox->addWidget(mouseKeys); - QBoxLayout *hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + TQBoxLayout *hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); mk_delay = new KIntNumInput(mouse); mk_delay->setLabel(i18n("&Acceleration delay:"), AlignVCenter); @@ -304,7 +304,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) mk_delay->setRange(1, 1000, 50); hbox->addWidget(mk_delay); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); mk_interval = new KIntNumInput(mk_delay, 0, mouse); mk_interval->setLabel(i18n("R&epeat interval:"), AlignVCenter); @@ -312,7 +312,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) mk_interval->setRange(1, 1000, 10); hbox->addWidget(mk_interval); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); mk_time_to_max = new KIntNumInput(mk_interval, 0, mouse); mk_time_to_max->setLabel(i18n("Acceleration &time:"), AlignVCenter); @@ -320,7 +320,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) mk_time_to_max->setSuffix(i18n(" msec")); hbox->addWidget(mk_time_to_max); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); mk_max_speed = new KIntNumInput(mk_time_to_max, 0, mouse); mk_max_speed->setLabel(i18n("Ma&ximum speed:"), AlignVCenter); @@ -328,20 +328,20 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) mk_max_speed->setSuffix(i18n(" pixel/sec")); hbox->addWidget(mk_max_speed); - hbox = new QHBoxLayout(vvbox, KDialog::spacingHint()); + hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addSpacing(24); mk_curve = new KIntNumInput(mk_max_speed, 0, mouse); mk_curve->setLabel(i18n("Acceleration &profile:"), AlignVCenter); mk_curve->setRange(-1000, 1000, 100); hbox->addWidget(mk_curve); - connect(mouseKeys, SIGNAL(clicked()), this, SLOT(checkAccess())); - connect(mouseKeys, SIGNAL(clicked()), this, SLOT(changed())); - connect(mk_delay, SIGNAL(valueChanged(int)), this, SLOT(changed())); - connect(mk_interval, SIGNAL(valueChanged(int)), this, SLOT(changed())); - connect(mk_time_to_max, SIGNAL(valueChanged(int)), this, SLOT(changed())); - connect(mk_max_speed, SIGNAL(valueChanged(int)), this, SLOT(changed())); - connect(mk_curve, SIGNAL(valueChanged(int)), this, SLOT(changed())); + connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(mk_delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(mk_interval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(mk_time_to_max, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(mk_max_speed, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(mk_curve, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); vbox->addStretch(); } @@ -355,8 +355,8 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) struct device_table { int idVendor; int idProduct; - QString Model; - QString Name; + TQString Model; + TQString Name; int flags; } device_table[] = { { VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES }, @@ -377,7 +377,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR }, { VENDOR_LOGITECH, 0xC512, "M-RAK89B", "Cordless Desktop Pro LX700", HAS_CSR | USE_CH2 }, { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR }, - { 0, 0, QString(), QString(), 0 } + { 0, 0, TQString(), TQString(), 0 } }; usb_init(); @@ -395,7 +395,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name) // OK, we have a device that appears to be one of the ones we support LogitechMouse *mouse = new LogitechMouse( dev, device_table[n].flags, this, device_table[n].Name.latin1() ); settings->logitechMouseList.append(mouse); - tabwidget->addTab( (QWidget*)mouse, device_table[n].Name ); + tabwidget->addTab( (TQWidget*)mouse, device_table[n].Name ); } } } @@ -682,7 +682,7 @@ void MouseSettings::load(KConfig *config) else thresholdMove = t; - QString key = config->readEntry("MouseButtonMapping"); + TQString key = config->readEntry("MouseButtonMapping"); if (key == "RightHanded") handed = RIGHT_HANDED; else if (key == "LeftHanded") @@ -805,9 +805,9 @@ void MouseSettings::save(KConfig *config) config->writeEntry("Acceleration",accelRate); config->writeEntry("Threshold",thresholdMove); if (handed == RIGHT_HANDED) - config->writeEntry("MouseButtonMapping",QString("RightHanded")); + config->writeEntry("MouseButtonMapping",TQString("RightHanded")); else - config->writeEntry("MouseButtonMapping",QString("LeftHanded")); + config->writeEntry("MouseButtonMapping",TQString("LeftHanded")); config->writeEntry( "ReverseScrollPolarity", reverseScrollPolarity ); config->setGroup("KDE"); diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h index 005c7a2fc..749351f19 100644 --- a/kcontrol/input/mouse.h +++ b/kcontrol/input/mouse.h @@ -31,12 +31,12 @@ #ifndef __MOUSECONFIG_H__ #define __MOUSECONFIG_H__ -#include <qbuttongroup.h> -#include <qdialog.h> -#include <qlabel.h> -#include <qlcdnumber.h> -#include <qpushbutton.h> -#include <qradiobutton.h> +#include <tqbuttongroup.h> +#include <tqdialog.h> +#include <tqlabel.h> +#include <tqlcdnumber.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> #include <kapplication.h> @@ -85,7 +85,7 @@ public: #ifdef HAVE_LIBUSB // TODO: In Qt4, replace with a better container. - QPtrList <LogitechMouse> logitechMouseList; + TQPtrList <LogitechMouse> logitechMouseList; #endif }; @@ -93,7 +93,7 @@ class MouseConfig : public KCModule { Q_OBJECT public: - MouseConfig(QWidget *parent=0, const char* name=0); + MouseConfig(TQWidget *parent=0, const char* name=0); ~MouseConfig(); void save(); @@ -129,23 +129,23 @@ private: KIntNumInput *dragStartDist; KIntNumInput *wheelScrollLines; - QButtonGroup *handedBox; -// QRadioButton *leftHanded, *rightHanded; -// QCheckBox *doubleClick; -// QCheckBox *cbAutoSelect; - QLabel *lDelay; -// QSlider *slAutoSelect; -// QCheckBox *cbVisualActivate; -// QCheckBox *cbCursor; -// QCheckBox *cbLargeCursor; - - QTabWidget *tabwidget; - QWidget *tab2; + TQButtonGroup *handedBox; +// TQRadioButton *leftHanded, *rightHanded; +// TQCheckBox *doubleClick; +// TQCheckBox *cbAutoSelect; + TQLabel *lDelay; +// TQSlider *slAutoSelect; +// TQCheckBox *cbVisualActivate; +// TQCheckBox *cbCursor; +// TQCheckBox *cbLargeCursor; + + TQTabWidget *tabwidget; + TQWidget *tab2; KMouseDlg* tab1; ThemePage* themetab; MouseSettings *settings; - QCheckBox *mouseKeys; + TQCheckBox *mouseKeys; KIntNumInput *mk_delay, *mk_interval, *mk_time_to_max, *mk_max_speed, *mk_curve; diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index 36108ef36..ceb399648 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -18,11 +18,11 @@ #include <kglobal.h> -#include <qwidget.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qstring.h> -#include <qcursor.h> +#include <tqwidget.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqstring.h> +#include <tqcursor.h> #include <kglobal.h> @@ -91,7 +91,7 @@ class PreviewCursor PreviewCursor(); ~PreviewCursor(); - void load( const QString &, const QString & ); + void load( const TQString &, const TQString & ); const Picture picture() const { return m_pict; } const Cursor handle() const { return m_handle; } const int width() const { return m_width; } @@ -113,9 +113,9 @@ PreviewCursor::PreviewCursor() : } -void PreviewCursor::load( const QString &name, const QString &theme ) +void PreviewCursor::load( const TQString &name, const TQString &theme ) { - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); if ( m_pict ) XRenderFreePicture( dpy, m_pict ); if ( m_handle ) XFreeCursor( dpy, m_handle ); @@ -176,14 +176,14 @@ void PreviewCursor::load( const QString &name, const QString &theme ) PreviewCursor::~PreviewCursor() { - if ( m_handle ) XFreeCursor( QPaintDevice::x11AppDisplay(), m_handle ); - if ( m_pict ) XRenderFreePicture( QPaintDevice::x11AppDisplay(), m_pict ); + if ( m_handle ) XFreeCursor( TQPaintDevice::x11AppDisplay(), m_handle ); + if ( m_pict ) XRenderFreePicture( TQPaintDevice::x11AppDisplay(), m_pict ); } Picture PreviewCursor::createPicture( const XcursorImage* image ) const { - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); XImage ximage; ximage.width = image->width; @@ -221,7 +221,7 @@ Picture PreviewCursor::createPicture( const XcursorImage* image ) const void PreviewCursor::cropCursorImage( XcursorImage *&image ) const { // Calculate the auto-crop rectangle - QRect r( QPoint( image->width, image->height ), QPoint() ); + TQRect r( TQPoint( image->width, image->height ), TQPoint() ); XcursorPixel *pixels = image->pixels; for ( int y = 0; y < int(image->height); y++ ) { for ( int x = 0; x < int(image->width); x++ ) { @@ -262,8 +262,8 @@ void PreviewCursor::cropCursorImage( XcursorImage *&image ) const -PreviewWidget::PreviewWidget( QWidget *parent, const char *name ) - : QWidget( parent, name ) +PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { cursors = new PreviewCursor* [ numCursors ]; for ( int i = 0; i < numCursors; i++ ) @@ -284,7 +284,7 @@ PreviewWidget::~PreviewWidget() } -void PreviewWidget::setTheme( const QString &theme ) +void PreviewWidget::setTheme( const TQString &theme ) { setUpdatesEnabled( false ); @@ -307,11 +307,11 @@ void PreviewWidget::setTheme( const QString &theme ) } -void PreviewWidget::paintEvent( QPaintEvent * ) +void PreviewWidget::paintEvent( TQPaintEvent * ) { - QPixmap buffer( size() ); - QPainter p( &buffer ); - p.fillRect( rect(), colorGroup().brush( QColorGroup::Background ) ); + TQPixmap buffer( size() ); + TQPainter p( &buffer ); + p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); Picture dest; if ( !qt_has_xft || !qt_use_xrender ) { @@ -339,7 +339,7 @@ void PreviewWidget::paintEvent( QPaintEvent * ) } -void PreviewWidget::mouseMoveEvent( QMouseEvent *e ) +void PreviewWidget::mouseMoveEvent( TQMouseEvent *e ) { int pos = e->x() / ( width() / numCursors ); diff --git a/kcontrol/input/xcursor/previewwidget.h b/kcontrol/input/xcursor/previewwidget.h index 1c1d12c0f..a3db01d88 100644 --- a/kcontrol/input/xcursor/previewwidget.h +++ b/kcontrol/input/xcursor/previewwidget.h @@ -27,13 +27,13 @@ class PreviewCursor; class PreviewWidget : public QWidget { public: - PreviewWidget( QWidget *parent = NULL, const char *name = NULL ); + PreviewWidget( TQWidget *parent = NULL, const char *name = NULL ); ~PreviewWidget(); - void setTheme( const QString & ); + void setTheme( const TQString & ); - void paintEvent( QPaintEvent * ); - void mouseMoveEvent( QMouseEvent * ); + void paintEvent( TQPaintEvent * ); + void mouseMoveEvent( TQMouseEvent * ); private: PreviewCursor **cursors; diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 96e3e6871..4fb8b8a69 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -33,15 +33,15 @@ #include <kio/netaccess.h> #include <ktar.h> -#include <qlayout.h> -#include <qdir.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qlabel.h> -#include <qhbox.h> -#include <qpainter.h> -#include <qfileinfo.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqdir.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqhbox.h> +#include <tqpainter.h> +#include <tqfileinfo.h> +#include <tqpushbutton.h> #include <cstdlib> // for getenv() @@ -68,23 +68,23 @@ namespace { } struct ThemeInfo { - QString path; // Path to the cursor theme + TQString path; // Path to the cursor theme bool writable; // Theme directory is writable }; -ThemePage::ThemePage( QWidget* parent, const char* name ) - : QWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL ) +ThemePage::ThemePage( TQWidget* parent, const char* name ) + : TQWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL ) { - QBoxLayout *layout = new QVBoxLayout( this ); + TQBoxLayout *layout = new TQVBoxLayout( this ); layout->setAutoAdd( true ); layout->setMargin( KDialog::marginHint() ); layout->setSpacing( KDialog::spacingHint() ); - new QLabel( i18n("Select the cursor theme you want to use (hover preview to test cursor):"), this ); + new TQLabel( i18n("Select the cursor theme you want to use (hover preview to test cursor):"), this ); // Create the preview widget - preview = new PreviewWidget( new QHBox( this ) ); + preview = new PreviewWidget( new TQHBox( this ) ); // Create the theme list view listview = new KListView( this ); @@ -93,26 +93,26 @@ ThemePage::ThemePage( QWidget* parent, const char* name ) listview->addColumn( i18n("Name") ); listview->addColumn( i18n("Description") ); - connect( listview, SIGNAL(selectionChanged(QListViewItem*)), - SLOT(selectionChanged(QListViewItem*)) ); + connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + TQT_SLOT(selectionChanged(TQListViewItem*)) ); themeDirs = getThemeBaseDirs(); insertThemes(); - QHBox *hbox = new QHBox( this ); + TQHBox *hbox = new TQHBox( this ); hbox->setSpacing( KDialog::spacingHint() ); - installButton = new QPushButton( i18n("Install New Theme..."), hbox ); - removeButton = new QPushButton( i18n("Remove Theme"), hbox ); + installButton = new TQPushButton( i18n("Install New Theme..."), hbox ); + removeButton = new TQPushButton( i18n("Remove Theme"), hbox ); - connect( installButton, SIGNAL( clicked() ), SLOT( installClicked() ) ); - connect( removeButton, SIGNAL( clicked() ), SLOT( removeClicked() ) ); + connect( installButton, TQT_SIGNAL( clicked() ), TQT_SLOT( installClicked() ) ); + connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeClicked() ) ); // Disable the install button if ~/.icons isn't writable - QString path = QDir::homeDirPath() + "/.icons"; - QFileInfo icons = QFileInfo( path ); + TQString path = TQDir::homeDirPath() + "/.icons"; + TQFileInfo icons = TQFileInfo( path ); if ( ( icons.exists() && !icons.isWritable() ) || - ( !icons.exists() && !QFileInfo( QDir::homeDirPath() ).isWritable() ) ) + ( !icons.exists() && !TQFileInfo( TQDir::homeDirPath() ).isWritable() ) ) installButton->setEnabled( false ); if ( !themeDirs.contains( path ) ) @@ -134,7 +134,7 @@ void ThemePage::save() KConfig c( "kcminputrc" ); c.setGroup( "Mouse" ); - c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : QString::null ); + c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null ); KMessageBox::information( this, i18n("You have to restart KDE for these " "changes to take effect."), i18n("Cursor Settings Changed"), @@ -163,7 +163,7 @@ void ThemePage::load( bool useDefaults ) currentTheme = "system"; // Find the theme in the listview and select it - QListViewItem *item = listview->findItem( currentTheme, DirColumn ); + TQListViewItem *item = listview->findItem( currentTheme, DirColumn ); if( !item ) item = listview->findItem( "system", DirColumn ); selectedTheme = item->text( DirColumn ); @@ -186,7 +186,7 @@ void ThemePage::defaults() } -void ThemePage::selectionChanged( QListViewItem *item ) +void ThemePage::selectionChanged( TQListViewItem *item ) { if ( !item ) { @@ -209,13 +209,13 @@ void ThemePage::selectionChanged( QListViewItem *item ) void ThemePage::installClicked() { // Get the URL for the theme we're going to install - KURL url = KURLRequesterDlg::getURL( QString::null, this, i18n( "Drag or Type Theme URL" ) ); + KURL url = KURLRequesterDlg::getURL( TQString::null, this, i18n( "Drag or Type Theme URL" ) ); if ( url.isEmpty() ) return; - QString tmpFile; + TQString tmpFile; if ( !KIO::NetAccess::download( url, tmpFile, this ) ) { - QString text; + TQString text; if ( url.isLocalFile() ) text = i18n( "Unable to find the cursor theme archive %1." ); @@ -237,7 +237,7 @@ void ThemePage::installClicked() void ThemePage::removeClicked() { - QString question = i18n( "<qt>Are you sure you want to remove the " + TQString question = i18n( "<qt>Are you sure you want to remove the " "<strong>%1</strong> cursor theme?<br>" "This will delete all the files installed by this theme.</qt>") .arg( listview->currentItem()->text( NameColumn ) ); @@ -266,7 +266,7 @@ void ThemePage::removeClicked() } -bool ThemePage::installThemes( const QString &file ) +bool ThemePage::installThemes( const TQString &file ) { KTar archive( file ); @@ -274,10 +274,10 @@ bool ThemePage::installThemes( const QString &file ) return false; const KArchiveDirectory *archiveDir = archive.directory(); - QStringList themeDirs; + TQStringList themeDirs; - const QStringList entries = archiveDir->entries(); - for ( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it ) + const TQStringList entries = archiveDir->entries(); + for ( TQStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it ) { const KArchiveEntry *entry = archiveDir->entry( *it ); if ( entry->isDirectory() && entry->name().lower() != "default" ) { @@ -290,14 +290,14 @@ bool ThemePage::installThemes( const QString &file ) if ( themeDirs.count() < 1 ) return false; - const QString destDir = QDir::homeDirPath() + "/.icons/"; + const TQString destDir = TQDir::homeDirPath() + "/.icons/"; KStandardDirs::makeDir( destDir ); // Make sure the directory exists - for ( QStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it ) + for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it ) { // Check if a theme with that name already exists - if ( QDir( destDir ).exists( *it ) ) { - const QString question = i18n( "A theme named %1 already exists in your icon " + if ( TQDir( destDir ).exists( *it ) ) { + const TQString question = i18n( "A theme named %1 already exists in your icon " "theme folder. Do you want replace it with this one?" ).arg( *it ); int answer = KMessageBox::warningContinueCancel( this, question, i18n( "Overwrite Theme?"), i18n("Replace") ); if ( answer != KMessageBox::Continue ) @@ -314,7 +314,7 @@ bool ThemePage::installThemes( const QString &file ) // result in strange side effects (from the average users point of view). OTOH // a user might want to do this 'upgrade' a global theme. - const QString dest = destDir + *it; + const TQString dest = destDir + *it; const KArchiveDirectory *dir = static_cast< const KArchiveDirectory* >( archiveDir->entry( *it ) ); dir->copyTo( dest ); insertTheme( dest ); @@ -327,14 +327,14 @@ bool ThemePage::installThemes( const QString &file ) } -void ThemePage::insertTheme( const QString &path ) +void ThemePage::insertTheme( const TQString &path ) { - QString dirName = QDir( path ).dirName(); + TQString dirName = TQDir( path ).dirName(); // Defaults in case there's no name or comment field. - QString name = dirName; - QString desc = i18n( "No description available" ); - QString sample = "left_ptr"; + TQString name = dirName; + TQString desc = i18n( "No description available" ); + TQString sample = "left_ptr"; KSimpleConfig c( path + "/index.theme", true ); // Open read-only c.setGroup( "Icon Theme" ); @@ -373,11 +373,11 @@ void ThemePage::insertTheme( const QString &path ) } -const QStringList ThemePage::getThemeBaseDirs() const +const TQStringList ThemePage::getThemeBaseDirs() const { #if XCURSOR_LIB_MAJOR == 1 && XCURSOR_LIB_MINOR < 1 // These are the default paths Xcursor will scan for cursor themes - QString path( "~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons" ); + TQString path( "~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons" ); // If XCURSOR_PATH is set, use that instead of the default path char *xcursorPath = std::getenv( "XCURSOR_PATH" ); @@ -385,35 +385,35 @@ const QStringList ThemePage::getThemeBaseDirs() const path = xcursorPath; #else // Get the search patch from Xcursor - QString path = XcursorLibraryPath(); + TQString path = XcursorLibraryPath(); #endif // Expand all occurences of ~ to the home dir - path.replace( "~/", QDir::homeDirPath() + '/' ); - return QStringList::split( ':', path ); + path.replace( "~/", TQDir::homeDirPath() + '/' ); + return TQStringList::split( ':', path ); } -bool ThemePage::isCursorTheme( const QString &theme, const int depth ) const +bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const { // Prevent infinate recursion if ( depth > 10 ) return false; // Search each icon theme directory for 'theme' - for ( QStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it ) + for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it ) { - QDir dir( *it ); + TQDir dir( *it ); if ( !dir.exists() ) continue; - const QStringList subdirs( dir.entryList( QDir::Dirs ) ); + const TQStringList subdirs( dir.entryList( TQDir::Dirs ) ); if ( subdirs.contains( theme ) ) { - const QString path = *it + '/' + theme; - const QString indexfile = path + "/index.theme"; + const TQString path = *it + '/' + theme; + const TQString indexfile = path + "/index.theme"; const bool haveIndexFile = dir.exists( indexfile ); const bool haveCursors = dir.exists( path + "/cursors" ); - QStringList inherit; + TQStringList inherit; // Return true if we have a cursors subdirectory if ( haveCursors ) @@ -428,7 +428,7 @@ bool ThemePage::isCursorTheme( const QString &theme, const int depth ) const } // Recurse through the list of inherited themes - for ( QStringList::ConstIterator it2 = inherit.begin(); it2 != inherit.end(); ++it2 ) + for ( TQStringList::ConstIterator it2 = inherit.begin(); it2 != inherit.end(); ++it2 ) { if ( *it2 == theme ) // Avoid possible DoS continue; @@ -448,17 +448,17 @@ void ThemePage::insertThemes() // Scan each base dir for cursor themes and add them to the listview. // An icon theme is considered to be a cursor theme if it contains // a cursors subdirectory or if it inherits a cursor theme. - for ( QStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it ) + for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it ) { - QDir dir( *it ); + TQDir dir( *it ); if ( !dir.exists() ) continue; - QStringList subdirs( dir.entryList( QDir::Dirs ) ); + TQStringList subdirs( dir.entryList( TQDir::Dirs ) ); subdirs.remove( "." ); subdirs.remove( ".." ); - for ( QStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it ) + for ( TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it ) { // Only add the theme if we don't already have a theme with that name // in the list. Xcursor will use the first theme it finds in that @@ -467,8 +467,8 @@ void ThemePage::insertThemes() if ( listview->findItem( *it, DirColumn ) ) continue; - const QString path = dir.path() + '/' + *it; - const QString indexfile = path + "/index.theme"; + const TQString path = dir.path() + '/' + *it; + const TQString indexfile = path + "/index.theme"; const bool haveIndexFile = dir.exists( *it + "/index.theme" ); const bool haveCursors = dir.exists( *it + "/cursors" ); @@ -479,9 +479,9 @@ void ThemePage::insertThemes() // Defaults in case there's no index.theme file or it lacks // a name and a comment field. - QString name = *it; - QString desc = i18n( "No description available" ); - QString sample = "left_ptr"; + TQString name = *it; + TQString desc = i18n( "No description available" ); + TQString sample = "left_ptr"; // Parse the index.theme file if the theme has one. if ( haveIndexFile ) @@ -498,8 +498,8 @@ void ThemePage::insertThemes() if ( !haveCursors ) { bool result = false; - QStringList inherit = c.readListEntry( "Inherits" ); - for ( QStringList::ConstIterator it2 = inherit.begin(); it2 != inherit.end(); ++it2 ) + TQStringList inherit = c.readListEntry( "Inherits" ); + for ( TQStringList::ConstIterator it2 = inherit.begin(); it2 != inherit.end(); ++it2 ) if ( result = isCursorTheme( *it2 ) ) break; @@ -518,7 +518,7 @@ void ThemePage::insertThemes() // Create a ThemeInfo object, and fill in the members ThemeInfo *info = new ThemeInfo; info->path = path; - info->writable = QFileInfo( path ).isWritable(); + info->writable = TQFileInfo( path ).isWritable(); themeInfo.insert( *it, info ); // Create the listview item and insert it into the list. @@ -542,10 +542,10 @@ void ThemePage::insertThemes() } -QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) const +TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) const { XcursorImage *xcur; - QPixmap pix; + TQPixmap pix; xcur = XcursorLibraryLoadImage( sample.latin1(), theme.latin1(), iconSize ); if ( !xcur ) xcur = XcursorLibraryLoadImage( "left_ptr", theme.latin1(), iconSize ); @@ -553,7 +553,7 @@ QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) con if ( xcur ) { // Calculate an auto-crop rectangle for the cursor image // (helps with cursors converted from windows .cur or .ani files) - QRect r( QPoint( xcur->width, xcur->height ), QPoint() ); + TQRect r( TQPoint( xcur->width, xcur->height ), TQPoint() ); XcursorPixel *src = xcur->pixels; for ( int y = 0; y < int( xcur->height ); y++ ) { @@ -574,7 +574,7 @@ QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) con int size = kMax( iconSize, kMax( r.width(), r.height() ) ); // Create the intermediate QImage - QImage image( size, size, 32 ); + TQImage image( size, size, 32 ); image.setAlphaBuffer( true ); // Clear the image @@ -583,13 +583,13 @@ QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) con dst[i] = 0; // Compute the source and destination offsets - QPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 ); - QPoint srcOffset( r.topLeft() ); + TQPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 ); + TQPoint srcOffset( r.topLeft() ); dst = reinterpret_cast<Q_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x(); src = reinterpret_cast<Q_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x(); - // Copy the XcursorImage into the QImage, converting it from premultiplied + // Copy the XcursorImage into the TQImage, converting it from premultiplied // to non-premultiplied alpha and cropping it if needed. for ( int y = 0; y < r.height(); y++ ) { @@ -614,13 +614,13 @@ QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) con // Scale down the image if we need to if ( image.width() > iconSize || image.height() > iconSize ) - image = image.smoothScale( iconSize, iconSize, QImage::ScaleMin ); + image = image.smoothScale( iconSize, iconSize, TQImage::ScaleMin ); pix.convertFromImage( image ); XcursorImageDestroy( xcur ); } else { - QImage image( iconSize, iconSize, 32 ); + TQImage image( iconSize, iconSize, 32 ); image.setAlphaBuffer( true ); Q_UINT32 *data = reinterpret_cast< Q_UINT32* >( image.bits() ); diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h index 7d4dec675..95ee12fd9 100644 --- a/kcontrol/input/xcursor/themepage.h +++ b/kcontrol/input/xcursor/themepage.h @@ -19,7 +19,7 @@ #ifndef __THEMEPAGE_H #define __THEMEPAGE_H -#include <qdict.h> +#include <tqdict.h> class KListView; @@ -37,7 +37,7 @@ class ThemePage : public QWidget Q_OBJECT public: - ThemePage( QWidget* parent = 0, const char* name = 0 ); + ThemePage( TQWidget* parent = 0, const char* name = 0 ); ~ThemePage(); // Called by the KCM @@ -50,25 +50,25 @@ class ThemePage : public QWidget void changed( bool ); private slots: - void selectionChanged( QListViewItem * ); + void selectionChanged( TQListViewItem * ); void installClicked(); void removeClicked(); private: - bool installThemes( const QString &file ); - void insertTheme( const QString & ); - const QStringList getThemeBaseDirs() const; - bool isCursorTheme( const QString &theme, const int depth = 0 ) const; + bool installThemes( const TQString &file ); + void insertTheme( const TQString & ); + const TQStringList getThemeBaseDirs() const; + bool isCursorTheme( const TQString &theme, const int depth = 0 ) const; void insertThemes(); - QPixmap createIcon( const QString &, const QString & ) const; + TQPixmap createIcon( const TQString &, const TQString & ) const; KListView *listview; PreviewWidget *preview; - QPushButton *installButton, *removeButton; - QString selectedTheme; - QString currentTheme; - QStringList themeDirs; - QDict<ThemeInfo> themeInfo; + TQPushButton *installButton, *removeButton; + TQString selectedTheme; + TQString currentTheme; + TQStringList themeDirs; + TQDict<ThemeInfo> themeInfo; }; #endif // __THEMEPAGE_H diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index cb4cfdaea..e2014a1ca 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -22,15 +22,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qfile.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qspinbox.h> -#include <qtabwidget.h> -#include <qtextcodec.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqfile.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqspinbox.h> +#include <tqtabwidget.h> +#include <tqtextcodec.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <kconfig.h> #include <kdebug.h> @@ -45,22 +45,22 @@ #include "kcmioslaveinfo.h" -typedef KGenericFactory<KCMIOSlaveInfo, QWidget> SlaveFactory; +typedef KGenericFactory<KCMIOSlaveInfo, TQWidget> SlaveFactory; K_EXPORT_COMPONENT_FACTORY( kcm_ioslaveinfo, SlaveFactory("kcmioslaveinfo") ) -KCMIOSlaveInfo::KCMIOSlaveInfo(QWidget *parent, const char *name, const QStringList &) +KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStringList &) :KCModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0) { - QVBoxLayout *layout=new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); setQuickHelp( i18n("<h1>IO slaves</h1> Gives you an overview of the installed ioslaves.")); setButtons( KCModule::Help ); - QLabel* label=new QLabel(i18n("Available IO slaves:"),this); - QHBox *hbox=new QHBox(this); + TQLabel* label=new TQLabel(i18n("Available IO slaves:"),this); + TQHBox *hbox=new TQHBox(this); m_ioslavesLb=new KListBox(hbox); m_ioslavesLb->setMinimumSize(fontMetrics().width("blahfaselwhatever----"),10); - connect( m_ioslavesLb, SIGNAL( selectionChanged( QListBoxItem * ) ), SLOT( showInfo( QListBoxItem * ) ) ); + connect( m_ioslavesLb, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( showInfo( TQListBoxItem * ) ) ); //TODO make something useful after 2.1 is released m_info=new KTextBrowser(hbox); hbox->setSpacing(KDialog::spacingHint()); @@ -70,10 +70,10 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(QWidget *parent, const char *name, const QStringL hbox->setStretchFactor(m_ioslavesLb,1); hbox->setStretchFactor(m_info,5); - QStringList protocols=KProtocolInfo::protocols(); - for (QStringList::Iterator it=protocols.begin(); it!=protocols.end(); ++it) + TQStringList protocols=KProtocolInfo::protocols(); + for (TQStringList::Iterator it=protocols.begin(); it!=protocols.end(); ++it) { - QString proto = *it; + TQString proto = *it; m_ioslavesLb->insertItem( SmallIcon( KProtocolInfo::icon( proto )), proto ); }; @@ -94,13 +94,13 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(QWidget *parent, const char *name, const QStringL } -void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const QByteArray &data) +void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const TQByteArray &data) { if ( data.size() == 0 ) { // EOF int index = helpData.find( "<meta http-equiv=\"Content-Type\"" ); index = helpData.find( "charset=", index ) + 8; - QString charset = helpData.mid( index, helpData.find( '\"', index ) - index ); - QString text = QTextCodec::codecForName(charset.latin1())->toUnicode( helpData ); + TQString charset = helpData.mid( index, helpData.find( '\"', index ) - index ); + TQString text = TQTextCodec::codecForName(charset.latin1())->toUnicode( helpData ); index = text.find( "<div class=\"titlepage\">" ); text = text.mid( index ); index = text.find( "<table width=\"100%\" class=\"bottom-nav\"" ); @@ -116,9 +116,9 @@ void KCMIOSlaveInfo::slotResult(KIO::Job *) m_tfj = 0; } -void KCMIOSlaveInfo::showInfo(const QString& protocol) +void KCMIOSlaveInfo::showInfo(const TQString& protocol) { - QString file = QString("kioslave/%1.docbook").arg( protocol ); + TQString file = TQString("kioslave/%1.docbook").arg( protocol ); file = KGlobal::locale()->langLookup( file ); if (m_tfj) { @@ -129,15 +129,15 @@ void KCMIOSlaveInfo::showInfo(const QString& protocol) if (!file.isEmpty()) { helpData.truncate( 0 ); - m_tfj = KIO::get( KURL( QString("help:/kioslave/%1.html").arg( protocol ) ), true, false ); - connect( m_tfj, SIGNAL( data( KIO::Job *, const QByteArray &) ), SLOT( slaveHelp( KIO::Job *, const QByteArray &) ) ); - connect( m_tfj, SIGNAL( result( KIO::Job * ) ), SLOT( slotResult( KIO::Job * ) ) ); + m_tfj = KIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false ); + connect( m_tfj, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( KIO::Job *, const TQByteArray &) ) ); + connect( m_tfj, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) ); return; } m_info->setText(i18n("Some info about protocol %1:/ ...").arg(protocol)); } -void KCMIOSlaveInfo::showInfo(QListBoxItem *item) +void KCMIOSlaveInfo::showInfo(TQListBoxItem *item) { if (item==0) return; diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h index 87eda14b4..1aa9dbf6b 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h @@ -24,8 +24,8 @@ #ifndef kcmioslaveinfo_h_included #define kcmioslaveinfo_h_included -#include <qlistbox.h> -#include <qstring.h> +#include <tqlistbox.h> +#include <tqstring.h> #include <kaboutdata.h> #include <kcmodule.h> @@ -42,19 +42,19 @@ class KCMIOSlaveInfo : public KCModule { Q_OBJECT public: - KCMIOSlaveInfo(QWidget *parent = 0L, const char *name = 0L, const QStringList &lits=QStringList() ); + KCMIOSlaveInfo(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &lits=TQStringList() ); protected: KListBox *m_ioslavesLb; KTextBrowser *m_info; - QCString helpData; + TQCString helpData; KIO::Job *m_tfj; protected slots: - void showInfo(const QString& protocol); - void showInfo(QListBoxItem *item); - void slaveHelp( KIO::Job *, const QByteArray &data); + void showInfo(const TQString& protocol); + void showInfo(TQListBoxItem *item); + void slaveHelp( KIO::Job *, const TQByteArray &data); void slotResult( KIO::Job * ); }; diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp index f8340d03c..095f18f41 100644 --- a/kcontrol/joystick/caldialog.cpp +++ b/kcontrol/joystick/caldialog.cpp @@ -22,10 +22,10 @@ #include "caldialog.h" #include "joydevice.h" -#include <qlabel.h> -#include <qtimer.h> -#include <qapplication.h> -#include <qvbox.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqapplication.h> +#include <tqvbox.h> #include <klocale.h> #include <kmessagebox.h> @@ -33,17 +33,17 @@ //-------------------------------------------------------------- -CalDialog::CalDialog(QWidget *parent, JoyDevice *joy) +CalDialog::CalDialog(TQWidget *parent, JoyDevice *joy) : KDialogBase(parent, "calibrateDialog", true, i18n("Calibration"), KDialogBase::Cancel|KDialogBase::User1, KDialogBase::User1, true, KGuiItem(i18n("Next"))), joydev(joy) { - QVBox *main = makeVBoxMainWidget(); + TQVBox *main = makeVBoxMainWidget(); - text = new QLabel(main); + text = new TQLabel(main); text->setMinimumHeight(200); - valueLbl = new QLabel(main); + valueLbl = new TQLabel(main); } //-------------------------------------------------------------- @@ -56,7 +56,7 @@ void CalDialog::calibrate() // calibrate precision (which min,max delivers the joystick in its center position) // get values through the normal idle procedure - QTimer ti; + TQTimer ti; ti.start(2000, true); // single shot in 2 seconds // normally I'd like to hide the 'Next' button in this step, @@ -67,15 +67,15 @@ void CalDialog::calibrate() { qApp->processEvents(2000); } - while ( ti.isActive() && (result() != QDialog::Rejected) ); + while ( ti.isActive() && (result() != TQDialog::Rejected) ); - if ( result() == QDialog::Rejected ) return; // user cancelled the dialog + if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog joydev->calcPrecision(); int i, lastVal; int min[2], center[2], max[2]; - QString hint; + TQString hint; for (i = 0; i < joydev->numAxes(); i++) { @@ -93,12 +93,12 @@ void CalDialog::calibrate() "to continue with the next step.</qt>").arg(i+1).arg(hint)); waitButton(i, true, lastVal); - if ( result() == QDialog::Rejected ) return; // user cancelled the dialog + if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog joydev->resetMinMax(i, lastVal); if ( result() != -2 ) waitButton(i, false, lastVal); - if ( result() == QDialog::Rejected ) return; // user cancelled the dialog + if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog min[0] = joydev->axisMin(i); min[1] = joydev->axisMax(i); @@ -110,12 +110,12 @@ void CalDialog::calibrate() "to continue with the next step.</qt>").arg(i+1).arg(hint)); waitButton(i, true, lastVal); - if ( result() == QDialog::Rejected ) return; // user cancelled the dialog + if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog joydev->resetMinMax(i, lastVal); if ( result() != -2 ) waitButton(i, false, lastVal); - if ( result() == QDialog::Rejected ) return; // user cancelled the dialog + if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog center[0] = joydev->axisMin(i); center[1] = joydev->axisMax(i); @@ -127,12 +127,12 @@ void CalDialog::calibrate() "to continue with the next step.</qt>").arg(i+1).arg(hint)); waitButton(i, true, lastVal); - if ( result() == QDialog::Rejected ) return; // user cancelled the dialog + if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog joydev->resetMinMax(i, lastVal); if ( result() != -2 ) waitButton(i, false, lastVal); - if ( result() == QDialog::Rejected ) return; // user cancelled the dialog + if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog max[0] = joydev->axisMin(i); max[1] = joydev->axisMax(i); diff --git a/kcontrol/joystick/caldialog.h b/kcontrol/joystick/caldialog.h index 678a0a2d1..02e151e45 100644 --- a/kcontrol/joystick/caldialog.h +++ b/kcontrol/joystick/caldialog.h @@ -34,7 +34,7 @@ class CalDialog : public KDialogBase Q_OBJECT public: - CalDialog(QWidget *parent, JoyDevice *joy); + CalDialog(TQWidget *parent, JoyDevice *joy); void calibrate(); @@ -47,8 +47,8 @@ class CalDialog : public KDialogBase private: JoyDevice *joydev; - QLabel *text; - QLabel *valueLbl; + TQLabel *text; + TQLabel *valueLbl; }; #endif diff --git a/kcontrol/joystick/joydevice.cpp b/kcontrol/joystick/joydevice.cpp index 2c1a16ce7..76067ee17 100644 --- a/kcontrol/joystick/joydevice.cpp +++ b/kcontrol/joystick/joydevice.cpp @@ -36,7 +36,7 @@ //-------------------------------------------------------------- -JoyDevice::JoyDevice(const QString &devicefile) +JoyDevice::JoyDevice(const TQString &devicefile) : devName(devicefile), joyFd(-1), buttons(0), axes(0), amin(0), amax(0), corr(0), origCorr(0) { @@ -44,7 +44,7 @@ JoyDevice::JoyDevice(const QString &devicefile) //-------------------------------------------------------------- -QString JoyDevice::errText(ErrorCode code) const +TQString JoyDevice::errText(ErrorCode code) const { switch ( code ) { diff --git a/kcontrol/joystick/joydevice.h b/kcontrol/joystick/joydevice.h index b84464241..29d4c49ce 100644 --- a/kcontrol/joystick/joydevice.h +++ b/kcontrol/joystick/joydevice.h @@ -21,7 +21,7 @@ #ifndef _JOYDEVICE_H_ #define _JOYDEVICE_H_ -#include <qstring.h> +#include <tqstring.h> #include <sys/types.h> #undef __STRICT_ANSI__ @@ -55,24 +55,24 @@ class JoyDevice }; // devicefile to use, e.g. "/dev/js0" - JoyDevice(const QString &devicefile); + JoyDevice(const TQString &devicefile); ~JoyDevice(); // returns one of the error-codes from above ErrorCode open(); // return descriptive error text for given error code - QString errText(ErrorCode code) const; + TQString errText(ErrorCode code) const; int fd() const { return joyFd; } void close(); ErrorCode restoreCorr(); // return devicefilename from constructor - const QString &device() const { return devName; } + const TQString &device() const { return devName; } // descriptive text for this device read from the driver - QString text() const { return descr; } + TQString text() const { return descr; } int numButtons() const { return buttons; } int numAxes() const { return axes; } @@ -94,8 +94,8 @@ class JoyDevice ErrorCode applyCalibration(); private: - QString devName; // device filename - QString descr; // descriptive text + TQString devName; // device filename + TQString descr; // descriptive text int joyFd; int buttons; diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 75115fcb7..3ffc0e1d7 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------------------- -typedef KGenericFactory<joystick, QWidget> JoystickFactory; +typedef KGenericFactory<joystick, TQWidget> JoystickFactory; K_EXPORT_COMPONENT_FACTORY(kcm_joystick, JoystickFactory("joystick")) extern "C" @@ -66,7 +66,7 @@ extern "C" //--------------------------------------------------------------------------------------------- -joystick::joystick(QWidget *parent, const char *name, const QStringList &) +joystick::joystick(TQWidget *parent, const char *name, const TQStringList &) : KCModule(JoystickFactory::instance(), parent, name) { setAboutData( new KAboutData("kcmjoystick", I18N_NOOP("KDE Joystick Control Module"), "1.0", diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h index 819a5f70d..bebb8115d 100644 --- a/kcontrol/joystick/joystick.h +++ b/kcontrol/joystick/joystick.h @@ -30,7 +30,7 @@ class joystick: public KCModule Q_OBJECT public: - joystick(QWidget *parent = 0, const char *name = 0, const QStringList &list = QStringList()); + joystick(TQWidget *parent = 0, const char *name = 0, const TQStringList &list = TQStringList()); virtual void load(); virtual void defaults(); diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index a4d42e3f1..cfc293b89 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -23,16 +23,16 @@ #include "poswidget.h" #include "caldialog.h" -#include <qhbox.h> -#include <qvbox.h> -#include <qtable.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qlistbox.h> -#include <qcheckbox.h> -#include <qtimer.h> -#include <qfontmetrics.h> -#include <qpushbutton.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqtable.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqlistbox.h> +#include <tqcheckbox.h> +#include <tqtimer.h> +#include <tqfontmetrics.h> +#include <tqpushbutton.h> #include <klocale.h> #include <kdialog.h> @@ -40,57 +40,57 @@ #include <kiconloader.h> //-------------------------------------------------------------- -static QString PRESSED = I18N_NOOP("PRESSED"); +static TQString PRESSED = I18N_NOOP("PRESSED"); //-------------------------------------------------------------- -JoyWidget::JoyWidget(QWidget *parent, const char *name) - : QWidget(parent, name), idle(0), joydev(0) +JoyWidget::JoyWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name), idle(0), joydev(0) { - QVBox *mainVbox = new QVBox(parent); + TQVBox *mainVbox = new TQVBox(parent); mainVbox->setSpacing(KDialog::spacingHint()); // create area to show an icon + message if no joystick was detected { - messageBox = new QHBox(mainVbox); + messageBox = new TQHBox(mainVbox); messageBox->setSpacing(KDialog::spacingHint()); - QLabel *icon = new QLabel(messageBox); + TQLabel *icon = new TQLabel(messageBox); icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true)); icon->setFixedSize(icon->sizeHint()); - message = new QLabel(messageBox); + message = new TQLabel(messageBox); messageBox->hide(); } - QHBox *devHbox = new QHBox(mainVbox); - new QLabel(i18n("Device:"), devHbox); - device = new QComboBox(true, devHbox); - device->setInsertionPolicy(QComboBox::NoInsertion); - connect(device, SIGNAL(activated(const QString &)), this, SLOT(deviceChanged(const QString &))); + TQHBox *devHbox = new TQHBox(mainVbox); + new TQLabel(i18n("Device:"), devHbox); + device = new TQComboBox(true, devHbox); + device->setInsertionPolicy(TQComboBox::NoInsertion); + connect(device, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(deviceChanged(const TQString &))); devHbox->setStretchFactor(device, 3); - QHBox *hbox = new QHBox(mainVbox); + TQHBox *hbox = new TQHBox(mainVbox); hbox->setSpacing(KDialog::spacingHint()); - QVBox *vboxLeft = new QVBox(hbox); + TQVBox *vboxLeft = new TQVBox(hbox); vboxLeft->setSpacing(KDialog::spacingHint()); - new QLabel(i18n("Position:"), vboxLeft); + new TQLabel(i18n("Position:"), vboxLeft); xyPos = new PosWidget(vboxLeft); - trace = new QCheckBox(i18n("Show trace"), mainVbox); - connect(trace, SIGNAL(toggled(bool)), this, SLOT(traceChanged(bool))); + trace = new TQCheckBox(i18n("Show trace"), mainVbox); + connect(trace, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(traceChanged(bool))); - QVBox *vboxMid = new QVBox(hbox); + TQVBox *vboxMid = new TQVBox(hbox); vboxMid->setSpacing(KDialog::spacingHint()); - QVBox *vboxRight = new QVBox(hbox); + TQVBox *vboxRight = new TQVBox(hbox); vboxRight->setSpacing(KDialog::spacingHint()); // calculate the column width we need - QFontMetrics fm(font()); + TQFontMetrics fm(font()); int colWidth = QMAX(fm.width(PRESSED), fm.width("-32767")) + 10; // -32767 largest string - new QLabel(i18n("Buttons:"), vboxMid); - buttonTbl = new QTable(0, 1, vboxMid); + new TQLabel(i18n("Buttons:"), vboxMid); + buttonTbl = new TQTable(0, 1, vboxMid); buttonTbl->setReadOnly(true); buttonTbl->horizontalHeader()->setLabel(0, i18n("State")); buttonTbl->horizontalHeader()->setClickEnabled(false); @@ -99,8 +99,8 @@ JoyWidget::JoyWidget(QWidget *parent, const char *name) buttonTbl->verticalHeader()->setResizeEnabled(false); buttonTbl->setColumnWidth(0, colWidth); - new QLabel(i18n("Axes:"), vboxRight); - axesTbl = new QTable(0, 1, vboxRight); + new TQLabel(i18n("Axes:"), vboxRight); + axesTbl = new TQTable(0, 1, vboxRight); axesTbl->setReadOnly(true); axesTbl->horizontalHeader()->setLabel(0, i18n("Value")); axesTbl->horizontalHeader()->setClickEnabled(false); @@ -110,13 +110,13 @@ JoyWidget::JoyWidget(QWidget *parent, const char *name) axesTbl->setColumnWidth(0, colWidth); // calibrate button - calibrate = new QPushButton(i18n("Calibrate"), mainVbox); - connect(calibrate, SIGNAL(clicked()), this, SLOT(calibrateDevice())); + calibrate = new TQPushButton(i18n("Calibrate"), mainVbox); + connect(calibrate, TQT_SIGNAL(clicked()), this, TQT_SLOT(calibrateDevice())); calibrate->setEnabled(false); // set up a timer for idle processing of joystick events - idle = new QTimer(this); - connect(idle, SIGNAL(timeout()), this, SLOT(checkDevice())); + idle = new TQTimer(this); + connect(idle, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkDevice())); // check which devicefiles we have init(); @@ -170,7 +170,7 @@ void JoyWidget::init() // we found one - device->insertItem(QString("%1 (%2)").arg(joy->text()).arg(joy->device())); + device->insertItem(TQString("%1 (%2)").arg(joy->text()).arg(joy->device())); // display values for first device if ( first ) @@ -186,7 +186,7 @@ void JoyWidget::init() if ( device->count() == 0 ) { messageBox->show(); - message->setText(QString("<qt><b>%1</b></qt>").arg( + message->setText(TQString("<qt><b>%1</b></qt>").arg( i18n("No joystick device automatically found on this computer.<br>" "Checks were done in /dev/js[0-4] and /dev/input/js[0-4]<br>" "If you know that there is one attached, please enter the correct device file."))); @@ -212,7 +212,7 @@ void JoyWidget::restoreCurrDev() else { // try to find the current open device in the combobox list - QListBoxItem *item; + TQListBoxItem *item; item = device->listBox()->findItem(joydev->device(), Qt::Contains); if ( !item ) // the current open device is one the user entered (not in the list) @@ -224,11 +224,11 @@ void JoyWidget::restoreCurrDev() //-------------------------------------------------------------- -void JoyWidget::deviceChanged(const QString &dev) +void JoyWidget::deviceChanged(const TQString &dev) { // find "/dev" in given string int start, stop; - QString devName; + TQString devName; if ( (start = dev.find("/dev")) == -1 ) { @@ -315,7 +315,7 @@ void JoyWidget::checkDevice() if ( number == 1 ) // y-axis xyPos->changeY(value); - axesTbl->setText(number, 0, QString("%1").arg(int(value))); + axesTbl->setText(number, 0, TQString("%1").arg(int(value))); } } @@ -348,7 +348,7 @@ void JoyWidget::calibrateDevice() dlg.calibrate(); // user cancelled somewhere during calibration, therefore the device is in a bad state - if ( dlg.result() == QDialog::Rejected ) + if ( dlg.result() == TQDialog::Rejected ) joydev->restoreCorr(); idle->start(0); // continue with event getting diff --git a/kcontrol/joystick/joywidget.h b/kcontrol/joystick/joywidget.h index 5f561c0e5..d857229e8 100644 --- a/kcontrol/joystick/joywidget.h +++ b/kcontrol/joystick/joywidget.h @@ -21,7 +21,7 @@ #ifndef _JOYWIDGET_H_ #define _JOYWIDGET_H_ -#include <qwidget.h> +#include <tqwidget.h> class JoyDevice; @@ -40,7 +40,7 @@ class JoyWidget : public QWidget Q_OBJECT public: - JoyWidget(QWidget *parent = 0, const char *name = 0); + JoyWidget(TQWidget *parent = 0, const char *name = 0); ~JoyWidget(); @@ -53,7 +53,7 @@ class JoyWidget : public QWidget private slots: void checkDevice(); - void deviceChanged(const QString &dev); + void deviceChanged(const TQString &dev); void traceChanged(bool); void calibrateDevice(); @@ -62,16 +62,16 @@ class JoyWidget : public QWidget void restoreCurrDev(); // restores the content of the combobox to reflect the current open device private: - QHBox *messageBox; - QLabel *message; // in case of no device, show here a message rather than in a dialog - QComboBox *device; + TQHBox *messageBox; + TQLabel *message; // in case of no device, show here a message rather than in a dialog + TQComboBox *device; PosWidget *xyPos; - QTable *buttonTbl; - QTable *axesTbl; - QCheckBox *trace; - QPushButton *calibrate; + TQTable *buttonTbl; + TQTable *axesTbl; + TQCheckBox *trace; + TQPushButton *calibrate; - QTimer *idle; + TQTimer *idle; JoyDevice *joydev; }; diff --git a/kcontrol/joystick/poswidget.cpp b/kcontrol/joystick/poswidget.cpp index 54e619d7a..eb24ece23 100644 --- a/kcontrol/joystick/poswidget.cpp +++ b/kcontrol/joystick/poswidget.cpp @@ -20,15 +20,15 @@ ***************************************************************************/ #include "poswidget.h" -#include <qpainter.h> +#include <tqpainter.h> #define XY_WIDTH 220 #define MARK_WIDTH 10 //----------------------------------------------------------------- -PosWidget::PosWidget(QWidget *parent, const char *name) - : QWidget(parent, name, WRepaintNoErase), x(0), y(0), trace(false) +PosWidget::PosWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name, WRepaintNoErase), x(0), y(0), trace(false) { setMinimumSize(XY_WIDTH, XY_WIDTH); setMaximumSize(XY_WIDTH, XY_WIDTH); @@ -37,9 +37,9 @@ PosWidget::PosWidget(QWidget *parent, const char *name) //----------------------------------------------------------------- -void PosWidget::paintEvent(QPaintEvent *) +void PosWidget::paintEvent(TQPaintEvent *) { - QPainter paint(this); + TQPainter paint(this); paint.drawRect(0, 0, width(), height()); paint.setPen(Qt::gray); @@ -106,7 +106,7 @@ void PosWidget::showTrace(bool t) void PosWidget::eraseOld() { - QPainter paint(this); + TQPainter paint(this); //paint.eraseRect(x - MARK_WIDTH/2, y - MARK_WIDTH/2, MARK_WIDTH + 1, MARK_WIDTH + 1); diff --git a/kcontrol/joystick/poswidget.h b/kcontrol/joystick/poswidget.h index 9151da57f..a4d57117e 100644 --- a/kcontrol/joystick/poswidget.h +++ b/kcontrol/joystick/poswidget.h @@ -21,7 +21,7 @@ #ifndef _POSWIDGET_H_ #define _POSWIDGET_H_ -#include <qwidget.h> +#include <tqwidget.h> /** Widget to display the joystick-selected (x,y) position @@ -31,7 +31,7 @@ class PosWidget : public QWidget Q_OBJECT public: - PosWidget(QWidget *parent = 0, const char *name = 0); + PosWidget(TQWidget *parent = 0, const char *name = 0); void changeX(int x); void changeY(int y); @@ -42,7 +42,7 @@ class PosWidget : public QWidget void showTrace(bool t); protected: - virtual void paintEvent(QPaintEvent *); + virtual void paintEvent(TQPaintEvent *); private: void eraseOld(); diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 209b264ec..3a07ee567 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -17,11 +17,11 @@ */ -#include <qpainter.h> -#include <qwhatsthis.h> -#include <qregexp.h> -#include <qlayout.h> -#include <qfile.h> +#include <tqpainter.h> +#include <tqwhatsthis.h> +#include <tqregexp.h> +#include <tqlayout.h> +#include <tqfile.h> #include <kstandarddirs.h> #include <klocale.h> @@ -68,8 +68,8 @@ static const char system_text[] = I18N_NOOP("System:"); static const char release_text[] = I18N_NOOP("Release:"); static const char machine_text[] = I18N_NOOP("Machine:"); -AboutWidget::AboutWidget(QWidget *parent , const char *name, QListViewItem* category, const QString &caption) - : QHBox(parent, name), +AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* category, const TQString &caption) + : TQHBox(parent, name), _moduleList(false), _category(category), _caption(caption) @@ -80,16 +80,16 @@ AboutWidget::AboutWidget(QWidget *parent , const char *name, QListViewItem* cate setMinimumSize(400, 400); // set qwhatsthis help - QWhatsThis::add(this, i18n(intro_text)); + TQWhatsThis::add(this, i18n(intro_text)); _viewer = new KHTMLPart( this, "_viewer" ); - _viewer->widget()->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored ); + _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); connect( _viewer->browserExtension(), - SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), - this, SLOT(slotModuleLinkClicked(const KURL&)) ); + TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) ); updatePixmap(); } -void AboutWidget::setCategory( QListViewItem* category, const QString& icon, const QString &caption ) +void AboutWidget::setCategory( TQListViewItem* category, const TQString& icon, const TQString &caption ) { _icon = icon; _caption = caption; @@ -105,11 +105,11 @@ void AboutWidget::setCategory( QListViewItem* category, const QString& icon, con void AboutWidget::updatePixmap() { - QString file = locate( "data", "kcontrol/about/main.html" ); - QFile f( file ); + TQString file = locate( "data", "kcontrol/about/main.html" ); + TQFile f( file ); f.open( IO_ReadOnly ); - QTextStream t( &f ); - QString res = t.read(); + TQTextStream t( &f ); + TQString res = t.read(); res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) @@ -118,7 +118,7 @@ void AboutWidget::updatePixmap() res = res.arg( "" ); - QString title, intro, caption; + TQString title, intro, caption; if (KCGlobal::isInfoCenter()) { res = res.arg(i18n(kcc_infotext)) @@ -132,7 +132,7 @@ void AboutWidget::updatePixmap() .arg(i18n(intro_text)); } - QString content; + TQString content; if (!_moduleList) { @@ -151,7 +151,7 @@ void AboutWidget::updatePixmap() else { KIconLoader *loader = KGlobal::instance()->iconLoader(); - QString iconPath; + TQString iconPath; if (!_icon.isEmpty()) { iconPath = loader->iconPath( _icon, KIcon::Toolbar ); content += "<div id=\"tableTitle\"><img src=\"" + iconPath +" \"</a> " + _caption + "</div>"; @@ -159,11 +159,11 @@ void AboutWidget::updatePixmap() content += "<table class=\"kc_table\">\n"; // traverse the list - QListViewItem* pEntry = _category; + TQListViewItem* pEntry = _category; while (pEntry != NULL) { - QString szName; - QString szComment; + TQString szName; + TQString szComment; ConfigModule *module = static_cast<ModuleTreeItem*>(pEntry)->module(); /* TODO: work out link */ content += "<tr><td class=\"kc_leftcol\">"; @@ -174,8 +174,8 @@ void AboutWidget::updatePixmap() iconPath = loader->iconPath( module->icon(), KIcon::Small ); content += "<img src=\"" + iconPath +" \"</a> <a href=\"%1\" class=\"kcm_link\">" + szName + "</a></td><td class=\"kc_rightcol\">" + szComment; - KURL moduleURL( QString("kcm://%1").arg(QString().sprintf("%p",module)) ); - QString linkURL( moduleURL.url() ); + KURL moduleURL( TQString("kcm://%1").arg(TQString().sprintf("%p",module)) ); + TQString linkURL( moduleURL.url() ); content = content.arg( linkURL ); _moduleMap.insert( linkURL, module ); } diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h index e0b51fd54..b6ae9857b 100644 --- a/kcontrol/kcontrol/aboutwidget.h +++ b/kcontrol/kcontrol/aboutwidget.h @@ -20,9 +20,9 @@ #ifndef __aboutwidget_h__ #define __aboutwidget_h__ -#include <qwidget.h> -#include <qlistview.h> -#include <qhbox.h> +#include <tqwidget.h> +#include <tqlistview.h> +#include <tqhbox.h> class KCModuleInfo; class QPixmap; @@ -36,13 +36,13 @@ class AboutWidget : public QHBox Q_OBJECT public: - AboutWidget(QWidget *parent, const char *name=0, QListViewItem* category=0, const QString &caption=QString::null); + AboutWidget(TQWidget *parent, const char *name=0, TQListViewItem* category=0, const TQString &caption=TQString::null); /** * Set a new category without creating a new AboutWidget if there is * one visible already (reduces flicker) */ - void setCategory( QListViewItem* category, const QString& icon, const QString& caption); + void setCategory( TQListViewItem* category, const TQString& icon, const TQString& caption); signals: void moduleSelected(ConfigModule *); @@ -58,11 +58,11 @@ private: void updatePixmap(); bool _moduleList; - QListViewItem* _category; - QString _icon; - QString _caption; + TQListViewItem* _category; + TQString _icon; + TQString _caption; KHTMLPart *_viewer; - QMap<QString,ConfigModule*> _moduleMap; + TQMap<TQString,ConfigModule*> _moduleMap; }; #endif diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index be2587114..598807a2d 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -17,13 +17,13 @@ */ -#include <qlabel.h> -#include <qvbox.h> -#include <qpixmap.h> -#include <qfont.h> -#include <qwhatsthis.h> -#include <qapplication.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqpixmap.h> +#include <tqfont.h> +#include <tqwhatsthis.h> +#include <tqapplication.h> +#include <tqpushbutton.h> #include <kapplication.h> #include <kmessagebox.h> @@ -42,34 +42,34 @@ class ModuleTitle : public QHBox { public: - ModuleTitle( QWidget *parent, const char *name=0 ); + ModuleTitle( TQWidget *parent, const char *name=0 ); ~ModuleTitle() {} void showTitleFor( ConfigModule *module ); void clear(); protected: - QLabel *m_icon; - QLabel *m_name; + TQLabel *m_icon; + TQLabel *m_name; }; -ModuleTitle::ModuleTitle( QWidget *parent, const char *name ) - : QHBox( parent, name ) +ModuleTitle::ModuleTitle( TQWidget *parent, const char *name ) + : TQHBox( parent, name ) { - QWidget *spacer = new QWidget( this ); + TQWidget *spacer = new TQWidget( this ); spacer->setFixedWidth( KDialog::marginHint()-KDialog::spacingHint() ); - m_icon = new QLabel( this ); - m_name = new QLabel( this ); + m_icon = new TQLabel( this ); + m_name = new TQLabel( this ); - QFont font = m_name->font(); + TQFont font = m_name->font(); font.setPointSize( font.pointSize()+1 ); font.setBold( true ); m_name->setFont( font ); setSpacing( KDialog::spacingHint() ); - if ( QApplication::reverseLayout() ) + if ( TQApplication::reverseLayout() ) { - spacer = new QWidget( this ); + spacer = new TQWidget( this ); setStretchFactor( spacer, 10 ); } else @@ -81,10 +81,10 @@ void ModuleTitle::showTitleFor( ConfigModule *config ) if ( !config ) return; - QWhatsThis::remove( this ); - QWhatsThis::add( this, config->comment() ); + TQWhatsThis::remove( this ); + TQWhatsThis::add( this, config->comment() ); KIconLoader *loader = KGlobal::instance()->iconLoader(); - QPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 ); + TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 ); m_icon->setPixmap( icon ); m_name->setText( config->moduleName() ); @@ -93,20 +93,20 @@ void ModuleTitle::showTitleFor( ConfigModule *config ) void ModuleTitle::clear() { - m_icon->setPixmap( QPixmap() ); - m_name->setText( QString::null ); + m_icon->setPixmap( TQPixmap() ); + m_name->setText( TQString::null ); kapp->processEvents(); } -ModuleWidget::ModuleWidget( QWidget *parent, const char *name ) - : QVBox( parent, name ) +ModuleWidget::ModuleWidget( TQWidget *parent, const char *name ) + : TQVBox( parent, name ) { - QHBox* titleLine = new QHBox( this, "titleLine"); + TQHBox* titleLine = new TQHBox( this, "titleLine"); m_title = new ModuleTitle( titleLine, "m_title" ); - QPushButton *helpButton = new QPushButton( titleLine ); + TQPushButton *helpButton = new TQPushButton( titleLine ); helpButton->setIconSet( SmallIconSet("help") ); - connect (helpButton, SIGNAL( clicked() ), this, SIGNAL( helpRequest() ) ); - m_body = new QVBox( this, "m_body" ); + connect (helpButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpRequest() ) ); + m_body = new TQVBox( this, "m_body" ); setStretchFactor( m_body, 10 ); } @@ -117,7 +117,7 @@ ProxyWidget *ModuleWidget::load( ConfigModule *module ) if ( proxy ) { - proxy->reparent(m_body, 0, QPoint(0,0), false); + proxy->reparent(m_body, 0, TQPoint(0,0), false); proxy->show(); m_title->showTitleFor( module ); } @@ -125,19 +125,19 @@ ProxyWidget *ModuleWidget::load( ConfigModule *module ) return proxy; } -DockContainer::DockContainer(QWidget *parent) - : QWidgetStack(parent, "DockContainer") +DockContainer::DockContainer(TQWidget *parent) + : TQWidgetStack(parent, "DockContainer") , _basew(0L) , _module(0L) { - _busyw = new QLabel(i18n("<big><b>Loading...</b></big>"), this); + _busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this); _busyw->setAlignment(AlignCenter); _busyw->setTextFormat(RichText); _busyw->setGeometry(0,0, width(), height()); addWidget( _busyw ); _modulew = new ModuleWidget( this, "_modulew" ); - connect (_modulew, SIGNAL( helpRequest() ), SLOT( slotHelpRequest() ) ); + connect (_modulew, TQT_SIGNAL( helpRequest() ), TQT_SLOT( slotHelpRequest() ) ); addWidget( _modulew ); } @@ -146,7 +146,7 @@ DockContainer::~DockContainer() deleteModule(); } -void DockContainer::setBaseWidget(QWidget *widget) +void DockContainer::setBaseWidget(TQWidget *widget) { removeWidget( _basew ); delete _basew; @@ -163,17 +163,17 @@ void DockContainer::setBaseWidget(QWidget *widget) ProxyWidget* DockContainer::loadModule( ConfigModule *module ) { - QApplication::setOverrideCursor( waitCursor ); + TQApplication::setOverrideCursor( waitCursor ); ProxyWidget *widget = _modulew->load( module ); if (widget) { _module = module; - connect(_module, SIGNAL(childClosed()), SLOT(removeModule())); - connect(_module, SIGNAL(changed(ConfigModule *)), - SIGNAL(changedModule(ConfigModule *))); - connect(widget, SIGNAL(quickHelpChanged()), SLOT(quickHelpChanged())); + connect(_module, TQT_SIGNAL(childClosed()), TQT_SLOT(removeModule())); + connect(_module, TQT_SIGNAL(changed(ConfigModule *)), + TQT_SIGNAL(changedModule(ConfigModule *))); + connect(widget, TQT_SIGNAL(quickHelpChanged()), TQT_SLOT(quickHelpChanged())); raiseWidget( _modulew ); emit newModule(widget->caption(), module->docPath(), widget->quickHelp()); @@ -184,7 +184,7 @@ ProxyWidget* DockContainer::loadModule( ConfigModule *module ) emit newModule(_basew->caption(), "", ""); } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return widget; } diff --git a/kcontrol/kcontrol/dockcontainer.h b/kcontrol/kcontrol/dockcontainer.h index 94494cac5..6291d5b00 100644 --- a/kcontrol/kcontrol/dockcontainer.h +++ b/kcontrol/kcontrol/dockcontainer.h @@ -20,8 +20,8 @@ #ifndef __dockcontainer_h__ #define __dockcontainer_h__ -#include <qwidgetstack.h> -#include <qvbox.h> +#include <tqwidgetstack.h> +#include <tqvbox.h> class ConfigModule; class ModuleTitle; @@ -33,7 +33,7 @@ class ModuleWidget : public QVBox Q_OBJECT public: - ModuleWidget( QWidget *parent, const char *name ); + ModuleWidget( TQWidget *parent, const char *name ); ~ModuleWidget() {} ProxyWidget* load( ConfigModule *module ); @@ -43,7 +43,7 @@ class ModuleWidget : public QVBox protected: ModuleTitle *m_title; - QVBox *m_body; + TQVBox *m_body; }; class DockContainer : public QWidgetStack @@ -51,11 +51,11 @@ class DockContainer : public QWidgetStack Q_OBJECT public: - DockContainer(QWidget *parent=0); + DockContainer(TQWidget *parent=0); virtual ~DockContainer(); - void setBaseWidget(QWidget *widget); - QWidget *baseWidget() { return _basew; } + void setBaseWidget(TQWidget *widget); + TQWidget *baseWidget() { return _basew; } bool dockModule(ConfigModule *module); ConfigModule *module() { return _module; } @@ -72,12 +72,12 @@ protected: ProxyWidget* loadModule( ConfigModule *module ); signals: - void newModule(const QString &name, const QString& docPath, const QString &quickhelp); + void newModule(const TQString &name, const TQString& docPath, const TQString &quickhelp); void changedModule(ConfigModule *module); private: - QWidget *_basew; - QLabel *_busyw; + TQWidget *_basew; + TQLabel *_busyw; ModuleWidget *_modulew; ConfigModule *_module; diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index 83d2052b2..0a409b7e0 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/kcontrol/kcontrol/global.cpp @@ -26,24 +26,24 @@ #include <kapplication.h> #include <kuser.h> -#include <qobjectlist.h> -#include <qaccel.h> +#include <tqobjectlist.h> +#include <tqaccel.h> #include "global.h" bool KCGlobal::_root = false; bool KCGlobal::_infocenter = false; -QStringList KCGlobal::_types; -QString KCGlobal::_uname = ""; -QString KCGlobal::_hname = ""; -QString KCGlobal::_kdeversion = ""; -QString KCGlobal::_isystem = ""; -QString KCGlobal::_irelease = ""; -QString KCGlobal::_iversion = ""; -QString KCGlobal::_imachine = ""; +TQStringList KCGlobal::_types; +TQString KCGlobal::_uname = ""; +TQString KCGlobal::_hname = ""; +TQString KCGlobal::_kdeversion = ""; +TQString KCGlobal::_isystem = ""; +TQString KCGlobal::_irelease = ""; +TQString KCGlobal::_iversion = ""; +TQString KCGlobal::_imachine = ""; IndexViewMode KCGlobal::_viewmode = Icon; KIcon::StdSizes KCGlobal::_iconsize = KIcon::SizeMedium; -QString KCGlobal::_baseGroup = ""; +TQString KCGlobal::_baseGroup = ""; void KCGlobal::init() { @@ -51,7 +51,7 @@ void KCGlobal::init() buf[0] = '\0'; if (!gethostname(buf, sizeof(buf))) buf[sizeof(buf)-1] ='\0'; - QString hostname(buf); + TQString hostname(buf); setHostName(hostname); setUserName(KUser().loginName()); @@ -68,13 +68,13 @@ void KCGlobal::init() setSystemMachine(info.machine); } -void KCGlobal::setType(const QCString& s) +void KCGlobal::setType(const TQCString& s) { - QString string = s.lower(); - _types = QStringList::split(',', string); + TQString string = s.lower(); + _types = TQStringList::split(',', string); } -QString KCGlobal::baseGroup() +TQString KCGlobal::baseGroup() { if ( _baseGroup.isEmpty() ) { @@ -91,26 +91,26 @@ QString KCGlobal::baseGroup() if (_infocenter) { kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl; - _baseGroup = QString::fromLatin1("Settings/Information/"); + _baseGroup = TQString::fromLatin1("Settings/Information/"); } else { kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl; - _baseGroup = QString::fromLatin1("Settings/"); + _baseGroup = TQString::fromLatin1("Settings/"); } } } return _baseGroup; } -void KCGlobal::repairAccels( QWidget * tw ) +void KCGlobal::repairAccels( TQWidget * tw ) { - QObjectList * l = tw->queryList( "QAccel" ); - QObjectListIt it( *l ); // iterate over the buttons - QObject * obj; + TQObjectList * l = tw->queryList( "TQAccel" ); + TQObjectListIt it( *l ); // iterate over the buttons + TQObject * obj; while ( (obj=it.current()) != 0 ) { // for each found object... ++it; - ((QAccel*)obj)->repairEventFilter(); + ((TQAccel*)obj)->repairEventFilter(); } delete l; // delete the list, not the objects } diff --git a/kcontrol/kcontrol/global.h b/kcontrol/kcontrol/global.h index 71fbb55c3..80c588751 100644 --- a/kcontrol/kcontrol/global.h +++ b/kcontrol/kcontrol/global.h @@ -22,9 +22,9 @@ #include <kicontheme.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> enum IndexViewMode {Icon, Tree}; @@ -36,41 +36,41 @@ public: static bool isInfoCenter() { return _infocenter; } static bool root() { return _root; } - static QStringList types() { return _types; } - static QString userName() { return _uname; } - static QString hostName() { return _hname; } - static QString kdeVersion() { return _kdeversion; } - static QString systemName() { return _isystem; } - static QString systemRelease() { return _irelease; } - static QString systemVersion() { return _iversion; } - static QString systemMachine() { return _imachine; } + static TQStringList types() { return _types; } + static TQString userName() { return _uname; } + static TQString hostName() { return _hname; } + static TQString kdeVersion() { return _kdeversion; } + static TQString systemName() { return _isystem; } + static TQString systemRelease() { return _irelease; } + static TQString systemVersion() { return _iversion; } + static TQString systemMachine() { return _imachine; } static IndexViewMode viewMode() { return _viewmode; } static KIcon::StdSizes iconSize() { return _iconsize; } - static QString baseGroup(); + static TQString baseGroup(); static void setIsInfoCenter(bool b) { _infocenter = b; } static void setRoot(bool r) { _root = r; } - static void setType(const QCString& s); - static void setUserName(const QString& n){ _uname = n; } - static void setHostName(const QString& n){ _hname = n; } - static void setKDEVersion(const QString& n){ _kdeversion = n; } - static void setSystemName(const QString& n){ _isystem = n; } - static void setSystemRelease(const QString& n){ _irelease = n; } - static void setSystemVersion(const QString& n){ _iversion = n; } - static void setSystemMachine(const QString& n){ _imachine = n; } + static void setType(const TQCString& s); + static void setUserName(const TQString& n){ _uname = n; } + static void setHostName(const TQString& n){ _hname = n; } + static void setKDEVersion(const TQString& n){ _kdeversion = n; } + static void setSystemName(const TQString& n){ _isystem = n; } + static void setSystemRelease(const TQString& n){ _irelease = n; } + static void setSystemVersion(const TQString& n){ _iversion = n; } + static void setSystemMachine(const TQString& n){ _imachine = n; } static void setViewMode(IndexViewMode m) { _viewmode = m; } static void setIconSize(KIcon::StdSizes s) { _iconsize = s; } - static void repairAccels( QWidget * tw ); + static void repairAccels( TQWidget * tw ); private: static bool _root; static bool _infocenter; - static QStringList _types; - static QString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _kdeversion; + static TQStringList _types; + static TQString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _kdeversion; static IndexViewMode _viewmode; static KIcon::StdSizes _iconsize; - static QString _baseGroup; + static TQString _baseGroup; }; #endif diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index b53fbc8a9..131a9bd5c 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -17,7 +17,7 @@ */ -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kdebug.h> @@ -28,12 +28,12 @@ #include "global.h" #include "helpwidget.h" -HelpWidget::HelpWidget(QWidget *parent) : QWhatsThis(parent) +HelpWidget::HelpWidget(TQWidget *parent) : TQWhatsThis(parent) { setBaseText(); } -void HelpWidget::setText(const QString& docPath, const QString& text) +void HelpWidget::setText(const TQString& docPath, const TQString& text) { docpath = docPath; if (text.isEmpty() && docPath.isEmpty()) @@ -59,12 +59,12 @@ void HelpWidget::setBaseText() "Click <a href = \"kcontrol/index.html\">here</a> to read the general Control Center manual.") ); } -QString HelpWidget::text() const +TQString HelpWidget::text() const { return helptext; } -bool HelpWidget::clicked(const QString & _url) +bool HelpWidget::clicked(const TQString & _url) { if ( _url.isNull() ) return true; diff --git a/kcontrol/kcontrol/helpwidget.h b/kcontrol/kcontrol/helpwidget.h index 08e495096..7393a7c13 100644 --- a/kcontrol/kcontrol/helpwidget.h +++ b/kcontrol/kcontrol/helpwidget.h @@ -26,18 +26,18 @@ class QWhatsThis; class HelpWidget : public QWhatsThis { public: - HelpWidget(QWidget *parent); + HelpWidget(TQWidget *parent); - void setText( const QString& docPath, const QString& text); + void setText( const TQString& docPath, const TQString& text); void setBaseText(); - QString text() const; + TQString text() const; - bool clicked(const QString &); + bool clicked(const TQString &); void handbookRequest(); private: - QString docpath; - QString helptext; + TQString docpath; + TQString helptext; }; #endif diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp index d427b5707..cf57dc0e4 100644 --- a/kcontrol/kcontrol/indexwidget.cpp +++ b/kcontrol/kcontrol/indexwidget.cpp @@ -18,7 +18,7 @@ */ -#include <qlistview.h> +#include <tqlistview.h> #include "indexwidget.h" @@ -26,8 +26,8 @@ #include "moduletreeview.h" #include "moduleiconview.h" -IndexWidget::IndexWidget(ConfigModuleList *modules, QWidget *parent ,const char *name) - : QWidgetStack(parent, name) +IndexWidget::IndexWidget(ConfigModuleList *modules, TQWidget *parent ,const char *name) + : TQWidgetStack(parent, name) , _tree(0L) , _icon(0L) , _modules(modules) @@ -44,7 +44,7 @@ void IndexWidget::reload() _icon->fill(); } -QListViewItem *IndexWidget::firstTreeViewItem() +TQListViewItem *IndexWidget::firstTreeViewItem() { if (_tree) return _tree->firstChild(); @@ -53,14 +53,14 @@ QListViewItem *IndexWidget::firstTreeViewItem() } -void IndexWidget::resizeEvent(QResizeEvent *e) +void IndexWidget::resizeEvent(TQResizeEvent *e) { - QWidgetStack::resizeEvent( e ); + TQWidgetStack::resizeEvent( e ); } void IndexWidget::moduleSelected(ConfigModule *m) { - const QObject *obj = sender(); + const TQObject *obj = sender(); if(!m) return; emit moduleActivated(m); @@ -69,19 +69,19 @@ void IndexWidget::moduleSelected(ConfigModule *m) { _tree->makeVisible(m); - _tree->disconnect(SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(m); - connect(_tree, SIGNAL(moduleSelected(ConfigModule*)), - this, SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), + this, TQT_SLOT(moduleSelected(ConfigModule*))); } else if (obj->inherits("ModuleTreeView") && _icon) { _icon->makeVisible(m); - _icon->disconnect(SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(m); - connect(_icon, SIGNAL(moduleSelected(ConfigModule*)), - this, SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), + this, TQT_SLOT(moduleSelected(ConfigModule*))); } } @@ -89,17 +89,17 @@ void IndexWidget::makeSelected(ConfigModule *module) { if (_icon) { - _icon->disconnect(SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(module); - connect(_icon, SIGNAL(moduleSelected(ConfigModule*)), - this, SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), + this, TQT_SLOT(moduleSelected(ConfigModule*))); } if (_tree) { - _tree->disconnect(SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(module); - connect(_tree, SIGNAL(moduleSelected(ConfigModule*)), - this, SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), + this, TQT_SLOT(moduleSelected(ConfigModule*))); } } @@ -121,8 +121,8 @@ void IndexWidget::activateView(IndexViewMode mode) { _icon=new ModuleIconView(_modules, this); _icon->fill(); - connect(_icon, SIGNAL(moduleSelected(ConfigModule*)), - this, SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), + this, TQT_SLOT(moduleSelected(ConfigModule*))); } raiseWidget( _icon ); } @@ -132,10 +132,10 @@ void IndexWidget::activateView(IndexViewMode mode) { _tree=new ModuleTreeView(_modules, this); _tree->fill(); - connect(_tree, SIGNAL(moduleSelected(ConfigModule*)), - this, SLOT(moduleSelected(ConfigModule*))); - connect(_tree, SIGNAL(categorySelected(QListViewItem*)), - this, SIGNAL(categorySelected(QListViewItem*))); + connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), + this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQT_SIGNAL(categorySelected(TQListViewItem*)), + this, TQT_SIGNAL(categorySelected(TQListViewItem*))); } raiseWidget( _tree ); } diff --git a/kcontrol/kcontrol/indexwidget.h b/kcontrol/kcontrol/indexwidget.h index 0a358aa2e..a0591fcd1 100644 --- a/kcontrol/kcontrol/indexwidget.h +++ b/kcontrol/kcontrol/indexwidget.h @@ -20,7 +20,7 @@ #ifndef __indexwidget_h__ #define __indexwidget_h__ -#include <qwidgetstack.h> +#include <tqwidgetstack.h> #include "global.h" @@ -34,10 +34,10 @@ class IndexWidget : public QWidgetStack Q_OBJECT public: - IndexWidget(ConfigModuleList *list, QWidget *parent, const char *name=0); + IndexWidget(ConfigModuleList *list, TQWidget *parent, const char *name=0); virtual ~IndexWidget(); - QListViewItem *firstTreeViewItem(); + TQListViewItem *firstTreeViewItem(); public slots: void makeVisible(ConfigModule *module); void makeSelected(ConfigModule *module); @@ -49,10 +49,10 @@ protected slots: signals: void moduleActivated(ConfigModule *module); - void categorySelected(QListViewItem *); + void categorySelected(TQListViewItem *); protected: - void resizeEvent(QResizeEvent *e); + void resizeEvent(TQResizeEvent *e); private: ModuleTreeView *_tree; diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp index 5d3a0ce27..723895de3 100644 --- a/kcontrol/kcontrol/kcrootonly.cpp +++ b/kcontrol/kcontrol/kcrootonly.cpp @@ -16,18 +16,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <klocale.h> #include "kcrootonly.h" -KCRootOnly::KCRootOnly(QWidget *parent, const char *name) +KCRootOnly::KCRootOnly(TQWidget *parent, const char *name) : KCModule(parent, name) { - QVBoxLayout *layout=new QVBoxLayout(this); - QLabel *label = new QLabel(i18n("<big>You need super user privileges to run this control module.</big><br>" + TQVBoxLayout *layout=new TQVBoxLayout(this); + TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>" "Click on the \"Administrator Mode\" button below."), this); layout->addWidget(label); label->setAlignment(AlignCenter); diff --git a/kcontrol/kcontrol/kcrootonly.h b/kcontrol/kcontrol/kcrootonly.h index e04df7c80..b52fab34b 100644 --- a/kcontrol/kcontrol/kcrootonly.h +++ b/kcontrol/kcontrol/kcrootonly.h @@ -6,7 +6,7 @@ class KCRootOnly: public KCModule { public: - KCRootOnly(QWidget *parent, const char *name); + KCRootOnly(TQWidget *parent, const char *name); }; #endif diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 90e63583c..4a0191dd7 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -32,7 +32,7 @@ * to newInstance(). */ -#include <qpaintdevicemetrics.h> +#include <tqpaintdevicemetrics.h> #include <kcmdlineargs.h> #include <dcopclient.h> @@ -61,10 +61,10 @@ KControlApp::KControlApp() // KUniqueApplication does dcop regitration for us ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface"); - connect (modIface, SIGNAL(helpClicked()), toplevel, SLOT(slotHelpRequest())); - connect (modIface, SIGNAL(handbookClicked()), toplevel, SLOT(slotHandbookRequest())); + connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest())); + connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest())); - QRect desk = KGlobalSettings::desktopGeometry(toplevel); + TQRect desk = KGlobalSettings::desktopGeometry(toplevel); KConfig *config = KGlobal::config(); config->setGroup("General"); // Initial size is: @@ -73,13 +73,13 @@ KControlApp::KControlApp() // 800x600 on 72 dpi, 12 pt font // --> 368 + 6 x dpiX, 312 + 4 x dpiY // Adjusted for font size - QPaintDeviceMetrics pdm(toplevel); + TQPaintDeviceMetrics pdm(toplevel); int fontSize = toplevel->fontInfo().pointSize(); if (fontSize == 0) fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX(); - int x = config->readNumEntry(QString::fromLatin1("InitialWidth %1").arg(desk.width()), + int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()), QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) ); - int y = config->readNumEntry(QString::fromLatin1("InitialHeight %1").arg(desk.height()), + int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) ); toplevel->resize(x,y); } @@ -90,9 +90,9 @@ KControlApp::~KControlApp() { KConfig *config = KGlobal::config(); config->setGroup("General"); - QWidget *desk = QApplication::desktop(); - config->writeEntry(QString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); - config->writeEntry(QString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); + TQWidget *desk = TQApplication::desktop(); + config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); + config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); config->sync(); } delete toplevel; @@ -109,7 +109,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) KCONTROL_VERSION, I18N_NOOP("The KDE Info Center"), KAboutData::License_GPL, I18N_NOOP("(c) 1998-2004, The KDE Control Center Developers")); - QCString argv_0 = argv[0]; + TQCString argv_0 = argv[0]; KAboutData *aboutData; if (argv_0.right(11) == "kinfocenter") { diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp index b58f06c26..6d40a8bf7 100644 --- a/kcontrol/kcontrol/moduleIface.cpp +++ b/kcontrol/kcontrol/moduleIface.cpp @@ -23,26 +23,26 @@ #include <kdebug.h> #include <kconfig.h> -ModuleIface::ModuleIface(QObject *parent, const char *name) - : QObject(parent, name), DCOPObject(name) { +ModuleIface::ModuleIface(TQObject *parent, const char *name) + : TQObject(parent, name), DCOPObject(name) { - _parent = static_cast<QWidget *>(parent); + _parent = static_cast<TQWidget *>(parent); } ModuleIface::~ModuleIface() { } -QFont ModuleIface::getFont() { +TQFont ModuleIface::getFont() { return _parent->font(); } -QPalette ModuleIface::getPalette(){ +TQPalette ModuleIface::getPalette(){ kdDebug(1208) << "Returned Palette" << endl; return _parent->palette(); } -QString ModuleIface::getStyle() { +TQString ModuleIface::getStyle() { KConfig config( "kdeglobals" ); config.setGroup( "General" ); return config.readEntry("widgetStyle"); diff --git a/kcontrol/kcontrol/moduleIface.h b/kcontrol/kcontrol/moduleIface.h index 8c034d5cd..17b4b07ad 100644 --- a/kcontrol/kcontrol/moduleIface.h +++ b/kcontrol/kcontrol/moduleIface.h @@ -22,23 +22,23 @@ #include <dcopobject.h> -#include <qfont.h> -#include <qpalette.h> -#include <qwidget.h> +#include <tqfont.h> +#include <tqpalette.h> +#include <tqwidget.h> -class ModuleIface : public QObject, public DCOPObject { +class ModuleIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP public: - ModuleIface(QObject *parent, const char *name); + ModuleIface(TQObject *parent, const char *name); ~ModuleIface(); k_dcop: - QFont getFont(); - QPalette getPalette(); - QString getStyle(); + TQFont getFont(); + TQPalette getPalette(); + TQString getStyle(); void invokeHandbook(); void invokeHelp(); @@ -47,7 +47,7 @@ signals: void helpClicked(); private: - QWidget *_parent; + TQWidget *_parent; }; diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp index 041e6709c..c6df5cb71 100644 --- a/kcontrol/kcontrol/moduleiconview.cpp +++ b/kcontrol/kcontrol/moduleiconview.cpp @@ -18,8 +18,8 @@ */ -#include <qheader.h> -#include <qcursor.h> +#include <tqheader.h> +#include <tqcursor.h> #include <klocale.h> #include <kstandarddirs.h> @@ -34,13 +34,13 @@ #include "global.h" -ModuleIconView::ModuleIconView(ConfigModuleList *list, QWidget * parent, const char * name) +ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const char * name) : KListView(parent, name) , _path(KCGlobal::baseGroup()) , _modules(list) { setSorting(1, true); - addColumn(QString::null); + addColumn(TQString::null); // Needed to enforce a cut of the items label rather than // showing a horizontal scrollbar @@ -51,15 +51,15 @@ ModuleIconView::ModuleIconView(ConfigModuleList *list, QWidget * parent, const c // This is intentionally _not_ connected with executed(), since // honoring doubleclick doesn't make any sense here (changed by // large user demand) - connect(this, SIGNAL(clicked(QListViewItem*)), - this, SLOT(slotItemSelected(QListViewItem*))); + connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), + this, TQT_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleIconView::makeSelected(ConfigModule *m) { if (!m) return; - for (QListViewItem *i = firstChild(); i; i = i->nextSibling()) + for (TQListViewItem *i = firstChild(); i; i = i->nextSibling()) { if(static_cast<ModuleIconItem*>(i)->module() == m) { @@ -72,7 +72,7 @@ void ModuleIconView::makeSelected(ConfigModule *m) void ModuleIconView::makeVisible(ConfigModule *m) { if (!m) return; - QString tmp = _modules->findModule(m); + TQString tmp = _modules->findModule(m); if (tmp.isEmpty()) return; @@ -84,7 +84,7 @@ void ModuleIconView::fill() { clear(); - QPixmap icon; + TQPixmap icon; // add our "up" icon if we aren't top level if (_path != KCGlobal::baseGroup()) { @@ -94,16 +94,16 @@ void ModuleIconView::fill() i->setOrderNo(0); int last_slash = _path.findRev('/', -2); if (last_slash == -1) - i->setTag(QString::null); + i->setTag(TQString::null); else i->setTag(_path.left(last_slash+1)); } int c = 0; - QStringList submenus = _modules->submenus(_path); - for (QStringList::Iterator it = submenus.begin(); it != submenus.end(); ++it ) + TQStringList submenus = _modules->submenus(_path); + for (TQStringList::Iterator it = submenus.begin(); it != submenus.end(); ++it ) { - QString path = (*it); + TQString path = (*it); KServiceGroup::Ptr group = KServiceGroup::group(path); if (!group || !group->isValid()) @@ -117,7 +117,7 @@ void ModuleIconView::fill() } c = 0; - QPtrList<ConfigModule> moduleList = _modules->modules(_path); + TQPtrList<ConfigModule> moduleList = _modules->modules(_path); for (ConfigModule *module=moduleList.first(); module != 0; module=moduleList.next()) { icon = loadIcon( module->icon() ); @@ -127,9 +127,9 @@ void ModuleIconView::fill() } } -void ModuleIconView::slotItemSelected(QListViewItem* item) +void ModuleIconView::slotItemSelected(TQListViewItem* item) { - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); if (!item) return; if (static_cast<ModuleIconItem*>(item)->module()) @@ -144,7 +144,7 @@ void ModuleIconView::slotItemSelected(QListViewItem* item) } } -void ModuleIconView::keyPressEvent(QKeyEvent *e) +void ModuleIconView::keyPressEvent(TQKeyEvent *e) { if( e->key() == Key_Return || e->key() == Key_Enter @@ -159,9 +159,9 @@ void ModuleIconView::keyPressEvent(QKeyEvent *e) } } -QPixmap ModuleIconView::loadIcon( const QString &name ) +TQPixmap ModuleIconView::loadIcon( const TQString &name ) { - QPixmap icon = DesktopIcon( name, KCGlobal::iconSize() ); + TQPixmap icon = DesktopIcon( name, KCGlobal::iconSize() ); if(icon.isNull()) icon = DesktopIcon( "folder", KCGlobal::iconSize() ); diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h index 4f38a1cad..dcacf9770 100644 --- a/kcontrol/kcontrol/moduleiconview.h +++ b/kcontrol/kcontrol/moduleiconview.h @@ -29,28 +29,28 @@ class ModuleIconItem : public KListViewItem { public: - ModuleIconItem(QListView *parent, const QString& text, const QPixmap& pm, ConfigModule *m = 0) + ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0) : KListViewItem(parent, text) - , _tag(QString::null) + , _tag(TQString::null) , _module(m) { setPixmap(0, pm); } void setConfigModule(ConfigModule* m) { _module = m; } - void setTag(const QString& t) { _tag = t; } + void setTag(const TQString& t) { _tag = t; } void setOrderNo(int order) { - QString s; + TQString s; setText(1, s.sprintf( "%02d", order ) ); } ConfigModule* module() { return _module; } - QString tag() { return _tag; } + TQString tag() { return _tag; } private: - QString _tag; + TQString _tag; ConfigModule *_module; }; @@ -59,7 +59,7 @@ class ModuleIconView : public KListView Q_OBJECT public: - ModuleIconView(ConfigModuleList *list, QWidget * parent = 0, const char * name = 0); + ModuleIconView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); void makeSelected(ConfigModule* module); void makeVisible(ConfigModule *module); @@ -69,14 +69,14 @@ signals: void moduleSelected(ConfigModule*); protected slots: - void slotItemSelected(QListViewItem*); + void slotItemSelected(TQListViewItem*); protected: - void keyPressEvent(QKeyEvent *); - QPixmap loadIcon( const QString &name ); + void keyPressEvent(TQKeyEvent *); + TQPixmap loadIcon( const TQString &name ); private: - QString _path; + TQString _path; ConfigModuleList *_modules; }; diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index 02becb29a..ad60eda5a 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -21,11 +21,11 @@ that is intentional :-] */ -#include <qheader.h> -#include <qstring.h> -#include <qptrlist.h> -#include <qpoint.h> -#include <qcursor.h> +#include <tqheader.h> +#include <tqstring.h> +#include <tqptrlist.h> +#include <tqpoint.h> +#include <tqcursor.h> #include <klocale.h> #include <kglobal.h> @@ -40,7 +40,7 @@ that is intentional :-] #include "global.h" -ModuleMenu::ModuleMenu(ConfigModuleList *list, QWidget * parent, const char * name) +ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * name) : KPopupMenu(parent, name) , _modules(list) { @@ -49,27 +49,27 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, QWidget * parent, const char * na fill(this, KCGlobal::baseGroup()); - connect(this, SIGNAL(activated(int)), this, SLOT(moduleSelected(int))); + connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); } -void ModuleMenu::fill(KPopupMenu *parentMenu, const QString &parentPath) +void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) { - QStringList subMenus = _modules->submenus(parentPath); - for(QStringList::ConstIterator it = subMenus.begin(); + TQStringList subMenus = _modules->submenus(parentPath); + for(TQStringList::ConstIterator it = subMenus.begin(); it != subMenus.end(); ++it) { - QString path = *it; + TQString path = *it; KServiceGroup::Ptr group = KServiceGroup::group(path); if (!group) continue; // create new menu KPopupMenu *menu = new KPopupMenu(parentMenu); - connect(menu, SIGNAL(activated(int)), this, SLOT(moduleSelected(int))); + connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); // Item names may contain ampersands. To avoid them being converted to // accelators, replace them with two ampersands. - QString name = group->caption(); + TQString name = group->caption(); name.replace("&", "&&"); parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall) @@ -79,12 +79,12 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const QString &parentPath) } ConfigModule *module; - QPtrList<ConfigModule> moduleList = _modules->modules(parentPath); + TQPtrList<ConfigModule> moduleList = _modules->modules(parentPath); for (module=moduleList.first(); module != 0; module=moduleList.next()) { // Item names may contain ampersands. To avoid them being converted to // accelators, replace them with two ampersands. - QString name = module->moduleName(); + TQString name = module->moduleName(); name.replace("&", "&&"); int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall) diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h index b08140bfc..feac18bd6 100644 --- a/kcontrol/kcontrol/modulemenu.h +++ b/kcontrol/kcontrol/modulemenu.h @@ -24,12 +24,12 @@ that is intentional :-] #define __modulemenu_h__ -#include <qptrlist.h> -#include <qstringlist.h> -#include <qintdict.h> -#include <qstring.h> -#include <qwidget.h> -#include <qdict.h> +#include <tqptrlist.h> +#include <tqstringlist.h> +#include <tqintdict.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqdict.h> #include <kpopupmenu.h> @@ -43,7 +43,7 @@ class ModuleMenu : public KPopupMenu Q_OBJECT public: - ModuleMenu(ConfigModuleList *list, QWidget * parent = 0, const char * name = 0); + ModuleMenu(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); signals: void moduleActivated(ConfigModule*); @@ -52,13 +52,13 @@ private slots: void moduleSelected(int id); protected: - void fill(KPopupMenu *parentMenu, const QString &parentPath); + void fill(KPopupMenu *parentMenu, const TQString &parentPath); private: int id; ConfigModuleList *_modules; - QIntDict<ConfigModule> _moduleDict; + TQIntDict<ConfigModule> _moduleDict; }; diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index b6d8a2693..cc8c63af4 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -21,9 +21,9 @@ #include <sys/types.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qvbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqvbox.h> #include <kapplication.h> #include <kdebug.h> #include <kservicegroup.h> @@ -43,7 +43,7 @@ #include <X11/Xlib.h> -template class QPtrList<ConfigModule>; +template class TQPtrList<ConfigModule>; ConfigModule::ConfigModule(const KService::Ptr &s) @@ -75,11 +75,11 @@ ProxyWidget *ConfigModule::module() { _module = new ProxyWidget(modWidget, moduleName(), "", run_as_root); - connect(_module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); - connect(_module, SIGNAL(closed()), this, SLOT(clientClosed())); - connect(_module, SIGNAL(handbookRequest()), this, SIGNAL(handbookRequest())); - connect(_module, SIGNAL(helpRequest()), this, SIGNAL(helpRequest())); - connect(_module, SIGNAL(runAsRoot()), this, SLOT(runAsRoot())); + connect(_module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); + connect(_module, TQT_SIGNAL(closed()), this, TQT_SLOT(clientClosed())); + connect(_module, TQT_SIGNAL(handbookRequest()), this, TQT_SIGNAL(handbookRequest())); + connect(_module, TQT_SIGNAL(helpRequest()), this, TQT_SIGNAL(helpRequest())); + connect(_module, TQT_SIGNAL(runAsRoot()), this, TQT_SLOT(runAsRoot())); return _module; } @@ -142,31 +142,31 @@ void ConfigModule::runAsRoot() // create an embed widget that will embed the // kcmshell running as root - _embedLayout = new QVBoxLayout(_module->parentWidget()); - _embedFrame = new QVBox( _module->parentWidget() ); - _embedFrame->setFrameStyle( QFrame::Box | QFrame::Raised ); - QPalette pal( red ); - pal.setColor( QColorGroup::Background, + _embedLayout = new TQVBoxLayout(_module->parentWidget()); + _embedFrame = new TQVBox( _module->parentWidget() ); + _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); + TQPalette pal( red ); + pal.setColor( TQColorGroup::Background, _module->parentWidget()->colorGroup().background() ); _embedFrame->setPalette( pal ); _embedFrame->setLineWidth( 2 ); _embedFrame->setMidLineWidth( 2 ); _embedLayout->addWidget(_embedFrame,1); // cannot reparent anything else inside QXEmbed, so put the busy label separately - _embedStack = new QWidgetStack(_embedFrame); + _embedStack = new TQWidgetStack(_embedFrame); _embedWidget = new KControlEmbed(_embedStack); _module->hide(); _embedFrame->show(); - QLabel *_busy = new QLabel(i18n("<big>Loading...</big>"), _embedStack); + TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack); _busy->setAlignment(AlignCenter); _busy->setTextFormat(RichText); _busy->setGeometry(0,0, _module->width(), _module->height()); _busy->show(); _embedStack->raiseWidget(_busy); - connect(_embedWidget, SIGNAL( windowEmbedded(WId)), SLOT( embedded())); + connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded())); // prepare the process to run the kcmshell - QString cmd = service()->exec().stripWhiteSpace(); + TQString cmd = service()->exec().stripWhiteSpace(); bool kdeshell = false; if (cmd.left(5) == "kdesu") { @@ -186,7 +186,7 @@ void ConfigModule::runAsRoot() } // run the process - QString kdesu = KStandardDirs::findExe("kdesu"); + TQString kdesu = KStandardDirs::findExe("kdesu"); if (!kdesu.isEmpty()) { _rootProcess = new KProcess; @@ -198,13 +198,13 @@ void ConfigModule::runAsRoot() // We also don't have a way to close the module in that case. *_rootProcess << "--n"; // Don't keep password. if (kdeshell) { - *_rootProcess << QString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language()); + *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language()); } else { - *_rootProcess << QString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( KGlobal::locale()->language() ); + *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( KGlobal::locale()->language() ); } - connect(_rootProcess, SIGNAL(processExited(KProcess*)), this, SLOT(rootExited(KProcess*))); + connect(_rootProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(rootExited(KProcess*))); if ( !_rootProcess->start(KProcess::NotifyOnExit) ) { @@ -271,7 +271,7 @@ void ConfigModuleList::readDesktopEntries() readDesktopEntriesRecursive( KCGlobal::baseGroup() ); } -bool ConfigModuleList::readDesktopEntriesRecursive(const QString &path) +bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path) { KServiceGroup::Ptr group = KServiceGroup::group(path); @@ -314,32 +314,32 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const QString &path) return true; } -QPtrList<ConfigModule> ConfigModuleList::modules(const QString &path) +TQPtrList<ConfigModule> ConfigModuleList::modules(const TQString &path) { Menu *menu = subMenus.find(path); if (menu) return menu->modules; - return QPtrList<ConfigModule>(); + return TQPtrList<ConfigModule>(); } -QStringList ConfigModuleList::submenus(const QString &path) +TQStringList ConfigModuleList::submenus(const TQString &path) { Menu *menu = subMenus.find(path); if (menu) return menu->submenus; - return QStringList(); + return TQStringList(); } -QString ConfigModuleList::findModule(ConfigModule *module) +TQString ConfigModuleList::findModule(ConfigModule *module) { - QDictIterator<Menu> it(subMenus); + TQDictIterator<Menu> it(subMenus); Menu *menu; for(;(menu = it.current());++it) { if (menu->modules.containsRef(module)) return it.currentKey(); } - return QString::null; + return TQString::null; } diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h index f2364698d..ce31c7af0 100644 --- a/kcontrol/kcontrol/modules.h +++ b/kcontrol/kcontrol/modules.h @@ -21,8 +21,8 @@ #define MODULES_H #include <kcmoduleinfo.h> -#include <qobject.h> -#include <qdict.h> +#include <tqobject.h> +#include <tqdict.h> #include <qxembed.h> template<class ConfigModule> class QPtrList; @@ -36,7 +36,7 @@ class QVBoxLayout; class QVBox; class QWidgetStack; -class ConfigModule : public QObject, public KCModuleInfo +class ConfigModule : public TQObject, public KCModuleInfo { Q_OBJECT @@ -81,53 +81,53 @@ private: ProxyWidget *_module; QXEmbed *_embedWidget; KProcess *_rootProcess; - QVBoxLayout *_embedLayout; - QVBox *_embedFrame; - QWidgetStack *_embedStack; + TQVBoxLayout *_embedLayout; + TQVBox *_embedFrame; + TQWidgetStack *_embedStack; }; -class ConfigModuleList : public QPtrList<ConfigModule> +class ConfigModuleList : public TQPtrList<ConfigModule> { public: ConfigModuleList(); void readDesktopEntries(); - bool readDesktopEntriesRecursive(const QString &path); + bool readDesktopEntriesRecursive(const TQString &path); /** * Returns all submenus of the submenu identified by path */ - QPtrList<ConfigModule> modules(const QString &path); + TQPtrList<ConfigModule> modules(const TQString &path); /** * Returns all modules of the submenu identified by path */ - QStringList submenus(const QString &path); + TQStringList submenus(const TQString &path); /** * Returns the path of the submenu the module is in */ - QString findModule(ConfigModule *module); + TQString findModule(ConfigModule *module); protected: class Menu { public: - QPtrList<ConfigModule> modules; - QStringList submenus; + TQPtrList<ConfigModule> modules; + TQStringList submenus; }; - QDict<Menu> subMenus; + TQDict<Menu> subMenus; }; class KControlEmbed : public QXEmbed { Q_OBJECT public: - KControlEmbed( QWidget* w ) : QXEmbed( w ) {} + KControlEmbed( TQWidget* w ) : QXEmbed( w ) {} virtual void windowChanged( WId w ) { if( w ) emit windowEmbedded( w ); } signals: void windowEmbedded( WId w ); diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index f933cfcef..6f767ab20 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -18,31 +18,31 @@ */ -#include <qheader.h> -#include <qimage.h> -#include <qpainter.h> -#include <qbitmap.h> +#include <tqheader.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqbitmap.h> #include <klocale.h> #include <kiconloader.h> #include <kservicegroup.h> #include <kdebug.h> -#include <qwhatsthis.h> -#include <qbitmap.h> +#include <tqwhatsthis.h> +#include <tqbitmap.h> #include "moduletreeview.h" #include "moduletreeview.moc" #include "modules.h" #include "global.h" -static QPixmap appIcon(const QString &iconName) +static TQPixmap appIcon(const TQString &iconName) { - QString path; - QPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true); + TQString path; + TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true); // make sure they are not larger than KIcon::SizeSmall if (normal.width() > KIcon::SizeSmall || normal.height() > KIcon::SizeSmall) { - QImage tmp = normal.convertToImage(); + TQImage tmp = normal.convertToImage(); tmp = tmp.smoothScale(KIcon::SizeSmall, KIcon::SizeSmall); normal.convertFromImage(tmp); } @@ -53,11 +53,11 @@ class ModuleTreeWhatsThis : public QWhatsThis { public: ModuleTreeWhatsThis( ModuleTreeView* tree) - : QWhatsThis( tree ), treeView( tree ) {} + : TQWhatsThis( tree ), treeView( tree ) {} ~ModuleTreeWhatsThis(){}; - QString text( const QPoint & p) { + TQString text( const TQPoint & p) { ModuleTreeItem* i = (ModuleTreeItem*) treeView->itemAt( p ); if ( i && i->module() ) { return i->module()->comment(); @@ -71,60 +71,60 @@ private: ModuleTreeView* treeView; }; -ModuleTreeView::ModuleTreeView(ConfigModuleList *list, QWidget * parent, const char * name) +ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const char * name) : KListView(parent, name) , _modules(list) { - addColumn(QString::null); - setColumnWidthMode (0, QListView::Maximum); + addColumn(TQString::null); + setColumnWidthMode (0, TQListView::Maximum); setAllColumnsShowFocus(true); - setResizeMode(QListView::AllColumns); + setResizeMode(TQListView::AllColumns); setRootIsDecorated(true); setHScrollBarMode(AlwaysOff); header()->hide(); new ModuleTreeWhatsThis( this ); - connect(this, SIGNAL(clicked(QListViewItem*)), - this, SLOT(slotItemSelected(QListViewItem*))); + connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), + this, TQT_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleTreeView::fill() { clear(); - QStringList subMenus = _modules->submenus(KCGlobal::baseGroup()); - for(QStringList::ConstIterator it = subMenus.begin(); + TQStringList subMenus = _modules->submenus(KCGlobal::baseGroup()); + for(TQStringList::ConstIterator it = subMenus.begin(); it != subMenus.end(); ++it) { - QString path = *it; + TQString path = *it; ModuleTreeItem* menu = new ModuleTreeItem(this); menu->setGroup(path); fill(menu, path); } ConfigModule *module; - QPtrList<ConfigModule> moduleList = _modules->modules(KCGlobal::baseGroup()); + TQPtrList<ConfigModule> moduleList = _modules->modules(KCGlobal::baseGroup()); for (module=moduleList.first(); module != 0; module=moduleList.next()) { new ModuleTreeItem(this, module); } } -void ModuleTreeView::fill(ModuleTreeItem *parent, const QString &parentPath) +void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath) { - QStringList subMenus = _modules->submenus(parentPath); - for(QStringList::ConstIterator it = subMenus.begin(); + TQStringList subMenus = _modules->submenus(parentPath); + for(TQStringList::ConstIterator it = subMenus.begin(); it != subMenus.end(); ++it) { - QString path = *it; + TQString path = *it; ModuleTreeItem* menu = new ModuleTreeItem(parent); menu->setGroup(path); fill(menu, path); } ConfigModule *module; - QPtrList<ConfigModule> moduleList = _modules->modules(parentPath); + TQPtrList<ConfigModule> moduleList = _modules->modules(parentPath); for (module=moduleList.first(); module != 0; module=moduleList.next()) { new ModuleTreeItem(parent, module); @@ -133,10 +133,10 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const QString &parentPath) -QSize ModuleTreeView::sizeHint() const +TQSize ModuleTreeView::sizeHint() const { - return QListView::sizeHint().boundedTo( - QSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) ); + return TQListView::sizeHint().boundedTo( + TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) ); } void ModuleTreeView::makeSelected(ConfigModule *module) @@ -162,7 +162,7 @@ void ModuleTreeView::updateItem(ModuleTreeItem *item, ConfigModule *module) } /* -void ModuleTreeView::expandItem(QListViewItem *item, QPtrList<QListViewItem> *parentList) +void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem> *parentList) { while (item) { @@ -176,14 +176,14 @@ void ModuleTreeView::expandItem(QListViewItem *item, QPtrList<QListViewItem> *pa */ void ModuleTreeView::makeVisible(ConfigModule *module) { - QString path = _modules->findModule(module); + TQString path = _modules->findModule(module); if (path.startsWith(KCGlobal::baseGroup())) path = path.mid(KCGlobal::baseGroup().length()); - QStringList groups = QStringList::split('/', path); + TQStringList groups = TQStringList::split('/', path); ModuleTreeItem *item = 0; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it=groups.begin(); it != groups.end(); ++it) { if (item) @@ -209,7 +209,7 @@ void ModuleTreeView::makeVisible(ConfigModule *module) ensureItemVisible(item); } -void ModuleTreeView::slotItemSelected(QListViewItem* item) +void ModuleTreeView::slotItemSelected(TQListViewItem* item) { if (!item) return; @@ -228,9 +228,9 @@ void ModuleTreeView::slotItemSelected(QListViewItem* item) /* else { - QPtrList<QListViewItem> parents; + TQPtrList<TQListViewItem> parents; - QListViewItem* i = item; + TQListViewItem* i = item; while(i) { parents.append(i); @@ -238,19 +238,19 @@ void ModuleTreeView::slotItemSelected(QListViewItem* item) } //int oy1 = item->itemPos(); - //int oy2 = mapFromGlobal(QCursor::pos()).y(); + //int oy2 = mapFromGlobal(TQCursor::pos()).y(); //int offset = oy2 - oy1; expandItem(firstChild(), &parents); - //int x =mapFromGlobal(QCursor::pos()).x(); + //int x =mapFromGlobal(TQCursor::pos()).x(); //int y = item->itemPos() + offset; - //QCursor::setPos(mapToGlobal(QPoint(x, y))); + //TQCursor::setPos(mapToGlobal(TQPoint(x, y))); } */ } -void ModuleTreeView::keyPressEvent(QKeyEvent *e) +void ModuleTreeView::keyPressEvent(TQKeyEvent *e) { if (!currentItem()) return; @@ -258,7 +258,7 @@ void ModuleTreeView::keyPressEvent(QKeyEvent *e) || e->key() == Key_Enter || e->key() == Key_Space) { - //QCursor::setPos(mapToGlobal(QPoint(10, currentItem()->itemPos()+5))); + //TQCursor::setPos(mapToGlobal(TQPoint(10, currentItem()->itemPos()+5))); slotItemSelected(currentItem()); } else @@ -266,10 +266,10 @@ void ModuleTreeView::keyPressEvent(QKeyEvent *e) } -ModuleTreeItem::ModuleTreeItem(QListViewItem *parent, ConfigModule *module) - : QListViewItem(parent) +ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, ConfigModule *module) + : TQListViewItem(parent) , _module(module) - , _tag(QString::null) + , _tag(TQString::null) , _maxChildIconWidth(0) { if (_module) @@ -280,10 +280,10 @@ ModuleTreeItem::ModuleTreeItem(QListViewItem *parent, ConfigModule *module) } } -ModuleTreeItem::ModuleTreeItem(QListView *parent, ConfigModule *module) - : QListViewItem(parent) +ModuleTreeItem::ModuleTreeItem(TQListView *parent, ConfigModule *module) + : TQListViewItem(parent) , _module(module) - , _tag(QString::null) + , _tag(TQString::null) , _maxChildIconWidth(0) { if (_module) @@ -294,21 +294,21 @@ ModuleTreeItem::ModuleTreeItem(QListView *parent, ConfigModule *module) } } -ModuleTreeItem::ModuleTreeItem(QListViewItem *parent, const QString& text) - : QListViewItem(parent, " " + text) +ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, const TQString& text) + : TQListViewItem(parent, " " + text) , _module(0) - , _tag(QString::null) + , _tag(TQString::null) , _maxChildIconWidth(0) {} -ModuleTreeItem::ModuleTreeItem(QListView *parent, const QString& text) - : QListViewItem(parent, " " + text) +ModuleTreeItem::ModuleTreeItem(TQListView *parent, const TQString& text) + : TQListViewItem(parent, " " + text) , _module(0) - , _tag(QString::null) + , _tag(TQString::null) , _maxChildIconWidth(0) {} -void ModuleTreeItem::setPixmap(int column, const QPixmap& pm) +void ModuleTreeItem::setPixmap(int column, const TQPixmap& pm) { if (!pm.isNull()) { @@ -317,7 +317,7 @@ void ModuleTreeItem::setPixmap(int column, const QPixmap& pm) p->regChildIconWidth(pm.width()); } - QListViewItem::setPixmap(column, pm); + TQListViewItem::setPixmap(column, pm); } void ModuleTreeItem::regChildIconWidth(int width) @@ -326,7 +326,7 @@ void ModuleTreeItem::regChildIconWidth(int width) _maxChildIconWidth = width; } -void ModuleTreeItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align ) +void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { if (!pixmap(0)) { @@ -339,23 +339,23 @@ void ModuleTreeItem::paintCell( QPainter * p, const QColorGroup & cg, int column if (offset > 0) { - QPixmap pixmap(offset, offset); + TQPixmap pixmap(offset, offset); pixmap.fill(Qt::color0); pixmap.setMask(pixmap.createHeuristicMask()); - QBitmap mask( pixmap.size(), true ); + TQBitmap mask( pixmap.size(), true ); pixmap.setMask( mask ); - QListViewItem::setPixmap(0, pixmap); + TQListViewItem::setPixmap(0, pixmap); } } - QListViewItem::paintCell( p, cg, column, width, align ); + TQListViewItem::paintCell( p, cg, column, width, align ); } -void ModuleTreeItem::setGroup(const QString &path) +void ModuleTreeItem::setGroup(const TQString &path) { KServiceGroup::Ptr group = KServiceGroup::group(path); - QString defName = path.left(path.length()-1); + TQString defName = path.left(path.length()-1); int pos = defName.findRev('/'); if (pos >= 0) defName = defName.mid(pos+1); diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index ecdd2d938..3c16f099e 100644 --- a/kcontrol/kcontrol/moduletreeview.h +++ b/kcontrol/kcontrol/moduletreeview.h @@ -20,11 +20,11 @@ #ifndef __moduletreeview_h__ #define __moduletreeview_h__ -#include <qpalette.h> -#include <qptrlist.h> -#include <qlistview.h> +#include <tqpalette.h> +#include <tqptrlist.h> +#include <tqlistview.h> #include <klistview.h> -#include <qdict.h> +#include <tqdict.h> class ConfigModule; @@ -35,33 +35,33 @@ class ModuleTreeItem : public QListViewItem { public: - ModuleTreeItem(QListViewItem *parent, ConfigModule *module = 0); - ModuleTreeItem(QListViewItem *parent, const QString& text); - ModuleTreeItem(QListView *parent, ConfigModule *module = 0); - ModuleTreeItem(QListView *parent, const QString& text); + ModuleTreeItem(TQListViewItem *parent, ConfigModule *module = 0); + ModuleTreeItem(TQListViewItem *parent, const TQString& text); + ModuleTreeItem(TQListView *parent, ConfigModule *module = 0); + ModuleTreeItem(TQListView *parent, const TQString& text); - void setTag(const QString& tag) { _tag = tag; } - void setCaption(const QString& caption) { _caption = caption; } + void setTag(const TQString& tag) { _tag = tag; } + void setCaption(const TQString& caption) { _caption = caption; } void setModule(ConfigModule *m) { _module = m; } - QString tag() const { return _tag; }; - QString caption() const { return _caption; }; - QString icon() const { return _icon; }; + TQString tag() const { return _tag; }; + TQString caption() const { return _caption; }; + TQString icon() const { return _icon; }; ConfigModule *module() { return _module; }; void regChildIconWidth(int width); int maxChildIconWidth() { return _maxChildIconWidth; } - void setPixmap(int column, const QPixmap& pm); - void setGroup(const QString &path); + void setPixmap(int column, const TQPixmap& pm); + void setGroup(const TQString &path); protected: - void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); private: ConfigModule *_module; - QString _tag; - QString _caption; + TQString _tag; + TQString _caption; int _maxChildIconWidth; - QString _icon; + TQString _icon; }; class ModuleTreeView : public KListView @@ -69,24 +69,24 @@ class ModuleTreeView : public KListView Q_OBJECT public: - ModuleTreeView(ConfigModuleList *list, QWidget * parent = 0, const char * name = 0); + ModuleTreeView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); void makeSelected(ConfigModule* module); void makeVisible(ConfigModule *module); void fill(); - QSize sizeHint() const; + TQSize sizeHint() const; signals: void moduleSelected(ConfigModule*); - void categorySelected(QListViewItem*); + void categorySelected(TQListViewItem*); protected slots: - void slotItemSelected(QListViewItem*); + void slotItemSelected(TQListViewItem*); protected: void updateItem(ModuleTreeItem *item, ConfigModule* module); - void keyPressEvent(QKeyEvent *); - void fill(ModuleTreeItem *parent, const QString &parentPath); + void keyPressEvent(TQKeyEvent *); + void fill(ModuleTreeItem *parent, const TQString &parentPath); private: ConfigModuleList *_modules; diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index 6654bfe14..b8f83c5fc 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -20,7 +20,7 @@ #include <unistd.h> // for getuid() #include <kpushbutton.h> -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include <kapplication.h> #include <kcmodule.h> @@ -29,25 +29,25 @@ #include <kstdguiitem.h> #include <dcopclient.h> -#include <qwhatsthis.h> -#include <qlabel.h> +#include <tqwhatsthis.h> +#include <tqlabel.h> #include "global.h" #include "proxywidget.h" #include "proxywidget.moc" #include <kdebug.h> -#include <qtimer.h> +#include <tqtimer.h> class WhatsThis : public QWhatsThis { public: WhatsThis( ProxyWidget* parent ) - : QWhatsThis( parent ), proxy( parent ) {} + : TQWhatsThis( parent ), proxy( parent ) {} ~WhatsThis(){}; - QString text( const QPoint & ) { + TQString text( const TQPoint & ) { if ( !proxy->quickHelp().isEmpty() ) return proxy->quickHelp(); else @@ -60,7 +60,7 @@ private: //////////////////////////////////////////////////////////////////////////////////////////////////////// -static void setVisible(QPushButton *btn, bool vis) +static void setVisible(TQPushButton *btn, bool vis) { if (vis) btn->show(); @@ -75,21 +75,21 @@ static void setVisible(QPushButton *btn, bool vis) class RootInfoWidget : public QLabel { public: - RootInfoWidget(QWidget *parent, const char *name); - void setRootMsg(const QString& s) { setText(s); } + RootInfoWidget(TQWidget *parent, const char *name); + void setRootMsg(const TQString& s) { setText(s); } }; -RootInfoWidget::RootInfoWidget(QWidget *parent, const char *name = 0) - : QLabel(parent, name) +RootInfoWidget::RootInfoWidget(TQWidget *parent, const char *name = 0) + : TQLabel(parent, name) { - setFrameShape(QFrame::Box); - setFrameShadow(QFrame::Raised); + setFrameShape(TQFrame::Box); + setFrameShadow(TQFrame::Raised); setText(i18n("<b>Changes in this module require root access.</b><br>" "Click the \"Administrator Mode\" button to " "allow modifications in this module.")); - QWhatsThis::add(this, i18n("This module requires special permissions, probably " + TQWhatsThis::add(this, i18n("This module requires special permissions, probably " "for system-wide modifications; therefore, it is " "required that you provide the root password to be " "able to change the module's properties. If you " @@ -103,12 +103,12 @@ RootInfoWidget::RootInfoWidget(QWidget *parent, const char *name = 0) class ProxyView : public QScrollView { public: - ProxyView(KCModule *client, const QString& title, QWidget *parent, bool run_as_root, const char *name); + ProxyView(KCModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name); private: - virtual void resizeEvent(QResizeEvent *); + virtual void resizeEvent(TQResizeEvent *); - QWidget *contentWidget; + TQWidget *contentWidget; KCModule *client; bool scroll; }; @@ -116,82 +116,82 @@ private: class ProxyContentWidget : public QWidget { public: - ProxyContentWidget( QWidget* parent ) : QWidget( parent ) {} + ProxyContentWidget( TQWidget* parent ) : TQWidget( parent ) {} ~ProxyContentWidget(){} // this should be really done by qscrollview in AutoOneFit mode! - QSize sizeHint() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSizeHint(); } }; -ProxyView::ProxyView(KCModule *_client, const QString&, QWidget *parent, bool run_as_root, const char *name) - : QScrollView(parent, name), client(_client) +ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name) + : TQScrollView(parent, name), client(_client) { - setResizePolicy(QScrollView::AutoOneFit); + setResizePolicy(TQScrollView::AutoOneFit); setFrameStyle( NoFrame ); contentWidget = new ProxyContentWidget( viewport() ); - QVBoxLayout* vbox = new QVBoxLayout( contentWidget ); + TQVBoxLayout* vbox = new TQVBoxLayout( contentWidget ); if (run_as_root && _client->useRootOnlyMsg()) // notify the user { RootInfoWidget *infoBox = new RootInfoWidget(contentWidget); vbox->addWidget( infoBox ); - QString msg = _client->rootOnlyMsg(); + TQString msg = _client->rootOnlyMsg(); if (!msg.isEmpty()) infoBox->setRootMsg(msg); vbox->setSpacing(KDialog::spacingHint()); } - client->reparent(contentWidget,0,QPoint(0,0),true); + client->reparent(contentWidget,0,TQPoint(0,0),true); vbox->addWidget( client ); vbox->activate(); // make sure we have a proper minimumSizeHint addChild(contentWidget); } -void ProxyView::resizeEvent(QResizeEvent *e) +void ProxyView::resizeEvent(TQResizeEvent *e) { - QScrollView::resizeEvent(e); + TQScrollView::resizeEvent(e); } //////////////////////////////////////////////////////////////////////////////////////////////////////// -ProxyWidget::ProxyWidget(KCModule *client, QString title, const char *name, +ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name, bool run_as_root) - : QWidget(0, name) + : TQWidget(0, name) , _client(client) { setCaption(title); if (getuid()==0 ) { // Make root modules look as similar as possible... - QCString replyType; - QByteArray replyData; + TQCString replyType; + TQByteArray replyData; - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", QByteArray(), + if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(), replyType, replyData)) - if ( replyType == "QPalette") { - QDataStream reply( replyData, IO_ReadOnly ); - QPalette pal; + if ( replyType == "TQPalette") { + TQDataStream reply( replyData, IO_ReadOnly ); + TQPalette pal; reply >> pal; setPalette(pal); } /* // Doesn't work ... - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", QByteArray(), + if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(), replyType, replyData)) - if ( replyType == "QString") { - QDataStream reply( replyData, IO_ReadOnly ); - QString style; + if ( replyType == "TQString") { + TQDataStream reply( replyData, IO_ReadOnly ); + TQString style; reply >> style; setStyle(style); } */ - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", QByteArray(), + if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(), replyType, replyData)) - if ( replyType == "QFont") { - QDataStream reply( replyData, IO_ReadOnly ); - QFont font; + if ( replyType == "TQFont") { + TQDataStream reply( replyData, IO_ReadOnly ); + TQFont font; reply >> font; setFont(font); } @@ -200,8 +200,8 @@ ProxyWidget::ProxyWidget(KCModule *client, QString title, const char *name, view = new ProxyView(client, title, this, run_as_root, "proxyview"); (void) new WhatsThis( this ); - connect(_client, SIGNAL(changed(bool)), SLOT(clientChanged(bool))); - connect(_client, SIGNAL(quickHelpChanged()), SIGNAL(quickHelpChanged())); + connect(_client, TQT_SIGNAL(changed(bool)), TQT_SLOT(clientChanged(bool))); + connect(_client, TQT_SIGNAL(quickHelpChanged()), TQT_SIGNAL(quickHelpChanged())); _sep = new KSeparator(KSeparator::HLine, this); @@ -225,18 +225,18 @@ ProxyWidget::ProxyWidget(KCModule *client, QString title, const char *name, _apply->setEnabled( false ); _reset->setEnabled( false ); - connect(_handbook, SIGNAL(clicked()), SLOT(handbookClicked())); - connect(_default, SIGNAL(clicked()), SLOT(defaultClicked())); - connect(_apply, SIGNAL(clicked()), SLOT(applyClicked())); - connect(_reset, SIGNAL(clicked()), SLOT(resetClicked())); - connect(_root, SIGNAL(clicked()), SLOT(rootClicked())); + connect(_handbook, TQT_SIGNAL(clicked()), TQT_SLOT(handbookClicked())); + connect(_default, TQT_SIGNAL(clicked()), TQT_SLOT(defaultClicked())); + connect(_apply, TQT_SIGNAL(clicked()), TQT_SLOT(applyClicked())); + connect(_reset, TQT_SIGNAL(clicked()), TQT_SLOT(resetClicked())); + connect(_root, TQT_SIGNAL(clicked()), TQT_SLOT(rootClicked())); - QVBoxLayout *top = new QVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); top->addWidget(view); top->addWidget(_sep); - QHBoxLayout *buttons = new QHBoxLayout(top, 4); + TQHBoxLayout *buttons = new TQHBoxLayout(top, 4); buttons->addWidget(_handbook); buttons->addWidget(_default); if (run_as_root) @@ -259,7 +259,7 @@ ProxyWidget::~ProxyWidget() delete _client; } -QString ProxyWidget::quickHelp() const +TQString ProxyWidget::quickHelp() const { if (_client) return _client->quickHelp(); @@ -272,7 +272,7 @@ void ProxyWidget::handbookClicked() if (getuid()!=0) emit handbookRequest(); else - kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", QByteArray()); + kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray()); } void ProxyWidget::helpClicked() @@ -280,7 +280,7 @@ void ProxyWidget::helpClicked() if (getuid()!=0) emit helpRequest(); else - kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", QByteArray()); + kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray()); } void ProxyWidget::defaultClicked() diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h index a06e571de..c1368b447 100644 --- a/kcontrol/kcontrol/proxywidget.h +++ b/kcontrol/kcontrol/proxywidget.h @@ -32,7 +32,7 @@ class KCModule; class KAboutData; #include "dockcontainer.h" -#include <qscrollview.h> +#include <tqscrollview.h> class ProxyView; @@ -42,10 +42,10 @@ class ProxyWidget : public QWidget public: - ProxyWidget(KCModule *client, QString title, const char *name=0, bool run_as_root = false); + ProxyWidget(KCModule *client, TQString title, const char *name=0, bool run_as_root = false); ~ProxyWidget(); - QString quickHelp() const; + TQString quickHelp() const; const KAboutData *aboutData() const; public slots: @@ -71,8 +71,8 @@ signals: private: - QPushButton *_handbook, *_default, *_apply, *_reset, *_root; - QFrame *_sep; + TQPushButton *_handbook, *_default, *_apply, *_reset, *_root; + TQFrame *_sep; KCModule *_client; ProxyView *view; diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index 9701d2d20..e4949622d 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -18,10 +18,10 @@ */ -#include <qlabel.h> -#include <qlayout.h> -#include <qsortedlist.h> -#include <qregexp.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqsortedlist.h> +#include <tqregexp.h> #include <klineedit.h> #include <kiconloader.h> @@ -37,8 +37,8 @@ class ModuleItem : public QListBoxPixmap { public: - ModuleItem(ConfigModule *module, QListBox * listbox = 0) : - QListBoxPixmap(listbox, + ModuleItem(ConfigModule *module, TQListBox * listbox = 0) : + TQListBoxPixmap(listbox, KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall), module->moduleName()) , m_module(module) @@ -53,7 +53,7 @@ protected: }; -KeywordListEntry::KeywordListEntry(const QString& name, ConfigModule* module) +KeywordListEntry::KeywordListEntry(const TQString& name, ConfigModule* module) : _name(name) { if(module) @@ -66,35 +66,35 @@ void KeywordListEntry::addModule(ConfigModule* module) _modules.append(module); } -SearchWidget::SearchWidget(QWidget *parent , const char *name) - : QWidget(parent, name) +SearchWidget::SearchWidget(TQWidget *parent , const char *name) + : TQWidget(parent, name) { _keywords.setAutoDelete(true); - QVBoxLayout * l = new QVBoxLayout(this, 0, 2); + TQVBoxLayout * l = new TQVBoxLayout(this, 0, 2); // keyword list _keyList = new KListBox(this); - QLabel *keyl = new QLabel(_keyList, i18n("&Keywords:"), this); + TQLabel *keyl = new TQLabel(_keyList, i18n("&Keywords:"), this); l->addWidget(keyl); l->addWidget(_keyList); // result list _resultList = new KListBox(this); - QLabel *resultl = new QLabel(_resultList, i18n("&Results:"), this); + TQLabel *resultl = new TQLabel(_resultList, i18n("&Results:"), this); l->addWidget(resultl); l->addWidget(_resultList); - connect(_keyList, SIGNAL(highlighted(const QString&)), - this, SLOT(slotKeywordSelected(const QString&))); + connect(_keyList, TQT_SIGNAL(highlighted(const TQString&)), + this, TQT_SLOT(slotKeywordSelected(const TQString&))); - connect(_resultList, SIGNAL(selected(QListBoxItem*)), - this, SLOT(slotModuleSelected(QListBoxItem *))); - connect(_resultList, SIGNAL(clicked(QListBoxItem *)), - this, SLOT(slotModuleClicked(QListBoxItem *))); + connect(_resultList, TQT_SIGNAL(selected(TQListBoxItem*)), + this, TQT_SLOT(slotModuleSelected(TQListBoxItem *))); + connect(_resultList, TQT_SIGNAL(clicked(TQListBoxItem *)), + this, TQT_SLOT(slotModuleClicked(TQListBoxItem *))); } void SearchWidget::populateKeywordList(ConfigModuleList *list) @@ -108,13 +108,13 @@ void SearchWidget::populateKeywordList(ConfigModuleList *list) continue; // get the modules keyword list - QStringList kw = module->keywords(); + TQStringList kw = module->keywords(); kw << module->moduleName(); // loop through the keyword list to populate _keywords - for(QStringList::ConstIterator it = kw.begin(); it != kw.end(); ++it) + for(TQStringList::ConstIterator it = kw.begin(); it != kw.end(); ++it) { - QString name = (*it).lower(); + TQString name = (*it).lower(); bool found = false; // look if _keywords already has an entry for this keyword @@ -140,35 +140,35 @@ void SearchWidget::populateKeywordList(ConfigModuleList *list) populateKeyListBox("*"); } -void SearchWidget::populateKeyListBox(const QString& s) +void SearchWidget::populateKeyListBox(const TQString& s) { _keyList->clear(); - QStringList matches; + TQStringList matches; for(KeywordListEntry *k = _keywords.first(); k != 0; k = _keywords.next()) { - if ( QRegExp(s, false, true).search(k->moduleName()) >= 0) + if ( TQRegExp(s, false, true).search(k->moduleName()) >= 0) matches.append(k->moduleName().stripWhiteSpace()); } - for(QStringList::ConstIterator it = matches.begin(); it != matches.end(); it++) + for(TQStringList::ConstIterator it = matches.begin(); it != matches.end(); it++) _keyList->insertItem(*it); _keyList->sort(); } -void SearchWidget::populateResultListBox(const QString& s) +void SearchWidget::populateResultListBox(const TQString& s) { _resultList->clear(); - QPtrList<ModuleItem> results; + TQPtrList<ModuleItem> results; for(KeywordListEntry *k = _keywords.first(); k != 0; k = _keywords.next()) { if (k->moduleName() == s) { - QPtrList<ConfigModule> modules = k->modules(); + TQPtrList<ConfigModule> modules = k->modules(); for(ConfigModule *m = modules.first(); m != 0; m = modules.next()) new ModuleItem(m, _resultList); @@ -178,27 +178,27 @@ void SearchWidget::populateResultListBox(const QString& s) _resultList->sort(); } -void SearchWidget::searchTextChanged(const QString & s) +void SearchWidget::searchTextChanged(const TQString & s) { - QString regexp = s; + TQString regexp = s; regexp += "*"; populateKeyListBox(regexp); if (_keyList->count()==1) _keyList->setSelected(0,true); } -void SearchWidget::slotKeywordSelected(const QString & s) +void SearchWidget::slotKeywordSelected(const TQString & s) { populateResultListBox(s); } -void SearchWidget::slotModuleSelected(QListBoxItem *item) +void SearchWidget::slotModuleSelected(TQListBoxItem *item) { if (item) emit moduleSelected( static_cast<ModuleItem*>(item)->module() ); } -void SearchWidget::slotModuleClicked(QListBoxItem *item) +void SearchWidget::slotModuleClicked(TQListBoxItem *item) { if (item) emit moduleSelected( static_cast<ModuleItem*>(item)->module() ); diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h index 99aceb7e8..492de1729 100644 --- a/kcontrol/kcontrol/searchwidget.h +++ b/kcontrol/kcontrol/searchwidget.h @@ -21,10 +21,10 @@ #ifndef __searchwidget_h__ #define __searchwidget_h__ -#include <qwidget.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include "modules.h" @@ -35,16 +35,16 @@ class QListBoxItem; class KeywordListEntry { public: - KeywordListEntry(const QString& name, ConfigModule* module); + KeywordListEntry(const TQString& name, ConfigModule* module); void addModule(ConfigModule* module); - QString moduleName() { return _name; } - QPtrList<ConfigModule> modules() { return _modules; } + TQString moduleName() { return _name; } + TQPtrList<ConfigModule> modules() { return _modules; } private: - QString _name; - QPtrList<ConfigModule> _modules; + TQString _name; + TQPtrList<ConfigModule> _modules; }; @@ -53,26 +53,26 @@ class SearchWidget : public QWidget Q_OBJECT public: - SearchWidget(QWidget *parent, const char *name=0); + SearchWidget(TQWidget *parent, const char *name=0); void populateKeywordList(ConfigModuleList *list); - void searchTextChanged(const QString &); + void searchTextChanged(const TQString &); signals: void moduleSelected(ConfigModule *); protected: - void populateKeyListBox(const QString& regexp); - void populateResultListBox(const QString& keyword); + void populateKeyListBox(const TQString& regexp); + void populateResultListBox(const TQString& keyword); protected slots: - void slotKeywordSelected(const QString &); - void slotModuleSelected(QListBoxItem *item); - void slotModuleClicked(QListBoxItem *item); + void slotKeywordSelected(const TQString &); + void slotModuleSelected(TQListBoxItem *item); + void slotModuleClicked(TQListBoxItem *item); private: KListBox *_keyList, *_resultList; - QPtrList<KeywordListEntry> _keywords; + TQPtrList<KeywordListEntry> _keywords; }; #endif diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index c7a47e372..aac3427ff 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -30,12 +30,12 @@ #include <kiconloader.h> #include <klineedit.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include "indexwidget.h" #include "searchwidget.h" @@ -52,21 +52,21 @@ TopLevel::TopLevel(const char* name) : KMainWindow( 0, name, WStyle_ContextHelp ) , _active(0), dummyAbout(0) { - setCaption(QString::null); + setCaption(TQString::null); report_bug = 0; // read settings KConfig *config = KGlobal::config(); config->setGroup("Index"); - QString viewmode = config->readEntry("ViewMode", "Tree"); + TQString viewmode = config->readEntry("ViewMode", "Tree"); if (viewmode == "Tree") KCGlobal::setViewMode(Tree); else KCGlobal::setViewMode(Icon); - QString size = config->readEntry("IconSize", "Medium"); + TQString size = config->readEntry("IconSize", "Medium"); if (size == "Small") KCGlobal::setIconSize(KIcon::SizeSmall); else if (size == "Large") @@ -81,58 +81,58 @@ TopLevel::TopLevel(const char* name) _modules->readDesktopEntries(); for ( ConfigModule* m = _modules->first(); m; m = _modules->next() ) { - connect( m, SIGNAL( handbookRequest() ), this, SLOT( slotHandbookRequest() ) ); - connect( m, SIGNAL( helpRequest() ), this, SLOT( slotHelpRequest() ) ); + connect( m, TQT_SIGNAL( handbookRequest() ), this, TQT_SLOT( slotHandbookRequest() ) ); + connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) ); } // create the layout box - _splitter = new QSplitter( QSplitter::Horizontal, this ); + _splitter = new TQSplitter( TQSplitter::Horizontal, this ); - QFrame* leftFrame = new QFrame ( _splitter ); - QBoxLayout *leftFrameLayout = new QVBoxLayout( leftFrame ); + TQFrame* leftFrame = new TQFrame ( _splitter ); + TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame ); - QFrame* mSearchFrame = new QFrame( leftFrame ); + TQFrame* mSearchFrame = new TQFrame( leftFrame ); leftFrameLayout->addWidget( mSearchFrame ); - QBoxLayout *searchLayout = new QHBoxLayout( mSearchFrame ); + TQBoxLayout *searchLayout = new TQHBoxLayout( mSearchFrame ); searchLayout->setSpacing( KDialog::spacingHint() ); searchLayout->setMargin( 6 ); - QPushButton *clearButton = new QPushButton( mSearchFrame ); + TQPushButton *clearButton = new TQPushButton( mSearchFrame ); clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") ); searchLayout->addWidget( clearButton ); - QToolTip::add( clearButton, i18n("Clear search") ); + TQToolTip::add( clearButton, i18n("Clear search") ); - QLabel *label = new QLabel(i18n("Search:"), mSearchFrame ); + TQLabel *label = new TQLabel(i18n("Search:"), mSearchFrame ); searchLayout->addWidget( label ); KLineEdit *searchEdit = new KLineEdit( mSearchFrame ); clearButton->setFixedHeight( searchEdit->height() ); - connect( clearButton, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) ); + connect( clearButton, TQT_SIGNAL( clicked() ), searchEdit, TQT_SLOT( clear() ) ); label->setBuddy( searchEdit ); searchLayout->addWidget( searchEdit ); - connect( searchEdit, SIGNAL( textChanged( const QString & ) ), - SLOT( slotSearchChanged(const QString &) ) ); + connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), + TQT_SLOT( slotSearchChanged(const TQString &) ) ); // create the left hand side under search - _stack = new QWidgetStack( leftFrame ); + _stack = new TQWidgetStack( leftFrame ); leftFrameLayout->addWidget( _stack ); // index tab _index = new IndexWidget(_modules, this); - connect(_index, SIGNAL(moduleActivated(ConfigModule*)), - this, SLOT(activateModule(ConfigModule*))); + connect(_index, TQT_SIGNAL(moduleActivated(ConfigModule*)), + this, TQT_SLOT(activateModule(ConfigModule*))); _stack->addWidget( _index ); - connect(_index, SIGNAL(categorySelected(QListViewItem*)), - this, SLOT(categorySelected(QListViewItem*))); + connect(_index, TQT_SIGNAL(categorySelected(TQListViewItem*)), + this, TQT_SLOT(categorySelected(TQListViewItem*))); // search tab _search = new SearchWidget(this); _search->populateKeywordList(_modules); - connect(_search, SIGNAL(moduleSelected(ConfigModule *)), - this, SLOT(activateModule(ConfigModule *))); + connect(_search, TQT_SIGNAL(moduleSelected(ConfigModule *)), + this, TQT_SLOT(activateModule(ConfigModule *))); _stack->addWidget( _search ); @@ -142,21 +142,21 @@ TopLevel::TopLevel(const char* name) // help widget _help = new HelpWidget(_dock); - _stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); + _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // Restore sizes config->setGroup("General"); - QValueList<int> sizes = config->readIntListEntry( "SplitterSizes" ); + TQValueList<int> sizes = config->readIntListEntry( "SplitterSizes" ); if (!sizes.isEmpty()) _splitter->setSizes(sizes); // That one does the trick ... - _splitter->setResizeMode( leftFrame, QSplitter::KeepSize ); + _splitter->setResizeMode( leftFrame, TQSplitter::KeepSize ); - connect(_dock, SIGNAL(newModule(const QString&, const QString&, const QString&)), - this, SLOT(newModule(const QString&, const QString&, const QString&))); - connect(_dock, SIGNAL(changedModule(ConfigModule*)), - SLOT(changedModule(ConfigModule*))); + connect(_dock, TQT_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)), + this, TQT_SLOT(newModule(const TQString&, const TQString&, const TQString&))); + connect(_dock, TQT_SIGNAL(changedModule(ConfigModule*)), + TQT_SLOT(changedModule(ConfigModule*))); // set the main view setCentralWidget( _splitter ); @@ -178,8 +178,8 @@ TopLevel::TopLevel(const char* name) if (KCGlobal::isInfoCenter()) { AboutWidget *aw = new AboutWidget( this, 0, _index->firstTreeViewItem()); - connect( aw, SIGNAL( moduleSelected( ConfigModule * ) ), - SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), + TQT_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); KWin::setIcons( winId(), KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ), @@ -188,8 +188,8 @@ TopLevel::TopLevel(const char* name) else { AboutWidget *aw = new AboutWidget(this); - connect( aw, SIGNAL( moduleSelected( ConfigModule * ) ), - SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), + TQT_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget(aw); } } @@ -234,40 +234,40 @@ bool TopLevel::queryClose() void TopLevel::setupActions() { - KStdAction::quit(this, SLOT(close()), actionCollection()); - KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), + KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); icon_view = new KRadioAction - (i18n("&Icon View"), 0, this, SLOT(activateIconView()), + (i18n("&Icon View"), 0, this, TQT_SLOT(activateIconView()), actionCollection(), "activate_iconview"); icon_view->setExclusiveGroup( "viewmode" ); tree_view = new KRadioAction - (i18n("&Tree View"), 0, this, SLOT(activateTreeView()), + (i18n("&Tree View"), 0, this, TQT_SLOT(activateTreeView()), actionCollection(), "activate_treeview"); tree_view->setExclusiveGroup( "viewmode" ); icon_small = new KRadioAction - (i18n("&Small"), 0, this, SLOT(activateSmallIcons()), + (i18n("&Small"), 0, this, TQT_SLOT(activateSmallIcons()), actionCollection(), "activate_smallicons"); icon_small->setExclusiveGroup( "iconsize" ); icon_medium = new KRadioAction - (i18n("&Medium"), 0, this, SLOT(activateMediumIcons()), + (i18n("&Medium"), 0, this, TQT_SLOT(activateMediumIcons()), actionCollection(), "activate_mediumicons"); icon_medium->setExclusiveGroup( "iconsize" ); icon_large = new KRadioAction - (i18n("&Large"), 0, this, SLOT(activateLargeIcons()), + (i18n("&Large"), 0, this, TQT_SLOT(activateLargeIcons()), actionCollection(), "activate_largeicons"); icon_large->setExclusiveGroup( "iconsize" ); icon_huge = new KRadioAction - (i18n("&Huge"), 0, this, SLOT(activateHugeIcons()), + (i18n("&Huge"), 0, this, TQT_SLOT(activateHugeIcons()), actionCollection(), "activate_hugeicons"); icon_huge->setExclusiveGroup( "iconsize" ); - about_module = new KAction(i18n("About Current Module"), 0, this, SLOT(aboutModule()), actionCollection(), "help_about_module"); + about_module = new KAction(i18n("About Current Module"), 0, this, TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); about_module->setEnabled(false); // I need to add this so that each module can get a bug reported, @@ -280,7 +280,7 @@ actionCollection()); report_bug = actionCollection()->action("help_report_bug"); report_bug->setText(i18n("&Report Bug...")); report_bug->disconnect(); - connect(report_bug, SIGNAL(activated()), SLOT(reportBug())); + connect(report_bug, TQT_SIGNAL(activated()), TQT_SLOT(reportBug())); } void TopLevel::activateIconView() @@ -345,7 +345,7 @@ void TopLevel::activateHugeIcons() _index->reload(); } -void TopLevel::newModule(const QString &name, const QString& docPath, const QString &quickhelp) +void TopLevel::newModule(const TQString &name, const TQString& docPath, const TQString &quickhelp) { setCaption(name, false); @@ -366,7 +366,7 @@ void TopLevel::changedModule(ConfigModule *changed) setCaption(changed->moduleName(), changed->isChanged() ); } -void TopLevel::categorySelected(QListViewItem *category) +void TopLevel::categorySelected(TQListViewItem *category) { if (_active) { @@ -390,13 +390,13 @@ void TopLevel::categorySelected(QListViewItem *category) } _dock->removeModule(); about_module->setText( i18n( "About Current Module" ) ); - about_module->setIconSet( QIconSet() ); + about_module->setIconSet( TQIconSet() ); about_module->setEnabled( false ); // insert the about widget - QListViewItem *firstItem = category->firstChild(); - QString caption = static_cast<ModuleTreeItem*>(category)->caption(); - QString icon = static_cast<ModuleTreeItem*>(category)->icon(); + TQListViewItem *firstItem = category->firstChild(); + TQString caption = static_cast<ModuleTreeItem*>(category)->caption(); + TQString icon = static_cast<ModuleTreeItem*>(category)->icon(); if( _dock->baseWidget()->isA( "AboutWidget" ) ) { static_cast<AboutWidget *>( _dock->baseWidget() )->setCategory( firstItem, icon, caption); @@ -404,8 +404,8 @@ void TopLevel::categorySelected(QListViewItem *category) else { AboutWidget *aw = new AboutWidget( this, 0, firstItem, caption ); - connect( aw, SIGNAL( moduleSelected( ConfigModule * ) ), - SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), + TQT_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); } } @@ -445,7 +445,7 @@ void TopLevel::activateModule(ConfigModule *mod) else { about_module->setText(i18n("About Current Module")); - about_module->setIconSet(QIconSet()); + about_module->setIconSet(TQIconSet()); about_module->setEnabled(false); } } @@ -456,7 +456,7 @@ void TopLevel::deleteDummyAbout() dummyAbout = 0; } -void TopLevel::slotSearchChanged(const QString& search) +void TopLevel::slotSearchChanged(const TQString& search) { if (search.isEmpty()) _stack->raiseWidget(_index); @@ -469,7 +469,7 @@ void TopLevel::slotSearchChanged(const QString& search) void TopLevel::slotHelpRequest() { - _help->display(_help->text(), QCursor::pos ( ), _dock); + _help->display(_help->text(), TQCursor::pos ( ), _dock); } void TopLevel::slotHandbookRequest() @@ -500,7 +500,7 @@ void TopLevel::reportBug() } KBugReport *br = new KBugReport(this, false, dummyAbout); if (deleteit) - connect(br, SIGNAL(finished()), SLOT(deleteDummyAbout())); + connect(br, TQT_SIGNAL(finished()), TQT_SLOT(deleteDummyAbout())); else dummyAbout = 0; br->show(); @@ -512,7 +512,7 @@ void TopLevel::aboutModule() dlg.exec(); } -QString TopLevel::handleAmpersand( QString modulename ) const +TQString TopLevel::handleAmpersand( TQString modulename ) const { if( modulename.contains( '&' )) // double it { diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h index 02e42a49e..2f10cb3bc 100644 --- a/kcontrol/kcontrol/toplevel.h +++ b/kcontrol/kcontrol/toplevel.h @@ -22,7 +22,7 @@ #define __TOPLEVEL_H__ #include <kmainwindow.h> -#include <qlistview.h> +#include <tqlistview.h> class QSplitter; @@ -52,8 +52,8 @@ protected: protected slots: void activateModule(ConfigModule *); - void categorySelected(QListViewItem *category); - void newModule(const QString &name, const QString& docPath, const QString &quickhelp); + void categorySelected(TQListViewItem *category); + void newModule(const TQString &name, const TQString& docPath, const TQString &quickhelp); void activateIconView(); void activateTreeView(); @@ -67,7 +67,7 @@ protected slots: void deleteDummyAbout(); - void slotSearchChanged(const QString &); + void slotSearchChanged(const TQString &); void slotHandbookRequest(); void slotHelpRequest(); @@ -77,10 +77,10 @@ protected slots: private: - QString handleAmpersand( QString ) const; + TQString handleAmpersand( TQString ) const; - QSplitter *_splitter; - QWidgetStack *_stack; + TQSplitter *_splitter; + TQWidgetStack *_stack; DockContainer *_dock; ModuleTitle *_title; diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index e30d73b6f..f24af2c1e 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -17,12 +17,12 @@ Boston, MA 02110-1301, USA. */ -#include <qheader.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> #include <dcopclient.h> #include <dcopref.h> @@ -42,11 +42,11 @@ #include "kcmkded.h" #include "kcmkded.moc" -typedef KGenericFactory<KDEDConfig, QWidget> KDEDFactory; +typedef KGenericFactory<KDEDConfig, TQWidget> KDEDFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kded, KDEDFactory( "kcmkded" ) ) -KDEDConfig::KDEDConfig(QWidget* parent, const char* name, const QStringList &) : +KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) : KCModule( KDEDFactory::instance(), parent, name ) { KAboutData *about = @@ -67,10 +67,10 @@ KDEDConfig::KDEDConfig(QWidget* parent, const char* name, const QStringList &) : RUNNING = i18n("Running")+" "; NOT_RUNNING = i18n("Not running")+" "; - QVBoxLayout *lay = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - QGroupBox *gb = new QVGroupBox(i18n("Load-on-Demand Services"), this ); - QWhatsThis::add(gb, i18n("This is a list of available KDE services which will " + TQGroupBox *gb = new TQVGroupBox(i18n("Load-on-Demand Services"), this ); + TQWhatsThis::add(gb, i18n("This is a list of available KDE services which will " "be started on demand. They are only listed for convenience, as you " "cannot manipulate these services.")); lay->addWidget( gb ); @@ -82,8 +82,8 @@ KDEDConfig::KDEDConfig(QWidget* parent, const char* name, const QStringList &) : _lvLoD->setAllColumnsShowFocus(true); _lvLoD->header()->setStretchEnabled(true, 1); - gb = new QVGroupBox(i18n("Startup Services"), this ); - QWhatsThis::add(gb, i18n("This shows all KDE services that can be loaded " + gb = new TQVGroupBox(i18n("Startup Services"), this ); + TQWhatsThis::add(gb, i18n("This shows all KDE services that can be loaded " "on KDE startup. Checked services will be invoked on next startup. " "Be careful with deactivation of unknown services.")); lay->addWidget( gb ); @@ -103,16 +103,16 @@ KDEDConfig::KDEDConfig(QWidget* parent, const char* name, const QStringList &) : _pbStart->setEnabled( false ); _pbStop->setEnabled( false ); - connect(_pbStart, SIGNAL(clicked()), SLOT(slotStartService())); - connect(_pbStop, SIGNAL(clicked()), SLOT(slotStopService())); - connect(_lvStartup, SIGNAL(selectionChanged(QListViewItem*)), SLOT(slotEvalItem(QListViewItem*)) ); + connect(_pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartService())); + connect(_pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(slotStopService())); + connect(_lvStartup, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotEvalItem(TQListViewItem*)) ); load(); } -void setModuleGroup(KConfig *config, const QString &filename) +void setModuleGroup(KConfig *config, const TQString &filename) { - QString module = filename; + TQString module = filename; int i = module.findRev('/'); if (i != -1) module = module.mid(i+1); @@ -120,16 +120,16 @@ void setModuleGroup(KConfig *config, const QString &filename) if (i != -1) module = module.left(i); - config->setGroup(QString("Module-%1").arg(module)); + config->setGroup(TQString("Module-%1").arg(module)); } -bool KDEDConfig::autoloadEnabled(KConfig *config, const QString &filename) +bool KDEDConfig::autoloadEnabled(KConfig *config, const TQString &filename) { setModuleGroup(config, filename); return config->readBoolEntry("autoload", true); } -void KDEDConfig::setAutoloadEnabled(KConfig *config, const QString &filename, bool b) +void KDEDConfig::setAutoloadEnabled(KConfig *config, const TQString &filename, bool b) { setModuleGroup(config, filename); return config->writeEntry("autoload", b); @@ -147,21 +147,21 @@ void KDEDConfig::load( bool useDefaults ) { _lvStartup->clear(); _lvLoD->clear(); - QStringList files; + TQStringList files; KGlobal::dirs()->findAllResources( "services", - QString::fromLatin1( "kded/*.desktop" ), + TQString::fromLatin1( "kded/*.desktop" ), true, true, files ); - QListViewItem* item = 0L; + TQListViewItem* item = 0L; CheckListItem* clitem; - for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { + for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { if ( KDesktopFile::isDesktopFile( *it ) ) { KDesktopFile file( *it, true, "services" ); if ( file.readBoolEntry("X-KDE-Kded-autoload") ) { - clitem = new CheckListItem(_lvStartup, QString::null); - connect(clitem, SIGNAL(changed(QCheckListItem*)), SLOT(slotItemChecked(QCheckListItem*))); + clitem = new CheckListItem(_lvStartup, TQString::null); + connect(clitem, TQT_SIGNAL(changed(TQCheckListItem*)), TQT_SLOT(slotItemChecked(TQCheckListItem*))); clitem->setOn(autoloadEnabled(&kdedrc, *it)); item = clitem; item->setText(1, file.readName()); @@ -170,7 +170,7 @@ void KDEDConfig::load( bool useDefaults ) { item->setText(4, file.readEntry("X-KDE-Library")); } else if ( file.readBoolEntry("X-KDE-Kded-load-on-demand") ) { - item = new QListViewItem(_lvLoD, file.readName()); + item = new TQListViewItem(_lvLoD, file.readName()); item->setText(1, file.readComment()); item->setText(2, NOT_RUNNING); item->setText(4, file.readEntry("X-KDE-Library")); @@ -183,16 +183,16 @@ void KDEDConfig::load( bool useDefaults ) { } void KDEDConfig::save() { - QCheckListItem* item = 0L; + TQCheckListItem* item = 0L; - QStringList files; + TQStringList files; KGlobal::dirs()->findAllResources( "services", - QString::fromLatin1( "kded/*.desktop" ), + TQString::fromLatin1( "kded/*.desktop" ), true, true, files ); KConfig kdedrc("kdedrc", false, false); - for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { + for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { if ( KDesktopFile::isDesktopFile( *it ) ) { @@ -201,7 +201,7 @@ void KDEDConfig::save() { if (file.readBoolEntry("X-KDE-Kded-autoload")){ - item = static_cast<QCheckListItem *>(_lvStartup->findItem(file.readEntry("X-KDE-Library"),4)); + item = static_cast<TQCheckListItem *>(_lvStartup->findItem(file.readEntry("X-KDE-Library"),4)); if (item) { // we found a match, now compare and see what changed setAutoloadEnabled(&kdedrc, *it, item->isOn()); @@ -212,7 +212,7 @@ void KDEDConfig::save() { kdedrc.sync(); DCOPRef( "kded", "kded" ).call( "reconfigure" ); - QTimer::singleShot(0, this, SLOT(slotServiceRunningToggled())); + TQTimer::singleShot(0, this, TQT_SLOT(slotServiceRunningToggled())); } @@ -225,11 +225,11 @@ void KDEDConfig::defaults() void KDEDConfig::getServiceStatus() { QCStringList modules; - QCString replyType; - QByteArray replyData; + TQCString replyType; + TQByteArray replyData; - if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", QByteArray(), + if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(), replyType, replyData ) ) { _lvLoD->setEnabled( false ); @@ -240,18 +240,18 @@ void KDEDConfig::getServiceStatus() else { if ( replyType == "QCStringList" ) { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); reply >> modules; } } - for( QListViewItemIterator it( _lvLoD); it.current() != 0; ++it ) + for( TQListViewItemIterator it( _lvLoD); it.current() != 0; ++it ) it.current()->setText(2, NOT_RUNNING); - for( QListViewItemIterator it( _lvStartup); it.current() != 0; ++it ) + for( TQListViewItemIterator it( _lvStartup); it.current() != 0; ++it ) it.current()->setText(3, NOT_RUNNING); for ( QCStringList::Iterator it = modules.begin(); it != modules.end(); ++it ) { - QListViewItem *item = _lvLoD->findItem(*it, 4); + TQListViewItem *item = _lvLoD->findItem(*it, 4); if ( item ) { item->setText(2, RUNNING); @@ -267,14 +267,14 @@ void KDEDConfig::getServiceStatus() void KDEDConfig::slotReload() { - QString current = _lvStartup->currentItem()->text(4); + TQString current = _lvStartup->currentItem()->text(4); load(); - QListViewItem *item = _lvStartup->findItem(current, 4); + TQListViewItem *item = _lvStartup->findItem(current, 4); if (item) _lvStartup->setCurrentItem(item); } -void KDEDConfig::slotEvalItem(QListViewItem * item) +void KDEDConfig::slotEvalItem(TQListViewItem * item) { if (!item) return; @@ -304,14 +304,14 @@ void KDEDConfig::slotServiceRunningToggled() void KDEDConfig::slotStartService() { - QCString service = _lvStartup->currentItem()->text(4).latin1(); + TQCString service = _lvStartup->currentItem()->text(4).latin1(); - QByteArray data, replyData; - QCString replyType; - QDataStream arg( data, IO_WriteOnly ); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg( data, IO_WriteOnly ); arg << service; - if (kapp->dcopClient()->call( "kded", "kded", "loadModule(QCString)", data, replyType, replyData ) ) { - QDataStream reply(replyData, IO_ReadOnly); + if (kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) { + TQDataStream reply(replyData, IO_ReadOnly); if ( replyType == "bool" ) { bool result; @@ -331,13 +331,13 @@ void KDEDConfig::slotStartService() void KDEDConfig::slotStopService() { - QCString service = _lvStartup->currentItem()->text(4).latin1(); + TQCString service = _lvStartup->currentItem()->text(4).latin1(); kdDebug() << "Stopping: " << service << endl; - QByteArray data; - QDataStream arg( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream arg( data, IO_WriteOnly ); arg << service; - if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(QCString)", data ) ) { + if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) { slotServiceRunningToggled(); } else { @@ -346,18 +346,18 @@ void KDEDConfig::slotStopService() } -void KDEDConfig::slotItemChecked(QCheckListItem*) +void KDEDConfig::slotItemChecked(TQCheckListItem*) { emit changed(true); } -CheckListItem::CheckListItem(QListView *parent, const QString &text) - : QObject(parent), - QCheckListItem(parent, text, CheckBox) +CheckListItem::CheckListItem(TQListView *parent, const TQString &text) + : TQObject(parent), + TQCheckListItem(parent, text, CheckBox) { } void CheckListItem::stateChange(bool on) { - QCheckListItem::stateChange(on); + TQCheckListItem::stateChange(on); emit changed(this); } diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h index b945ff52f..9971fd6cd 100644 --- a/kcontrol/kded/kcmkded.h +++ b/kcontrol/kded/kcmkded.h @@ -19,7 +19,7 @@ #ifndef KCMKDED_H #define KCMKDED_H -#include <qlistview.h> +#include <tqlistview.h> #include <kcmodule.h> @@ -32,7 +32,7 @@ class KDEDConfig : public KCModule { Q_OBJECT public: - KDEDConfig(QWidget* parent, const char* name= 0L, const QStringList& foo = QStringList()); + KDEDConfig(TQWidget* parent, const char* name= 0L, const TQStringList& foo = TQStringList()); ~KDEDConfig() {}; void load(); @@ -45,31 +45,31 @@ protected slots: void slotStartService(); void slotStopService(); void slotServiceRunningToggled(); - void slotEvalItem(QListViewItem *item); - void slotItemChecked(QCheckListItem *item); + void slotEvalItem(TQListViewItem *item); + void slotItemChecked(TQCheckListItem *item); void getServiceStatus(); - bool autoloadEnabled(KConfig *config, const QString &filename); - void setAutoloadEnabled(KConfig *config, const QString &filename, bool b); + bool autoloadEnabled(KConfig *config, const TQString &filename); + void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b); private: KListView *_lvLoD; KListView *_lvStartup; - QPushButton *_pbStart; - QPushButton *_pbStop; + TQPushButton *_pbStart; + TQPushButton *_pbStop; - QString RUNNING; - QString NOT_RUNNING; + TQString RUNNING; + TQString NOT_RUNNING; }; -class CheckListItem : public QObject, public QCheckListItem +class CheckListItem : public TQObject, public QCheckListItem { Q_OBJECT public: - CheckListItem(QListView* parent, const QString &text); + CheckListItem(TQListView* parent, const TQString &text); ~CheckListItem() { } signals: - void changed(QCheckListItem*); + void changed(TQCheckListItem*); protected: virtual void stateChange(bool); }; diff --git a/kcontrol/kdm/background.cpp b/kcontrol/kdm/background.cpp index 19c962a1d..b5ce18ff5 100644 --- a/kcontrol/kdm/background.cpp +++ b/kcontrol/kdm/background.cpp @@ -23,9 +23,9 @@ #include <unistd.h> #include <sys/types.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <kdebug.h> #include <klocale.h> @@ -33,19 +33,19 @@ #include "../background/bgsettings.h" #include "../background/bgdialog.h" #include "background.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <ksimpleconfig.h> #include <kdialog.h> extern KSimpleConfig *config; -KBackground::KBackground(QWidget *parent, const char *name) - : QWidget(parent, name) +KBackground::KBackground(TQWidget *parent, const char *name) + : TQWidget(parent, name) { // Enabling checkbox - m_pCBEnable = new QCheckBox( i18n("E&nable background"), this ); - QWhatsThis::add( m_pCBEnable, + m_pCBEnable = new TQCheckBox( i18n("E&nable background"), this ); + TQWhatsThis::add( m_pCBEnable, i18n("If this is checked, KDM will use the settings below for the background." " If it is disabled, you have to look after the background yourself." " This is done by running some program (possibly xsetroot) in the script" @@ -54,14 +54,14 @@ KBackground::KBackground(QWidget *parent, const char *name) m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/kdm/backgroundrc" ) ); m_background = new BGDialog( this, m_simpleConf, false ); - connect(m_background, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); // Top layout - QVBoxLayout *top = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() ); + TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() ); top->addWidget(m_pCBEnable); top->addWidget(m_background); top->addStretch(); - connect( m_pCBEnable, SIGNAL(toggled( bool )), SLOT(slotEnableChanged()) ); + connect( m_pCBEnable, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotEnableChanged()) ); } KBackground::~KBackground() diff --git a/kcontrol/kdm/background.h b/kcontrol/kdm/background.h index bc1e48213..7de6a82dc 100644 --- a/kcontrol/kdm/background.h +++ b/kcontrol/kdm/background.h @@ -10,8 +10,8 @@ #ifndef __Bgnd_h_Included__ #define __Bgnd_h_Included__ -#include <qobject.h> -#include <qwidget.h> +#include <tqobject.h> +#include <tqwidget.h> class KSimpleConfig; @@ -24,7 +24,7 @@ class KBackground: public QWidget { Q_OBJECT public: - KBackground(QWidget *parent=0, const char *name=0); + KBackground(TQWidget *parent=0, const char *name=0); ~KBackground(); void load(); @@ -40,8 +40,8 @@ private: void init(); void apply(); - QCheckBox *m_pCBEnable; - QLabel *m_pMLabel; + TQCheckBox *m_pCBEnable; + TQLabel *m_pMLabel; KSimpleConfig *m_simpleConf; BGDialog *m_background; }; diff --git a/kcontrol/kdm/kbackedcombobox.cpp b/kcontrol/kdm/kbackedcombobox.cpp index 97759db5a..1ba598e49 100644 --- a/kcontrol/kdm/kbackedcombobox.cpp +++ b/kcontrol/kdm/kbackedcombobox.cpp @@ -19,14 +19,14 @@ #include "kbackedcombobox.h" -void KBackedComboBox::insertItem( const QString &id, const QString &name ) +void KBackedComboBox::insertItem( const TQString &id, const TQString &name ) { id2name[id] = name; name2id[name] = id; KComboBox::insertItem( name ); } -void KBackedComboBox::setCurrentId( const QString &id ) +void KBackedComboBox::setCurrentId( const TQString &id ) { if (id2name.contains( id )) setCurrentItem( id2name[id] ); @@ -34,7 +34,7 @@ void KBackedComboBox::setCurrentId( const QString &id ) setCurrentItem( 0 ); } -const QString &KBackedComboBox::currentId() const +const TQString &KBackedComboBox::currentId() const { return name2id[currentText()]; } diff --git a/kcontrol/kdm/kbackedcombobox.h b/kcontrol/kdm/kbackedcombobox.h index 3b006f23f..1ec1d2a72 100644 --- a/kcontrol/kdm/kbackedcombobox.h +++ b/kcontrol/kdm/kbackedcombobox.h @@ -25,13 +25,13 @@ class KBackedComboBox : public KComboBox { public: - KBackedComboBox( QWidget *parent ) : KComboBox( false, parent ) {} - void insertItem( const QString &id, const QString &name ); - void setCurrentId( const QString &id ); - const QString ¤tId() const; + KBackedComboBox( TQWidget *parent ) : KComboBox( false, parent ) {} + void insertItem( const TQString &id, const TQString &name ); + void setCurrentId( const TQString &id ); + const TQString ¤tId() const; private: - QMap<QString,QString> id2name, name2id; + TQMap<TQString,TQString> id2name, name2id; }; diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp index 7d1d034ca..58696902b 100644 --- a/kcontrol/kdm/kdm-appear.cpp +++ b/kcontrol/kdm/kdm-appear.cpp @@ -23,14 +23,14 @@ #include <sys/types.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qwhatsthis.h> -#include <qvalidator.h> -#include <qstylefactory.h> -#include <qstyle.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> +#include <tqstylefactory.h> +#include <tqstyle.h> #include <klocale.h> #include <klineedit.h> @@ -49,29 +49,29 @@ extern KSimpleConfig *config; -KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name) - : QWidget(parent, name) +KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QString wtstr; + TQString wtstr; - QVBoxLayout *vbox = new QVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *vbox = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "vbox"); - QGroupBox *group = new QGroupBox(i18n("Appearance"), this); + TQGroupBox *group = new TQGroupBox(i18n("Appearance"), this); vbox->addWidget(group); - QGridLayout *grid = new QGridLayout( group, 5, 2, KDialog::marginHint(), + TQGridLayout *grid = new TQGridLayout( group, 5, 2, KDialog::marginHint(), KDialog::spacingHint(), "grid"); grid->addRowSpacing(0, group->fontMetrics().height()); grid->setColStretch(0, 1); grid->setColStretch(1, 1); - QHBoxLayout *hlay = new QHBoxLayout( KDialog::spacingHint() ); + TQHBoxLayout *hlay = new TQHBoxLayout( KDialog::spacingHint() ); grid->addMultiCellLayout(hlay, 1,1, 0,1); greetstr_lined = new KLineEdit(group); - QLabel *label = new QLabel(greetstr_lined, i18n("&Greeting:"), group); + TQLabel *label = new TQLabel(greetstr_lined, i18n("&Greeting:"), group); hlay->addWidget(label); - connect(greetstr_lined, SIGNAL(textChanged(const QString&)), - SLOT(changed())); + connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(changed())); hlay->addWidget(greetstr_lined); wtstr = i18n("This is the \"headline\" for KDM's login window. You may want to " "put some nice greeting or information about the operating system here.<p>" @@ -85,24 +85,24 @@ KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name) "<li>%m -> the machine (hardware) type</li>" "<li>%% -> a single %</li>" "</ul>" ); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( greetstr_lined, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( greetstr_lined, wtstr ); - QGridLayout *hglay = new QGridLayout( 3, 4, KDialog::spacingHint() ); + TQGridLayout *hglay = new TQGridLayout( 3, 4, KDialog::spacingHint() ); grid->addMultiCellLayout(hglay, 2,4, 0,0); - label = new QLabel(i18n("Logo area:"), group); + label = new TQLabel(i18n("Logo area:"), group); hglay->addWidget(label, 0, 0); - QVBoxLayout *vlay = new QVBoxLayout( KDialog::spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( KDialog::spacingHint() ); hglay->addMultiCellLayout(vlay, 0,0, 1,2); - noneRadio = new QRadioButton( i18n("logo area", "&None"), group ); - clockRadio = new QRadioButton( i18n("Show cloc&k"), group ); - logoRadio = new QRadioButton( i18n("Sho&w logo"), group ); - QButtonGroup *buttonGroup = new QButtonGroup( group ); + noneRadio = new TQRadioButton( i18n("logo area", "&None"), group ); + clockRadio = new TQRadioButton( i18n("Show cloc&k"), group ); + logoRadio = new TQRadioButton( i18n("Sho&w logo"), group ); + TQButtonGroup *buttonGroup = new TQButtonGroup( group ); label->setBuddy( buttonGroup ); - connect( buttonGroup, SIGNAL(clicked(int)), SLOT(slotAreaRadioClicked(int)) ); - connect( buttonGroup, SIGNAL(clicked(int)), SLOT(changed()) ); + connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotAreaRadioClicked(int)) ); + connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()) ); buttonGroup->hide(); buttonGroup->insert(noneRadio, KdmNone); buttonGroup->insert(clockRadio, KdmClock); @@ -111,61 +111,61 @@ KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name) vlay->addWidget(clockRadio); vlay->addWidget(logoRadio); wtstr = i18n("You can choose to display a custom logo (see below), a clock or no logo at all."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( noneRadio, wtstr ); - QWhatsThis::add( logoRadio, wtstr ); - QWhatsThis::add( clockRadio, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( noneRadio, wtstr ); + TQWhatsThis::add( logoRadio, wtstr ); + TQWhatsThis::add( clockRadio, wtstr ); - logoLabel = new QLabel(i18n("&Logo:"), group); - logobutton = new QPushButton(group); + logoLabel = new TQLabel(i18n("&Logo:"), group); + logobutton = new TQPushButton(group); logoLabel->setBuddy( logobutton ); logobutton->setAutoDefault(false); logobutton->setAcceptDrops(true); logobutton->installEventFilter(this); // for drag and drop - connect(logobutton, SIGNAL(clicked()), SLOT(slotLogoButtonClicked())); + connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked())); hglay->addWidget(logoLabel, 1, 0); hglay->addWidget(logobutton, 1, 1, AlignCenter); hglay->addRowSpacing(1, 110); wtstr = i18n("Click here to choose an image that KDM will display. " "You can also drag and drop an image onto this button " "(e.g. from Konqueror)."); - QWhatsThis::add( logoLabel, wtstr ); - QWhatsThis::add( logobutton, wtstr ); + TQWhatsThis::add( logoLabel, wtstr ); + TQWhatsThis::add( logobutton, wtstr ); hglay->addRowSpacing( 2, KDialog::spacingHint()); hglay->setColStretch( 3, 1); - hglay = new QGridLayout( 2, 3, KDialog::spacingHint() ); + hglay = new TQGridLayout( 2, 3, KDialog::spacingHint() ); grid->addLayout(hglay, 2, 1); - label = new QLabel(i18n("Position:"), group); + label = new TQLabel(i18n("Position:"), group); hglay->addMultiCellWidget(label, 0,1, 0,0, AlignVCenter); - QValidator *posValidator = new QIntValidator(0, 100, group); - QLabel *xLineLabel = new QLabel(i18n("&X:"), group); + TQValidator *posValidator = new TQIntValidator(0, 100, group); + TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group); hglay->addWidget(xLineLabel, 0, 1); - xLineEdit = new QLineEdit (group); - connect( xLineEdit, SIGNAL( textChanged(const QString&) ), SLOT( changed() )); + xLineEdit = new TQLineEdit (group); + connect( xLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() )); hglay->addWidget(xLineEdit, 0, 2); xLineLabel->setBuddy(xLineEdit); xLineEdit->setValidator(posValidator); - QLabel *yLineLabel = new QLabel(i18n("&Y:"), group); + TQLabel *yLineLabel = new TQLabel(i18n("&Y:"), group); hglay->addWidget(yLineLabel, 1, 1); - yLineEdit = new QLineEdit (group); - connect( yLineEdit, SIGNAL( textChanged(const QString&) ), SLOT( changed() )); + yLineEdit = new TQLineEdit (group); + connect( yLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() )); hglay->addWidget(yLineEdit, 1, 2); yLineLabel->setBuddy(yLineEdit); yLineEdit->setValidator(posValidator); wtstr = i18n("Here you specify the relative coordinates (in percent) of the login dialog's <em>center</em>."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( xLineLabel, wtstr ); - QWhatsThis::add( xLineEdit, wtstr ); - QWhatsThis::add( yLineLabel, wtstr ); - QWhatsThis::add( yLineEdit, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( xLineLabel, wtstr ); + TQWhatsThis::add( xLineEdit, wtstr ); + TQWhatsThis::add( yLineLabel, wtstr ); + TQWhatsThis::add( yLineEdit, wtstr ); hglay->setColStretch( 3, 1); hglay->setRowStretch( 2, 1); - hglay = new QGridLayout( 2, 3, KDialog::spacingHint() ); + hglay = new TQGridLayout( 2, 3, KDialog::spacingHint() ); grid->addLayout(hglay, 3, 1); hglay->setColStretch(3, 1); @@ -173,57 +173,57 @@ KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name) guicombo->insertItem( "", i18n("<default>") ); loadGuiStyles(guicombo); guicombo->listBox()->sort(); - label = new QLabel(guicombo, i18n("GUI s&tyle:"), group); - connect(guicombo, SIGNAL(activated(int)), SLOT(changed())); + label = new TQLabel(guicombo, i18n("GUI s&tyle:"), group); + connect(guicombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hglay->addWidget(label, 0, 0); hglay->addWidget(guicombo, 0, 1); wtstr = i18n("You can choose a basic GUI style here that will be " "used by KDM only."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( guicombo, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( guicombo, wtstr ); colcombo = new KBackedComboBox(group); colcombo->insertItem( "", i18n("<default>") ); loadColorSchemes(colcombo); colcombo->listBox()->sort(); - label = new QLabel(colcombo, i18n("&Color scheme:"), group); - connect(colcombo, SIGNAL(activated(int)), SLOT(changed())); + label = new TQLabel(colcombo, i18n("&Color scheme:"), group); + connect(colcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hglay->addWidget(label, 1, 0); hglay->addWidget(colcombo, 1, 1); wtstr = i18n("You can choose a basic Color Scheme here that will be " "used by KDM only."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( colcombo, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( colcombo, wtstr ); echocombo = new KBackedComboBox(group); echocombo->insertItem("NoEcho", i18n("No Echo")); echocombo->insertItem("OneStar", i18n("One Star")); echocombo->insertItem("ThreeStars", i18n("Three Stars")); - label = new QLabel(echocombo, i18n("Echo &mode:"), group); - connect(echocombo, SIGNAL(activated(int)), SLOT(changed())); + label = new TQLabel(echocombo, i18n("Echo &mode:"), group); + connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hglay->addWidget(label, 2, 0); hglay->addWidget(echocombo, 2, 1); wtstr = i18n("You can choose whether and how KDM shows your password when you type it."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( echocombo, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( echocombo, wtstr ); // The Language group box - group = new QGroupBox(0, Vertical, i18n("Locale"), this); + group = new TQGroupBox(0, Vertical, i18n("Locale"), this); vbox->addWidget(group); langcombo = new KLanguageButton(group); loadLanguageList(langcombo); - connect(langcombo, SIGNAL(activated(const QString &)), SLOT(changed())); - label = new QLabel(langcombo, i18n("Languag&e:"), group); - QGridLayout *hbox = new QGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); + connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); + label = new TQLabel(langcombo, i18n("Languag&e:"), group); + TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); hbox->setColStretch(1, 1); hbox->addWidget(label, 1, 0); hbox->addWidget(langcombo, 1, 1); wtstr = i18n("Here you can choose the language used by KDM. This setting does not affect" " a user's personal settings; that will take effect after login."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( langcombo, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( langcombo, wtstr ); vbox->addStretch(1); @@ -232,8 +232,8 @@ KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name) void KDMAppearanceWidget::makeReadOnly() { - disconnect( logobutton, SIGNAL(clicked()), - this, SLOT(slotLogoButtonClicked()) ); + disconnect( logobutton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotLogoButtonClicked()) ); logobutton->setAcceptDrops(false); greetstr_lined->setReadOnly(true); noneRadio->setEnabled(false); @@ -249,38 +249,38 @@ void KDMAppearanceWidget::makeReadOnly() void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) { - QStringList langlist = KGlobal::dirs()->findAllResources("locale", - QString::fromLatin1("*/entry.desktop")); + TQStringList langlist = KGlobal::dirs()->findAllResources("locale", + TQString::fromLatin1("*/entry.desktop")); langlist.sort(); - for ( QStringList::ConstIterator it = langlist.begin(); + for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) { - QString fpath = (*it).left((*it).length() - 14); + TQString fpath = (*it).left((*it).length() - 14); int index = fpath.findRev('/'); - QString nid = fpath.mid(index + 1); + TQString nid = fpath.mid(index + 1); KSimpleConfig entry(*it); - entry.setGroup(QString::fromLatin1("KCM Locale")); - QString name = entry.readEntry(QString::fromLatin1("Name"), i18n("without name")); - combo->insertLanguage(nid, name, QString::fromLatin1("l10n/"), QString::null); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null); } } void KDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo) { // XXX: Global + local schemes - QStringList list = KGlobal::dirs()-> + TQStringList list = KGlobal::dirs()-> findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true); - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig config(*it, true); config.setGroup("Color Scheme"); - QString str; + TQString str; if (!(str = config.readEntry("Name")).isEmpty() || !(str = config.readEntry("name")).isEmpty()) { - QString str2 = (*it).mid( (*it).findRev( '/' ) + 1 ); // strip off path + TQString str2 = (*it).mid( (*it).findRev( '/' ) + 1 ); // strip off path str2.setLength( str2.length() - 6 ); // strip off ".kcsrc combo->insertItem( str2, str ); } @@ -290,9 +290,9 @@ void KDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo) void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) { // XXX: Global + local schemes - QStringList list = KGlobal::dirs()-> + TQStringList list = KGlobal::dirs()-> findAllResources("data", "kstyle/themes/*.themerc", false, true); - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig config(*it, true); @@ -304,7 +304,7 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) continue; config.setGroup("KDE"); - QString str2 = config.readEntry("WidgetStyle"); + TQString str2 = config.readEntry("WidgetStyle"); if (str2.isNull()) continue; @@ -313,18 +313,18 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) } } -bool KDMAppearanceWidget::setLogo(QString logo) +bool KDMAppearanceWidget::setLogo(TQString logo) { - QString flogo = logo.isEmpty() ? - locate("data", QString::fromLatin1("kdm/pics/kdelogo.png") ) : + TQString flogo = logo.isEmpty() ? + locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) : logo; - QImage p(flogo); + TQImage p(flogo); if (p.isNull()) return false; if (p.width() > 100 || p.height() > 100) - p = p.smoothScale(100, 100, QImage::ScaleMin); + p = p.smoothScale(100, 100, TQImage::ScaleMin); logobutton->setPixmap(p); - uint bd = style().pixelMetric( QStyle::PM_ButtonMargin ) * 2; + uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; logobutton->setFixedSize(p.width() + bd, p.height() + bd); logopath = logo; return true; @@ -334,7 +334,7 @@ bool KDMAppearanceWidget::setLogo(QString logo) void KDMAppearanceWidget::slotLogoButtonClicked() { KImageIO::registerFormats(); - KFileDialog dialogue(locate("data", QString::fromLatin1("kdm/pics/")), + KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")), KImageIO::pattern( KImageIO::Reading ), this, 0, true); dialogue.setOperationMode( KFileDialog::Opening ); @@ -342,7 +342,7 @@ void KDMAppearanceWidget::slotLogoButtonClicked() KImageFilePreview* imagePreview = new KImageFilePreview( &dialogue ); dialogue.setPreviewWidget( imagePreview ); - if (dialogue.exec() == QDialog::Accepted) { + if (dialogue.exec() == TQDialog::Accepted) { if ( setLogo(dialogue.selectedFile()) ) { changed(); } @@ -357,30 +357,30 @@ void KDMAppearanceWidget::slotAreaRadioClicked(int id) } -bool KDMAppearanceWidget::eventFilter(QObject *, QEvent *e) +bool KDMAppearanceWidget::eventFilter(TQObject *, TQEvent *e) { - if (e->type() == QEvent::DragEnter) { - iconLoaderDragEnterEvent((QDragEnterEvent *) e); + if (e->type() == TQEvent::DragEnter) { + iconLoaderDragEnterEvent((TQDragEnterEvent *) e); return true; } - if (e->type() == QEvent::Drop) { - iconLoaderDropEvent((QDropEvent *) e); + if (e->type() == TQEvent::Drop) { + iconLoaderDropEvent((TQDropEvent *) e); return true; } return false; } -void KDMAppearanceWidget::iconLoaderDragEnterEvent(QDragEnterEvent *e) +void KDMAppearanceWidget::iconLoaderDragEnterEvent(TQDragEnterEvent *e) { e->accept(KURLDrag::canDecode(e)); } -KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg); +KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg); -void KDMAppearanceWidget::iconLoaderDropEvent(QDropEvent *e) +void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) { KURL pixurl; bool istmp; @@ -402,7 +402,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(QDropEvent *e) // By now url should be "file:/..." if (!setLogo(pixurl.path())) { KIO::NetAccess::del(pixurl, parentWidget()); - QString msg = i18n("There was an error loading the image:\n" + TQString msg = i18n("There was an error loading the image:\n" "%1\n" "It will not be saved.") .arg(pixurl.path()); @@ -445,7 +445,7 @@ void KDMAppearanceWidget::load() greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to Kubuntu at %n"))); // Regular logo or clock - QString logoArea = config->readEntry("LogoArea", "Logo" ); + TQString logoArea = config->readEntry("LogoArea", "Logo" ); if (logoArea == "Clock") { clockRadio->setChecked(true); slotAreaRadioClicked(KdmClock); @@ -469,7 +469,7 @@ void KDMAppearanceWidget::load() // Check the echo mode echocombo->setCurrentId(config->readEntry("EchoMode", "OneStar")); - QStringList sl = config->readListEntry( "GreeterPos" ); + TQStringList sl = config->readListEntry( "GreeterPos" ); if (sl.count() != 2) { xLineEdit->setText( "50" ); yLineEdit->setText( "50" ); @@ -499,7 +499,7 @@ void KDMAppearanceWidget::defaults() langcombo->setCurrentItem( "en_US" ); } -QString KDMAppearanceWidget::quickHelp() const +TQString KDMAppearanceWidget::quickHelp() const { return i18n("<h1>KDM - Appearance</h1> Here you can configure the basic appearance" " of the KDM login manager, i.e. a greeting string, an icon etc.<p>" diff --git a/kcontrol/kdm/kdm-appear.h b/kcontrol/kdm/kdm-appear.h index 991b6e4e0..dba6af36d 100644 --- a/kcontrol/kdm/kdm-appear.h +++ b/kcontrol/kdm/kdm-appear.h @@ -22,10 +22,10 @@ #define __KDMAPPEAR_H__ -#include <qdir.h> -#include <qimage.h> -#include <qfileinfo.h> -#include <qpushbutton.h> +#include <tqdir.h> +#include <tqimage.h> +#include <tqfileinfo.h> +#include <tqpushbutton.h> #include <kcolorbutton.h> #include <kurl.h> @@ -47,27 +47,27 @@ class KDMAppearanceWidget : public QWidget Q_OBJECT public: - KDMAppearanceWidget(QWidget *parent, const char *name=0); + KDMAppearanceWidget(TQWidget *parent, const char *name=0); void load(); void save(); void defaults(); void makeReadOnly(); - QString quickHelp() const; + TQString quickHelp() const; void loadColorSchemes(KBackedComboBox *combo); void loadGuiStyles(KBackedComboBox *combo); void loadLanguageList(KLanguageButton *combo); - bool eventFilter(QObject *, QEvent *); + bool eventFilter(TQObject *, TQEvent *); signals: void changed( bool state ); protected: - void iconLoaderDragEnterEvent(QDragEnterEvent *event); - void iconLoaderDropEvent(QDropEvent *event); - bool setLogo(QString logo); + void iconLoaderDragEnterEvent(TQDragEnterEvent *event); + void iconLoaderDropEvent(TQDropEvent *event); + bool setLogo(TQString logo); private slots: void slotAreaRadioClicked(int id); @@ -76,15 +76,15 @@ private slots: private: enum { KdmNone, KdmClock, KdmLogo }; - QLabel *logoLabel; - QPushButton *logobutton; + TQLabel *logoLabel; + TQPushButton *logobutton; KLineEdit *greetstr_lined; - QString logopath; - QRadioButton *noneRadio; - QRadioButton *clockRadio; - QRadioButton *logoRadio; - QLineEdit *xLineEdit; - QLineEdit *yLineEdit; + TQString logopath; + TQRadioButton *noneRadio; + TQRadioButton *clockRadio; + TQRadioButton *logoRadio; + TQLineEdit *xLineEdit; + TQLineEdit *yLineEdit; KBackedComboBox *guicombo; KBackedComboBox *colcombo; KBackedComboBox *echocombo; diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp index 71d292c5f..155d5b380 100644 --- a/kcontrol/kdm/kdm-conv.cpp +++ b/kcontrol/kdm/kdm-conv.cpp @@ -23,13 +23,13 @@ #include <sys/types.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qvbuttongroup.h> -#include <qwhatsthis.h> -#include <qheader.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqvbuttongroup.h> +#include <tqwhatsthis.h> +#include <tqheader.h> #include <kdialog.h> #include <ksimpleconfig.h> @@ -39,122 +39,122 @@ extern KSimpleConfig *config; -KDMConvenienceWidget::KDMConvenienceWidget(QWidget *parent, const char *name) - : QWidget(parent, name) +KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QString wtstr; + TQString wtstr; - QLabel *paranoia = new QLabel( i18n("<qt><center><font color=red><big><b>Attention!<br>Read help!</b></big></font></center></qt>"), this ); + TQLabel *paranoia = new TQLabel( i18n("<qt><center><font color=red><big><b>Attention!<br>Read help!</b></big></font></center></qt>"), this ); - QSizePolicy vpref( QSizePolicy::Minimum, QSizePolicy::Fixed ); + TQSizePolicy vpref( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); - alGroup = new QVGroupBox( i18n("Enable Au&to-Login"), this ); + alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this ); alGroup->setCheckable( true ); alGroup->setSizePolicy( vpref ); - QWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." + TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." " This applies only to KDM's graphical login." " Think twice before enabling this!") ); - connect(alGroup, SIGNAL(toggled(bool)), SLOT(slotChanged())); + connect(alGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - QWidget *hlpw1 = new QWidget( alGroup ); + TQWidget *hlpw1 = new TQWidget( alGroup ); userlb = new KComboBox( hlpw1 ); - u_label = new QLabel( userlb, i18n("Use&r:"), hlpw1 ); - QGridLayout *hlpl1 = new QGridLayout(hlpw1, 2, 2, 0, KDialog::spacingHint()); + u_label = new TQLabel( userlb, i18n("Use&r:"), hlpw1 ); + TQGridLayout *hlpl1 = new TQGridLayout(hlpw1, 2, 2, 0, KDialog::spacingHint()); hlpl1->setColStretch(2, 1); hlpl1->addWidget(u_label, 0, 0); hlpl1->addWidget(userlb, 0, 1); - connect(userlb, SIGNAL(highlighted(int)), SLOT(slotChanged())); + connect(userlb, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotChanged())); wtstr = i18n("Select the user to be logged in automatically."); - QWhatsThis::add( u_label, wtstr ); - QWhatsThis::add( userlb, wtstr ); - delaysb = new QSpinBox( 0, 3600, 5, hlpw1 ); + TQWhatsThis::add( u_label, wtstr ); + TQWhatsThis::add( userlb, wtstr ); + delaysb = new TQSpinBox( 0, 3600, 5, hlpw1 ); delaysb->setSpecialValueText( i18n("delay", "none") ); delaysb->setSuffix( i18n("seconds", " s") ); - d_label = new QLabel( delaysb, i18n("D&elay:"), hlpw1 ); + d_label = new TQLabel( delaysb, i18n("D&elay:"), hlpw1 ); hlpl1->addWidget(d_label, 1, 0); hlpl1->addWidget(delaysb, 1, 1); - connect(delaysb, SIGNAL(valueChanged(int)), SLOT(slotChanged())); + connect(delaysb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); wtstr = i18n("The delay (in seconds) before the automatic login kicks in. " "This feature is also known as \"timed login\"."); - QWhatsThis::add( d_label, wtstr ); - QWhatsThis::add( delaysb, wtstr ); - againcb = new QCheckBox( i18n("P&ersistent"), alGroup ); - connect( againcb, SIGNAL(toggled(bool)), SLOT(slotChanged()) ); - QWhatsThis::add( againcb, i18n("Normally, automatic login is performed only " + TQWhatsThis::add( d_label, wtstr ); + TQWhatsThis::add( delaysb, wtstr ); + againcb = new TQCheckBox( i18n("P&ersistent"), alGroup ); + connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); + TQWhatsThis::add( againcb, i18n("Normally, automatic login is performed only " "when KDM starts up. If this is checked, automatic login will kick in " "after finishing a session as well.") ); - autoLockCheck = new QCheckBox( i18n("Loc&k session"), alGroup ); - connect( autoLockCheck, SIGNAL(toggled(bool)), SLOT(slotChanged()) ); - QWhatsThis::add( autoLockCheck, i18n("If checked, the automatically started session " + autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup ); + connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); + TQWhatsThis::add( autoLockCheck, i18n("If checked, the automatically started session " "will be locked immediately (provided it is a KDE session). This can " "be used to obtain a super-fast login restricted to one user.") ); - puGroup = new QVButtonGroup(i18n("Preselect User"), this ); + puGroup = new TQVButtonGroup(i18n("Preselect User"), this ); puGroup->setSizePolicy( vpref ); - connect(puGroup, SIGNAL(clicked(int)), SLOT(slotPresChanged())); - connect(puGroup, SIGNAL(clicked(int)), SLOT(slotChanged())); - npRadio = new QRadioButton(i18n("preselected user", "&None"), puGroup); - ppRadio = new QRadioButton(i18n("Prev&ious"), puGroup); - QWhatsThis::add( ppRadio, i18n("Preselect the user that logged in previously. " + connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged())); + connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged())); + npRadio = new TQRadioButton(i18n("preselected user", "&None"), puGroup); + ppRadio = new TQRadioButton(i18n("Prev&ious"), puGroup); + TQWhatsThis::add( ppRadio, i18n("Preselect the user that logged in previously. " "Use this if this computer is usually used several consecutive times by one user.") ); - spRadio = new QRadioButton(i18n("Specif&y"), puGroup); - QWhatsThis::add( spRadio, i18n("Preselect the user specified in the combo box below. " + spRadio = new TQRadioButton(i18n("Specif&y"), puGroup); + TQWhatsThis::add( spRadio, i18n("Preselect the user specified in the combo box below. " "Use this if this computer is predominantly used by a certain user.") ); - QWidget *hlpw = new QWidget(puGroup); + TQWidget *hlpw = new TQWidget(puGroup); puserlb = new KComboBox(true, hlpw); - pu_label = new QLabel(puserlb, i18n("Us&er:"), hlpw); - connect(puserlb, SIGNAL(textChanged(const QString &)), SLOT(slotChanged())); + pu_label = new TQLabel(puserlb, i18n("Us&er:"), hlpw); + connect(puserlb, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); wtstr = i18n("Select the user to be preselected for login. " "This box is editable, so you can specify an arbitrary non-existent " "user to mislead possible attackers."); - QWhatsThis::add( pu_label, wtstr ); - QWhatsThis::add( puserlb, wtstr ); - QBoxLayout *hlpl = new QHBoxLayout(hlpw, 0, KDialog::spacingHint()); + TQWhatsThis::add( pu_label, wtstr ); + TQWhatsThis::add( puserlb, wtstr ); + TQBoxLayout *hlpl = new TQHBoxLayout(hlpw, 0, KDialog::spacingHint()); hlpl->addWidget(pu_label); hlpl->addWidget(puserlb); hlpl->addStretch( 1 ); - cbjumppw = new QCheckBox(i18n("Focus pass&word"), puGroup); - QWhatsThis::add( cbjumppw, i18n("When this option is on, KDM will place the cursor " + cbjumppw = new TQCheckBox(i18n("Focus pass&word"), puGroup); + TQWhatsThis::add( cbjumppw, i18n("When this option is on, KDM will place the cursor " "in the password field instead of the user field after preselecting a user. " "Use this to save one key press per login, if the preselection usually does not need to " "be changed.") ); - connect(cbjumppw, SIGNAL(toggled(bool)), SLOT(slotChanged())); + connect(cbjumppw, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - npGroup = new QVGroupBox(i18n("Enable Password-&Less Logins"), this ); + npGroup = new TQVGroupBox(i18n("Enable Password-&Less Logins"), this ); npGroup->setCheckable( true ); - QWhatsThis::add( npGroup, i18n("When this option is checked, the checked users from" + TQWhatsThis::add( npGroup, i18n("When this option is checked, the checked users from" " the list below will be allowed to log in without entering their" " password. This applies only to KDM's graphical login." " Think twice before enabling this!") ); - connect(npGroup, SIGNAL(toggled(bool)), SLOT(slotChanged())); + connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - pl_label = new QLabel(i18n("No password re&quired for:"), npGroup); + pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup); npuserlv = new KListView(npGroup); pl_label->setBuddy(npuserlv); - npuserlv->addColumn(QString::null); + npuserlv->addColumn(TQString::null); npuserlv->header()->hide(); - npuserlv->setResizeMode(QListView::LastColumn); - QWhatsThis::add(npuserlv, i18n("Check all users you want to allow a password-less login for." + npuserlv->setResizeMode(TQListView::LastColumn); + TQWhatsThis::add(npuserlv, i18n("Check all users you want to allow a password-less login for." " Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.")); - connect( npuserlv, SIGNAL(clicked( QListViewItem * )), - SLOT(slotChanged()) ); + connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )), + TQT_SLOT(slotChanged()) ); - btGroup = new QVGroupBox( i18n("Miscellaneous"), this ); + btGroup = new TQVGroupBox( i18n("Miscellaneous"), this ); - cbarlen = new QCheckBox(i18n("Automatically log in again after &X server crash"), btGroup); - QWhatsThis::add( cbarlen, i18n("When this option is on, a user will be" + cbarlen = new TQCheckBox(i18n("Automatically log in again after &X server crash"), btGroup); + TQWhatsThis::add( cbarlen, i18n("When this option is on, a user will be" " logged in again automatically when their session is interrupted by an" " X server crash; note that this can open a security hole: if you use" " a screen locker than KDE's integrated one, this will make" " circumventing a password-secured screen lock possible.") ); - connect(cbarlen, SIGNAL(toggled(bool)), SLOT(slotChanged())); + connect(cbarlen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - QGridLayout *main = new QGridLayout(this, 5, 2, 10); + TQGridLayout *main = new TQGridLayout(this, 5, 2, 10); main->addWidget(paranoia, 0, 0); main->addWidget(alGroup, 1, 0); main->addWidget(puGroup, 2, 0); @@ -164,23 +164,23 @@ KDMConvenienceWidget::KDMConvenienceWidget(QWidget *parent, const char *name) main->setColStretch(1, 2); main->setRowStretch(3, 1); - connect( userlb, SIGNAL(activated( const QString & )), - SLOT(slotSetAutoUser( const QString & )) ); - connect( puserlb, SIGNAL(textChanged( const QString & )), - SLOT(slotSetPreselUser( const QString & )) ); - connect( npuserlv, SIGNAL(clicked( QListViewItem * )), - SLOT(slotUpdateNoPassUser( QListViewItem * )) ); + connect( userlb, TQT_SIGNAL(activated( const TQString & )), + TQT_SLOT(slotSetAutoUser( const TQString & )) ); + connect( puserlb, TQT_SIGNAL(textChanged( const TQString & )), + TQT_SLOT(slotSetPreselUser( const TQString & )) ); + connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )), + TQT_SLOT(slotUpdateNoPassUser( TQListViewItem * )) ); } void KDMConvenienceWidget::makeReadOnly() { - ((QWidget*)alGroup->child("qt_groupbox_checkbox"))->setEnabled(false); + ((TQWidget*)alGroup->child("qt_groupbox_checkbox"))->setEnabled(false); userlb->setEnabled(false); delaysb->setEnabled(false); againcb->setEnabled(false); autoLockCheck->setEnabled(false); - ((QWidget*)npGroup->child("qt_groupbox_checkbox"))->setEnabled(false); + ((TQWidget*)npGroup->child("qt_groupbox_checkbox"))->setEnabled(false); npuserlv->setEnabled(false); cbarlen->setEnabled(false); npRadio->setEnabled(false); @@ -243,7 +243,7 @@ void KDMConvenienceWidget::load() cbarlen->setChecked(config->readBoolEntry( "AutoReLogin", false) ); config->setGroup("X-:*-Greeter"); - QString presstr = config->readEntry( "PreselectUser", "None" ); + TQString presstr = config->readEntry( "PreselectUser", "None" ); if (presstr == "Previous") ppRadio->setChecked(true); else if (presstr == "Default") @@ -280,22 +280,22 @@ void KDMConvenienceWidget::slotChanged() emit changed(true); } -void KDMConvenienceWidget::slotSetAutoUser( const QString &user ) +void KDMConvenienceWidget::slotSetAutoUser( const TQString &user ) { autoUser = user; } -void KDMConvenienceWidget::slotSetPreselUser( const QString &user ) +void KDMConvenienceWidget::slotSetPreselUser( const TQString &user ) { preselUser = user; } -void KDMConvenienceWidget::slotUpdateNoPassUser( QListViewItem *item ) +void KDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item ) { if ( !item ) return; - QCheckListItem *itm = (QCheckListItem *)item; - QStringList::iterator it = noPassUsers.find( itm->text() ); + TQCheckListItem *itm = (TQCheckListItem *)item; + TQStringList::iterator it = noPassUsers.find( itm->text() ); if (itm->isOn()) { if (it == noPassUsers.end()) noPassUsers.append( itm->text() ); @@ -316,9 +316,9 @@ void KDMConvenienceWidget::slotClearUsers() puserlb->insertItem(preselUser); } -void KDMConvenienceWidget::slotAddUsers(const QMap<QString,int> &users) +void KDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users) { - QMapConstIterator<QString,int> it; + TQMapConstIterator<TQString,int> it; for (it = users.begin(); it != users.end(); ++it) { if (it.data() > 0) { if (it.key() != autoUser) @@ -327,7 +327,7 @@ void KDMConvenienceWidget::slotAddUsers(const QMap<QString,int> &users) puserlb->insertItem(it.key()); } if (it.data() != 0) - (new QCheckListItem(npuserlv, it.key(), QCheckListItem::CheckBox))-> + (new TQCheckListItem(npuserlv, it.key(), TQCheckListItem::CheckBox))-> setOn(noPassUsers.find(it.key()) != noPassUsers.end()); } @@ -342,9 +342,9 @@ void KDMConvenienceWidget::slotAddUsers(const QMap<QString,int> &users) puserlb->setCurrentItem(preselUser); } -void KDMConvenienceWidget::slotDelUsers(const QMap<QString,int> &users) +void KDMConvenienceWidget::slotDelUsers(const TQMap<TQString,int> &users) { - QMapConstIterator<QString,int> it; + TQMapConstIterator<TQString,int> it; for (it = users.begin(); it != users.end(); ++it) { if (it.data() > 0) { if (it.key() != autoUser && userlb->listBox()) diff --git a/kcontrol/kdm/kdm-conv.h b/kcontrol/kdm/kdm-conv.h index c00128629..611ab9797 100644 --- a/kcontrol/kdm/kdm-conv.h +++ b/kcontrol/kdm/kdm-conv.h @@ -22,13 +22,13 @@ #ifndef __KDMCONV_H__ #define __KDMCONV_H__ -#include <qptrlist.h> -#include <qstring.h> -#include <qimage.h> -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qspinbox.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqimage.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> #include <klistbox.h> #include <kcombobox.h> @@ -44,7 +44,7 @@ class KDMConvenienceWidget : public QWidget Q_OBJECT public: - KDMConvenienceWidget(QWidget *parent=0, const char *name=0); + KDMConvenienceWidget(TQWidget *parent=0, const char *name=0); void load(); void save(); @@ -53,8 +53,8 @@ public: public slots: void slotClearUsers(); - void slotAddUsers(const QMap<QString,int> &); - void slotDelUsers(const QMap<QString,int> &); + void slotAddUsers(const TQMap<TQString,int> &); + void slotDelUsers(const TQMap<TQString,int> &); signals: @@ -63,9 +63,9 @@ signals: private slots: void slotPresChanged(); void slotChanged(); - void slotSetAutoUser( const QString &user ); - void slotSetPreselUser( const QString &user ); - void slotUpdateNoPassUser( QListViewItem *item ); + void slotSetAutoUser( const TQString &user ); + void slotSetPreselUser( const TQString &user ); + void slotUpdateNoPassUser( TQListViewItem *item ); private: QGroupBox *alGroup, *puGroup, *npGroup, *btGroup; diff --git a/kcontrol/kdm/kdm-font.cpp b/kcontrol/kdm/kdm-font.cpp index 456573b4d..af83176b1 100644 --- a/kcontrol/kdm/kdm-font.cpp +++ b/kcontrol/kdm/kdm-font.cpp @@ -21,13 +21,13 @@ #include <sys/types.h> -#include <qapplication.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> +#include <tqapplication.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> #include <kdialog.h> #include <ksimpleconfig.h> @@ -39,38 +39,38 @@ extern KSimpleConfig *config; -KDMFontWidget::KDMFontWidget(QWidget *parent, const char *name) - : QWidget(parent, name) +KDMFontWidget::KDMFontWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QGridLayout *ml = new QGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint()); - QLabel *label = new QLabel(i18n("&General:"), this); + TQGridLayout *ml = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint()); + TQLabel *label = new TQLabel(i18n("&General:"), this); stdFontChooser = new KFontRequester(this); label->setBuddy(stdFontChooser); - QWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") ); - connect(stdFontChooser, SIGNAL(fontSelected(const QFont&)),this,SLOT(configChanged())); + TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") ); + connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); ml->addWidget(label, 1, 0); ml->addWidget(stdFontChooser, 1, 1); - label = new QLabel(i18n("&Failures:"), this); + label = new TQLabel(i18n("&Failures:"), this); failFontChooser = new KFontRequester(this); label->setBuddy(failFontChooser); - QWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") ); - connect(failFontChooser, SIGNAL(fontSelected(const QFont&)),this,SLOT(configChanged())); + TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") ); + connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); ml->addWidget(label, 2, 0); ml->addWidget(failFontChooser, 2, 1); - label = new QLabel(i18n("Gree&ting:"), this); + label = new TQLabel(i18n("Gree&ting:"), this); greetingFontChooser = new KFontRequester(this); label->setBuddy(greetingFontChooser); - QWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") ); - connect(greetingFontChooser, SIGNAL(fontSelected(const QFont&)),this,SLOT(configChanged())); + TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") ); + connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); ml->addWidget(label, 3, 0); ml->addWidget(greetingFontChooser, 3, 1); - aacb = new QCheckBox (i18n("Use anti-aliasing for fonts"), this); - QWhatsThis::add( aacb, i18n("If you check this box and your X-Server has the Xft extension, " + aacb = new TQCheckBox (i18n("Use anti-aliasing for fonts"), this); + TQWhatsThis::add( aacb, i18n("If you check this box and your X-Server has the Xft extension, " "fonts will be antialiased (smoothed) in the login dialog.") ); - connect(aacb, SIGNAL(toggled ( bool )),this,SLOT(configChanged())); + connect(aacb, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(configChanged())); ml->addMultiCellWidget(aacb, 4, 4, 0, 1); ml->setRowStretch(5, 10); } @@ -90,9 +90,9 @@ void KDMFontWidget::configChanged() void KDMFontWidget::set_def() { - stdFontChooser->setFont(QFont("Sans Serif", 10)); - failFontChooser->setFont(QFont("Sans Serif", 10, QFont::Bold)); - greetingFontChooser->setFont(QFont("Sans Serif", 22)); + stdFontChooser->setFont(TQFont("Sans Serif", 10)); + failFontChooser->setFont(TQFont("Sans Serif", 10, TQFont::Bold)); + greetingFontChooser->setFont(TQFont("Sans Serif", 22)); } void KDMFontWidget::save() @@ -114,7 +114,7 @@ void KDMFontWidget::load() config->setGroup("X-*-Greeter"); // Read the fonts - QFont font = stdFontChooser->font(); + TQFont font = stdFontChooser->font(); stdFontChooser->setFont(config->readFontEntry("StdFont", &font)); font = failFontChooser->font(); failFontChooser->setFont(config->readFontEntry("FailFont", &font)); diff --git a/kcontrol/kdm/kdm-font.h b/kcontrol/kdm/kdm-font.h index 232db3cb4..92488d3e7 100644 --- a/kcontrol/kdm/kdm-font.h +++ b/kcontrol/kdm/kdm-font.h @@ -20,7 +20,7 @@ #ifndef __KDMFONT_H__ #define __KDMFONT_H__ -#include <qwidget.h> +#include <tqwidget.h> class KFontRequester; class QCheckBox; @@ -30,7 +30,7 @@ class KDMFontWidget : public QWidget Q_OBJECT public: - KDMFontWidget(QWidget *parent=0, const char *name=0); + KDMFontWidget(TQWidget *parent=0, const char *name=0); void load(); void save(); diff --git a/kcontrol/kdm/kdm-shut.cpp b/kcontrol/kdm/kdm-shut.cpp index 2eb88ac51..3b442956a 100644 --- a/kcontrol/kdm/kdm-shut.cpp +++ b/kcontrol/kdm/kdm-shut.cpp @@ -21,11 +21,11 @@ #include <sys/types.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <ksimpleconfig.h> #include <karrowbutton.h> @@ -40,27 +40,27 @@ extern KSimpleConfig *config; -KDMSessionsWidget::KDMSessionsWidget(QWidget *parent, const char *name) - : QWidget(parent, name) +KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QString wtstr; + TQString wtstr; - QGroupBox *group0 = new QGroupBox( i18n("Allow Shutdown"), this ); + TQGroupBox *group0 = new TQGroupBox( i18n("Allow Shutdown"), this ); - sdlcombo = new QComboBox( FALSE, group0 ); - sdllabel = new QLabel (sdlcombo, i18n ("&Local:"), group0); + sdlcombo = new TQComboBox( FALSE, group0 ); + sdllabel = new TQLabel (sdlcombo, i18n ("&Local:"), group0); sdlcombo->insertItem(i18n("Everybody"), SdAll); sdlcombo->insertItem(i18n("Only Root"), SdRoot); sdlcombo->insertItem(i18n("Nobody"), SdNone); - connect(sdlcombo, SIGNAL(activated(int)), SLOT(changed())); - sdrcombo = new QComboBox( FALSE, group0 ); - sdrlabel = new QLabel (sdrcombo, i18n ("&Remote:"), group0); + connect(sdlcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + sdrcombo = new TQComboBox( FALSE, group0 ); + sdrlabel = new TQLabel (sdrcombo, i18n ("&Remote:"), group0); sdrcombo->insertItem(i18n("Everybody"), SdAll); sdrcombo->insertItem(i18n("Only Root"), SdRoot); sdrcombo->insertItem(i18n("Nobody"), SdNone); - connect(sdrcombo, SIGNAL(activated(int)), SLOT(changed())); - QWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown" + connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + TQWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown" " the computer using KDM. You can specify different values for local (console) and remote displays. " "Possible values are:<ul>" " <li><em>Everybody:</em> everybody can shutdown the computer using KDM</li>" @@ -68,26 +68,26 @@ KDMSessionsWidget::KDMSessionsWidget(QWidget *parent, const char *name) " <li><em>Nobody:</em> nobody can shutdown the computer using KDM</li></ul>") ); - QGroupBox *group1 = new QGroupBox( i18n("Commands"), this ); + TQGroupBox *group1 = new TQGroupBox( i18n("Commands"), this ); shutdown_lined = new KURLRequester(group1); - QLabel *shutdown_label = new QLabel(shutdown_lined, i18n("H&alt:"), group1); - connect(shutdown_lined, SIGNAL(textChanged(const QString&)), - SLOT(changed())); + TQLabel *shutdown_label = new TQLabel(shutdown_lined, i18n("H&alt:"), group1); + connect(shutdown_lined, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(changed())); wtstr = i18n("Command to initiate the system halt. Typical value: /sbin/halt"); - QWhatsThis::add( shutdown_label, wtstr ); - QWhatsThis::add( shutdown_lined, wtstr ); + TQWhatsThis::add( shutdown_label, wtstr ); + TQWhatsThis::add( shutdown_lined, wtstr ); restart_lined = new KURLRequester(group1); - QLabel *restart_label = new QLabel(restart_lined, i18n("Reb&oot:"), group1); - connect(restart_lined, SIGNAL(textChanged(const QString&)), - SLOT(changed())); + TQLabel *restart_label = new TQLabel(restart_lined, i18n("Reb&oot:"), group1); + connect(restart_lined, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(changed())); wtstr = i18n("Command to initiate the system reboot. Typical value: /sbin/reboot"); - QWhatsThis::add( restart_label, wtstr ); - QWhatsThis::add( restart_lined, wtstr ); + TQWhatsThis::add( restart_label, wtstr ); + TQWhatsThis::add( restart_lined, wtstr ); - QGroupBox *group4 = new QGroupBox( i18n("Miscellaneous"), this ); + TQGroupBox *group4 = new TQGroupBox( i18n("Miscellaneous"), this ); bm_combo = new KBackedComboBox( group4 ); bm_combo->insertItem("None", i18n("boot manager", "None")); @@ -95,16 +95,16 @@ KDMSessionsWidget::KDMSessionsWidget(QWidget *parent, const char *name) #if defined(__linux__) && ( defined(__i386__) || defined(__amd64__) ) bm_combo->insertItem("Lilo", i18n("Lilo")); #endif - QLabel *bm_label = new QLabel( bm_combo, i18n("Boot manager:"), group4 ); - connect(bm_combo, SIGNAL(activated(int)), SLOT(changed())); + TQLabel *bm_label = new TQLabel( bm_combo, i18n("Boot manager:"), group4 ); + connect(bm_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog."); - QWhatsThis::add( bm_label, wtstr ); - QWhatsThis::add( bm_combo, wtstr ); + TQWhatsThis::add( bm_label, wtstr ); + TQWhatsThis::add( bm_combo, wtstr ); - QBoxLayout *main = new QVBoxLayout( this, 10 ); - QGridLayout *lgroup0 = new QGridLayout( group0, 1, 1, 10); - QGridLayout *lgroup1 = new QGridLayout( group1, 1, 1, 10); - QGridLayout *lgroup4 = new QGridLayout( group4, 1, 1, 10); + TQBoxLayout *main = new TQVBoxLayout( this, 10 ); + TQGridLayout *lgroup0 = new TQGridLayout( group0, 1, 1, 10); + TQGridLayout *lgroup1 = new TQGridLayout( group1, 1, 1, 10); + TQGridLayout *lgroup4 = new TQGridLayout( group4, 1, 1, 10); main->addWidget(group0); main->addWidget(group1); @@ -151,9 +151,9 @@ void KDMSessionsWidget::makeReadOnly() bm_combo->setEnabled(false); } -void KDMSessionsWidget::writeSD(QComboBox *combo) +void KDMSessionsWidget::writeSD(TQComboBox *combo) { - QString what; + TQString what; switch (combo->currentItem()) { case SdAll: what = "All"; break; case SdRoot: what = "Root"; break; @@ -177,9 +177,9 @@ void KDMSessionsWidget::save() config->writeEntry("BootManager", bm_combo->currentId()); } -void KDMSessionsWidget::readSD(QComboBox *combo, QString def) +void KDMSessionsWidget::readSD(TQComboBox *combo, TQString def) { - QString str = config->readEntry("AllowShutdown", def); + TQString str = config->readEntry("AllowShutdown", def); SdModes sdMode; if(str == "All") sdMode = SdAll; diff --git a/kcontrol/kdm/kdm-shut.h b/kcontrol/kdm/kdm-shut.h index 8bad7d5a0..0d603e9eb 100644 --- a/kcontrol/kdm/kdm-shut.h +++ b/kcontrol/kdm/kdm-shut.h @@ -21,7 +21,7 @@ #define __KDMSESS_H__ -#include <qstring.h> +#include <tqstring.h> class QComboBox; class QCheckBox; @@ -33,7 +33,7 @@ class KDMSessionsWidget : public QWidget Q_OBJECT public: - KDMSessionsWidget(QWidget *parent=0, const char *name=0); + KDMSessionsWidget(TQWidget *parent=0, const char *name=0); void load(); void save(); @@ -49,8 +49,8 @@ protected slots: void changed(); private: - void readSD (QComboBox *, QString); - void writeSD (QComboBox *); + void readSD (TQComboBox *, TQString); + void writeSD (TQComboBox *); QComboBox *sdlcombo, *sdrcombo; QLabel *sdllabel, *sdrlabel; diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp index d8a540bd3..ce27f6498 100644 --- a/kcontrol/kdm/kdm-users.cpp +++ b/kcontrol/kdm/kdm-users.cpp @@ -20,14 +20,14 @@ #include <unistd.h> #include <sys/types.h> -#include <qstyle.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qvalidator.h> -#include <qwhatsthis.h> -#include <qvgroupbox.h> -#include <qpushbutton.h> +#include <tqstyle.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqvalidator.h> +#include <tqwhatsthis.h> +#include <tqvgroupbox.h> +#include <tqpushbutton.h> #include <kfiledialog.h> #include <kimageio.h> @@ -45,8 +45,8 @@ extern KSimpleConfig *config; -KDMUsersWidget::KDMUsersWidget(QWidget *parent, const char *name) - : QWidget(parent, name) +KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { #ifdef __linux__ struct stat st; @@ -76,130 +76,130 @@ KDMUsersWidget::KDMUsersWidget(QWidget *parent, const char *name) config->setGroup( "X-*-Greeter" ); m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; m_notFirst = false; - QDir testDir( m_userPixDir ); + TQDir testDir( m_userPixDir ); if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() ) KMessageBox::sorry( this, i18n("Unable to create folder %1").arg( testDir.absPath() ) ); - chmod( QFile::encodeName( m_userPixDir ), 0755 ); + chmod( TQFile::encodeName( m_userPixDir ), 0755 ); m_defaultText = i18n("<default>"); - QString wtstr; + TQString wtstr; - minGroup = new QGroupBox( 2, Horizontal, i18n("System U&IDs"), this ); - QWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by KDM and this setup dialog." + minGroup = new TQGroupBox( 2, Horizontal, i18n("System U&IDs"), this ); + TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by KDM and this setup dialog." " Note that users with the UID 0 (typically root) are not affected by this and must be" " explicitly hidden in \"Not hidden\" mode.")); - QSizePolicy sp_ign_fix( QSizePolicy::Ignored, QSizePolicy::Fixed ); - QValidator *valid = new QIntValidator( 0, 999999, minGroup ); - QLabel *minlab = new QLabel( i18n("Below:"), minGroup ); + TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed ); + TQValidator *valid = new TQIntValidator( 0, 999999, minGroup ); + TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup ); leminuid = new KLineEdit( minGroup ); minlab->setBuddy( leminuid ); leminuid->setSizePolicy( sp_ign_fix ); leminuid->setValidator( valid ); - connect( leminuid, SIGNAL(textChanged( const QString & )), SLOT(slotChanged()) ); - connect( leminuid, SIGNAL(textChanged( const QString & )), SLOT(slotMinMaxChanged()) ); - QLabel *maxlab = new QLabel( i18n("Above:"), minGroup ); + connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); + connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); + TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup ); lemaxuid = new KLineEdit( minGroup ); maxlab->setBuddy( lemaxuid ); lemaxuid->setSizePolicy( sp_ign_fix ); lemaxuid->setValidator( valid ); - connect(lemaxuid, SIGNAL(textChanged( const QString & )), SLOT(slotChanged()) ); - connect(lemaxuid, SIGNAL(textChanged( const QString & )), SLOT(slotMinMaxChanged()) ); - - usrGroup = new QButtonGroup( 5, Qt::Vertical, i18n("Users"), this ); - connect( usrGroup, SIGNAL(clicked( int )), SLOT(slotShowOpts()) ); - connect( usrGroup, SIGNAL(clicked( int )), SLOT(slotChanged()) ); - cbshowlist = new QCheckBox( i18n("Show list"), usrGroup ); - QWhatsThis::add( cbshowlist, i18n("If this option is checked, KDM will show a list of users," + connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); + connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); + + usrGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("Users"), this ); + connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) ); + connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); + cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup ); + TQWhatsThis::add( cbshowlist, i18n("If this option is checked, KDM will show a list of users," " so users can click on their name or image rather than typing in their login.") ); - cbcomplete = new QCheckBox( i18n("Autocompletion"), usrGroup ); - QWhatsThis::add( cbcomplete, i18n("If this option is checked, KDM will automatically complete" + cbcomplete = new TQCheckBox( i18n("Autocompletion"), usrGroup ); + TQWhatsThis::add( cbcomplete, i18n("If this option is checked, KDM will automatically complete" " user names while they are typed in the line edit.") ); - cbinverted = new QCheckBox( i18n("Inverse selection"), usrGroup ); - QWhatsThis::add( cbinverted, i18n("This option specifies how the users for \"Show list\" and \"Autocompletion\"" + cbinverted = new TQCheckBox( i18n("Inverse selection"), usrGroup ); + TQWhatsThis::add( cbinverted, i18n("This option specifies how the users for \"Show list\" and \"Autocompletion\"" " are selected in the \"Select users and groups\" list: " "If not checked, select only the checked users. " "If checked, select all non-system users, except the checked ones.")); - cbusrsrt = new QCheckBox( i18n("Sor&t users"), usrGroup ); - connect( cbusrsrt, SIGNAL(toggled( bool )), SLOT(slotChanged()) ); - QWhatsThis::add( cbusrsrt, i18n("If this is checked, KDM will alphabetically sort the user list." + cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup ); + connect( cbusrsrt, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotChanged()) ); + TQWhatsThis::add( cbusrsrt, i18n("If this is checked, KDM will alphabetically sort the user list." " Otherwise users are listed in the order they appear in the password file.") ); - wstack = new QWidgetStack( this ); - s_label = new QLabel( wstack, i18n("S&elect users and groups:"), this ); + wstack = new TQWidgetStack( this ); + s_label = new TQLabel( wstack, i18n("S&elect users and groups:"), this ); optinlv = new KListView( this ); optinlv->addColumn( i18n("Selected Users") ); - optinlv->setResizeMode( QListView::LastColumn ); - QWhatsThis::add( optinlv, i18n("KDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); + optinlv->setResizeMode( TQListView::LastColumn ); + TQWhatsThis::add( optinlv, i18n("KDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); wstack->addWidget( optinlv ); - connect( optinlv, SIGNAL(clicked( QListViewItem * )), - SLOT(slotUpdateOptIn( QListViewItem * )) ); - connect( optinlv, SIGNAL(clicked( QListViewItem * )), - SLOT(slotChanged()) ); + connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), + TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) ); + connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), + TQT_SLOT(slotChanged()) ); optoutlv = new KListView( this ); optoutlv->addColumn( i18n("Hidden Users") ); - optoutlv->setResizeMode( QListView::LastColumn ); - QWhatsThis::add( optoutlv, i18n("KDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); + optoutlv->setResizeMode( TQListView::LastColumn ); + TQWhatsThis::add( optoutlv, i18n("KDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); wstack->addWidget( optoutlv ); - connect( optoutlv, SIGNAL(clicked( QListViewItem * )), - SLOT(slotUpdateOptOut( QListViewItem * )) ); - connect( optoutlv, SIGNAL(clicked( QListViewItem * )), - SLOT(slotChanged()) ); + connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), + TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) ); + connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), + TQT_SLOT(slotChanged()) ); - faceGroup = new QButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this ); - QWhatsThis::add( faceGroup, i18n("Here you can specify where KDM will obtain the images that represent users." + faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this ); + TQWhatsThis::add( faceGroup, i18n("Here you can specify where KDM will obtain the images that represent users." " \"Admin\" represents the global folder; these are the pictures you can set below." " \"User\" means that KDM should read the user's $HOME/.face.icon file." " The two selections in the middle define the order of preference if both sources are available.") ); - connect( faceGroup, SIGNAL(clicked( int )), SLOT(slotFaceOpts()) ); - connect( faceGroup, SIGNAL(clicked( int )), SLOT(slotChanged()) ); - rbadmonly = new QRadioButton( i18n("Admin"), faceGroup ); - rbprefadm = new QRadioButton( i18n("Admin, user"), faceGroup ); - rbprefusr = new QRadioButton( i18n("User, admin"), faceGroup ); - rbusronly = new QRadioButton( i18n("User"), faceGroup ); - - QGroupBox *picGroup = new QVGroupBox( i18n("User Images"), this ); - QWidget *hlpw = new QWidget( picGroup ); + connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) ); + connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); + rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup ); + rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup ); + rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup ); + rbusronly = new TQRadioButton( i18n("User"), faceGroup ); + + TQGroupBox *picGroup = new TQVGroupBox( i18n("User Images"), this ); + TQWidget *hlpw = new TQWidget( picGroup ); usercombo = new KComboBox( hlpw ); - QWhatsThis::add( usercombo, i18n("The user the image below belongs to.") ); - connect( usercombo, SIGNAL(activated( int )), - SLOT(slotUserSelected()) ); - QLabel *userlabel = new QLabel( usercombo, i18n("User:"), hlpw ); - userbutton = new QPushButton( hlpw ); + TQWhatsThis::add( usercombo, i18n("The user the image below belongs to.") ); + connect( usercombo, TQT_SIGNAL(activated( int )), + TQT_SLOT(slotUserSelected()) ); + TQLabel *userlabel = new TQLabel( usercombo, i18n("User:"), hlpw ); + userbutton = new TQPushButton( hlpw ); userbutton->setAcceptDrops( true ); userbutton->installEventFilter( this ); // for drag and drop - uint sz = style().pixelMetric( QStyle::PM_ButtonMargin ) * 2 + 48; + uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; userbutton->setFixedSize( sz, sz ); - connect( userbutton, SIGNAL(clicked()), - SLOT(slotUserButtonClicked()) ); - QToolTip::add( userbutton, i18n("Click or drop an image here") ); - QWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list" + connect( userbutton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotUserButtonClicked()) ); + TQToolTip::add( userbutton, i18n("Click or drop an image here") ); + TQWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list" " of images or drag and drop your own image on to the button (e.g. from Konqueror).") ); - rstuserbutton = new QPushButton( i18n("Unset"), hlpw ); - QWhatsThis::add( rstuserbutton, i18n("Click this button to make KDM use the default image for the selected user.") ); - connect( rstuserbutton, SIGNAL(clicked()), - SLOT(slotUnsetUserPix()) ); - QGridLayout *hlpl = new QGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() ); + rstuserbutton = new TQPushButton( i18n("Unset"), hlpw ); + TQWhatsThis::add( rstuserbutton, i18n("Click this button to make KDM use the default image for the selected user.") ); + connect( rstuserbutton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotUnsetUserPix()) ); + TQGridLayout *hlpl = new TQGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() ); hlpl->addWidget( userlabel, 0, 0 ); // hlpl->addSpacing( KDialog::spacingHint() ); hlpl->addWidget( usercombo, 0, 1 ); hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, AlignHCenter ); hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, AlignHCenter ); - QHBoxLayout *main = new QHBoxLayout( this, 10 ); + TQHBoxLayout *main = new TQHBoxLayout( this, 10 ); - QVBoxLayout *lLayout = new QVBoxLayout( main, 10 ); + TQVBoxLayout *lLayout = new TQVBoxLayout( main, 10 ); lLayout->addWidget( minGroup ); lLayout->addWidget( usrGroup ); lLayout->addStretch( 1 ); - QVBoxLayout *mLayout = new QVBoxLayout( main, 10 ); + TQVBoxLayout *mLayout = new TQVBoxLayout( main, 10 ); mLayout->addWidget( s_label ); mLayout->addWidget( wstack ); mLayout->setStretchFactor( wstack, 1 ); main->setStretchFactor( mLayout, 1 ); - QVBoxLayout *rLayout = new QVBoxLayout( main, 10 ); + TQVBoxLayout *rLayout = new TQVBoxLayout( main, 10 ); rLayout->addWidget( faceGroup ); rLayout->addWidget( picGroup ); rLayout->addStretch( 1 ); @@ -219,7 +219,7 @@ void KDMUsersWidget::makeReadOnly() rbprefusr->setEnabled(false); rbusronly->setEnabled(false); wstack->setEnabled(false); - disconnect( userbutton, SIGNAL(clicked()), this, SLOT(slotUserButtonClicked()) ); + disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) ); userbutton->setAcceptDrops(false); rstuserbutton->setEnabled(false); } @@ -254,8 +254,8 @@ void KDMUsersWidget::slotFaceOpts() void KDMUsersWidget::slotUserSelected() { - QString user = usercombo->currentText(); - QImage p; + TQString user = usercombo->currentText(); + TQImage p; if (user != m_defaultText && p.load( m_userPixDir + user + ".face.icon" )) { rstuserbutton->setEnabled( !getuid() ); @@ -263,22 +263,22 @@ void KDMUsersWidget::slotUserSelected() p.load( m_userPixDir + ".default.face.icon" ); rstuserbutton->setEnabled( false ); } - userbutton->setPixmap( p.smoothScale( 48, 48, QImage::ScaleMin ) ); + userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) ); } -void KDMUsersWidget::changeUserPix(const QString &pix) +void KDMUsersWidget::changeUserPix(const TQString &pix) { - QString user( usercombo->currentText() ); + TQString user( usercombo->currentText() ); if (user == m_defaultText) { user = ".default"; - if (KMessageBox::questionYesNo(this, i18n("Save image as default image?"),QString::null,KStdGuiItem::save(),KStdGuiItem::cancel()) + if (KMessageBox::questionYesNo(this, i18n("Save image as default image?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::cancel()) != KMessageBox::Yes) return; } - QImage p( pix ); + TQImage p( pix ); if (p.isNull()) { KMessageBox::sorry( this, i18n("There was an error loading the image\n" @@ -286,21 +286,21 @@ void KDMUsersWidget::changeUserPix(const QString &pix) return; } - p = p.smoothScale( 48, 48, QImage::ScaleMin ); - QString userpix = m_userPixDir + user + ".face.icon"; + p = p.smoothScale( 48, 48, TQImage::ScaleMin ); + TQString userpix = m_userPixDir + user + ".face.icon"; if (!p.save( userpix, "PNG" )) KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1") .arg( userpix ) ); else - chmod( QFile::encodeName( userpix ), 0644 ); + chmod( TQFile::encodeName( userpix ), 0644 ); slotUserSelected(); } void KDMUsersWidget::slotUserButtonClicked() { - KFileDialog dlg(m_notFirst ? QString::null : + KFileDialog dlg(m_notFirst ? TQString::null : KGlobal::dirs()->resourceDirs("data").last() + "kdm/pics/users", KImageIO::pattern( KImageIO::Reading ), this, 0, true); @@ -310,7 +310,7 @@ void KDMUsersWidget::slotUserButtonClicked() KImageFilePreview *ip = new KImageFilePreview( &dlg ); dlg.setPreviewWidget( ip ); - if (dlg.exec() != QDialog::Accepted) + if (dlg.exec() != TQDialog::Accepted) return; m_notFirst = true; @@ -319,33 +319,33 @@ void KDMUsersWidget::slotUserButtonClicked() void KDMUsersWidget::slotUnsetUserPix() { - QFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" ); + TQFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" ); slotUserSelected(); } -bool KDMUsersWidget::eventFilter(QObject *, QEvent *e) +bool KDMUsersWidget::eventFilter(TQObject *, TQEvent *e) { - if (e->type() == QEvent::DragEnter) { - QDragEnterEvent *ee = (QDragEnterEvent *) e; + if (e->type() == TQEvent::DragEnter) { + TQDragEnterEvent *ee = (TQDragEnterEvent *) e; ee->accept( KURLDrag::canDecode(ee) ); return true; } - if (e->type() == QEvent::Drop) { - userButtonDropEvent((QDropEvent *) e); + if (e->type() == TQEvent::Drop) { + userButtonDropEvent((TQDropEvent *) e); return true; } return false; } -KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg); +KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg); -void KDMUsersWidget::userButtonDropEvent(QDropEvent *e) +void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e) { KURL *url = decodeImgDrop(e, this); if (url) { - QString pixpath; + TQString pixpath; KIO::NetAccess::download(*url, pixpath, parentWidget()); changeUserPix( pixpath ); KIO::NetAccess::removeTempFile(pixpath); @@ -376,12 +376,12 @@ void KDMUsersWidget::save() } -void KDMUsersWidget::updateOptList( QListViewItem *item, QStringList &list ) +void KDMUsersWidget::updateOptList( TQListViewItem *item, TQStringList &list ) { if ( !item ) return; - QCheckListItem *itm = (QCheckListItem *)item; - QStringList::iterator it = list.find( itm->text() ); + TQCheckListItem *itm = (TQCheckListItem *)item; + TQStringList::iterator it = list.find( itm->text() ); if (itm->isOn()) { if (it == list.end()) list.append( itm->text() ); @@ -391,12 +391,12 @@ void KDMUsersWidget::updateOptList( QListViewItem *item, QStringList &list ) } } -void KDMUsersWidget::slotUpdateOptIn( QListViewItem *item ) +void KDMUsersWidget::slotUpdateOptIn( TQListViewItem *item ) { updateOptList( item, selectedUsers ); } -void KDMUsersWidget::slotUpdateOptOut( QListViewItem *item ) +void KDMUsersWidget::slotUpdateOptOut( TQListViewItem *item ) { updateOptList( item, hiddenUsers ); } @@ -409,14 +409,14 @@ void KDMUsersWidget::slotClearUsers() usercombo->insertItem( m_defaultText ); } -void KDMUsersWidget::slotAddUsers(const QMap<QString,int> &users) +void KDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users) { - QMapConstIterator<QString,int> it; + TQMapConstIterator<TQString,int> it; for (it = users.begin(); it != users.end(); ++it) { - const QString *name = &it.key(); - (new QCheckListItem(optinlv, *name, QCheckListItem::CheckBox))-> + const TQString *name = &it.key(); + (new TQCheckListItem(optinlv, *name, TQCheckListItem::CheckBox))-> setOn(selectedUsers.find(*name) != selectedUsers.end()); - (new QCheckListItem(optoutlv, *name, QCheckListItem::CheckBox))-> + (new TQCheckListItem(optoutlv, *name, TQCheckListItem::CheckBox))-> setOn(hiddenUsers.find(*name) != hiddenUsers.end()); if ((*name)[0] != '@') usercombo->insertItem(*name); @@ -427,11 +427,11 @@ void KDMUsersWidget::slotAddUsers(const QMap<QString,int> &users) usercombo->listBox()->sort(); } -void KDMUsersWidget::slotDelUsers(const QMap<QString,int> &users) +void KDMUsersWidget::slotDelUsers(const TQMap<TQString,int> &users) { - QMapConstIterator<QString,int> it; + TQMapConstIterator<TQString,int> it; for (it = users.begin(); it != users.end(); ++it) { - const QString *name = &it.key(); + const TQString *name = &it.key(); if (usercombo->listBox()) delete usercombo->listBox()->findItem( *name, ExactMatch | CaseSensitive ); delete optinlv->findItem( *name, 0 ); @@ -441,7 +441,7 @@ void KDMUsersWidget::slotDelUsers(const QMap<QString,int> &users) void KDMUsersWidget::load() { - QString str; + TQString str; config->setGroup("X-*-Greeter"); @@ -456,12 +456,12 @@ void KDMUsersWidget::load() cbinverted->setChecked( config->readEntry( "ShowUsers" ) != "Selected" ); cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true)); - QString ps = config->readEntry( "FaceSource" ); - if (ps == QString::fromLatin1("UserOnly")) + TQString ps = config->readEntry( "FaceSource" ); + if (ps == TQString::fromLatin1("UserOnly")) rbusronly->setChecked(true); - else if (ps == QString::fromLatin1("PreferUser")) + else if (ps == TQString::fromLatin1("PreferUser")) rbprefusr->setChecked(true); - else if (ps == QString::fromLatin1("PreferAdmin")) + else if (ps == TQString::fromLatin1("PreferAdmin")) rbprefadm->setChecked(true); else rbadmonly->setChecked(true); diff --git a/kcontrol/kdm/kdm-users.h b/kcontrol/kdm/kdm-users.h index b54d96ff8..129f5301d 100644 --- a/kcontrol/kdm/kdm-users.h +++ b/kcontrol/kdm/kdm-users.h @@ -20,14 +20,14 @@ #ifndef __KDMUSERS_H__ #define __KDMUSERS_H__ -#include <qwidget.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qimage.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qwidgetstack.h> +#include <tqwidget.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqimage.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqwidgetstack.h> #include <klineedit.h> #include <klistview.h> @@ -42,19 +42,19 @@ class KDMUsersWidget : public QWidget Q_OBJECT public: - KDMUsersWidget( QWidget *parent = 0, const char *name = 0 ); + KDMUsersWidget( TQWidget *parent = 0, const char *name = 0 ); void load(); void save(); void defaults(); void makeReadOnly(); - bool eventFilter( QObject *o, QEvent *e ); + bool eventFilter( TQObject *o, TQEvent *e ); public slots: void slotClearUsers(); - void slotAddUsers( const QMap<QString,int> & ); - void slotDelUsers( const QMap<QString,int> & ); + void slotAddUsers( const TQMap<TQString,int> & ); + void slotDelUsers( const TQMap<TQString,int> & ); signals: void changed( bool state ); @@ -63,8 +63,8 @@ signals: private slots: void slotMinMaxChanged(); void slotShowOpts(); - void slotUpdateOptIn( QListViewItem *item ); - void slotUpdateOptOut( QListViewItem *item ); + void slotUpdateOptIn( TQListViewItem *item ); + void slotUpdateOptOut( TQListViewItem *item ); void slotUserSelected(); void slotUnsetUserPix(); void slotFaceOpts(); @@ -72,9 +72,9 @@ private slots: void slotChanged(); private: - void updateOptList( QListViewItem *item, QStringList &list ); - void userButtonDropEvent( QDropEvent *e ); - void changeUserPix( const QString & ); + void updateOptList( TQListViewItem *item, TQStringList &list ); + void userButtonDropEvent( TQDropEvent *e ); + void changeUserPix( const TQString & ); QGroupBox *minGroup; // top left QLineEdit *leminuid, *lemaxuid; diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp index 12c356e5c..ae99b51f5 100644 --- a/kcontrol/kdm/main.cpp +++ b/kcontrol/kdm/main.cpp @@ -23,7 +23,7 @@ #include <config.h> -#include <qlayout.h> +#include <tqlayout.h> #include <kaboutdata.h> #include <kgenericfactory.h> @@ -47,10 +47,10 @@ #include <pwd.h> #include <grp.h> -typedef KGenericFactory<KDModule, QWidget> KDMFactory; +typedef KGenericFactory<KDModule, TQWidget> KDMFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kdm, KDMFactory("kdmconfig") ) -KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg) +KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg) { KURL::List uris; @@ -61,10 +61,10 @@ KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg) if( KImageIO::canRead(KImageIO::type(url->fileName())) ) return url; - QStringList qs = QStringList::split('\n', KImageIO::pattern()); + TQStringList qs = TQStringList::split('\n', KImageIO::pattern()); qs.remove(qs.begin()); - QString msg = i18n( "%1 " + TQString msg = i18n( "%1 " "does not appear to be an image file.\n" "Please use files with these extensions:\n" "%2") @@ -78,7 +78,7 @@ KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg) KSimpleConfig *config; -KDModule::KDModule(QWidget *parent, const char *name, const QStringList &) +KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KDMFactory::instance(), parent, name) , minshowuid(0) , maxshowuid(0) @@ -123,17 +123,17 @@ KDModule::KDModule(QWidget *parent, const char *name, const QStringList &) KGlobal::locale()->insertCatalogue("kcmbackground"); - QStringList sl; - QMap<gid_t,QStringList> tgmap; - QMap<gid_t,QStringList>::Iterator tgmapi; - QMap<gid_t,QStringList>::ConstIterator tgmapci; - QMap<QString, QPair<int,QStringList> >::Iterator umapi; + TQStringList sl; + TQMap<gid_t,TQStringList> tgmap; + TQMap<gid_t,TQStringList>::Iterator tgmapi; + TQMap<gid_t,TQStringList>::ConstIterator tgmapci; + TQMap<TQString, QPair<int,TQStringList> >::Iterator umapi; struct passwd *ps; for (setpwent(); (ps = getpwent()); ) { - QString un( QFile::decodeName( ps->pw_name ) ); + TQString un( TQFile::decodeName( ps->pw_name ) ); if (usermap.find( un ) == usermap.end()) { - usermap.insert( un, QPair<int,QStringList>( ps->pw_uid, sl ) ); + usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) ); if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end()) (*tgmapi).append( un ); else @@ -144,22 +144,22 @@ KDModule::KDModule(QWidget *parent, const char *name, const QStringList &) struct group *grp; for (setgrent(); (grp = getgrent()); ) { - QString gn( QFile::decodeName( grp->gr_name ) ); + TQString gn( TQFile::decodeName( grp->gr_name ) ); bool delme = false; if ((tgmapi = tgmap.find( grp->gr_gid )) != tgmap.end()) { if ((*tgmapi).count() == 1 && (*tgmapi).first() == gn) delme = true; else - for (QStringList::ConstIterator it = (*tgmapi).begin(); + for (TQStringList::ConstIterator it = (*tgmapi).begin(); it != (*tgmapi).end(); ++it) usermap[*it].second.append( gn ); tgmap.remove( tgmapi ); } if (!*grp->gr_mem || - (delme && !grp->gr_mem[1] && gn == QFile::decodeName( *grp->gr_mem ))) + (delme && !grp->gr_mem[1] && gn == TQFile::decodeName( *grp->gr_mem ))) continue; do { - QString un( QFile::decodeName( *grp->gr_mem ) ); + TQString un( TQFile::decodeName( *grp->gr_mem ) ); if ((umapi = usermap.find( un )) != usermap.end()) { if ((*umapi).second.find( gn ) == (*umapi).second.end()) (*umapi).second.append( gn ); @@ -173,10 +173,10 @@ KDModule::KDModule(QWidget *parent, const char *name, const QStringList &) kdWarning() << "user(s) '" << tgmapci.data().join(",") << "' have unknown GID " << tgmapci.key() << endl; - config = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); + config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); - QVBoxLayout *top = new QVBoxLayout(this); - tab = new QTabWidget(this); + TQVBoxLayout *top = new TQVBoxLayout(this); + tab = new TQTabWidget(this); // ***** // _don't_ add a theme configurator until the theming engine is _really_ done!! @@ -184,34 +184,34 @@ KDModule::KDModule(QWidget *parent, const char *name, const QStringList &) appearance = new KDMAppearanceWidget(this); tab->addTab(appearance, i18n("A&ppearance")); - connect(appearance, SIGNAL(changed(bool)), SIGNAL( changed(bool))); + connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool))); font = new KDMFontWidget(this); tab->addTab(font, i18n("&Font")); - connect(font, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); background = new KBackground(this); tab->addTab(background, i18n("&Background")); - connect(background, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); sessions = new KDMSessionsWidget(this); tab->addTab(sessions, i18n("&Shutdown")); - connect(sessions, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); users = new KDMUsersWidget(this, 0); tab->addTab(users, i18n("&Users")); - connect(users, SIGNAL(changed(bool)), SIGNAL(changed(bool))); - connect(users, SIGNAL(setMinMaxUID(int,int)), SLOT(slotMinMaxUID(int,int))); - connect(this, SIGNAL(addUsers(const QMap<QString,int> &)), users, SLOT(slotAddUsers(const QMap<QString,int> &))); - connect(this, SIGNAL(delUsers(const QMap<QString,int> &)), users, SLOT(slotDelUsers(const QMap<QString,int> &))); - connect(this, SIGNAL(clearUsers()), users, SLOT(slotClearUsers())); + connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int))); + connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &))); + connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &))); + connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers())); convenience = new KDMConvenienceWidget(this, 0); tab->addTab(convenience, i18n("Con&venience")); - connect(convenience, SIGNAL(changed(bool)), SIGNAL(changed(bool))); - connect(this, SIGNAL(addUsers(const QMap<QString,int> &)), convenience, SLOT(slotAddUsers(const QMap<QString,int> &))); - connect(this, SIGNAL(delUsers(const QMap<QString,int> &)), convenience, SLOT(slotDelUsers(const QMap<QString,int> &))); - connect(this, SIGNAL(clearUsers()), convenience, SLOT(slotClearUsers())); + connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &))); + connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &))); + connect(this, TQT_SIGNAL(clearUsers()), convenience, TQT_SLOT(slotClearUsers())); load(); if (getuid() != 0 || !config->checkConfigFilesWritable( true )) { @@ -272,10 +272,10 @@ void KDModule::propagateUsers() { groupmap.clear(); emit clearUsers(); - QMap<QString,int> lusers; - QMapConstIterator<QString, QPair<int,QStringList> > it; - QStringList::ConstIterator jt; - QMap<QString,int>::Iterator gmapi; + TQMap<TQString,int> lusers; + TQMapConstIterator<TQString, QPair<int,TQStringList> > it; + TQStringList::ConstIterator jt; + TQMap<TQString,int>::Iterator gmapi; for (it = usermap.begin(); it != usermap.end(); ++it) { int uid = it.data().first; if (!uid || (uid >= minshowuid && uid <= maxshowuid)) { @@ -295,10 +295,10 @@ void KDModule::propagateUsers() void KDModule::slotMinMaxUID(int min, int max) { if (updateOK) { - QMap<QString,int> alusers, dlusers; - QMapConstIterator<QString, QPair<int,QStringList> > it; - QStringList::ConstIterator jt; - QMap<QString,int>::Iterator gmapi; + TQMap<TQString,int> alusers, dlusers; + TQMapConstIterator<TQString, QPair<int,TQStringList> > it; + TQStringList::ConstIterator jt; + TQMap<TQString,int>::Iterator gmapi; for (it = usermap.begin(); it != usermap.end(); ++it) { int uid = it.data().first; if (!uid) continue; diff --git a/kcontrol/kdm/main.h b/kcontrol/kdm/main.h index 5e8da66b8..8bec1a715 100644 --- a/kcontrol/kdm/main.h +++ b/kcontrol/kdm/main.h @@ -24,8 +24,8 @@ #ifndef __kdm_main_h #define __kdm_main_h -#include <qtabwidget.h> -#include <qmap.h> +#include <tqtabwidget.h> +#include <tqmap.h> #include <kcmodule.h> @@ -42,7 +42,7 @@ class KDModule : public KCModule public: - KDModule(QWidget *parent, const char *name, const QStringList &); + KDModule(TQWidget *parent, const char *name, const TQStringList &); ~KDModule(); void load(); @@ -56,8 +56,8 @@ public slots: signals: void clearUsers(); - void addUsers(const QMap<QString,int> &); - void delUsers(const QMap<QString,int> &); + void addUsers(const TQMap<TQString,int> &); + void delUsers(const TQMap<TQString,int> &); private: @@ -70,8 +70,8 @@ private: KDMUsersWidget *users; KDMConvenienceWidget *convenience; - QMap<QString, QPair<int,QStringList> > usermap; - QMap<QString,int> groupmap; + TQMap<TQString, QPair<int,TQStringList> > usermap; + TQMap<TQString,int> groupmap; int minshowuid, maxshowuid; bool updateOK; diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index 446cd24ac..a38f46f29 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -21,11 +21,11 @@ #include "commandShortcuts.h" #include "treeview.h" -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqwhatsthis.h> #include <kactivelabel.h> #include <kapplication.h> @@ -36,8 +36,8 @@ #include <klocale.h> static bool treeFilled = false; -CommandShortcutsModule::CommandShortcutsModule( QWidget *parent, const char *name ) -: QWidget( parent, name ) +CommandShortcutsModule::CommandShortcutsModule( TQWidget *parent, const char *name ) +: TQWidget( parent, name ) { treeFilled = false; initGUI(); @@ -68,7 +68,7 @@ void CommandShortcutsModule::defaults() m_tree->fill(); } -QString CommandShortcutsModule::quickHelp() const +TQString CommandShortcutsModule::quickHelp() const { return i18n("<h1>Command Shortcuts</h1> Using key bindings you can configure applications " "and commands to be triggered when you press a key or a combination of keys."); @@ -76,62 +76,62 @@ QString CommandShortcutsModule::quickHelp() const void CommandShortcutsModule::initGUI() { - QVBoxLayout* mainLayout = new QVBoxLayout(this, KDialog::marginHint()); + TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint()); mainLayout->addSpacing( KDialog::marginHint() ); KActiveLabel* label = new KActiveLabel(this); label->setText(i18n("<qt>Below is a list of known commands which you may assign keyboard shortcuts to. " "To edit, add or remove entries from this list use the " "<a href=\"launchMenuEditor\">KDE menu editor</a>.</qt>")); - label->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); - disconnect(label, SIGNAL(linkClicked(const QString &)), label, SLOT(openLink(const QString &))); - connect(label, SIGNAL(linkClicked(const QString &)), this, SLOT(launchMenuEditor())); + label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &))); + connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor())); mainLayout->addWidget(label); m_tree = new AppTreeView(this, "appTreeView"); - m_tree->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + m_tree->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mainLayout->setStretchFactor(m_tree, 10); mainLayout->addWidget(m_tree); - QWhatsThis::add(m_tree, + TQWhatsThis::add(m_tree, i18n("This is a list of all the desktop applications and commands " "currently defined on this system. Click to select a command to " "assign a keyboard shortcut to. Complete management of these " "entries can be done via the menu editor program.")); - connect(m_tree, SIGNAL(entrySelected(const QString&, const QString &, bool)), - this, SLOT(commandSelected(const QString&, const QString &, bool))); - connect(m_tree, SIGNAL(doubleClicked(QListViewItem *, const QPoint &, int)), - this, SLOT(commandDoubleClicked(QListViewItem *, const QPoint &, int))); - m_shortcutBox = new QButtonGroup(i18n("Shortcut for Selected Command"), this); + connect(m_tree, TQT_SIGNAL(entrySelected(const TQString&, const TQString &, bool)), + this, TQT_SLOT(commandSelected(const TQString&, const TQString &, bool))); + connect(m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQT_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int))); + m_shortcutBox = new TQButtonGroup(i18n("Shortcut for Selected Command"), this); mainLayout->addWidget(m_shortcutBox); - QHBoxLayout* buttonLayout = new QHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2); + TQHBoxLayout* buttonLayout = new TQHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2); buttonLayout->addSpacing( KDialog::marginHint() ); - m_noneRadio = new QRadioButton(i18n("no key", "&None"), m_shortcutBox); - QWhatsThis::add(m_noneRadio, i18n("The selected command will not be associated with any key.")); + m_noneRadio = new TQRadioButton(i18n("no key", "&None"), m_shortcutBox); + TQWhatsThis::add(m_noneRadio, i18n("The selected command will not be associated with any key.")); buttonLayout->addWidget(m_noneRadio); - m_customRadio = new QRadioButton(i18n("C&ustom"), m_shortcutBox); - QWhatsThis::add(m_customRadio, + m_customRadio = new TQRadioButton(i18n("C&ustom"), m_shortcutBox); + TQWhatsThis::add(m_customRadio, i18n("If this option is selected you can create a customized key binding for the" " selected command using the button to the right.") ); buttonLayout->addWidget(m_customRadio); m_shortcutButton = new KKeyButton(m_shortcutBox); - QWhatsThis::add(m_shortcutButton, + TQWhatsThis::add(m_shortcutButton, i18n("Use this button to choose a new shortcut key. Once you click it, " "you can press the key-combination which you would like to be assigned " "to the currently selected command.")); buttonLayout->addSpacing(KDialog::spacingHint() * 2); buttonLayout->addWidget(m_shortcutButton); - connect(m_shortcutButton, SIGNAL(capturedShortcut(const KShortcut&)), - this, SLOT(shortcutChanged(const KShortcut&))); - connect(m_customRadio, SIGNAL(toggled(bool)), m_shortcutButton, SLOT(setEnabled(bool))); - connect(m_noneRadio, SIGNAL(toggled(bool)), this, SLOT(shortcutRadioToggled(bool))); + connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const KShortcut&)), + this, TQT_SLOT(shortcutChanged(const KShortcut&))); + connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool))); + connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool))); buttonLayout->addStretch(1); } void CommandShortcutsModule::launchMenuEditor() { if ( KApplication::startServiceByDesktopName( "kmenuedit", - QString::null /*url*/, + TQString::null /*url*/, 0 /*error*/, 0 /*dcopservice*/, 0 /*pid*/, @@ -156,8 +156,8 @@ void CommandShortcutsModule::shortcutRadioToggled(bool remove) if (remove) { - m_shortcutButton->setShortcut(QString::null, false); - item->setAccel(QString::null); + m_shortcutButton->setShortcut(TQString::null, false); + item->setAccel(TQString::null); if (m_changedItems.findRef(item) == -1) { m_changedItems.append(item); @@ -178,7 +178,7 @@ void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut) return; } - QString accel = shortcut.toString(); + TQString accel = shortcut.toString(); bool hasAccel = !accel.isEmpty(); m_noneRadio->blockSignals(true); m_noneRadio->setChecked(!hasAccel); @@ -194,7 +194,7 @@ void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut) emit changed( true ); } -void CommandShortcutsModule::showing(QWidget* w) +void CommandShortcutsModule::showing(TQWidget* w) { if (w != this || treeFilled) { @@ -213,7 +213,7 @@ void CommandShortcutsModule::showing(QWidget* w) treeFilled = true; } -void CommandShortcutsModule::commandSelected(const QString& /* path */, const QString & accel, bool isDirectory) +void CommandShortcutsModule::commandSelected(const TQString& /* path */, const TQString & accel, bool isDirectory) { m_noneRadio->blockSignals(true); m_shortcutBox->setEnabled(!isDirectory); @@ -227,7 +227,7 @@ void CommandShortcutsModule::commandSelected(const QString& /* path */, const QS m_noneRadio->blockSignals(false); } -void CommandShortcutsModule::commandDoubleClicked(QListViewItem *item, const QPoint &, int) +void CommandShortcutsModule::commandDoubleClicked(TQListViewItem *item, const TQPoint &, int) { if (!item) { diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h index 3bc492f17..504359fed 100644 --- a/kcontrol/keys/commandShortcuts.h +++ b/kcontrol/keys/commandShortcuts.h @@ -21,9 +21,9 @@ #ifndef __COMMAND_SHORTCUTS_MODULE_H #define __COMMAND_SHORTCUTS_MODULE_H -#include <qtabwidget.h> +#include <tqtabwidget.h> #include <kshortcut.h> -#include <qptrlist.h> +#include <tqptrlist.h> class AppTreeView; class AppTreeItem; @@ -32,32 +32,32 @@ class QRadioButton; class KKeyButton; class QListViewItem; -typedef QPtrList<AppTreeItem> treeItemList; -typedef QPtrListIterator<AppTreeItem> treeItemListIterator; +typedef TQPtrList<AppTreeItem> treeItemList; +typedef TQPtrListIterator<AppTreeItem> treeItemListIterator; class CommandShortcutsModule : public QWidget { Q_OBJECT public: - CommandShortcutsModule( QWidget *parent = 0, const char *name = 0 ); + CommandShortcutsModule( TQWidget *parent = 0, const char *name = 0 ); ~CommandShortcutsModule(); void load(); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; signals: void changed( bool ); public slots: - void showing(QWidget*); + void showing(TQWidget*); protected slots: - void commandSelected(const QString&, const QString &, bool); + void commandSelected(const TQString&, const TQString &, bool); void shortcutChanged(const KShortcut& shortcut); void shortcutRadioToggled(bool remove); - void commandDoubleClicked(QListViewItem *item, const QPoint &, int); + void commandDoubleClicked(TQListViewItem *item, const TQPoint &, int); void launchMenuEditor(); protected: @@ -65,9 +65,9 @@ class CommandShortcutsModule : public QWidget private: AppTreeView* m_tree; - QButtonGroup* m_shortcutBox; - QRadioButton* m_noneRadio; - QRadioButton* m_customRadio; + TQButtonGroup* m_shortcutBox; + TQRadioButton* m_noneRadio; + TQRadioButton* m_customRadio; KKeyButton* m_shortcutButton; treeItemList m_changedItems; }; diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h index 2e1f78643..9b00f08d2 100644 --- a/kcontrol/keys/kaccelaction.h +++ b/kcontrol/keys/kaccelaction.h @@ -23,10 +23,10 @@ #ifndef _KACCELACTION_H #define _KACCELACTION_H -#include <qmap.h> -#include <qptrvector.h> -#include <qstring.h> -#include <qvaluevector.h> +#include <tqmap.h> +#include <tqptrvector.h> +#include <tqstring.h> +#include <tqvaluevector.h> #include <kshortcut.h> @@ -71,37 +71,37 @@ class KAccelAction public: KAccelAction(); KAccelAction( const KAccelAction& ); - KAccelAction( const QString& sName, const QString& sLabel, const QString& sWhatsThis, + KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis, const KShortcut& cutDef3, const KShortcut& cutDef4, - const QObject* pObjSlot, const char* psMethodSlot, + const TQObject* pObjSlot, const char* psMethodSlot, bool bConfigurable, bool bEnabled ); ~KAccelAction(); void clear(); - bool init( const QString& sName, const QString& sLabel, const QString& sWhatsThis, + bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis, const KShortcut& cutDef3, const KShortcut& cutDef4, - const QObject* pObjSlot, const char* psMethodSlot, + const TQObject* pObjSlot, const char* psMethodSlot, bool bConfigurable, bool bEnabled ); KAccelAction& operator=( const KAccelAction& ); - const QString& name() const { return m_sName; } - const QString& label() const { return m_sLabel; } - const QString& whatsThis() const { return m_sWhatsThis; } + const TQString& name() const { return m_sName; } + const TQString& label() const { return m_sLabel; } + const TQString& whatsThis() const { return m_sWhatsThis; } const KShortcut& shortcut() const { return m_cut; } const KShortcut& shortcutDefault() const; const KShortcut& shortcutDefault3() const { return m_cutDefault3; } const KShortcut& shortcutDefault4() const { return m_cutDefault4; } - const QObject* objSlotPtr() const { return m_pObjSlot; } + const TQObject* objSlotPtr() const { return m_pObjSlot; } const char* methodSlotPtr() const { return m_psMethodSlot; } bool isConfigurable() const { return m_bConfigurable; } bool isEnabled() const { return m_bEnabled; } - void setName( const QString& ); - void setLabel( const QString& ); - void setWhatsThis( const QString& ); + void setName( const TQString& ); + void setLabel( const TQString& ); + void setWhatsThis( const TQString& ); bool setShortcut( const KShortcut& rgCuts ); - void setSlot( const QObject* pObjSlot, const char* psMethodSlot ); + void setSlot( const TQObject* pObjSlot, const char* psMethodSlot ); void setConfigurable( bool ); void setEnabled( bool ); @@ -113,19 +113,19 @@ class KAccelAction void clearShortcut(); bool contains( const KKeySequence& ); - QString toString() const; - QString toStringInternal() const; + TQString toString() const; + TQString toStringInternal() const; static bool useFourModifierKeys(); static void useFourModifierKeys( bool ); protected: - QString m_sName, + TQString m_sName, m_sLabel, m_sWhatsThis; KShortcut m_cut; KShortcut m_cutDefault3, m_cutDefault4; - const QObject* m_pObjSlot; + const TQObject* m_pObjSlot; const char* m_psMethodSlot; bool m_bConfigurable, m_bEnabled; @@ -156,28 +156,28 @@ class KAccelActions void clear(); bool init( const KAccelActions& ); - bool init( KConfigBase& config, const QString& sGroup ); + bool init( KConfigBase& config, const TQString& sGroup ); void updateShortcuts( KAccelActions& ); - int actionIndex( const QString& sAction ) const; + int actionIndex( const TQString& sAction ) const; KAccelAction* actionPtr( uint ); const KAccelAction* actionPtr( uint ) const; - KAccelAction* actionPtr( const QString& sAction ); - const KAccelAction* actionPtr( const QString& sAction ) const; + KAccelAction* actionPtr( const TQString& sAction ); + const KAccelAction* actionPtr( const TQString& sAction ) const; KAccelAction* actionPtr( KKeySequence cut ); KAccelAction& operator []( uint ); const KAccelAction& operator []( uint ) const; - KAccelAction* insert( const QString& sAction, const QString& sLabel, const QString& sWhatsThis, + KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis, const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4, - const QObject* pObjSlot = 0, const char* psMethodSlot = 0, + const TQObject* pObjSlot = 0, const char* psMethodSlot = 0, bool bConfigurable = true, bool bEnabled = true ); - KAccelAction* insert( const QString& sName, const QString& sLabel ); - bool remove( const QString& sAction ); + KAccelAction* insert( const TQString& sName, const TQString& sLabel ); + bool remove( const TQString& sAction ); - bool readActions( const QString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 ); - bool writeActions( const QString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0, + bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 ); + bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0, bool bWriteAll = false, bool bGlobal = false ) const; void emitKeycodeChanged(); diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 89a32cf5e..09726de63 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -11,12 +11,12 @@ #include <unistd.h> -#include <qlabel.h> -#include <qdir.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qregexp.h> +#include <tqlabel.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqregexp.h> #include <kdebug.h> #include <klocale.h> @@ -35,21 +35,21 @@ //---------------------------------------------------------------------------- -KKeyModule::KKeyModule( QWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name ) - : QWidget( parent, name ) +KKeyModule::KKeyModule( TQWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name ) + : TQWidget( parent, name ) { init( isGlobal, bSeriesOnly, bSeriesNone ); } -KKeyModule::KKeyModule( QWidget *parent, bool isGlobal, const char *name ) - : QWidget( parent, name ) +KKeyModule::KKeyModule( TQWidget *parent, bool isGlobal, const char *name ) + : TQWidget( parent, name ) { init( isGlobal, false, false ); } void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) { - QString wtstr; + TQString wtstr; KeyType = isGlobal ? "global" : "standard"; @@ -73,7 +73,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) // Sorting Hack: I'll re-write the module once feature-adding begins again. if( bSeriesOnly || bSeriesNone ) { for( uint i = 0; i < actions.size(); i++ ) { - QString sConfigKey = actions[i].m_sName; + TQString sConfigKey = actions[i].m_sName; //kdDebug(125) << "sConfigKey: " << sConfigKey << endl; int iLastSpace = sConfigKey.findRev( ' ' ); bool bIsNum = false; @@ -107,30 +107,30 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) //kdDebug(125) << "KKeyModule::init() - Read current key bindings from config." << endl; //actions.readActions( KeySet ); - sFileList = new QStringList(); - sList = new QListBox( this ); + sFileList = new TQStringList(); + sList = new TQListBox( this ); //readSchemeNames(); sList->setCurrentItem( 0 ); - connect( sList, SIGNAL( highlighted( int ) ), - SLOT( slotPreviewScheme( int ) ) ); + connect( sList, TQT_SIGNAL( highlighted( int ) ), + TQT_SLOT( slotPreviewScheme( int ) ) ); - QLabel *label = new QLabel( sList, i18n("&Key Scheme"), this ); + TQLabel *label = new TQLabel( sList, i18n("&Key Scheme"), this ); wtstr = i18n("Here you can see a list of the existing key binding schemes with 'Current scheme'" " referring to the settings you are using right now. Select a scheme to use, remove or" " change it."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( sList, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( sList, wtstr ); - addBt = new QPushButton( i18n("&Save Scheme..."), this ); - connect( addBt, SIGNAL( clicked() ), SLOT( slotAdd() ) ); - QWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.")); + addBt = new TQPushButton( i18n("&Save Scheme..."), this ); + connect( addBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) ); + TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.")); - removeBt = new QPushButton( i18n("&Remove Scheme"), this ); + removeBt = new TQPushButton( i18n("&Remove Scheme"), this ); removeBt->setEnabled(FALSE); - connect( removeBt, SIGNAL( clicked() ), SLOT( slotRemove() ) ); - QWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not" + connect( removeBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) ); + TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not" " remove the standard system wide schemes, 'Current scheme' and 'KDE default'.") ); // Hack to get this setting only displayed once. It belongs in main.cpp instead. @@ -139,12 +139,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) /* Needed to remove because this depended upon non-BC changes in KeyEntry.*/ // If this is the "Global Keys" section of the KDE Control Center: if( isGlobal && !bSeriesOnly ) { - preferMetaBt = new QCheckBox( i18n("Prefer 4-modifier defaults"), this ); + preferMetaBt = new TQCheckBox( i18n("Prefer 4-modifier defaults"), this ); if( !KKeySequence::keyboardHasMetaKey() ) preferMetaBt->setEnabled( false ); preferMetaBt->setChecked( KKeySequence::useFourModifierKeys() ); - connect( preferMetaBt, SIGNAL(clicked()), SLOT(slotPreferMeta()) ); - QWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would " + connect( preferMetaBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotPreferMeta()) ); + TQWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would " "like KDE to prefer the 3-modifier configuration defaults, then this option " "should be unchecked.") ); } else @@ -153,11 +153,11 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) KSeparator* line = new KSeparator( KSeparator::HLine, this ); kc = new KeyChooserSpec( actions, this, isGlobal ); - connect( kc, SIGNAL(keyChange()), this, SLOT(slotKeyChange()) ); + connect( kc, TQT_SIGNAL(keyChange()), this, TQT_SLOT(slotKeyChange()) ); readScheme(); - QGridLayout *topLayout = new QGridLayout( this, 6, 2, + TQGridLayout *topLayout = new TQGridLayout( this, 6, 2, KDialog::marginHint(), KDialog::spacingHint()); topLayout->addWidget(label, 0, 0); @@ -179,14 +179,14 @@ KKeyModule::~KKeyModule (){ delete sFileList; } -bool KKeyModule::writeSettings( const QString& sGroup, KConfig* pConfig ) +bool KKeyModule::writeSettings( const TQString& sGroup, KConfig* pConfig ) { kc->commitChanges(); actions.writeActions( sGroup, pConfig, true, false ); return true; } -bool KKeyModule::writeSettingsGlobal( const QString& sGroup ) +bool KKeyModule::writeSettingsGlobal( const TQString& sGroup ) { kc->commitChanges(); actions.writeActions( sGroup, 0, true, true ); @@ -225,15 +225,15 @@ void KKeyModule::defaults() /*void KKeyModule::slotRemove() { - QString kksPath = + TQString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType); - QDir d( kksPath ); + TQDir d( kksPath ); if (!d.exists()) // what can we do? return; - d.setFilter( QDir::Files ); - d.setSorting( QDir::Name ); + d.setFilter( TQDir::Files ); + d.setSorting( TQDir::Name ); d.setNameFilter("*.kksrc"); uint ind = sList->currentItem(); @@ -291,14 +291,14 @@ void KKeyModule::readScheme( int index ) /*void KKeyModule::slotAdd() { - QString sName; + TQString sName; if ( sList->currentItem() >= nSysSchemes ) sName = sList->currentText(); SaveScm ss( 0, "save scheme", sName ); bool nameValid; - QString sFile; + TQString sFile; int exists = -1; do { @@ -330,7 +330,7 @@ void KKeyModule::readScheme( int index ) // Make the next letter upper case - QString s = sFile.mid( ind, 1 ); + TQString s = sFile.mid( ind, 1 ); s = s.upper(); sFile.replace( ind, 1, s ); @@ -356,13 +356,13 @@ void KKeyModule::readScheme( int index ) } while ( nameValid == FALSE ); - disconnect( sList, SIGNAL( highlighted( int ) ), this, - SLOT( slotPreviewScheme( int ) ) ); + disconnect( sList, TQT_SIGNAL( highlighted( int ) ), this, + TQT_SLOT( slotPreviewScheme( int ) ) ); - QString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/"); + TQString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/"); - QDir d( kksPath ); + TQDir d( kksPath ); if ( !d.exists() ) if ( !d.mkdir( kksPath ) ) { qWarning("KKeyModule: Could not make directory to store user info."); @@ -403,8 +403,8 @@ void KKeyModule::readScheme( int index ) slotSave(); - connect( sList, SIGNAL( highlighted( int ) ), this, - SLOT( slotPreviewScheme( int ) ) ); + connect( sList, TQT_SIGNAL( highlighted( int ) ), this, + TQT_SLOT( slotPreviewScheme( int ) ) ); slotPreviewScheme( sList->currentItem() ); }*/ @@ -426,9 +426,9 @@ void KKeyModule::readScheme( int index ) /*void KKeyModule::readSchemeNames( ) { - QStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc"); - //QRegExp r( "-kde[34].kksrc$" ); - QRegExp r( "-kde3.kksrc$" ); + TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc"); + //TQRegExp r( "-kde[34].kksrc$" ); + TQRegExp r( "-kde3.kksrc$" ); sList->clear(); sFileList->clear(); @@ -442,7 +442,7 @@ void KKeyModule::readScheme( int index ) nSysSchemes = 2; // This for system files - for ( QStringList::ConstIterator it = schemes.begin(); it != schemes.end(); ++it) { + for ( TQStringList::ConstIterator it = schemes.begin(); it != schemes.end(); ++it) { // KPersonalizer relies on .kksrc files containing all the keyboard shortcut // schemes for various setups. It also requires the KDE defaults to be in // a .kksrc file. The KDE defaults shouldn't be listed here. @@ -452,7 +452,7 @@ void KKeyModule::readScheme( int index ) KSimpleConfig config( *it, true ); // TODO: Put 'Name' in "Settings" group config.setGroup( KeyScheme ); - QString str = config.readEntry( "Name" ); + TQString str = config.readEntry( "Name" ); sList->insertItem( str ); sFileList->append( *it ); @@ -473,7 +473,7 @@ void KKeyModule::init() /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n"; KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - QString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); + TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); KAccel::useFourModifierKeys( fourMods == "true" ); bool bUseFourModifierKeys = KAccel::useFourModifierKeys(); KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true ); @@ -508,7 +508,7 @@ void KKeyModule::init() // KeyChooserSpec //----------------------------------------------------------------- -KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, QWidget* parent, bool bGlobal ) +KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool bGlobal ) : KKeyChooser( actions, parent, bGlobal, false, true ), m_bGlobal( bGlobal ) { //if( global ) diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h index cba853e4d..f38efe8b0 100644 --- a/kcontrol/keys/keyconfig.h +++ b/kcontrol/keys/keyconfig.h @@ -8,13 +8,13 @@ #ifndef __KEYCONFIG_H__ #define __KEYCONFIG_H__ -#include <qpushbutton.h> -#include <qlistbox.h> +#include <tqpushbutton.h> +#include <tqlistbox.h> #include <kaccel.h> #include <kkeydialog.h> //#include <kcmodule.h> -#include <qdict.h> +#include <tqdict.h> class QCheckBox; @@ -28,8 +28,8 @@ public: //KAccelActions dict; KeyChooserSpec *kc; - KKeyModule( QWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name = 0 ); - KKeyModule( QWidget *parent, bool isGlobal, const char *name = 0 ); + KKeyModule( TQWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name = 0 ); + KKeyModule( TQWidget *parent, bool isGlobal, const char *name = 0 ); ~KKeyModule (); protected: @@ -41,8 +41,8 @@ public: virtual void defaults(); static void init(); - bool writeSettings( const QString& sGroup, KConfig* pConfig ); - bool writeSettingsGlobal( const QString& sGroup ); + bool writeSettings( const TQString& sGroup, KConfig* pConfig ); + bool writeSettingsGlobal( const TQString& sGroup ); public slots: //void slotPreviewScheme( int ); @@ -59,19 +59,19 @@ signals: //void keysChanged( const KAccelActions* map_P ); protected: - QListBox *sList; - QStringList *sFileList; - QPushButton *addBt; - QPushButton *removeBt; - QCheckBox *preferMetaBt; + TQListBox *sList; + TQStringList *sFileList; + TQPushButton *addBt; + TQPushButton *removeBt; + TQCheckBox *preferMetaBt; int nSysSchemes; bool bSeriesOnly; void readScheme( int index=0 ); - QString KeyType; - QString KeyScheme; - QString KeySet; + TQString KeyType; + TQString KeyScheme; + TQString KeySet; }; @@ -79,7 +79,7 @@ class KeyChooserSpec : public KKeyChooser { Q_OBJECT public: - KeyChooserSpec( KAccelActions& actions, QWidget* parent, + KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool bGlobal ); //void updateKeys( const KAccelActions* map_P ); protected: diff --git a/kcontrol/keys/khotkeys.cpp b/kcontrol/keys/khotkeys.cpp index 869cab71a..636cd972c 100644 --- a/kcontrol/keys/khotkeys.cpp +++ b/kcontrol/keys/khotkeys.cpp @@ -25,11 +25,11 @@ extern "C" { static void (*khotkeys_init_2)( void ); static void (*khotkeys_cleanup_2)( void ); - static QString (*khotkeys_get_menu_entry_shortcut_2)( const QString& entry_P ); - static QString (*khotkeys_change_menu_entry_shortcut_2)( const QString& entry_P, - const QString& shortcut_P ); - static bool (*khotkeys_menu_entry_moved_2)( const QString& new_P, const QString& old_P ); - static void (*khotkeys_menu_entry_deleted_2)( const QString& entry_P ); + static TQString (*khotkeys_get_menu_entry_shortcut_2)( const TQString& entry_P ); + static TQString (*khotkeys_change_menu_entry_shortcut_2)( const TQString& entry_P, + const TQString& shortcut_P ); + static bool (*khotkeys_menu_entry_moved_2)( const TQString& new_P, const TQString& old_P ); + static void (*khotkeys_menu_entry_deleted_2)( const TQString& entry_P ); } static bool khotkeys_present = false; @@ -44,16 +44,16 @@ bool KHotKeys::init() khotkeys_init_2 = ( void (*)(void)) ( lib->symbol( "khotkeys_init" )); khotkeys_cleanup_2 = ( void (*)(void)) ( lib->symbol( "khotkeys_cleanup" )); khotkeys_get_menu_entry_shortcut_2 = - ( QString (*)( const QString& )) + ( TQString (*)( const TQString& )) ( lib->symbol( "khotkeys_get_menu_entry_shortcut" )); khotkeys_change_menu_entry_shortcut_2 = - ( QString (*)( const QString&, const QString& )) + ( TQString (*)( const TQString&, const TQString& )) ( lib->symbol( "khotkeys_change_menu_entry_shortcut" )); khotkeys_menu_entry_moved_2 = - ( bool (*)( const QString&, const QString& )) + ( bool (*)( const TQString&, const TQString& )) ( lib->symbol( "khotkeys_menu_entry_moved" )); khotkeys_menu_entry_deleted_2 = - ( void (*)( const QString& )) + ( void (*)( const TQString& )) ( lib->symbol( "khotkeys_menu_entry_deleted" )); if( khotkeys_init_2 && khotkeys_cleanup_2 @@ -83,7 +83,7 @@ bool KHotKeys::present() return khotkeys_present; } -QString KHotKeys::getMenuEntryShortcut( const QString& entry_P ) +TQString KHotKeys::getMenuEntryShortcut( const TQString& entry_P ) { if( !khotkeys_inited ) init(); @@ -92,8 +92,8 @@ QString KHotKeys::getMenuEntryShortcut( const QString& entry_P ) return khotkeys_get_menu_entry_shortcut_2( entry_P ); } -QString KHotKeys::changeMenuEntryShortcut( const QString& entry_P, - const QString shortcut_P ) +TQString KHotKeys::changeMenuEntryShortcut( const TQString& entry_P, + const TQString shortcut_P ) { if( !khotkeys_inited ) init(); @@ -102,7 +102,7 @@ QString KHotKeys::changeMenuEntryShortcut( const QString& entry_P, return khotkeys_change_menu_entry_shortcut_2( entry_P, shortcut_P ); } -bool KHotKeys::menuEntryMoved( const QString& new_P, const QString& old_P ) +bool KHotKeys::menuEntryMoved( const TQString& new_P, const TQString& old_P ) { if( !khotkeys_inited ) init(); @@ -111,7 +111,7 @@ bool KHotKeys::menuEntryMoved( const QString& new_P, const QString& old_P ) return khotkeys_menu_entry_moved_2( new_P, old_P ); } -void KHotKeys::menuEntryDeleted( const QString& entry_P ) +void KHotKeys::menuEntryDeleted( const TQString& entry_P ) { if( !khotkeys_inited ) init(); diff --git a/kcontrol/keys/khotkeys.h b/kcontrol/keys/khotkeys.h index 90ea17985..9eab62106 100644 --- a/kcontrol/keys/khotkeys.h +++ b/kcontrol/keys/khotkeys.h @@ -21,7 +21,7 @@ #ifndef __khotkeys_public_h__ #define __khotkeys_public_h__ -#include <qstring.h> +#include <tqstring.h> // see kdebase/khotkeys/kcontrol for info on these @@ -31,11 +31,11 @@ public: static bool init(); static void cleanup(); static bool present(); - static QString getMenuEntryShortcut( const QString& entry_P ); - static QString changeMenuEntryShortcut( const QString& entry_P, - const QString shortcut_P ); - static bool menuEntryMoved( const QString& new_P, const QString& old_P ); - static void menuEntryDeleted( const QString& entry_P ); + static TQString getMenuEntryShortcut( const TQString& entry_P ); + static TQString changeMenuEntryShortcut( const TQString& entry_P, + const TQString shortcut_P ); + static bool menuEntryMoved( const TQString& new_P, const TQString& old_P ); + static void menuEntryDeleted( const TQString& entry_P ); }; #endif diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index c03c26f91..d3b29fffe 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> +#include <tqlayout.h> #include <kdebug.h> #include <klocale.h> @@ -48,7 +48,7 @@ o Pre-set scheme <Remove Scheme> Global Shortcuts */ -KeyModule::KeyModule( QWidget *parent, const char *name ) +KeyModule::KeyModule( TQWidget *parent, const char *name ) : KCModule( parent, name ) { setQuickHelp( i18n("<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain actions to be" @@ -69,22 +69,22 @@ KeyModule::~KeyModule() void KeyModule::initGUI() { - m_pTab = new QTabWidget( this ); - QVBoxLayout *l = new QVBoxLayout(this); + m_pTab = new TQTabWidget( this ); + TQVBoxLayout *l = new TQVBoxLayout(this); l->addWidget(m_pTab); m_pShortcuts = new ShortcutsModule( this ); m_pTab->addTab( m_pShortcuts, i18n("Shortcut Schemes") ); - connect( m_pShortcuts, SIGNAL(changed(bool)), SIGNAL(changed(bool)) ); + connect( m_pShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); m_pCommandShortcuts = new CommandShortcutsModule ( this ); m_pTab->addTab( m_pCommandShortcuts, i18n("Command Shortcuts") ); - connect( m_pCommandShortcuts, SIGNAL(changed(bool)), SIGNAL(changed(bool)) ); - connect( m_pTab, SIGNAL(currentChanged(QWidget*)), m_pCommandShortcuts, SLOT(showing(QWidget*)) ); + connect( m_pCommandShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); + connect( m_pTab, TQT_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQT_SLOT(showing(TQWidget*)) ); m_pModifiers = new ModifiersModule( this ); m_pTab->addTab( m_pModifiers, i18n("Modifier Keys") ); - connect( m_pModifiers, SIGNAL(changed(bool)), SIGNAL(changed(bool)) ); + connect( m_pModifiers, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); } void KeyModule::load() @@ -120,7 +120,7 @@ void KeyModule::defaults() m_pModifiers->defaults(); } -void KeyModule::resizeEvent( QResizeEvent * ) +void KeyModule::resizeEvent( TQResizeEvent * ) { m_pTab->setGeometry( 0, 0, width(), height() ); } @@ -129,7 +129,7 @@ void KeyModule::resizeEvent( QResizeEvent * ) extern "C" { - KDE_EXPORT KCModule *create_keys(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/) { // What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15 KGlobal::locale()->insertCatalogue("kwin"); @@ -154,7 +154,7 @@ extern "C" /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n"; KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - QString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); + TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); KAccel::useFourModifierKeys( fourMods == "true" ); bool bUseFourModifierKeys = KAccel::useFourModifierKeys(); KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true ); diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h index 5cabba122..f0b18c43d 100644 --- a/kcontrol/keys/main.h +++ b/kcontrol/keys/main.h @@ -24,7 +24,7 @@ #ifndef __keys_main_h #define __keys_main_h -#include <qtabwidget.h> +#include <tqtabwidget.h> #include <kcmodule.h> class CommandShortcutsModule; @@ -35,7 +35,7 @@ class KeyModule : public KCModule { Q_OBJECT public: - KeyModule( QWidget *parent, const char *name ); + KeyModule( TQWidget *parent, const char *name ); ~KeyModule(); void load(); @@ -45,10 +45,10 @@ class KeyModule : public KCModule protected: void initGUI(); - void resizeEvent( QResizeEvent* ); + void resizeEvent( TQResizeEvent* ); private: - QTabWidget* m_pTab; + TQTabWidget* m_pTab; CommandShortcutsModule* m_pCommandShortcuts; ShortcutsModule* m_pShortcuts; ModifiersModule* m_pModifiers; diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 8391c7938..d17e1619e 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -1,10 +1,10 @@ #include "modifiers.h" -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <kapplication.h> #include <kconfig.h> @@ -51,8 +51,8 @@ Extra1 [] [] User definable //1) labels: Shift | Ctrl | Option | Command //2) swap Ctrl & Command -ModifiersModule::ModifiersModule( QWidget *parent, const char *name ) -: QWidget( parent, name ) +ModifiersModule::ModifiersModule( TQWidget *parent, const char *name ) +: TQWidget( parent, name ) { initGUI(); load( false ); @@ -168,31 +168,31 @@ void ModifiersModule::setupMacModifierKeys() void ModifiersModule::initGUI() { - QGridLayout* pLayoutTop = new QGridLayout( this, 6, 2, KDialog::marginHint() ); + TQGridLayout* pLayoutTop = new TQGridLayout( this, 6, 2, KDialog::marginHint() ); pLayoutTop->setColStretch( 1, 1 ); - QGroupBox* pGroup = new QGroupBox( 2, Qt::Horizontal, i18n("KDE Modifiers"), this ); + TQGroupBox* pGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("KDE Modifiers"), this ); pLayoutTop->addWidget( pGroup, 0, 0 ); - QLabel* plbl = new QLabel( i18n("Modifier"), pGroup ); - QFont font = plbl->font(); + TQLabel* plbl = new TQLabel( i18n("Modifier"), pGroup ); + TQFont font = plbl->font(); font.setUnderline( true ); - font.setWeight( QFont::Bold ); + font.setWeight( TQFont::Bold ); plbl->setFont( font ); - plbl = new QLabel( i18n("X11-Mod"), pGroup ); + plbl = new TQLabel( i18n("X11-Mod"), pGroup ); plbl->setFont( font ); - new QLabel( i18n("QAccel", "Shift"), pGroup ); - new QLabel( "shift", pGroup ); + new TQLabel( i18n("TQAccel", "Shift"), pGroup ); + new TQLabel( "shift", pGroup ); - m_plblCtrl = new QLabel( i18n("QAccel", "Ctrl"), pGroup ); - new QLabel( "control", pGroup ); + m_plblCtrl = new TQLabel( i18n("TQAccel", "Ctrl"), pGroup ); + new TQLabel( "control", pGroup ); - m_plblAlt = new QLabel( i18n("QAccel", "Alt"), pGroup ); - new QLabel( "mod1", pGroup ); + m_plblAlt = new TQLabel( i18n("TQAccel", "Alt"), pGroup ); + new TQLabel( "mod1", pGroup ); - m_plblWin = new QLabel( i18n("Win"), pGroup ); - m_plblWinModX = new QLabel( "", pGroup ); + m_plblWin = new TQLabel( i18n("Win"), pGroup ); + m_plblWinModX = new TQLabel( "", pGroup ); /*m_pcbWinX = newModXComboBox( pGroup ); int i; switch( KKeyNative::modX(KKey::WIN) ) { @@ -204,14 +204,14 @@ void ModifiersModule::initGUI() } m_pcbWinX->setCurrentItem( i );*/ - m_pchkMacKeyboard = new QCheckBox( i18n("Macintosh keyboard"), this ); + m_pchkMacKeyboard = new TQCheckBox( i18n("Macintosh keyboard"), this ); m_pchkMacKeyboard->setChecked( m_bMacKeyboardOrig ); - connect( m_pchkMacKeyboard, SIGNAL(clicked()), SLOT(slotMacKeyboardClicked()) ); + connect( m_pchkMacKeyboard, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacKeyboardClicked()) ); pLayoutTop->addWidget( m_pchkMacKeyboard, 1, 0 ); - m_pchkMacSwap = new QCheckBox( i18n("MacOS-style modifier usage"), this ); + m_pchkMacSwap = new TQCheckBox( i18n("MacOS-style modifier usage"), this ); m_pchkMacSwap->setChecked( m_bMacSwapOrig ); - QWhatsThis::add( m_pchkMacSwap, + TQWhatsThis::add( m_pchkMacSwap, i18n("Checking this box will change your X Modifier Mapping to " "better reflect the standard MacOS modifier key usage. " "It allows you to use <i>Command+C</i> for <i>Copy</i>, for instance, " @@ -219,18 +219,18 @@ void ModifiersModule::initGUI() "<b>Command</b> will be used for application and console commands, " "<b>Option</b> as a command modifier and for navigating menus and dialogs, " "and <b>Control</b> for window manager commands.") ); - connect( m_pchkMacSwap, SIGNAL(clicked()), SLOT(slotMacSwapClicked()) ); + connect( m_pchkMacSwap, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacSwapClicked()) ); pLayoutTop->addWidget( m_pchkMacSwap, 2, 0 ); //------------------ pLayoutTop->addRowSpacing( 3, KDialog::spacingHint() * 3 ); - pGroup = new QGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this ); + pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this ); pLayoutTop->addWidget( pGroup, 4, 0 ); m_plstXMods = new KListView( pGroup ); m_plstXMods->setSorting( -1 ); - m_plstXMods->setSelectionMode( QListView::NoSelection ); + m_plstXMods->setSelectionMode( TQListView::NoSelection ); m_plstXMods->setAllColumnsShowFocus( true ); m_plstXMods->addColumn( i18n("X11-Mod") ); @@ -249,7 +249,7 @@ void ModifiersModule::initGUI() updateWidgets(); } -/*KComboBox* ModifiersModule::newModXComboBox( QWidget* parent ) +/*KComboBox* ModifiersModule::newModXComboBox( TQWidget* parent ) { KComboBox* pcb = new KComboBox( parent ); pcb->insertItem( "" ); @@ -285,8 +285,8 @@ void ModifiersModule::updateWidgets() } m_pchkMacSwap->setEnabled( true ); } else { - m_plblCtrl->setText( i18n("QAccel", "Ctrl") ); - m_plblAlt->setText( i18n("QAccel", "Alt") ); + m_plblCtrl->setText( i18n("TQAccel", "Ctrl") ); + m_plblAlt->setText( i18n("TQAccel", "Alt") ); m_plblWin->setText( i18n("Win") ); m_pchkMacSwap->setEnabled( false ); } @@ -325,7 +325,7 @@ void ModifiersModule::updateWidgets() default: i = 0; } if( i != 0 ) - m_plblWinModX->setText( "mod" + QString::number(i) ); + m_plblWinModX->setText( "mod" + TQString::number(i) ); else m_plblWinModX->setText( "<" + i18n("None") + ">" ); } diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h index 60ce76ae9..406d49862 100644 --- a/kcontrol/keys/modifiers.h +++ b/kcontrol/keys/modifiers.h @@ -1,7 +1,7 @@ #ifndef __MODIFIERS_MODULE_H #define __MODIFIERS_MODULE_H -#include <qwidget.h> +#include <tqwidget.h> class QCheckBox; class QLabel; @@ -12,7 +12,7 @@ class ModifiersModule : public QWidget { Q_OBJECT public: - ModifiersModule( QWidget *parent = 0, const char *name = 0 ); + ModifiersModule( TQWidget *parent = 0, const char *name = 0 ); void load( bool useDefaults ); void save(); @@ -25,13 +25,13 @@ class ModifiersModule : public QWidget protected: bool m_bMacKeyboardOrig, m_bMacSwapOrig; - QString m_sLabelCtrlOrig, m_sLabelAltOrig, m_sLabelWinOrig; + TQString m_sLabelCtrlOrig, m_sLabelAltOrig, m_sLabelWinOrig; - QLabel* m_plblCtrl, * m_plblAlt, * m_plblWin; - QLabel* m_plblWinModX; - QCheckBox* m_pchkMacKeyboard; + TQLabel* m_plblCtrl, * m_plblAlt, * m_plblWin; + TQLabel* m_plblWinModX; + TQCheckBox* m_pchkMacKeyboard; KListView* m_plstXMods; - QCheckBox* m_pchkMacSwap; + TQCheckBox* m_pchkMacSwap; void initGUI(); // Places the values in the *Orig variables into their diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 2ceceb46a..9f997b7e5 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -26,10 +26,10 @@ #include <stdlib.h> -#include <qdir.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> #include <kapplication.h> #include <kdebug.h> @@ -42,8 +42,8 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> -ShortcutsModule::ShortcutsModule( QWidget *parent, const char *name ) -: QWidget( parent, name ) +ShortcutsModule::ShortcutsModule( TQWidget *parent, const char *name ) +: TQWidget( parent, name ) { initGUI(); } @@ -91,7 +91,7 @@ void ShortcutsModule::defaults() m_pkcApplication->allDefault(); } -QString ShortcutsModule::quickHelp() const +TQString ShortcutsModule::quickHelp() const { return i18n("<h1>Key Bindings</h1> Using key bindings you can configure certain actions to be" " triggered when you press a key or a combination of keys, e.g. Ctrl+C is normally bound to" @@ -104,7 +104,7 @@ QString ShortcutsModule::quickHelp() const void ShortcutsModule::initGUI() { - QString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/"; + TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/"; kdDebug(125) << "A-----------" << endl; KAccelActions* keys = &m_actionsGeneral; @@ -128,57 +128,57 @@ void ShortcutsModule::initGUI() kdDebug(125) << "E-----------" << endl; kdDebug(125) << "F-----------" << endl; - QVBoxLayout* pVLayout = new QVBoxLayout( this, KDialog::marginHint() ); + TQVBoxLayout* pVLayout = new TQVBoxLayout( this, KDialog::marginHint() ); pVLayout->addSpacing( KDialog::marginHint() ); // (o) [Current ] <Remove> ( ) New <Save> - QHBoxLayout *pHLayout = new QHBoxLayout( pVLayout, KDialog::spacingHint() ); - QButtonGroup* pGroup = new QButtonGroup( this ); + TQHBoxLayout *pHLayout = new TQHBoxLayout( pVLayout, KDialog::spacingHint() ); + TQButtonGroup* pGroup = new TQButtonGroup( this ); pGroup->hide(); - m_prbPre = new QRadioButton( "", this ); - connect( m_prbPre, SIGNAL(clicked()), SLOT(slotSchemeCur()) ); + m_prbPre = new TQRadioButton( "", this ); + connect( m_prbPre, TQT_SIGNAL(clicked()), TQT_SLOT(slotSchemeCur()) ); pGroup->insert( m_prbPre ); pHLayout->addWidget( m_prbPre ); m_pcbSchemes = new KComboBox( this ); m_pcbSchemes->setMinimumWidth( 100 ); - m_pcbSchemes->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ); - connect( m_pcbSchemes, SIGNAL(activated(int)), SLOT(slotSelectScheme(int)) ); + m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); pHLayout->addWidget( m_pcbSchemes ); pHLayout->addSpacing( KDialog::marginHint() ); - m_pbtnRemove = new QPushButton( i18n("&Remove"), this ); + m_pbtnRemove = new TQPushButton( i18n("&Remove"), this ); m_pbtnRemove->setEnabled( false ); - connect( m_pbtnRemove, SIGNAL(clicked()), SLOT(slotRemoveScheme()) ); - QWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot" + connect( m_pbtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveScheme()) ); + TQWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot" " remove the standard system-wide schemes 'Current scheme' and 'KDE default'.") ); pHLayout->addWidget( m_pbtnRemove ); pHLayout->addSpacing( KDialog::marginHint() * 3 ); - m_prbNew = new QRadioButton( i18n("New scheme"), this ); + m_prbNew = new TQRadioButton( i18n("New scheme"), this ); m_prbNew->setEnabled( false ); pGroup->insert( m_prbNew ); pHLayout->addWidget( m_prbNew ); - m_pbtnSave = new QPushButton( i18n("&Save..."), this ); + m_pbtnSave = new TQPushButton( i18n("&Save..."), this ); m_pbtnSave->setEnabled( false ); - QWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") ); - connect( m_pbtnSave, SIGNAL(clicked()), SLOT(slotSaveSchemeAs()) ); + TQWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") ); + connect( m_pbtnSave, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveSchemeAs()) ); pHLayout->addWidget( m_pbtnSave ); pHLayout->addStretch( 1 ); - m_pTab = new QTabWidget( this ); + m_pTab = new TQTabWidget( this ); m_pTab->setMargin( KDialog::marginHint() ); pVLayout->addWidget( m_pTab ); // See if ~/.kde3/env/win-key.sh exists - QFile f( kde_winkeys_env_dir + "win-key.sh" ); + TQFile f( kde_winkeys_env_dir + "win-key.sh" ); if ( f.exists() == false ) { // No, it does not, so Win is a modifier m_bUseRmWinKeys = true; @@ -192,24 +192,24 @@ void ShortcutsModule::initGUI() m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false ); m_pkcGeneral->resize (m_pkcGeneral->sizeHint() ); if (system("xmodmap 1> /dev/null 2> /dev/null") == 0) { - m_useRmWinKeys = new QCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this ); + m_useRmWinKeys = new TQCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this ); m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() ); m_useRmWinKeys->setChecked( m_bUseRmWinKeys ); pVLayout->addWidget( m_useRmWinKeys, 1, 0 ); - connect( m_useRmWinKeys, SIGNAL(clicked()), SLOT(slotUseRmWinKeysClicked()) ); + connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) ); } m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") ); - connect( m_pkcGeneral, SIGNAL(keyChange()), SLOT(slotKeyChange()) ); + connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); m_pListSequence = new KAccelShortcutList( m_actionsSequence, true ); m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false ); m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") ); - connect( m_pkcSequence, SIGNAL(keyChange()), SLOT(slotKeyChange()) ); + connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); m_pListApplication = new KStdAccel::ShortcutList; m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false ); m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") ); - connect( m_pkcApplication, SIGNAL(keyChange()), SLOT(slotKeyChange()) ); + connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); kdDebug(125) << "G-----------" << endl; readSchemeNames(); @@ -225,7 +225,7 @@ void ShortcutsModule::createActionsGeneral() KAccelActions& actions = m_actionsGeneral; for( uint i = 0; i < actions.count(); i++ ) { - QString sConfigKey = actions[i].name(); + TQString sConfigKey = actions[i].name(); //kdDebug(125) << "sConfigKey: " << sConfigKey << endl; int iLastSpace = sConfigKey.findRev( ' ' ); bool bIsNum = false; @@ -236,7 +236,7 @@ void ShortcutsModule::createActionsGeneral() // << " bIsNum: " << bIsNum << endl; if( bIsNum && !sConfigKey.contains( ':' ) ) { actions[i].setConfigurable( false ); - actions[i].setName( QString::null ); + actions[i].setName( TQString::null ); } } } @@ -246,7 +246,7 @@ void ShortcutsModule::createActionsSequence() KAccelActions& actions = m_actionsSequence; for( uint i = 0; i < actions.count(); i++ ) { - QString sConfigKey = actions[i].name(); + TQString sConfigKey = actions[i].name(); //kdDebug(125) << "sConfigKey: " << sConfigKey << endl; int iLastSpace = sConfigKey.findRev( ' ' ); bool bIsNum = false; @@ -257,14 +257,14 @@ void ShortcutsModule::createActionsSequence() // << " bIsNum: " << bIsNum << endl; if( !bIsNum && !sConfigKey.contains( ':' ) ) { actions[i].setConfigurable( false ); - actions[i].setName( QString::null ); + actions[i].setName( TQString::null ); } } } void ShortcutsModule::readSchemeNames() { - QStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc"); + TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc"); m_pcbSchemes->clear(); m_rgsSchemeFiles.clear(); @@ -274,7 +274,7 @@ void ShortcutsModule::readSchemeNames() m_rgsSchemeFiles.append( "cur" ); // This for system files - for ( QStringList::ConstIterator it = schemes.begin(); it != schemes.end(); ++it) { + for ( TQStringList::ConstIterator it = schemes.begin(); it != schemes.end(); ++it) { // KPersonalizer relies on .kksrc files containing all the keyboard shortcut // schemes for various setups. It also requires the KDE defaults to be in // a .kksrc file. The KDE defaults shouldn't be listed here. @@ -283,14 +283,14 @@ void ShortcutsModule::readSchemeNames() KSimpleConfig config( *it, true ); config.setGroup( "Settings" ); - QString str = config.readEntry( "Name" ); + TQString str = config.readEntry( "Name" ); m_pcbSchemes->insertItem( str ); m_rgsSchemeFiles.append( *it ); } } -void ShortcutsModule::resizeEvent( QResizeEvent * ) +void ShortcutsModule::resizeEvent( TQResizeEvent * ) { //m_pTab->setGeometry(0,0,width(),height()); } @@ -315,7 +315,7 @@ void ShortcutsModule::slotSelectScheme( int ) { i18n("Your current changes will be lost if you load another scheme before saving this one."); kdDebug(125) << "ShortcutsModule::slotSelectScheme( " << m_pcbSchemes->currentItem() << " )" << endl; - QString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ]; + TQString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ]; if( sFilename == "cur" ) { // TODO: remove nulls params @@ -353,7 +353,7 @@ void ShortcutsModule::slotSelectScheme( int ) void ShortcutsModule::slotSaveSchemeAs() { - QString sName, sFile; + TQString sName, sFile; bool bNameValid, ok; int iScheme = -1; @@ -382,7 +382,7 @@ void ShortcutsModule::slotSaveSchemeAs() sFile.remove( ind, 1 ); // Make the next letter upper case - QString s = sFile.mid( ind, 1 ); + TQString s = sFile.mid( ind, 1 ); s = s.upper(); sFile.replace( ind, 1, s ); } @@ -404,11 +404,11 @@ void ShortcutsModule::slotSaveSchemeAs() return; } while( !bNameValid ); - disconnect( m_pcbSchemes, SIGNAL(activated(int)), this, SLOT(slotSelectScheme(int)) ); + disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) ); - QString kksPath = KGlobal::dirs()->saveLocation( "data", "kcmkeys/" ); + TQString kksPath = KGlobal::dirs()->saveLocation( "data", "kcmkeys/" ); - QDir dir( kksPath ); + TQDir dir( kksPath ); if( !dir.exists() && !dir.mkdir( kksPath ) ) { qWarning("KShortcutsModule: Could not make directory to store user info."); return; @@ -434,13 +434,13 @@ void ShortcutsModule::slotSaveSchemeAs() saveScheme(); - connect( m_pcbSchemes, SIGNAL(activated(int)), SLOT(slotSelectScheme(int)) ); + connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); slotSelectScheme(); } void ShortcutsModule::saveScheme() { - QString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ]; + TQString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ]; KSimpleConfig config( sFilename ); m_pkcGeneral->commitChanges(); @@ -458,16 +458,16 @@ void ShortcutsModule::slotRemoveScheme() void ShortcutsModule::slotUseRmWinKeysClicked() { - QString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/"; + TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/"; // See if ~/.kde3/env/win-key.sh exists - QFile f( kde_winkeys_env_dir + "win-key.sh" ); + TQFile f( kde_winkeys_env_dir + "win-key.sh" ); if ( f.exists() == false ) { // No, it does not, so Win is currently a modifier if (m_useRmWinKeys->isChecked() == false) { // Create the file if ( f.open( IO_WriteOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << "xmodmap -e 'keycode 133=Menu'" << "\n"; stream << "xmodmap -e 'keycode 134=Menu'" << "\n"; f.close(); diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h index e51d8cb7a..d45034c9d 100644 --- a/kcontrol/keys/shortcuts.h +++ b/kcontrol/keys/shortcuts.h @@ -24,11 +24,11 @@ #ifndef __SHORTCUTS_MODULE_H #define __SHORTCUTS_MODULE_H -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qtabwidget.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqtabwidget.h> #include "kaccelaction.h" #include <kcombobox.h> #include <kkeydialog.h> @@ -37,13 +37,13 @@ class ShortcutsModule : public QWidget { Q_OBJECT public: - ShortcutsModule( QWidget *parent = 0, const char *name = 0 ); + ShortcutsModule( TQWidget *parent = 0, const char *name = 0 ); ~ShortcutsModule(); void load(); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; protected: void initGUI(); @@ -51,7 +51,7 @@ class ShortcutsModule : public QWidget void createActionsSequence(); void readSchemeNames(); void saveScheme(); - void resizeEvent(QResizeEvent *e); + void resizeEvent(TQResizeEvent *e); signals: void changed( bool ); @@ -65,16 +65,16 @@ class ShortcutsModule : public QWidget void slotUseRmWinKeysClicked(); private: - QTabWidget* m_pTab; - QRadioButton *m_prbPre, *m_prbNew; + TQTabWidget* m_pTab; + TQRadioButton *m_prbPre, *m_prbNew; KComboBox* m_pcbSchemes; - QPushButton* m_pbtnSave, * m_pbtnRemove; + TQPushButton* m_pbtnSave, * m_pbtnRemove; int m_nSysSchemes; - QStringList m_rgsSchemeFiles; + TQStringList m_rgsSchemeFiles; KAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication; KShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication; KKeyChooser* m_pkcGeneral, * m_pkcSequence, * m_pkcApplication; - QCheckBox* m_useRmWinKeys; + TQCheckBox* m_useRmWinKeys; bool m_bUseRmWinKeys; }; diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 0c2056766..58de8a1f5 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -20,10 +20,10 @@ #include <unistd.h> -#include <qdir.h> -#include <qimage.h> -#include <qstringlist.h> -#include <qcursor.h> +#include <tqdir.h> +#include <tqimage.h> +#include <tqstringlist.h> +#include <tqcursor.h> #include <kstandarddirs.h> #include <klocale.h> @@ -34,25 +34,25 @@ #include "treeview.moc" #include "khotkeys.h" -AppTreeItem::AppTreeItem(QListViewItem *parent, const QString& storageId) +AppTreeItem::AppTreeItem(TQListViewItem *parent, const TQString& storageId) : KListViewItem(parent), m_init(false), m_storageId(storageId) {} -AppTreeItem::AppTreeItem(QListViewItem *parent, QListViewItem *after, const QString& storageId) +AppTreeItem::AppTreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& storageId) : KListViewItem(parent, after), m_init(false), m_storageId(storageId) {} -AppTreeItem::AppTreeItem(QListView *parent, const QString& storageId) +AppTreeItem::AppTreeItem(TQListView *parent, const TQString& storageId) : KListViewItem(parent), m_init(false), m_storageId(storageId) {} -AppTreeItem::AppTreeItem(QListView *parent, QListViewItem *after, const QString& storageId) +AppTreeItem::AppTreeItem(TQListView *parent, TQListViewItem *after, const TQString& storageId) : KListViewItem(parent, after), m_init(false), m_storageId(storageId) {} -void AppTreeItem::setName(const QString &name) +void AppTreeItem::setName(const TQString &name) { m_name = name; setText(0, m_name); } -void AppTreeItem::setAccel(const QString &accel) +void AppTreeItem::setAccel(const TQString &accel) { m_accel = accel; int temp = accel.find(';'); @@ -64,7 +64,7 @@ void AppTreeItem::setAccel(const QString &accel) else { setText(1, m_accel); - setText(2, QString::null); + setText(2, TQString::null); } } @@ -76,16 +76,16 @@ void AppTreeItem::setOpen(bool o) AppTreeView *tv = static_cast<AppTreeView *>(listView()); tv->fillBranch(m_directoryPath, this); } - QListViewItem::setOpen(o); + TQListViewItem::setOpen(o); } -static QPixmap appIcon(const QString &iconName) +static TQPixmap appIcon(const TQString &iconName) { - QPixmap normal = SmallIcon( iconName ); + TQPixmap normal = SmallIcon( iconName ); // make sure they are not larger than 20x20 if (normal.width() > 20 || normal.height() > 20) { - QImage tmp = normal.convertToImage(); + TQImage tmp = normal.convertToImage(); tmp = tmp.smoothScale(20, 20); normal.convertFromImage(tmp); } @@ -93,10 +93,10 @@ static QPixmap appIcon(const QString &iconName) } -AppTreeView::AppTreeView( QWidget *parent, const char *name ) +AppTreeView::AppTreeView( TQWidget *parent, const char *name ) : KListView(parent, name) { - setFrameStyle(QFrame::WinPanel | QFrame::Sunken); + setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAllColumnsShowFocus(true); setRootIsDecorated(true); setSorting(-1); @@ -109,11 +109,11 @@ AppTreeView::AppTreeView( QWidget *parent, const char *name ) addColumn(i18n("Shortcut")); addColumn(i18n("Alternate")); - connect(this, SIGNAL(clicked( QListViewItem* )), - SLOT(itemSelected( QListViewItem* ))); + connect(this, TQT_SIGNAL(clicked( TQListViewItem* )), + TQT_SLOT(itemSelected( TQListViewItem* ))); - connect(this,SIGNAL(selectionChanged ( QListViewItem * )), - SLOT(itemSelected( QListViewItem* ))); + connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )), + TQT_SLOT(itemSelected( TQListViewItem* ))); } AppTreeView::~AppTreeView() @@ -122,16 +122,16 @@ AppTreeView::~AppTreeView() void AppTreeView::fill() { - QApplication::setOverrideCursor(Qt::WaitCursor); + TQApplication::setOverrideCursor(Qt::WaitCursor); clear(); - fillBranch(QString::null, 0); - QApplication::restoreOverrideCursor(); + fillBranch(TQString::null, 0); + TQApplication::restoreOverrideCursor(); } -void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent) +void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent) { // get rid of leading slash in the relative path - QString relPath = rPath; + TQString relPath = rPath; if(relPath[0] == '/') relPath = relPath.mid(1, relPath.length()); @@ -143,7 +143,7 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent) KServiceGroup::List list = root->entries(true); - QListViewItem *after = 0; + TQListViewItem *after = 0; for(KServiceGroup::List::ConstIterator it = list.begin(); it != list.end(); ++it) @@ -153,7 +153,7 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent) if (e->isType(KST_KServiceGroup)) { KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e)); - QString groupCaption = g->caption(); + TQString groupCaption = g->caption(); // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. @@ -161,9 +161,9 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent) AppTreeItem *item; if (parent == 0) - item = new AppTreeItem(this, after, QString::null); + item = new AppTreeItem(this, after, TQString::null); else - item = new AppTreeItem(parent, after, QString::null); + item = new AppTreeItem(parent, after, TQString::null); item->setName(groupCaption); item->setPixmap(0, appIcon(g->icon())); @@ -174,7 +174,7 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent) else if (e->isType(KST_KService)) { KService::Ptr s(static_cast<KService *>(e)); - QString serviceCaption = s->name(); + TQString serviceCaption = s->name(); // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. @@ -195,7 +195,7 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent) } } -void AppTreeView::itemSelected(QListViewItem *item) +void AppTreeView::itemSelected(TQListViewItem *item) { AppTreeItem *_item = static_cast<AppTreeItem*>(item); @@ -204,29 +204,29 @@ void AppTreeView::itemSelected(QListViewItem *item) emit entrySelected(_item->storageId(), _item->accel(), _item->isDirectory()); } -QStringList AppTreeView::fileList(const QString& rPath) +TQStringList AppTreeView::fileList(const TQString& rPath) { - QString relativePath = rPath; + TQString relativePath = rPath; // truncate "/.directory" int pos = relativePath.findRev("/.directory"); if (pos > 0) relativePath.truncate(pos); - QStringList filelist; + TQStringList filelist; // loop through all resource dirs and build a file list - QStringList resdirlist = KGlobal::dirs()->resourceDirs("apps"); - for (QStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it) + TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps"); + for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it) { - QDir dir((*it) + "/" + relativePath); + TQDir dir((*it) + "/" + relativePath); if(!dir.exists()) continue; - dir.setFilter(QDir::Files); + dir.setFilter(TQDir::Files); dir.setNameFilter("*.desktop;*.kdelnk"); // build a list of files - QStringList files = dir.entryList(); - for (QStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { + TQStringList files = dir.entryList(); + for (TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { // does not work?! //if (filelist.contains(*it)) continue; @@ -243,27 +243,27 @@ QStringList AppTreeView::fileList(const QString& rPath) return filelist; } -QStringList AppTreeView::dirList(const QString& rPath) +TQStringList AppTreeView::dirList(const TQString& rPath) { - QString relativePath = rPath; + TQString relativePath = rPath; // truncate "/.directory" int pos = relativePath.findRev("/.directory"); if (pos > 0) relativePath.truncate(pos); - QStringList dirlist; + TQStringList dirlist; // loop through all resource dirs and build a subdir list - QStringList resdirlist = KGlobal::dirs()->resourceDirs("apps"); - for (QStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it) + TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps"); + for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it) { - QDir dir((*it) + "/" + relativePath); + TQDir dir((*it) + "/" + relativePath); if(!dir.exists()) continue; - dir.setFilter(QDir::Dirs); + dir.setFilter(TQDir::Dirs); // build a list of subdirs - QStringList subdirs = dir.entryList(); - for (QStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) { + TQStringList subdirs = dir.entryList(); + for (TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) { if ((*it) == "." || (*it) == "..") continue; // does not work?! // if (dirlist.contains(*it)) continue; diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h index d376bc00d..b07384397 100644 --- a/kcontrol/keys/treeview.h +++ b/kcontrol/keys/treeview.h @@ -21,7 +21,7 @@ #ifndef __treeview_h__ #define __treeview_h__ -#include <qstring.h> +#include <tqstring.h> #include <klistview.h> class QPopupMenu; @@ -32,19 +32,19 @@ class AppTreeItem : public KListViewItem { public: - AppTreeItem(QListViewItem *parent, const QString& storageId); - AppTreeItem(QListViewItem *parent, QListViewItem *after, const QString& storageId); - AppTreeItem(QListView *parent, const QString& storageId); - AppTreeItem(QListView *parent, QListViewItem* after, const QString& storageId); + AppTreeItem(TQListViewItem *parent, const TQString& storageId); + AppTreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& storageId); + AppTreeItem(TQListView *parent, const TQString& storageId); + AppTreeItem(TQListView *parent, TQListViewItem* after, const TQString& storageId); - QString storageId() const { return m_storageId; } - void setDirectoryPath(const QString& path) { m_directoryPath = path; } + TQString storageId() const { return m_storageId; } + void setDirectoryPath(const TQString& path) { m_directoryPath = path; } - QString name() const { return m_name; } - void setName(const QString &name); + TQString name() const { return m_name; } + void setName(const TQString &name); - QString accel() const { return m_accel; } - void setAccel(const QString &accel); + TQString accel() const { return m_accel; } + void setAccel(const TQString &accel); bool isDirectory() const { return !m_directoryPath.isEmpty(); } @@ -52,10 +52,10 @@ public: private: bool m_init : 1; - QString m_storageId; - QString m_name; - QString m_directoryPath; - QString m_accel; + TQString m_storageId; + TQString m_name; + TQString m_directoryPath; + TQString m_accel; }; class AppTreeView : public KListView @@ -63,21 +63,21 @@ class AppTreeView : public KListView friend class AppTreeItem; Q_OBJECT public: - AppTreeView(QWidget *parent=0, const char *name=0); + AppTreeView(TQWidget *parent=0, const char *name=0); ~AppTreeView(); void fill(); signals: - void entrySelected(const QString&, const QString &, bool); + void entrySelected(const TQString&, const TQString &, bool); protected slots: - void itemSelected(QListViewItem *); + void itemSelected(TQListViewItem *); protected: - void fillBranch(const QString& relPath, AppTreeItem* parent); + void fillBranch(const TQString& relPath, AppTreeItem* parent); - QStringList fileList(const QString& relativePath); - QStringList dirList(const QString& relativePath); + TQStringList fileList(const TQString& relativePath); + TQStringList dirList(const TQString& relativePath); }; diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index 4a6b0b3ee..c525cd337 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -34,11 +34,11 @@ #include "KfiPrint.h" #include "FcEngine.h" #endif -#include <qlayout.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qsettings.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqsettings.h> #include <kaboutdata.h> #include <kgenericfactory.h> #include <kdiroperator.h> @@ -59,7 +59,7 @@ #include <kdirlister.h> #include <kpushbutton.h> #include <kguiitem.h> -#include <qsplitter.h> +#include <tqsplitter.h> #define CFG_GROUP "Main Settings" #define CFG_LISTVIEW "ListView" @@ -68,13 +68,13 @@ #define CFG_SHOW_BITMAP "ShowBitmap" #define CFG_FONT_SIZE "FontSize" -typedef KGenericFactory<KFI::CKCmFontInst, QWidget> FontInstallFactory; +typedef KGenericFactory<KFI::CKCmFontInst, TQWidget> FontInstallFactory; K_EXPORT_COMPONENT_FACTORY(kcm_fontinst, FontInstallFactory("kcmfontinst")) namespace KFI { -CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) +CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) : KCModule(parent, "kfontinst"), #ifdef HAVE_XFT itsPreview(NULL), @@ -97,25 +97,25 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) && KCmdLineArgs::parsedArgs()->isSet("embed")); - itsStatusLabel = new QLabel(this); - itsStatusLabel->setFrameShape(QFrame::Panel); - itsStatusLabel->setFrameShadow(QFrame::Sunken); + itsStatusLabel = new TQLabel(this); + itsStatusLabel->setFrameShape(TQFrame::Panel); + itsStatusLabel->setFrameShadow(TQFrame::Sunken); itsStatusLabel->setLineWidth(1); itsConfig.setGroup(CFG_GROUP); - QFrame *fontsFrame; + TQFrame *fontsFrame; #ifdef HAVE_XFT KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart"); if(factory) { - itsSplitter=new QSplitter(this); - fontsFrame=new QFrame(itsSplitter), + itsSplitter=new TQSplitter(this); + fontsFrame=new TQFrame(itsSplitter), itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart"); - itsSplitter->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); - QValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); + TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); if(2!=sizes.count()) { @@ -128,37 +128,37 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) else { #endif - fontsFrame=new QFrame(this); - fontsFrame->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + fontsFrame=new TQFrame(this); + fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifdef HAVE_XFT } #endif - QGridLayout *fontsLayout=new QGridLayout(fontsFrame, 1, 1, 0, 1); - QVBoxLayout *layout=new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1); + TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); KToolBar *toolbar=new KToolBar(this); bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false)); fontsFrame->setLineWidth(0); - toolbar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); + toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); toolbar->setMovingEnabled(false); - QString previousPath=itsConfig.readEntry(CFG_PATH); + TQString previousPath=itsConfig.readEntry(CFG_PATH); - itsDirOp = new KDirOperator(Misc::root() ? QString("fonts:/") : QString("fonts:/")+i18n(KFI_KIO_FONTS_USER), + itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER), fontsFrame); itsDirOp->setViewConfig(&itsConfig, "ListView Settings"); - itsDirOp->setMinimumSize(QSize(96, 64)); + itsDirOp->setMinimumSize(TQSize(96, 64)); setMimeTypes(showBitmap); itsDirOp->dirLister()->setMainWindow(this); - itsDirOp->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1); KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame); - connect(button, SIGNAL(clicked()), SLOT(addFonts())); - button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); + button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); - fontsLayout->addItem(new QSpacerItem(4, 4, QSizePolicy::Expanding, QSizePolicy::Minimum)); + fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); layout->addWidget(toolbar); #ifdef HAVE_XFT @@ -181,15 +181,15 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) itsViewMenuAct=dynamic_cast<KActionMenu *>(itsDirOp->actionCollection()->action("view menu")); topMnu->popupMenu()->clear(); - connect(topMnu->popupMenu(), SIGNAL(aboutToShow()), SLOT(setupMenu())); + connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu())); if((act=itsDirOp->actionCollection()->action("up"))) - act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(cdUp())); + act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(cdUp())); if((act=itsDirOp->actionCollection()->action("home"))) - act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(home())); + act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(home())); if((act=itsDirOp->actionCollection()->action("back"))) - act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(back())); + act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(back())); if((act=itsDirOp->actionCollection()->action("forward"))) - act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(forward())); + act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(forward())); if((act=itsDirOp->actionCollection()->action("reload"))) act->plug(toolbar); @@ -198,26 +198,26 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) if((itsIconAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("short view")))) { - disconnect(itsIconAct, SIGNAL(activated()), itsDirOp, SLOT(slotSimpleView())); - connect(itsIconAct, SIGNAL(activated()), SLOT(iconView())); + disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView())); + connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView())); itsIconAct->plug(toolbar); } if((itsListAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("detailed view")))) { - disconnect(itsListAct, SIGNAL(activated()), itsDirOp, SLOT(slotDetailedView())); - connect(itsListAct, SIGNAL(activated()), SLOT(listView())); + disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView())); + connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView())); itsListAct->plug(toolbar); } - itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, this, SLOT(filterFonts()), + itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, this, TQT_SLOT(filterFonts()), itsDirOp->actionCollection(), "showbitmap"); itsShowBitmapAct->setChecked(showBitmap); itsShowBitmapAct->plug(toolbar); toolbar->insertLineSeparator(); - act=new KAction(i18n("Add Fonts..."), "newfont", 0, this, SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); + act=new KAction(i18n("Add Fonts..."), "newfont", 0, this, TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); act->plug(toolbar); topMnu->insert(act); @@ -226,24 +226,24 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) itsDeleteAct->plug(toolbar); itsDeleteAct->setEnabled(false); topMnu->insert(itsDeleteAct); - disconnect(itsDeleteAct, SIGNAL(activated()), itsDirOp, SLOT(deleteSelected())); - connect(itsDeleteAct, SIGNAL(activated()), this, SLOT(removeFonts())); + disconnect(itsDeleteAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(deleteSelected())); + connect(itsDeleteAct, TQT_SIGNAL(activated()), this, TQT_SLOT(removeFonts())); } toolbar->insertLineSeparator(); - act=new KAction(i18n("Configure..."), "configure", 0, this, SLOT(configure()), itsDirOp->actionCollection(), "configure"); + act=new KAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); act->plug(toolbar); #ifdef HAVE_XFT toolbar->insertLineSeparator(); - act=new KAction(i18n("Print..."), "fileprint", 0, this, SLOT(print()), itsDirOp->actionCollection(), "print"); + act=new KAction(i18n("Print..."), "fileprint", 0, this, TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); act->plug(toolbar); #endif if( (itsSepDirsAct=itsDirOp->actionCollection()->action("separate dirs")) && (itsShowHiddenAct=itsDirOp->actionCollection()->action("show hidden"))) { - //disconnect(itsViewMenuAct->popupMenu(), SIGNAL(aboutToShow()), itsDirOp, SLOT(insertViewDependentActions())); - connect(itsViewMenuAct->popupMenu(), SIGNAL(aboutToShow()), SLOT(setupViewMenu())); + //disconnect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), itsDirOp, TQT_SLOT(insertViewDependentActions())); + connect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupViewMenu())); setupViewMenu(); } @@ -266,12 +266,12 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) itsDirOp->dirLister()->setShowingDotFiles(true); - connect(itsDirOp, SIGNAL(fileHighlighted(const KFileItem *)), SLOT(fileHighlighted(const KFileItem *))); - connect(itsDirOp, SIGNAL(finishedLoading()), SLOT(loadingFinished())); - connect(itsDirOp, SIGNAL(dropped(const KFileItem *, QDropEvent *, const KURL::List &)), - SLOT(dropped(const KFileItem *, QDropEvent *, const KURL::List &))); - connect(itsDirOp->dirLister(), SIGNAL(infoMessage(const QString &)), SLOT(infoMessage(const QString &))); - connect(itsDirOp, SIGNAL(updateInformation(int, int)), SLOT(updateInformation(int, int))); + connect(itsDirOp, TQT_SIGNAL(fileHighlighted(const KFileItem *)), TQT_SLOT(fileHighlighted(const KFileItem *))); + connect(itsDirOp, TQT_SIGNAL(finishedLoading()), TQT_SLOT(loadingFinished())); + connect(itsDirOp, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)), + TQT_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &))); + connect(itsDirOp->dirLister(), TQT_SIGNAL(infoMessage(const TQString &)), TQT_SLOT(infoMessage(const TQString &))); + connect(itsDirOp, TQT_SIGNAL(updateInformation(int, int)), TQT_SLOT(updateInformation(int, int))); } CKCmFontInst::~CKCmFontInst() @@ -288,7 +288,7 @@ CKCmFontInst::~CKCmFontInst() void CKCmFontInst::setMimeTypes(bool showBitmap) { - QStringList mimeTypes; + TQStringList mimeTypes; mimeTypes << "application/x-font-ttf" << "application/x-font-otf" @@ -311,7 +311,7 @@ void CKCmFontInst::filterFonts() itsConfig.sync(); } -QString CKCmFontInst::quickHelp() const +TQString CKCmFontInst::quickHelp() const { return Misc::root() ? i18n("<h1>Font Installer</h1><p> This module allows you to" @@ -398,13 +398,13 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item) void CKCmFontInst::loadingFinished() { - QListView *lView=dynamic_cast<QListView *>(itsDirOp->view()); + TQListView *lView=dynamic_cast<TQListView *>(itsDirOp->view()); if(lView) lView->sort(); else { - QIconView *iView=dynamic_cast<QIconView *>(itsDirOp->view()); + TQIconView *iView=dynamic_cast<TQIconView *>(itsDirOp->view()); if(iView) iView->sort(); @@ -414,7 +414,7 @@ void CKCmFontInst::loadingFinished() void CKCmFontInst::addFonts() { - KURL::List list=KFileDialog::getOpenURLs(QString::null, "application/x-font-ttf application/x-font-otf " + KURL::List list=KFileDialog::getOpenURLs(TQString::null, "application/x-font-ttf application/x-font-otf " "application/x-font-ttc application/x-font-type1 " "application/x-font-pcf application/x-font-bdf", //"application/x-font-snf application/x-font-speedo", @@ -431,7 +431,7 @@ void CKCmFontInst::removeFonts() else { KURL::List urls; - QStringList files; + TQStringList files; KFileItemListIterator it(*(itsDirOp->selectedItems())); for(; it.current(); ++it) @@ -464,7 +464,7 @@ void CKCmFontInst::removeFonts() if(doIt) { KIO::DeleteJob *job = KIO::del(urls, false, true); - connect(job, SIGNAL(result(KIO::Job *)), this, SLOT(delResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(delResult(KIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } @@ -508,8 +508,8 @@ void CKCmFontInst::print() { static const int constSizes[]={0, 12, 18, 24, 36, 48}; - QStringList items; - QValueVector<int> sizes; + TQStringList items; + TQValueVector<int> sizes; CFcEngine engine; if(dlg.outputAll()) @@ -537,18 +537,18 @@ void CKCmFontInst::print() #endif } -void CKCmFontInst::dropped(const KFileItem *i, QDropEvent *, const KURL::List &urls) +void CKCmFontInst::dropped(const KFileItem *i, TQDropEvent *, const KURL::List &urls) { if(urls.count()) addFonts(urls, i && i->isDir() ? i->url() : itsDirOp->url()); } -void CKCmFontInst::infoMessage(const QString &msg) +void CKCmFontInst::infoMessage(const TQString &msg) { itsStatusLabel->setText(msg); } -static QString family(const QString &name) +static TQString family(const TQString &name) { int commaPos=name.find(','); @@ -558,8 +558,8 @@ static QString family(const QString &name) void CKCmFontInst::updateInformation(int, int fonts) { KIO::filesize_t size=0; - QString text(i18n("One Font", "%n Fonts", fonts)); - QStringList families; + TQString text(i18n("One Font", "%n Fonts", fonts)); + TQStringList families; if(fonts>0) { @@ -567,7 +567,7 @@ void CKCmFontInst::updateInformation(int, int fonts) for (item=itsDirOp->view()->firstFileItem(); item; item=itsDirOp->view()->nextItem(item)) { - QString fam(family(item->text())); + TQString fam(family(item->text())); size+=item->size(); if(-1==families.findIndex(fam)) @@ -590,8 +590,8 @@ void CKCmFontInst::delResult(KIO::Job *job) // // To speed up font deletion, we dont rescan font list each time - so after this has completed, we need // to refresh font list before updating the directory listing... - QByteArray packedArgs; - QDataStream stream(packedArgs, IO_WriteOnly); + TQByteArray packedArgs; + TQDataStream stream(packedArgs, IO_WriteOnly); stream << KFI::SPECIAL_RESCAN; @@ -636,7 +636,7 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest) } KIO::CopyJob *job=KIO::copy(copy, dest, true); - connect(job, SIGNAL(result(KIO::Job *)), this, SLOT(jobResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(jobResult(KIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index add6c4c36..bbb072a2a 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -33,7 +33,7 @@ #include "config.h" #endif -#include <qstringlist.h> +#include <tqstringlist.h> #include <kcmodule.h> #include <kurl.h> #include <kconfig.h> @@ -62,7 +62,7 @@ class CKCmFontInst : public KCModule public: - CKCmFontInst(QWidget *parent=NULL, const char *name=NULL, const QStringList &list=QStringList()); + CKCmFontInst(TQWidget *parent=NULL, const char *name=NULL, const TQStringList &list=TQStringList()); virtual ~CKCmFontInst(); void setMimeTypes(bool showBitmap); @@ -70,7 +70,7 @@ class CKCmFontInst : public KCModule public slots: void filterFonts(); - QString quickHelp() const; + TQString quickHelp() const; void listView(); void iconView(); void setupMenu(); @@ -81,8 +81,8 @@ class CKCmFontInst : public KCModule void removeFonts(); void configure(); void print(); - void dropped(const KFileItem *i, QDropEvent *e, const KURL::List &urls); - void infoMessage(const QString &msg); + void dropped(const KFileItem *i, TQDropEvent *e, const KURL::List &urls); + void infoMessage(const TQString &msg); void updateInformation(int dirs, int fonts); void delResult(KIO::Job *job); void jobResult(KIO::Job *job); @@ -105,10 +105,10 @@ class CKCmFontInst : public KCModule #ifdef HAVE_XFT KParts::ReadOnlyPart *itsPreview; #endif - QSplitter *itsSplitter; + TQSplitter *itsSplitter; KConfig itsConfig; bool itsEmbeddedAdmin; - QLabel *itsStatusLabel; + TQLabel *itsStatusLabel; }; } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp index d814d0c6b..241ac88bf 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp @@ -26,7 +26,7 @@ // (C) Craig Drummond, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include <qevent.h> +#include <tqevent.h> #include <kfileitem.h> #include <kurldrag.h> #include "KFileFontIconView.h" @@ -35,7 +35,7 @@ namespace KFI { // CPD: KDE4 should make acceptDrag() virtual there fore can get rid of all these ::contentsX functions... -void CKFileFontIconView::contentsDragEnterEvent(QDragEnterEvent *e) +void CKFileFontIconView::contentsDragEnterEvent(TQDragEnterEvent *e) { if(acceptDrag(e)) KFileIconView::contentsDragEnterEvent(e); @@ -43,7 +43,7 @@ void CKFileFontIconView::contentsDragEnterEvent(QDragEnterEvent *e) e->ignore(); } -void CKFileFontIconView::contentsDragMoveEvent(QDragMoveEvent *e) +void CKFileFontIconView::contentsDragMoveEvent(TQDragMoveEvent *e) { if(acceptDrag(e)) KFileIconView::contentsDragMoveEvent(e); @@ -51,7 +51,7 @@ void CKFileFontIconView::contentsDragMoveEvent(QDragMoveEvent *e) e->ignore(); } -void CKFileFontIconView::contentsDropEvent(QDropEvent *e) +void CKFileFontIconView::contentsDropEvent(TQDropEvent *e) { contentsDragLeaveEvent(NULL); @@ -61,28 +61,28 @@ void CKFileFontIconView::contentsDropEvent(QDropEvent *e) e->ignore(); } -bool CKFileFontIconView::acceptDrag(QDropEvent *e) const +bool CKFileFontIconView::acceptDrag(TQDropEvent *e) const { #if 0 // Crashes - seems to be called to quick??? bool ok=false; KURL::List urls; if(KURLDrag::canDecode(e) && (e->source()!=const_cast<CKFileFontIconView *>(this)) && - (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()) && + (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()) && KURLDrag::decode(e, urls) && !urls.isEmpty()) { KURL::List::Iterator it; ok=true; for(it=urls.begin(); ok && it!=urls.end(); ++it) - if(!CFontEngine::isAFontOrAfm(QFile::encodeName((*it).path()))) + if(!CFontEngine::isAFontOrAfm(TQFile::encodeName((*it).path()))) ok=false; } return ok; #endif return KURLDrag::canDecode(e) && (e->source()!= const_cast<CKFileFontIconView*>(this)) && - (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()); + (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()); } } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h index 936bb5bca..bb5ccfa5a 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h @@ -38,16 +38,16 @@ class CKFileFontIconView : public KFileIconView { public: - CKFileFontIconView(QWidget *parent, const char *name) : KFileIconView(parent, name) {} + CKFileFontIconView(TQWidget *parent, const char *name) : KFileIconView(parent, name) {} virtual ~CKFileFontIconView() {} protected: // DND support - void contentsDragEnterEvent(QDragEnterEvent *e); - void contentsDragMoveEvent(QDragMoveEvent *e); - void contentsDropEvent(QDropEvent *e); - bool acceptDrag(QDropEvent *e) const; + void contentsDragEnterEvent(TQDragEnterEvent *e); + void contentsDragMoveEvent(TQDragMoveEvent *e); + void contentsDropEvent(TQDropEvent *e); + bool acceptDrag(TQDropEvent *e) const; }; } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index 7346ca6c8..1ba7822ec 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -33,11 +33,11 @@ // 2000, 2001 Carsten Pfeiffer <pfeiffer@kde.org> // -#include <qevent.h> -#include <qkeycode.h> -#include <qheader.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqevent.h> +#include <tqkeycode.h> +#include <tqheader.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include <kapplication.h> #include <kfileitem.h> #include <kglobal.h> @@ -60,10 +60,10 @@ class CKFileFontView::CKFileFontViewPrivate CKFileFontViewPrivate() : itsDropItem(0) {} CFontListViewItem *itsDropItem; - QTimer itsAutoOpenTimer; + TQTimer itsAutoOpenTimer; }; -CKFileFontView::CKFileFontView(QWidget *parent, const char *name) +CKFileFontView::CKFileFontView(TQWidget *parent, const char *name) : KListView(parent, name), KFileView(), d(new CKFileFontViewPrivate()) @@ -79,15 +79,15 @@ CKFileFontView::CKFileFontView(QWidget *parent, const char *name) setAllColumnsShowFocus(true); setDragEnabled(false); - connect(header(), SIGNAL(sectionClicked(int)), SLOT(slotSortingChanged(int))); - connect(this, SIGNAL(returnPressed(QListViewItem *)), SLOT(slotActivate(QListViewItem *))); - connect(this, SIGNAL(clicked(QListViewItem *, const QPoint&, int)), SLOT(selected( QListViewItem *))); - connect(this, SIGNAL(doubleClicked(QListViewItem *, const QPoint &, int)), SLOT(slotActivate(QListViewItem *))); - connect(this, SIGNAL(contextMenuRequested(QListViewItem *, const QPoint &, int)), - this, SLOT(slotActivateMenu(QListViewItem *, const QPoint &))); + connect(header(), TQT_SIGNAL(sectionClicked(int)), TQT_SLOT(slotSortingChanged(int))); + connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(selected( TQListViewItem *))); + connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQT_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &))); // DND - connect(&(d->itsAutoOpenTimer), SIGNAL(timeout()), this, SLOT(slotAutoOpen())); + connect(&(d->itsAutoOpenTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoOpen())); setSelectionMode(KFileView::selectionMode()); itsResolver = new KMimeTypeResolver<CFontListViewItem, CKFileFontView>(this); } @@ -144,7 +144,7 @@ void CKFileFontView::invertSelection() KListView::invertSelection(); } -void CKFileFontView::slotActivateMenu(QListViewItem *item,const QPoint& pos) +void CKFileFontView::slotActivateMenu(TQListViewItem *item,const TQPoint& pos) { if (!item) sig->activateMenu(0, pos); @@ -165,7 +165,7 @@ void CKFileFontView::insertItem(KFileItem *i) { KFileView::insertItem(i); - CFontListViewItem *item = new CFontListViewItem((QListView*) this, i); + CFontListViewItem *item = new CFontListViewItem((TQListView*) this, i); setSortingKey(item, i); @@ -175,7 +175,7 @@ void CKFileFontView::insertItem(KFileItem *i) itsResolver->m_lstPendingMimeIconItems.append(item); } -void CKFileFontView::slotActivate(QListViewItem *item) +void CKFileFontView::slotActivate(TQListViewItem *item) { if (item) { @@ -186,7 +186,7 @@ void CKFileFontView::slotActivate(QListViewItem *item) } } -void CKFileFontView::selected(QListViewItem *item) +void CKFileFontView::selected(TQListViewItem *item) { if (item && !(KApplication::keyboardMouseState() & (ShiftButton|ControlButton)) && KGlobalSettings::singleClick()) @@ -198,7 +198,7 @@ void CKFileFontView::selected(QListViewItem *item) } } -void CKFileFontView::highlighted( QListViewItem *item ) +void CKFileFontView::highlighted( TQListViewItem *item ) { if (item) { @@ -211,31 +211,31 @@ void CKFileFontView::highlighted( QListViewItem *item ) void CKFileFontView::setSelectionMode(KFile::SelectionMode sm) { - disconnect(SIGNAL(selectionChanged()), this); - disconnect(SIGNAL(selectionChanged(QListViewItem *)), this); + disconnect(TQT_SIGNAL(selectionChanged()), this); + disconnect(TQT_SIGNAL(selectionChanged(TQListViewItem *)), this); switch (sm) { case KFile::Multi: - QListView::setSelectionMode(QListView::Multi); + TQListView::setSelectionMode(TQListView::Multi); break; case KFile::Extended: - QListView::setSelectionMode(QListView::Extended); + TQListView::setSelectionMode(TQListView::Extended); break; case KFile::NoSelection: - QListView::setSelectionMode(QListView::NoSelection); + TQListView::setSelectionMode(TQListView::NoSelection); break; default: // fall through case KFile::Single: - QListView::setSelectionMode(QListView::Single); + TQListView::setSelectionMode(TQListView::Single); break; } // for highlighting if (KFile::Multi==sm || KFile::Extended==sm) - connect(this, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); else - connect(this, SIGNAL(selectionChanged(QListViewItem *)), SLOT(highlighted(QListViewItem * ))); + connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(highlighted(TQListViewItem * ))); } bool CKFileFontView::isSelected(const KFileItem *i) const @@ -254,7 +254,7 @@ void CKFileFontView::updateView(bool b) { if (b) { - QListViewItemIterator it((QListView*)this); + TQListViewItemIterator it((TQListView*)this); for (; it.current(); ++it) { @@ -281,9 +281,9 @@ void CKFileFontView::updateView(const KFileItem *i) void CKFileFontView::setSortingKey(CFontListViewItem *item, const KFileItem *i) { - QDir::SortSpec spec = KFileView::sorting(); + TQDir::SortSpec spec = KFileView::sorting(); - if (spec&QDir::Size) + if (spec&TQDir::Size) item->setKey(sortingKey(i->size(), i->isDir(), spec)); else item->setKey(sortingKey(i->text(), i->isDir(), spec)); @@ -304,44 +304,44 @@ void CKFileFontView::removeItem(const KFileItem *i) void CKFileFontView::slotSortingChanged(int col) { - QDir::SortSpec sort = sorting(); + TQDir::SortSpec sort = sorting(); int sortSpec = -1; - bool reversed = col == itsSortingCol && (sort & QDir::Reversed) == 0; + bool reversed = col == itsSortingCol && (sort & TQDir::Reversed) == 0; itsSortingCol = col; switch(col) { case COL_NAME: - sortSpec = (sort & ~QDir::SortByMask | QDir::Name); + sortSpec = (sort & ~TQDir::SortByMask | TQDir::Name); break; case COL_SIZE: - sortSpec = (sort & ~QDir::SortByMask | QDir::Size); + sortSpec = (sort & ~TQDir::SortByMask | TQDir::Size); break; - // the following columns have no equivalent in QDir, so we set it - // to QDir::Unsorted and remember the column (itsSortingCol) + // the following columns have no equivalent in TQDir, so we set it + // to TQDir::Unsorted and remember the column (itsSortingCol) case COL_TYPE: - sortSpec = (sort & ~QDir::SortByMask | QDir::Time); + sortSpec = (sort & ~TQDir::SortByMask | TQDir::Time); break; default: break; } if (reversed) - sortSpec|=QDir::Reversed; + sortSpec|=TQDir::Reversed; else - sortSpec&=~QDir::Reversed; + sortSpec&=~TQDir::Reversed; - if (sort & QDir::IgnoreCase) - sortSpec|=QDir::IgnoreCase; + if (sort & TQDir::IgnoreCase) + sortSpec|=TQDir::IgnoreCase; else - sortSpec&=~QDir::IgnoreCase; + sortSpec&=~TQDir::IgnoreCase; - KFileView::setSorting(static_cast<QDir::SortSpec>(sortSpec)); + KFileView::setSorting(static_cast<TQDir::SortSpec>(sortSpec)); KFileItem *item; KFileItemListIterator it(*items()); - if ( sortSpec & QDir::Size ) + if ( sortSpec & TQDir::Size ) { for (; (item = it.current()); ++it ) { @@ -361,23 +361,23 @@ void CKFileFontView::slotSortingChanged(int col) KListView::sort(); if (!itsBlockSortingSignal) - sig->changeSorting( static_cast<QDir::SortSpec>( sortSpec ) ); + sig->changeSorting( static_cast<TQDir::SortSpec>( sortSpec ) ); } -void CKFileFontView::setSorting(QDir::SortSpec spec) +void CKFileFontView::setSorting(TQDir::SortSpec spec) { - if (spec & QDir::Size) + if (spec & TQDir::Size) itsSortingCol=COL_SIZE; else itsSortingCol=COL_NAME; // inversed, because slotSortingChanged will reverse it - if (spec & QDir::Reversed) - spec = (QDir::SortSpec) (spec & ~QDir::Reversed); + if (spec & TQDir::Reversed) + spec = (TQDir::SortSpec) (spec & ~TQDir::Reversed); else - spec = (QDir::SortSpec) (spec | QDir::Reversed); + spec = (TQDir::SortSpec) (spec | TQDir::Reversed); - KFileView::setSorting((QDir::SortSpec) spec); + KFileView::setSorting((TQDir::SortSpec) spec); // don't emit sortingChanged() when called via setSorting() itsBlockSortingSignal = true; // can't use blockSignals() @@ -433,7 +433,7 @@ KFileItem * CKFileFontView::prevItem(const KFileItem *fileItem) const return firstFileItem(); } -void CKFileFontView::keyPressEvent(QKeyEvent *e) +void CKFileFontView::keyPressEvent(TQKeyEvent *e) { KListView::keyPressEvent(e); @@ -463,13 +463,13 @@ void CKFileFontView::listingCompleted() itsResolver->start(); } -QDragObject *CKFileFontView::dragObject() +TQDragObject *CKFileFontView::dragObject() { // create a list of the URL:s that we want to drag KURL::List urls; KFileItemListIterator it(* KFileView::selectedItems()); - QPixmap pixmap; - QPoint hotspot; + TQPixmap pixmap; + TQPoint hotspot; for ( ; it.current(); ++it ) urls.append( (*it)->url() ); @@ -482,7 +482,7 @@ QDragObject *CKFileFontView::dragObject() hotspot.setX(pixmap.width() / 2); hotspot.setY(pixmap.height() / 2); - QDragObject *dragObject=new KURLDrag(urls, widget()); + TQDragObject *dragObject=new KURLDrag(urls, widget()); if(dragObject) dragObject->setPixmap(pixmap, hotspot); @@ -503,7 +503,7 @@ void CKFileFontView::slotAutoOpen() } } -bool CKFileFontView::acceptDrag(QDropEvent *e) const +bool CKFileFontView::acceptDrag(TQDropEvent *e) const { #if 0 // Following doesn't seem to work, why??? bool ok=false; @@ -511,14 +511,14 @@ bool CKFileFontView::acceptDrag(QDropEvent *e) const if((e->source()!=const_cast<CKFileFontView *>(this)) && - (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()) && + (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()) && KURLDrag::decode(e, urls) && !urls.isEmpty()) { KURL::List::Iterator it; ok=true; for(it=urls.begin(); ok && it!=urls.end(); ++it) - if(!CFontEngine::isAFontOrAfm(QFile::encodeName((*it).path()))) + if(!CFontEngine::isAFontOrAfm(TQFile::encodeName((*it).path()))) ok=false; } @@ -526,10 +526,10 @@ bool CKFileFontView::acceptDrag(QDropEvent *e) const #endif return KURLDrag::canDecode(e) && (e->source()!= const_cast<CKFileFontView*>(this)) && - (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()); + (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()); } -void CKFileFontView::contentsDragEnterEvent(QDragEnterEvent *e) +void CKFileFontView::contentsDragEnterEvent(TQDragEnterEvent *e) { if (!acceptDrag(e)) // can we decode this ? e->ignore(); // No @@ -554,7 +554,7 @@ void CKFileFontView::contentsDragEnterEvent(QDragEnterEvent *e) } } -void CKFileFontView::contentsDragMoveEvent(QDragMoveEvent *e) +void CKFileFontView::contentsDragMoveEvent(TQDragMoveEvent *e) { if (!acceptDrag(e)) // can we decode this ? e->ignore(); // No @@ -583,13 +583,13 @@ void CKFileFontView::contentsDragMoveEvent(QDragMoveEvent *e) } } -void CKFileFontView::contentsDragLeaveEvent(QDragLeaveEvent *) +void CKFileFontView::contentsDragLeaveEvent(TQDragLeaveEvent *) { d->itsDropItem = 0; d->itsAutoOpenTimer.stop(); } -void CKFileFontView::contentsDropEvent(QDropEvent *e) +void CKFileFontView::contentsDropEvent(TQDropEvent *e) { d->itsDropItem = 0; d->itsAutoOpenTimer.stop(); @@ -614,15 +614,15 @@ void CKFileFontView::contentsDropEvent(QDropEvent *e) } } -void CKFileFontView::readConfig(KConfig *kc, const QString &group) +void CKFileFontView::readConfig(KConfig *kc, const TQString &group) { - restoreLayout(kc, group.isEmpty() ? QString("CFileFontView") : group); + restoreLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group); slotSortingChanged(sortColumn()); } -void CKFileFontView::writeConfig(KConfig *kc, const QString &group) +void CKFileFontView::writeConfig(KConfig *kc, const TQString &group) { - saveLayout(kc, group.isEmpty() ? QString("CFileFontView") : group); + saveLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group); } ///////////////////////////////////////////////////////////////// diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index a58f9d908..295be9106 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -52,7 +52,7 @@ class CFontListViewItem : public KListViewItem { public: - CFontListViewItem(QListView *parent, const QString &text, const QPixmap &icon, KFileItem *fi) + CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi) : KListViewItem(parent, text), itsInf(fi) { @@ -60,14 +60,14 @@ class CFontListViewItem : public KListViewItem setText(0, text); } - CFontListViewItem(QListView *parent, KFileItem *fi) + CFontListViewItem(TQListView *parent, KFileItem *fi) : KListViewItem(parent), itsInf(fi) { init(); } - CFontListViewItem(QListView *parent, const QString &text, const QPixmap &icon, KFileItem *fi, QListViewItem *after) + CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi, TQListViewItem *after) : KListViewItem(parent, after), itsInf(fi) { @@ -82,15 +82,15 @@ class CFontListViewItem : public KListViewItem */ KFileItem *fileInfo() const { return itsInf; } - virtual QString key( int /*column*/, bool /*ascending*/ ) const { return itsKey; } + virtual TQString key( int /*column*/, bool /*ascending*/ ) const { return itsKey; } - void setKey( const QString& key ) { itsKey = key; } + void setKey( const TQString& key ) { itsKey = key; } - QRect rect() const + TQRect rect() const { - QRect r = listView()->itemRect(this); + TQRect r = listView()->itemRect(this); - return QRect(listView()->viewportToContents(r.topLeft()), QSize(r.width(), r.height())); + return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height())); } void init(); @@ -98,7 +98,7 @@ class CFontListViewItem : public KListViewItem private: KFileItem *itsInf; - QString itsKey; + TQString itsKey; class CFontListViewItemPrivate; @@ -119,10 +119,10 @@ class CKFileFontView : public KListView, public KFileView public: - CKFileFontView(QWidget *parent, const char *name); + CKFileFontView(TQWidget *parent, const char *name); virtual ~CKFileFontView(); - virtual QWidget * widget() { return this; } + virtual TQWidget * widget() { return this; } virtual void clearView(); virtual void setAutoUpdate(bool) {} // ### unused. remove in KDE4 virtual void setSelectionMode( KFile::SelectionMode sm ); @@ -142,38 +142,38 @@ class CKFileFontView : public KListView, public KFileView virtual KFileItem * prevItem(const KFileItem *i) const; virtual void insertItem( KFileItem *i); - void readConfig(KConfig *kc, const QString &group); - void writeConfig(KConfig *kc, const QString &group); + void readConfig(KConfig *kc, const TQString &group); + void writeConfig(KConfig *kc, const TQString &group); // implemented to get noticed about sorting changes (for sortingIndicator) - virtual void setSorting(QDir::SortSpec s); + virtual void setSorting(TQDir::SortSpec s); void ensureItemVisible(const KFileItem *i); // for KMimeTypeResolver void mimeTypeDeterminationFinished(); void determineIcon(CFontListViewItem *item); - QScrollView * scrollWidget() const { return (QScrollView*) this; } + TQScrollView * scrollWidget() const { return (TQScrollView*) this; } signals: // The user dropped something. // fileItem points to the item dropped on or can be 0 if the // user dropped on empty space. - void dropped(QDropEvent *event, KFileItem *fileItem); + void dropped(TQDropEvent *event, KFileItem *fileItem); // The user dropped the URLs urls. // url points to the item dropped on or can be empty if the // user dropped on empty space. - void dropped(QDropEvent *event, const KURL::List &urls, const KURL &url); + void dropped(TQDropEvent *event, const KURL::List &urls, const KURL &url); protected: - virtual void keyPressEvent(QKeyEvent *e); + virtual void keyPressEvent(TQKeyEvent *e); // DND support - QDragObject * dragObject(); - void contentsDragEnterEvent(QDragEnterEvent *e); - void contentsDragMoveEvent(QDragMoveEvent *e); - void contentsDragLeaveEvent(QDragLeaveEvent *e); - void contentsDropEvent(QDropEvent *e); - bool acceptDrag(QDropEvent *e) const; + TQDragObject * dragObject(); + void contentsDragEnterEvent(TQDragEnterEvent *e); + void contentsDragMoveEvent(TQDragMoveEvent *e); + void contentsDragLeaveEvent(TQDragLeaveEvent *e); + void contentsDropEvent(TQDropEvent *e); + bool acceptDrag(TQDropEvent *e) const; int itsSortingCol; @@ -184,17 +184,17 @@ class CKFileFontView : public KListView, public KFileView private slots: void slotSortingChanged(int c); - void selected(QListViewItem *item); - void slotActivate(QListViewItem *item); - void highlighted(QListViewItem *item); - void slotActivateMenu(QListViewItem *item, const QPoint& pos); + void selected(TQListViewItem *item); + void slotActivate(TQListViewItem *item); + void highlighted(TQListViewItem *item); + void slotActivateMenu(TQListViewItem *item, const TQPoint& pos); void slotAutoOpen(); private: - virtual void insertItem(QListViewItem *i) { KListView::insertItem(i); } + virtual void insertItem(TQListViewItem *i) { KListView::insertItem(i); } virtual void setSorting(int i, bool b) { KListView::setSorting(i, b); } - virtual void setSelected(QListViewItem *i, bool b) { KListView::setSelected(i, b); } + virtual void setSelected(TQListViewItem *i, bool b) { KListView::setSelected(i, b); } inline CFontListViewItem * viewItem( const KFileItem *item ) const { diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp index e902fa1e1..afd9fa204 100644 --- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp @@ -27,27 +27,27 @@ //////////////////////////////////////////////////////////////////////////////// #include "PrintDialog.h" -#include <qlayout.h> -#include <qframe.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqlabel.h> #include <klocale.h> namespace KFI { -CPrintDialog::CPrintDialog(QWidget *parent) +CPrintDialog::CPrintDialog(TQWidget *parent) : KDialogBase(Plain, i18n("Print Font Samples"), Ok|Cancel, Ok, parent, NULL, true, false) { - QFrame *page=plainPage(); - QGridLayout *layout=new QGridLayout(page, 1, 1, 0, spacingHint()); + TQFrame *page=plainPage(); + TQGridLayout *layout=new TQGridLayout(page, 1, 1, 0, spacingHint()); - layout->addWidget(new QLabel(i18n("Output:"), page), 0, 0); - itsOutput=new QComboBox(page); + layout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0); + itsOutput=new TQComboBox(page); itsOutput->insertItem(i18n("All Fonts"), 0); itsOutput->insertItem(i18n("Selected Fonts"), 1); layout->addWidget(itsOutput, 0, 1); - layout->addWidget(new QLabel(i18n("Font size:"), page), 1, 0); - itsSize=new QComboBox(page); + layout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0); + itsSize=new TQComboBox(page); itsSize->insertItem(i18n("Waterfall"), 0); itsSize->insertItem(i18n("12pt"), 1); itsSize->insertItem(i18n("18pt"), 2); @@ -55,7 +55,7 @@ CPrintDialog::CPrintDialog(QWidget *parent) itsSize->insertItem(i18n("36pt"), 4); itsSize->insertItem(i18n("48pt"), 5); layout->addWidget(itsSize, 1, 1); - layout->addItem(new QSpacerItem(2, 2), 2, 1); + layout->addItem(new TQSpacerItem(2, 2), 2, 1); } bool CPrintDialog::exec(bool select, int size) @@ -68,7 +68,7 @@ bool CPrintDialog::exec(bool select, int size) else itsOutput->setCurrentItem(1); itsSize->setCurrentItem(size); - return QDialog::Accepted==QDialog::exec(); + return TQDialog::Accepted==TQDialog::exec(); } } diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.h b/kcontrol/kfontinst/kcmfontinst/PrintDialog.h index 9be67f6d4..f63118d66 100644 --- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.h +++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.h @@ -30,7 +30,7 @@ //////////////////////////////////////////////////////////////////////////////// #include <kdialogbase.h> -#include <qcombobox.h> +#include <tqcombobox.h> namespace KFI { @@ -39,7 +39,7 @@ class CPrintDialog : public KDialogBase { public: - CPrintDialog(QWidget *parent); + CPrintDialog(TQWidget *parent); bool exec(bool select, int size); int chosenSize() { return itsSize->currentItem(); } @@ -47,7 +47,7 @@ class CPrintDialog : public KDialogBase private: - QComboBox *itsOutput, + TQComboBox *itsOutput, *itsSize; }; diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp index 255fca709..8b8a88167 100644 --- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp @@ -29,10 +29,10 @@ #include "SettingsDialog.h" #include "KfiConstants.h" #include "Misc.h" -#include <qlayout.h> -#include <qcheckbox.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kconfig.h> #include <kmessagebox.h> @@ -42,20 +42,20 @@ namespace KFI { -CSettingsDialog::CSettingsDialog(QWidget *parent) +CSettingsDialog::CSettingsDialog(TQWidget *parent) : KDialogBase(parent, "settingsdialog", true, i18n("Settings"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true) { - QVBox *page = makeVBoxMainWidget(); + TQVBox *page = makeVBoxMainWidget(); - itsDoX=new QCheckBox(i18n("Configure fonts for legacy X applications"), page); - QWhatsThis::add(itsDoX, i18n("<p>Modern applications use a system called \"FontConfig\" to obtain the list of fonts. " + itsDoX=new TQCheckBox(i18n("Configure fonts for legacy X applications"), page); + TQWhatsThis::add(itsDoX, i18n("<p>Modern applications use a system called \"FontConfig\" to obtain the list of fonts. " "Older applications, such as OpenOffice 1.x, GIMP 1.x, etc. use the previous \"core X fonts\" mechanism for " "this.</p><p>Selecting this option will inform the installer to create the necessary files so that these " "older applications can use the fonts you install.</p><p>Please note, however, that this will slow down " "the installation process.<p>")); - itsDoGs=new QCheckBox(i18n("Configure fonts for Ghostscript"), page); - QWhatsThis::add(itsDoGs, i18n("<p>When printing, most applications create what is know as PostScript. This is then sent to a special " + itsDoGs=new TQCheckBox(i18n("Configure fonts for Ghostscript"), page); + TQWhatsThis::add(itsDoGs, i18n("<p>When printing, most applications create what is know as PostScript. This is then sent to a special " "application, named Ghostscript, which can interpret the PostScript and send the appropriate instructions " "to your printer. If your application does not embed whatever fonts it uses into the PostScript, then " "Ghostscript needs to be informed as to which fonts you have installed, and where they are located.</p>" @@ -83,10 +83,10 @@ void CSettingsDialog::slotOk() if( ((!oldDoX && itsDoX->isChecked()) || (!oldDoGs && itsDoGs->isChecked())) && KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("You have enabled a previously disabled option. Would you like the config " "files updated now? (Normally they are only updated upon installing, or " - "removing, a font.)"), QString::null, i18n("Update"),i18n("Do Not Update"))) + "removing, a font.)"), TQString::null, i18n("Update"),i18n("Do Not Update"))) { - QByteArray packedArgs; - QDataStream stream(packedArgs, IO_WriteOnly); + TQByteArray packedArgs; + TQDataStream stream(packedArgs, IO_WriteOnly); stream << KFI::SPECIAL_RECONFIG; diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h index b41820e38..0edac64dd 100644 --- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h +++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h @@ -40,7 +40,7 @@ class CSettingsDialog : public KDialogBase { public: - CSettingsDialog(QWidget *parent); + CSettingsDialog(TQWidget *parent); private slots: @@ -48,7 +48,7 @@ class CSettingsDialog : public KDialogBase private: - QCheckBox *itsDoX, + TQCheckBox *itsDoX, *itsDoGs; }; diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp index 31fbaa83e..112e3562b 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp +++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp @@ -28,19 +28,19 @@ #include "KFileFont.h" #include "KfiConstants.h" -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kgenericfactory.h> #include <kio/netaccess.h> -static void addEntry(int face, QString &existing, const QString &add) +static void addEntry(int face, TQString &existing, const TQString &add) { if(face>0) existing.append(", "); existing.append(add); } -static int strToWeight(const QString &str) +static int strToWeight(const TQString &str) { if(NULL==str) return FC_WEIGHT_MEDIUM; @@ -79,7 +79,7 @@ static int strToWeight(const QString &str) } #ifndef KFI_FC_NO_WIDTHS -static int strToWidth(const QString &str) +static int strToWidth(const TQString &str) { if(str.isEmpty()) return FC_WIDTH_NORMAL; @@ -171,13 +171,13 @@ static const char * getFoundry(const char *notice) return NULL; } -static bool readAfm(const QString &file, QString &full, QString &family, QString &foundry, QString &weight, +static bool readAfm(const TQString &file, TQString &full, TQString &family, TQString &foundry, TQString &weight, #ifndef KFI_FC_NO_WIDTHS - QString &width, + TQString &width, #endif - QString &spacing, QString &slant) + TQString &spacing, TQString &slant) { - QFile f(file); + TQFile f(file); bool foundName=false, foundFamily=false; int intSpacing=FC_PROPORTIONAL, @@ -190,8 +190,8 @@ static bool readAfm(const QString &file, QString &full, QString &family, QString if(f.open(IO_ReadOnly)) { - QTextStream stream(&f); - QString line; + TQTextStream stream(&f); + TQString line; bool inMetrics=false; while(!stream.atEnd()) @@ -265,7 +265,7 @@ K_EXPORT_COMPONENT_FACTORY(kfile_font, KFileFontPluginFactory("kfontinst")) namespace KFI { -KFileFontPlugin::KFileFontPlugin(QObject *parent, const char *name, const QStringList& args) +KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args) : KFilePlugin(parent, name, args) { KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); @@ -286,20 +286,20 @@ void KFileFontPlugin::addMimeType(const char *mime) KFileMimeTypeInfo *info=addMimeTypeInfo(mime); KFileMimeTypeInfo::GroupInfo *group=addGroupInfo(info, "General", i18n("General")); - addItemInfo(group, "Full", i18n("Full Name"), QVariant::String); - addItemInfo(group, "Family", i18n("Family"), QVariant::String); - addItemInfo(group, "Foundry", i18n("Foundry"), QVariant::String); - addItemInfo(group, "Weight", i18n("Weight"), QVariant::String); + addItemInfo(group, "Full", i18n("Full Name"), TQVariant::String); + addItemInfo(group, "Family", i18n("Family"), TQVariant::String); + addItemInfo(group, "Foundry", i18n("Foundry"), TQVariant::String); + addItemInfo(group, "Weight", i18n("Weight"), TQVariant::String); #ifndef KFI_FC_NO_WIDTHS - addItemInfo(group, "Width", i18n("Width"), QVariant::String); + addItemInfo(group, "Width", i18n("Width"), TQVariant::String); #endif - addItemInfo(group, "Spacing", i18n("Spacing"), QVariant::String); - addItemInfo(group, "Slant", i18n("Slant"), QVariant::String); + addItemInfo(group, "Spacing", i18n("Spacing"), TQVariant::String); + addItemInfo(group, "Slant", i18n("Slant"), TQVariant::String); } bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) { - QString full, + TQString full, lastFull, family, foundry, @@ -319,7 +319,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) spacingAll, slantAll; KURL url(info.url()); - QString fName; + TQString fName; bool fontsProt = KFI_KIO_FONTS_PROTOCOL == url.protocol(), fileProt = "file" == url.protocol(), downloaded = false, diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.h b/kcontrol/kfontinst/kfile-plugin/KFileFont.h index b06ab2a57..d33079e0b 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.h +++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.h @@ -39,7 +39,7 @@ class KFileFontPlugin : public KFilePlugin { public: - KFileFontPlugin(QObject *parent, const char *name, const QStringList& args); + KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual ~KFileFontPlugin() {} bool readInfo(KFileMetaInfo& info, uint what = KFileMetaInfo::Fastest); diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp index ff5dcd623..4fe823c23 100644 --- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp +++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp @@ -35,8 +35,8 @@ #include <stdlib.h> #include <iostream> #include <stdio.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqregexp.h> +#include <tqfile.h> #include <ft2build.h> #include FT_SFNT_NAMES_H #include FT_TRUETYPE_IDS_H @@ -46,7 +46,7 @@ namespace KFI { -bool CFontEngine::openFont(const QString &file, int face) +bool CFontEngine::openFont(const TQString &file, int face) { bool ok=false; @@ -62,7 +62,7 @@ bool CFontEngine::openFont(const QString &file, int face) itsItalic=ITALIC_NONE; itsPath=file; itsFaceIndex=face; - itsPsName=QString(); + itsPsName=TQString(); if(!openFontFt(file) && !itsPsName.isEmpty()) itsType=NONE; @@ -74,12 +74,12 @@ bool CFontEngine::openFont(const QString &file, int face) void CFontEngine::closeFont() { closeFaceFt(); - itsPath=QString::null; + itsPath=TQString::null; itsFaceIndex=-1; itsType=NONE; } -QString CFontEngine::weightStr(enum EWeight w) +TQString CFontEngine::weightStr(enum EWeight w) { switch(w) { @@ -155,12 +155,12 @@ CFontEngine::EWeight CFontEngine::strToWeight(const char *str) return WEIGHT_MEDIUM; // WEIGHT_UNKNOWN; } -static void removeSymbols(QString &str) +static void removeSymbols(TQString &str) { - str.replace(QRegExp("[\\-\\[\\]()]"), " "); + str.replace(TQRegExp("[\\-\\[\\]()]"), " "); int len=str.length(); - QChar space(' '); + TQChar space(' '); for(int c=0; c<len; ++c) if(str[c].unicode()<0x20 || str[c].unicode()>0x7E) @@ -210,10 +210,10 @@ static bool lookupName(FT_Face face, int nid, int pid, int eid, FT_SfntName *nam return false; } -static QCString getName(FT_Face face, int nid) +static TQCString getName(FT_Face face, int nid) { FT_SfntName name; - QCString str; + TQCString str; if(lookupName(face, nid, TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) || lookupName(face, nid, TT_PLATFORM_APPLE_UNICODE, -1, &name)) @@ -226,7 +226,7 @@ static QCString getName(FT_Face face, int nid) return str; } -bool CFontEngine::openFontFt(const QString &file) +bool CFontEngine::openFontFt(const TQString &file) { enum ETtfWeight { @@ -242,7 +242,7 @@ bool CFontEngine::openFontFt(const QString &file) TTF_WEIGHT_BLACK = 900 +50 }; - bool status=FT_New_Face(itsFt.library, QFile::encodeName(file), 0, &itsFt.face) ? false : true; + bool status=FT_New_Face(itsFt.library, TQFile::encodeName(file), 0, &itsFt.face) ? false : true; if(status) itsFt.open=true; diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.h b/kcontrol/kfontinst/kfontinst/FontEngine.h index 06218c0ae..c534a5ef5 100644 --- a/kcontrol/kfontinst/kfontinst/FontEngine.h +++ b/kcontrol/kfontinst/kfontinst/FontEngine.h @@ -35,8 +35,8 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> namespace KFI { @@ -99,18 +99,18 @@ class CFontEngine ~CFontEngine() { closeFont(); } static EType getType(const char *fname); - static QString weightStr(EWeight w); - static QString italicStr(EItalic i) { return ITALIC_NONE==i ? "r" : ITALIC_ITALIC==i ? "i" : "o"; } + static TQString weightStr(EWeight w); + static TQString italicStr(EItalic i) { return ITALIC_NONE==i ? "r" : ITALIC_ITALIC==i ? "i" : "o"; } // // General functions - these should be used instead of specfic ones below... // - bool openFont(const QString &file, int face=0); + bool openFont(const TQString &file, int face=0); void closeFont(); // - const QString & getFamilyName() { return itsFamily; } - const QString & getPsName() { return itsPsName; } + const TQString & getFamilyName() { return itsFamily; } + const TQString & getPsName() { return itsPsName; } EWeight getWeight() { return itsWeight; } EItalic getItalic() { return itsItalic; } EType getType() { return itsType; } @@ -121,7 +121,7 @@ class CFontEngine private: - bool openFontFt(const QString &file); + bool openFontFt(const TQString &file); void closeFaceFt(); private: @@ -129,7 +129,7 @@ class CFontEngine EWeight itsWeight; EType itsType; EItalic itsItalic; - QString itsFamily, + TQString itsFamily, itsPsName, itsPath; int itsNumFaces, diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp index 6e0c165e9..476b422bd 100644 --- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp +++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp @@ -32,13 +32,13 @@ #include "FcEngine.h" #include "KfiConstants.h" #include <ksavefile.h> -#include <qtextstream.h> -#include <qdir.h> +#include <tqtextstream.h> +#include <tqdir.h> #include <ctype.h> #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <qregexp.h> +#include <tqregexp.h> #include <fstream> #include <unistd.h> @@ -52,7 +52,7 @@ static const char * findSpace(const char *str) return str; } -static bool parseLine(const char *line, QString &ps, QString &fname, bool &isAlias) +static bool parseLine(const char *line, TQString &ps, TQString &fname, bool &isAlias) { static const int constMaxLen = 127; static const int constFileMaxLen = 1023; @@ -107,13 +107,13 @@ static bool parseLine(const char *line, QString &ps, QString &fname, bool &isAli // // Returns a PS name from an X family name... // e.g. "Times New Roman" -> "TimesNewRoman" -static QString createX11PsName(const QString &font) +static TQString createX11PsName(const TQString &font) { - QString newName(font); + TQString newName(font); unsigned int ch; bool newWord=true; - newName.replace(QRegExp("\\-"), "_"); + newName.replace(TQRegExp("\\-"), "_"); for(ch=0; ch<newName.length(); ++ch) { @@ -136,7 +136,7 @@ static QString createX11PsName(const QString &font) } } - newName.replace(" ", QString::null); + newName.replace(" ", TQString::null); return newName; } @@ -156,10 +156,10 @@ static const char * getItalicStr(KFI::CFontEngine::EItalic it) // // Create a full Ps name -static QString createName(const QString &family, const QString &weight, const char *italic) +static TQString createName(const TQString &family, const TQString &weight, const char *italic) { - QString name; - QTextOStream str(&name); + TQString name; + TQTextOStream str(&name); str << family; if(!weight.isEmpty() || NULL!=italic) @@ -174,26 +174,26 @@ static QString createName(const QString &family, const QString &weight, const ch return name; } -static QString getEntry(QStringList &list, const QString &name) +static TQString getEntry(TQStringList &list, const TQString &name) { - QStringList::Iterator it(list.begin()), + TQStringList::Iterator it(list.begin()), end(list.end()); for( ; it!=end; ++it) if(0==(*it).find('/'+name+' ')) return *it; - return QString::null; + return TQString::null; } -inline bool isAlias(const QString &entry) +inline bool isAlias(const TQString &entry) { - return -1==entry.findRev(QRegExp(")\\s*;\\s*$")); + return -1==entry.findRev(TQRegExp(")\\s*;\\s*$")); } -static void addEntry(QStringList &list, const QString &name, const QString &file, const QString &fmapDir) +static void addEntry(TQStringList &list, const TQString &name, const TQString &file, const TQString &fmapDir) { - QString existing(getEntry(list, name)); + TQString existing(getEntry(list, name)); bool insert=true; if(!existing.isEmpty()) @@ -204,8 +204,8 @@ static void addEntry(QStringList &list, const QString &name, const QString &file if(insert) { - QString entry; - QTextOStream str(&entry); + TQString entry; + TQTextOStream str(&entry); str << '/' << name << " ("; @@ -219,16 +219,16 @@ static void addEntry(QStringList &list, const QString &name, const QString &file } } -static void addAliasEntry(QStringList &list, const QString &x11Name, const QString &psName) +static void addAliasEntry(TQStringList &list, const TQString &x11Name, const TQString &psName) { if(x11Name!=psName) { - QString existing(getEntry(list, x11Name)); + TQString existing(getEntry(list, x11Name)); if(existing.isEmpty()) { - QString entry; - QTextOStream str(&entry); + TQString entry; + TQTextOStream str(&entry); str << '/' << x11Name << " /" << psName << " ;"; list.append(entry); @@ -236,11 +236,11 @@ static void addAliasEntry(QStringList &list, const QString &x11Name, const QStri } } -static QString locateFile(const char *dir, const char *file, int level=0) +static TQString locateFile(const char *dir, const char *file, int level=0) { if(level<5) { - QDir d(dir); + TQDir d(dir); if(d.isReadable()) { @@ -249,14 +249,14 @@ static QString locateFile(const char *dir, const char *file, int level=0) if(fList) { QFileInfoListIterator it(*fList); - QFileInfo *fInfo; - QString str; + TQFileInfo *fInfo; + TQString str; for(; NULL!=(fInfo=it.current()); ++it) if("."!=fInfo->fileName() && ".."!=fInfo->fileName()) if(fInfo->isDir()) { - if(!(str=locateFile(QFile::encodeName(fInfo->filePath()+"/"), file, level+1)).isEmpty()) + if(!(str=locateFile(TQFile::encodeName(fInfo->filePath()+"/"), file, level+1)).isEmpty()) return str; } else @@ -266,19 +266,19 @@ static QString locateFile(const char *dir, const char *file, int level=0) } } - return QString::null; + return TQString::null; } -static QString locateFile(const char *file, const char **dirs) +static TQString locateFile(const char *file, const char **dirs) { int d; - QString str; + TQString str; for(d=0; dirs[d]; ++d) if(!(str=locateFile(dirs[d], file)).isEmpty()) return str; - return QString::null; + return TQString::null; } #define FONTMAP "Fontmap" @@ -289,13 +289,13 @@ namespace KFI namespace Fontmap { -bool create(const QString &dir, CFontEngine &fe) +bool create(const TQString &dir, CFontEngine &fe) { bool root(Misc::root()), added=false; - QString fmapDir(Misc::dirSyntax(root ? KFI_ROOT_CFG_DIR : dir)); + TQString fmapDir(Misc::dirSyntax(root ? KFI_ROOT_CFG_DIR : dir)); CFile old(fmapDir); - QStringList entries; + TQStringList entries; int i; FcPattern *pat = FcPatternCreate(); FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_SCALABLE, (void*)0); @@ -306,13 +306,13 @@ bool create(const QString &dir, CFontEngine &fe) for (i = 0; i<fs->nfont; i++) { - QString fName(Misc::fileSyntax(CFcEngine::getFcString(fs->fonts[i], FC_FILE))); + TQString fName(Misc::fileSyntax(CFcEngine::getFcString(fs->fonts[i], FC_FILE))); FcBool scalable=FcFalse; if(!fName.isEmpty() && (root || dir.isEmpty() || 0==fName.find(dir)) && FcResultMatch==FcPatternGetBool(fs->fonts[i], FC_SCALABLE, 0, &scalable) && scalable) { - const QStringList *existing=old.getEntries(fName); + const TQStringList *existing=old.getEntries(fName); if(existing && existing->count()) entries+=(*existing); @@ -342,7 +342,7 @@ bool create(const QString &dir, CFontEngine &fe) case CFontEngine::WEIGHT_MEDIUM: case CFontEngine::WEIGHT_REGULAR: { - QString x11Ps(createX11PsName(fe.getFamilyName())); + TQString x11Ps(createX11PsName(fe.getFamilyName())); if(CFontEngine::ITALIC_ITALIC!=fe.getItalic() && CFontEngine::ITALIC_OBLIQUE!=fe.getItalic()) @@ -378,11 +378,11 @@ bool create(const QString &dir, CFontEngine &fe) if(added || entries.count()!=old.getLineCount()) { KSaveFile out(fmapDir+FONTMAP); - QTextStream *stream=out.textStream(); + TQTextStream *stream=out.textStream(); if(stream) { - QStringList::Iterator it; + TQStringList::Iterator it; for(it=entries.begin(); it!=entries.end(); ++it) *stream << *it << endl; @@ -403,7 +403,7 @@ bool create(const QString &dir, CFontEngine &fe) NULL }; - QString gsFile=locateFile(FONTMAP, constGhostscriptDirs); + TQString gsFile=locateFile(FONTMAP, constGhostscriptDirs); if(!gsFile.isEmpty()) { @@ -411,11 +411,11 @@ bool create(const QString &dir, CFontEngine &fe) const char *constRLF=".runlibfile"; char line[constMaxLineLen]; - ifstream in(QFile::encodeName(gsFile)); + ifstream in(TQFile::encodeName(gsFile)); if(in) { - QCString fmap(QFile::encodeName(fmapDir+FONTMAP)); + TQCString fmap(TQFile::encodeName(fmapDir+FONTMAP)); int lineNum=0, kfiLine=-1, gsLine=-1, @@ -492,7 +492,7 @@ bool create(const QString &dir, CFontEngine &fe) if(added) // Don't re-write GS's Fontmap unless we've actually added something... { KSaveFile out(gsFile); - QTextStream *stream=out.textStream(); + TQTextStream *stream=out.textStream(); if(stream) *stream << buffer; @@ -507,11 +507,11 @@ bool create(const QString &dir, CFontEngine &fe) return status; } -CFile::CFile(const QString &dir) +CFile::CFile(const TQString &dir) : itsDir(dir), itsLineCount(0) { - ifstream f(QFile::encodeName(dir+FONTMAP)); + ifstream f(TQFile::encodeName(dir+FONTMAP)); itsEntries.setAutoDelete(true); @@ -528,7 +528,7 @@ CFile::CFile(const QString &dir) if(!f.eof()) { - QString ps, + TQString ps, fname; bool isAlias; @@ -550,14 +550,14 @@ CFile::CFile(const QString &dir) } } -const QStringList * CFile::getEntries(const QString &fname) +const TQStringList * CFile::getEntries(const TQString &fname) { TEntry *entry=findEntry(0==fname.find(itsDir) ? fname.mid(itsDir.length()) : fname, false); return entry ? &entry->entries : NULL; } -CFile::TEntry * CFile::findEntry(const QString &fname, bool isAlias) +CFile::TEntry * CFile::findEntry(const TQString &fname, bool isAlias) { TEntry *entry=NULL; @@ -568,7 +568,7 @@ CFile::TEntry * CFile::findEntry(const QString &fname, bool isAlias) return entry; } -CFile::TEntry * CFile::getEntry(TEntry **current, const QString &fname, bool isAlias) +CFile::TEntry * CFile::getEntry(TEntry **current, const TQString &fname, bool isAlias) { // // See if its the current one... diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.h b/kcontrol/kfontinst/kfontinst/Fontmap.h index 28d5c9d7e..92d64f5fb 100644 --- a/kcontrol/kfontinst/kfontinst/Fontmap.h +++ b/kcontrol/kfontinst/kfontinst/Fontmap.h @@ -29,8 +29,8 @@ // (C) Craig Drummond, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> namespace KFI { @@ -45,33 +45,33 @@ namespace Fontmap struct TEntry { - TEntry(const QString &fname) : filename(fname) {} + TEntry(const TQString &fname) : filename(fname) {} - QString filename, + TQString filename, psName; - QStringList entries; + TQStringList entries; }; public: - CFile(const QString &dir); + CFile(const TQString &dir); - const QStringList * getEntries(const QString &fname); + const TQStringList * getEntries(const TQString &fname); unsigned int getLineCount() { return itsLineCount; } private: - TEntry * findEntry(const QString &fname, bool isAlias=false); - TEntry * getEntry(TEntry **current, const QString &fname, bool isAlias=false); + TEntry * findEntry(const TQString &fname, bool isAlias=false); + TEntry * getEntry(TEntry **current, const TQString &fname, bool isAlias=false); private: - QString itsDir; - QPtrList<TEntry> itsEntries; + TQString itsDir; + TQPtrList<TEntry> itsEntries; unsigned int itsLineCount; }; - extern bool create(const QString &dir, CFontEngine &fe); + extern bool create(const TQString &dir, CFontEngine &fe); } } diff --git a/kcontrol/kfontinst/kfontinst/Main.cpp b/kcontrol/kfontinst/kfontinst/Main.cpp index 2da9a8997..a2aa5766b 100644 --- a/kcontrol/kfontinst/kfontinst/Main.cpp +++ b/kcontrol/kfontinst/kfontinst/Main.cpp @@ -36,7 +36,7 @@ #include "XConfig.h" #include "kxftconfig.h" #include <fontconfig/fontconfig.h> -#include <qfile.h> +#include <tqfile.h> #include <stdio.h> // @@ -105,8 +105,8 @@ KFI::CXConfig * getXCfg(bool root) // ...note on some systems (Solaris and HP-UX) only the xfs file will be found bool xfs=false; KFI::CXConfig *xcfg=NULL; - QString xConfigFile=getFile(QFile::encodeName(constXConfigFiles[0]), constXConfigFiles), - xfsConfigFile=getFile(QFile::encodeName(constXfsConfigFiles[0]), constXfsConfigFiles); + TQString xConfigFile=getFile(TQFile::encodeName(constXConfigFiles[0]), constXConfigFiles), + xfsConfigFile=getFile(TQFile::encodeName(constXfsConfigFiles[0]), constXfsConfigFiles); // If found xfs, but not X - then assume that xfs is being used... if(!xfsConfigFile.isEmpty() && xConfigFile.isEmpty()) @@ -253,7 +253,7 @@ int main(int argc, char *argv[]) usage(argv[0]); else { - QString folder; + TQString folder; if(folderRequired) { @@ -261,15 +261,15 @@ int main(int argc, char *argv[]) unsigned int len=folder.length(); // Remove quotes... - if( (folder[0]==QChar('\'') || folder[0]==QChar('\"')) && - (folder[len-1]==QChar('\'') || folder[len-1]==QChar('\"'))) + if( (folder[0]==TQChar('\'') || folder[0]==TQChar('\"')) && + (folder[len-1]==TQChar('\'') || folder[len-1]==TQChar('\"'))) folder=folder.mid(1, len-2); folder=KFI::Misc::dirSyntax(folder); } if(folderRequired && !KFI::Misc::dExists(folder)) { - std::cerr << "ERROR: " << QFile::encodeName(folder) << " does not exist!" << std::endl; + std::cerr << "ERROR: " << TQFile::encodeName(folder) << " does not exist!" << std::endl; rv=-2; } else @@ -323,7 +323,7 @@ int main(int argc, char *argv[]) if(0==rv && doGs) { KFI::CFontEngine fe; - rv=KFI::Fontmap::create(root ? QString::null : folder, fe) ? 0 : -6; + rv=KFI::Fontmap::create(root ? TQString::null : folder, fe) ? 0 : -6; } } else if(0==rv) diff --git a/kcontrol/kfontinst/kfontinst/XConfig.cpp b/kcontrol/kfontinst/kfontinst/XConfig.cpp index aa63e52af..112ab3d3c 100644 --- a/kcontrol/kfontinst/kfontinst/XConfig.cpp +++ b/kcontrol/kfontinst/kfontinst/XConfig.cpp @@ -30,11 +30,11 @@ #include "FontEngine.h" #include "kxftconfig.h" #include <ksavefile.h> -#include <qtextstream.h> +#include <tqtextstream.h> #include <fstream> #include <string.h> -#include <qdir.h> -#include <qregexp.h> +#include <tqdir.h> +#include <tqregexp.h> #include <klocale.h> #include <sys/types.h> #include <signal.h> @@ -50,7 +50,7 @@ extern "C" unsigned int kfi_getPid(const char *proc, unsigned int ppid); namespace KFI { -CXConfig::CXConfig(EType type, const QString &file) +CXConfig::CXConfig(EType type, const TQString &file) : itsType(type), itsFileName(file), itsOk(false), @@ -60,13 +60,13 @@ CXConfig::CXConfig(EType type, const QString &file) readConfig(); } -bool CXConfig::configureDir(const QString &dir) +bool CXConfig::configureDir(const TQString &dir) { // // On systems without mkfontscale, the following will fail, so cant base // return value upon that - hence only check return value of mkfontdir - Misc::doCmd("mkfontscale", QFile::encodeName(dir)); - return Misc::doCmd("mkfontdir", QFile::encodeName(dir)); + Misc::doCmd("mkfontscale", TQFile::encodeName(dir)); + return Misc::doCmd("mkfontdir", TQFile::encodeName(dir)); } bool CXConfig::readConfig() @@ -144,11 +144,11 @@ bool CXConfig::madeChanges() return false; } -void CXConfig::addPath(const QString &dir, bool unscaled) +void CXConfig::addPath(const TQString &dir, bool unscaled) { if(itsWritable) { - QString ds(Misc::dirSyntax(dir)); + TQString ds(Misc::dirSyntax(dir)); if(Misc::dExists(dir)) { @@ -184,7 +184,7 @@ void CXConfig::refreshPaths(bool xfs) if(xfsPid) { - QString pid; + TQString pid; kill(xfsPid, SIGUSR1); } @@ -194,10 +194,10 @@ void CXConfig::refreshPaths(bool xfs) Misc::doCmd("xset", "fp", "rehash"); } -CXConfig::TPath * CXConfig::findPath(const QString &dir) +CXConfig::TPath * CXConfig::findPath(const TQString &dir) { TPath *path=NULL; - QString ds(Misc::dirSyntax(dir)); + TQString ds(Misc::dirSyntax(dir)); for(path=itsPaths.first(); path; path=itsPaths.next()) if(path->dir==ds) @@ -206,7 +206,7 @@ CXConfig::TPath * CXConfig::findPath(const QString &dir) return NULL; } -static void processPath(char *str, QString &path, bool &unscaled) +static void processPath(char *str, TQString &path, bool &unscaled) { char *unsc=NULL; @@ -396,7 +396,7 @@ static char * getItem(char **start, char **end, const char *key, unsigned int &s bool CXConfig::processX11(bool read) { - std::ifstream x11(QFile::encodeName(itsFileName)); + std::ifstream x11(TQFile::encodeName(itsFileName)); bool ok=false; if(x11) @@ -437,7 +437,7 @@ bool CXConfig::processX11(bool read) while(NULL!=(item=getItem(&pos, &filesEnd, "FontPath", size, !read, buffer))) if(read) // Then save paths... { - QString path; + TQString path; bool unscaled; processPath(item, path, unscaled); @@ -487,7 +487,7 @@ bool CXConfig::processX11(bool read) for(path=itsPaths.first(); path; path=itsPaths.next()) if(TPath::DIR!=path->type || Misc::dExists(path->dir)) { - QCString cPath(QFile::encodeName(Misc::xDirSyntax(path->dir))); + TQCString cPath(TQFile::encodeName(Misc::xDirSyntax(path->dir))); fputs(" FontPath \t\"", fstream); fwrite(cPath.data(), 1, cPath.length(), fstream); @@ -612,7 +612,7 @@ static char * getXfsPath(char *buffer, unsigned int &totalSize, unsigned int off bool CXConfig::processXfs(bool read) { - std::ifstream xfs(QFile::encodeName(itsFileName)); + std::ifstream xfs(TQFile::encodeName(itsFileName)); bool ok=false; if(xfs) @@ -681,7 +681,7 @@ bool CXConfig::processXfs(bool read) while(NULL!=(path=getXfsPath(cat, size, size-(cat-buffer)))) if(read) { - QString str; + TQString str; bool unscaled; processPath(path, str, unscaled); @@ -706,7 +706,7 @@ bool CXConfig::processXfs(bool read) for(p=itsPaths.first(); p; p=itsPaths.next()) if(Misc::dExists(p->dir)) { - QCString cPath(QFile::encodeName(Misc::xDirSyntax(p->dir))); + TQCString cPath(TQFile::encodeName(Misc::xDirSyntax(p->dir))); if(!first) { @@ -744,11 +744,11 @@ bool CXConfig::processXfs(bool read) } -CXConfig::TPath::EType CXConfig::TPath::getType(const QString &d) +CXConfig::TPath::EType CXConfig::TPath::getType(const TQString &d) { - QString str(d); + TQString str(d); - str.replace(QRegExp("\\s*"), ""); + str.replace(TQRegExp("\\s*"), ""); return 0==str.find("unix/:") ? FONT_SERVER diff --git a/kcontrol/kfontinst/kfontinst/XConfig.h b/kcontrol/kfontinst/kfontinst/XConfig.h index 5a8ed1624..127b243fa 100644 --- a/kcontrol/kfontinst/kfontinst/XConfig.h +++ b/kcontrol/kfontinst/kfontinst/XConfig.h @@ -30,9 +30,9 @@ /////////////////////////////////////////////////////////////////////////////// #include "Misc.h" -#include <qptrlist.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <time.h> namespace KFI @@ -53,12 +53,12 @@ class CXConfig FONT_CONFIG }; - TPath(const QString &d, bool u=false, EType t=DIR, bool o=true) + TPath(const TQString &d, bool u=false, EType t=DIR, bool o=true) : dir(DIR==t ? Misc::dirSyntax(d) : d), unscaled(u), orig(o), type(t) {} - static EType getType(const QString &d); + static EType getType(const TQString &d); - QString dir; + TQString dir; bool unscaled, orig; // Was dir in file when read? EType type; @@ -72,16 +72,16 @@ class CXConfig public: - CXConfig(EType type, const QString &file); + CXConfig(EType type, const TQString &file); - static bool configureDir(const QString &dir); + static bool configureDir(const TQString &dir); bool ok() { return itsOk; } bool writable() { return itsWritable; } bool readConfig(); bool writeConfig(); bool madeChanges(); - void addPath(const QString &dir, bool unscaled=false); + void addPath(const TQString &dir, bool unscaled=false); bool inPath(TPath::EType type); bool xfsInPath() { return inPath(TPath::FONT_SERVER); } bool fcInPath() { return inPath(TPath::FONT_CONFIG); } @@ -96,13 +96,13 @@ class CXConfig bool processX11(bool read); bool processXfs(bool read); - TPath * findPath(const QString &dir); + TPath * findPath(const TQString &dir); private: EType itsType; - QPtrList<TPath> itsPaths; - QString itsFileName, + TQPtrList<TPath> itsPaths; + TQString itsFileName, itsInsertPos; bool itsOk, itsWritable; diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index e5bc2d6af..ee1d2dc3c 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -49,13 +49,13 @@ #include <kio/netaccess.h> #include <kio/slaveinterface.h> #include <kio/connection.h> -#include <qtextstream.h> +#include <tqtextstream.h> #include <kmimetype.h> #include <kmessagebox.h> #include <kprocess.h> -#include <qdir.h> -#include <qdatastream.h> -#include <qregexp.h> +#include <tqdir.h> +#include <tqdatastream.h> +#include <tqregexp.h> #include <kinstance.h> #include <klargefile.h> #include <ktempfile.h> @@ -76,8 +76,8 @@ #ifdef KFI_FORCE_DEBUG_TO_STDERR -#include <qtextstream.h> -QTextOStream ostr(stderr); +#include <tqtextstream.h> +TQTextOStream ostr(stderr); #define KFI_DBUG ostr << "[" << (int)(getpid()) << "] " #else @@ -121,32 +121,32 @@ int kdemain(int argc, char **argv) namespace KFI { -inline bool isSysFolder(const QString §) +inline bool isSysFolder(const TQString §) { return i18n(KFI_KIO_FONTS_SYS)==sect || KFI_KIO_FONTS_SYS==sect; } -inline bool isUserFolder(const QString §) +inline bool isUserFolder(const TQString §) { return i18n(KFI_KIO_FONTS_USER)==sect || KFI_KIO_FONTS_USER==sect; } -static QString removeMultipleExtension(const KURL &url) +static TQString removeMultipleExtension(const KURL &url) { - QString fname(url.fileName()); + TQString fname(url.fileName()); int pos; - if(-1!=(pos=fname.findRev(QString::fromLatin1(constMultipleExtension)))) + if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension)))) fname=fname.left(pos); return fname; } -static QString modifyName(const QString &fname) +static TQString modifyName(const TQString &fname) { static const char constSymbols[]={ '-', ' ', ':', 0 }; - QString rv(fname); + TQString rv(fname); int dotPos=rv.findRev('.'); if(-1!=dotPos) @@ -163,7 +163,7 @@ static QString modifyName(const QString &fname) return rv; } -static int getSize(const QCString &file) +static int getSize(const TQCString &file) { KDE_struct_stat buff; @@ -185,12 +185,12 @@ static int getSize(const QCString &file) return -1; } -static int getFontSize(const QString &file) +static int getFontSize(const TQString &file) { int size=0; KURL::List urls; - QStringList files; + TQStringList files; Misc::getAssociatedUrls(KURL(file), urls); @@ -205,12 +205,12 @@ static int getFontSize(const QString &file) files.append((*uIt).path()); } - QStringList::Iterator it(files.begin()), + TQStringList::Iterator it(files.begin()), end(files.end()); for(; it!=end; ++it) { - int s=getSize(QFile::encodeName(*it)); + int s=getSize(TQFile::encodeName(*it)); if(s>-1) size+=s; @@ -219,9 +219,9 @@ static int getFontSize(const QString &file) return size; } -static int getSize(QValueList<FcPattern *> &patterns) +static int getSize(TQValueList<FcPattern *> &patterns) { - QValueList<FcPattern *>::Iterator it, + TQValueList<FcPattern *>::Iterator it, end=patterns.end(); int size=0; @@ -231,7 +231,7 @@ static int getSize(QValueList<FcPattern *> &patterns) return size; } -static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const QString &s=QString::null) +static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null) { KIO::UDSAtom atom; atom.m_uds = ID; @@ -240,12 +240,12 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const QString entry.append(atom); } -static bool createFolderUDSEntry(KIO::UDSEntry &entry, const QString &name, const QString &path, bool sys) +static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys) { KFI_DBUG << "createFolderUDSEntry " << name << ' ' << path << ' ' << sys << ' ' << endl; KDE_struct_stat buff; - QCString cPath(QFile::encodeName(path)); + TQCString cPath(TQFile::encodeName(path)); entry.clear(); @@ -262,7 +262,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const QString &name, cons if(n!= -1) buffer2[n]='\0'; - addAtom(entry, KIO::UDS_LINK_DEST, 0, QString::fromLocal8Bit(buffer2)); + addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2)); if(-1==KDE_stat(cPath, &buff)) { @@ -282,17 +282,17 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const QString &name, cons addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime); struct passwd *user = getpwuid(buff.st_uid); - addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : QString::number(buff.st_uid).latin1()); + addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1()); struct group *grp = getgrgid(buff.st_gid); - addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : QString::number(buff.st_gid).latin1()); + addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1()); addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime); addAtom(entry, KIO::UDS_MIME_TYPE, 0, sys ? KFI_KIO_FONTS_PROTOCOL"/system-folder" : KFI_KIO_FONTS_PROTOCOL"/folder"); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - QString url(KFI_KIO_FONTS_PROTOCOL+QString::fromLatin1(":/")); + TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); return true; } else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet! @@ -313,7 +313,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const QString &name, cons return false; } -static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValueList<FcPattern *> &patterns, bool sys) +static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys) { KFI_DBUG << "createFontUDSEntry " << name << ' ' << patterns.count() << endl; @@ -331,8 +331,8 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValue // // In case of mixed bitmap/scalable - prefer scalable - QValueList<FcPattern *> sortedPatterns; - QValueList<FcPattern *>::Iterator it, + TQValueList<FcPattern *> sortedPatterns; + TQValueList<FcPattern *>::Iterator it, end(patterns.end()); FcBool b=FcFalse; @@ -348,8 +348,8 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValue for(it=sortedPatterns.begin(); it!=end; ++it) { - QString path(CFcEngine::getFcString(*it, FC_FILE)); - QCString cPath(QFile::encodeName(path)); + TQString path(CFcEngine::getFcString(*it, FC_FILE)); + TQCString cPath(TQFile::encodeName(path)); KDE_struct_stat buff; if(-1!=KDE_lstat(cPath, &buff)) @@ -366,7 +366,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValue if(n!= -1) buffer2[n]='\0'; - addAtom(entry, KIO::UDS_LINK_DEST, 0, QString::fromLocal8Bit(buffer2)); + addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2)); if(-1==KDE_stat(cPath, &buff)) { @@ -384,24 +384,24 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValue addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime); struct passwd *user = getpwuid(buff.st_uid); - addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : QString::number(buff.st_uid).latin1()); + addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1()); struct group *grp = getgrgid(buff.st_gid); - addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : QString::number(buff.st_gid).latin1()); + addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1()); addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime); addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name()); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - QString url(KFI_KIO_FONTS_PROTOCOL+QString::fromLatin1(":/")); + TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); if(!Misc::root()) { url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER); - url+=QString::fromLatin1("/"); + url+=TQString::fromLatin1("/"); } if(multiple) - url+=name+QString::fromLatin1(constMultipleExtension); + url+=name+TQString::fromLatin1(constMultipleExtension); else url+=Misc::getFile(path); addAtom(entry, KIO::UDS_URL, 0, url); @@ -423,7 +423,7 @@ static KURL getRedirect(const KURL &u) // Go from fonts:/System to fonts:/ KURL redirect(u); - QString path(u.path()), + TQString path(u.path()), sect(CKioFonts::getSect(path)); path.remove(sect); @@ -439,13 +439,13 @@ static bool nonRootSys(const KURL &u) return !Misc::root() && isSysFolder(CKioFonts::getSect(u.path())); } -static QString getFontFolder(const QString &defaultDir, const QString &root, QStringList &dirs) +static TQString getFontFolder(const TQString &defaultDir, const TQString &root, TQStringList &dirs) { if(dirs.contains(defaultDir)) return defaultDir; else { - QStringList::Iterator it, + TQStringList::Iterator it, end=dirs.end(); bool found=false; @@ -454,7 +454,7 @@ static QString getFontFolder(const QString &defaultDir, const QString &root, QSt return *it; } - return QString::null; + return TQString::null; } static bool writeAll(int fd, const char *buf, size_t len) @@ -479,16 +479,16 @@ static bool checkExt(const char *fname, const char *ext) : false; } -static bool isAAfm(const QString &fname) +static bool isAAfm(const TQString &fname) { - if(checkExt(QFile::encodeName(fname), "afm")) // CPD? Is this a necessary check? + if(checkExt(TQFile::encodeName(fname), "afm")) // CPD? Is this a necessary check? { - QFile file(fname); + TQFile file(fname); if(file.open(IO_ReadOnly)) { - QTextStream stream(&file); - QString line; + TQTextStream stream(&file); + TQString line; for(int lc=0; lc<30 && !stream.atEnd(); ++lc) { @@ -508,17 +508,17 @@ static bool isAAfm(const QString &fname) return false; } -static bool isAPfm(const QString &fname) +static bool isAPfm(const TQString &fname) { bool ok=false; // I know extension checking is bad, but Ghostscript's pf2afm requires the pfm file to // have the .pfm extension... - if(checkExt(QFile::encodeName(fname), "pfm")) + if(checkExt(TQFile::encodeName(fname), "pfm")) { // // OK, the extension matches, so perform a little contents checking... - FILE *f=fopen(QFile::encodeName(fname).data(), "r"); + FILE *f=fopen(TQFile::encodeName(fname).data(), "r"); if(f) { @@ -561,14 +561,14 @@ static bool isAPfm(const QString &fname) // // This function is *only* used for the generation of AFMs from PFMs. -static bool isAType1(const QString &fname) +static bool isAType1(const TQString &fname) { static const char * constStr="%!PS-AdobeFont-"; static const unsigned int constStrLen=15; static const unsigned int constPfbOffset=6; static const unsigned int constPfbLen=constStrLen+constPfbOffset; - QCString name(QFile::encodeName(fname)); + TQCString name(TQFile::encodeName(fname)); char buffer[constPfbLen]; bool match=false; @@ -600,53 +600,53 @@ static bool isAType1(const QString &fname) return match; } -static QString getMatch(const QString &file, const char *extension) +static TQString getMatch(const TQString &file, const char *extension) { - QString f(Misc::changeExt(file, extension)); + TQString f(Misc::changeExt(file, extension)); - return Misc::fExists(f) ? f : QString::null; + return Misc::fExists(f) ? f : TQString::null; } inline bool isHidden(const KURL &u) { - return QChar('.')==u.fileName()[0]; + return TQChar('.')==u.fileName()[0]; } struct FontList { struct Path { - Path(const QString &p=QString::null) : orig(p) { } + Path(const TQString &p=TQString::null) : orig(p) { } - QString orig, + TQString orig, modified; bool operator==(const Path &p) const { return p.orig==orig; } }; - FontList(const QString &n=QString::null, const QString &p=QString::null) : name(n) { if(!p.isEmpty()) paths.append(Path(p)); } + FontList(const TQString &n=TQString::null, const TQString &p=TQString::null) : name(n) { if(!p.isEmpty()) paths.append(Path(p)); } - QString name; - QValueList<Path> paths; + TQString name; + TQValueList<Path> paths; bool operator==(const FontList &f) const { return f.name==name; } }; // // This function returns a set of maping of from -> to for copy/move operations -static bool getFontList(const QStringList &files, QMap<QString, QString> &map) +static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &map) { // // First of all create a list of font files, and their paths - QStringList::ConstIterator it=files.begin(), + TQStringList::ConstIterator it=files.begin(), end=files.end(); - QValueList<FontList> list; + TQValueList<FontList> list; for(;it!=end; ++it) { - QString name(Misc::getFile(*it)), + TQString name(Misc::getFile(*it)), path(Misc::getDir(*it)); - QValueList<FontList>::Iterator entry=list.find(FontList(name)); + TQValueList<FontList>::Iterator entry=list.find(FontList(name)); if(entry!=list.end()) { @@ -657,12 +657,12 @@ static bool getFontList(const QStringList &files, QMap<QString, QString> &map) list.append(FontList(name, path)); } - QValueList<FontList>::Iterator fIt(list.begin()), + TQValueList<FontList>::Iterator fIt(list.begin()), fEnd(list.end()); for(; fIt!=fEnd; ++fIt) { - QValueList<FontList::Path>::Iterator pBegin((*fIt).paths.begin()), + TQValueList<FontList::Path>::Iterator pBegin((*fIt).paths.begin()), pIt(++pBegin), pEnd((*fIt).paths.end()); --pBegin; @@ -705,7 +705,7 @@ static bool getFontList(const QStringList &files, QMap<QString, QString> &map) return list.count() ? true : false; } -CKioFonts::CKioFonts(const QCString &pool, const QCString &app) +CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app) : KIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app), itsRoot(Misc::root()), itsUsingFcFpe(false), @@ -735,7 +735,7 @@ CKioFonts::CKioFonts(const QCString &pool, const QCString &app) // 4. If either are not found, then add to local.conf / .fonts.conf FcStrList *list=FcConfigGetFontDirs(FcInitLoadConfigAndFonts()); - QStringList dirs; + TQStringList dirs; FcChar8 *dir; while((dir=FcStrListNext(list))) @@ -745,8 +745,8 @@ CKioFonts::CKioFonts(const QCString &pool, const QCString &app) if(!itsRoot) { - QString home(Misc::dirSyntax(QDir::homeDirPath())), - defaultDir(Misc::dirSyntax(QDir::homeDirPath()+"/.fonts/")), + TQString home(Misc::dirSyntax(TQDir::homeDirPath())), + defaultDir(Misc::dirSyntax(TQDir::homeDirPath()+"/.fonts/")), dir(getFontFolder(defaultDir, home, dirs)); if(dir.isEmpty()) // Then no $HOME/ was found in fontconfigs dirs! @@ -760,7 +760,7 @@ CKioFonts::CKioFonts(const QCString &pool, const QCString &app) itsFolders[FOLDER_USER].location=dir; } - QString sysDefault("/usr/local/share/fonts/"), + TQString sysDefault("/usr/local/share/fonts/"), sysDir(getFontFolder(sysDefault, "/usr/local/share/", dirs)); if(sysDir.isEmpty()) @@ -804,9 +804,9 @@ CKioFonts::CKioFonts(const QCString &pool, const QCString &app) } else { - QString str(paths[path]); + TQString str(paths[path]); - str.replace(QRegExp("\\s*"), ""); + str.replace(TQRegExp("\\s*"), ""); if(0==str.find("unix/:")) itsUsingXfsFpe=true; @@ -833,14 +833,14 @@ void CKioFonts::listDir(const KURL &url) KIO::UDSEntry entry; int size=0; - if(itsRoot || QStringList::split('/', url.path(), false).count()!=0) + if(itsRoot || TQStringList::split('/', url.path(), false).count()!=0) { EFolder folder=getFolder(url); totalSize(itsFolders[folder].fontMap.count()); if(itsFolders[folder].fontMap.count()) { - QMap<QString, QValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.begin(), + TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.begin(), end=itsFolders[folder].fontMap.end(); for ( ; it != end; ++it) @@ -874,7 +874,7 @@ void CKioFonts::stat(const KURL &url) if(updateFontList() && checkUrl(url, true)) { - QString path(url.path(-1)); + TQString path(url.path(-1)); if(path.isEmpty()) { @@ -882,7 +882,7 @@ void CKioFonts::stat(const KURL &url) return; } - QStringList pathList(QStringList::split('/', path, false)); + TQStringList pathList(TQStringList::split('/', path, false)); KIO::UDSEntry entry; bool err=false; @@ -925,7 +925,7 @@ bool CKioFonts::createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder f { KFI_DBUG << "createStatEntry " << url.path() << endl; - QMap<QString, QValueList<FcPattern *> >::Iterator it=getMap(url); + TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=getMap(url); if(it!=itsFolders[folder].fontMap.end()) return createFontUDSEntry(entry, it.key(), it.data(), FOLDER_SYS==folder); @@ -937,7 +937,7 @@ void CKioFonts::get(const KURL &url) KFI_DBUG << "get " << url.path() << " query:" << url.query() << endl; bool thumb="1"==metaData("thumbnail"); - QStringList srcFiles; + TQStringList srcFiles; if(updateFontList() && checkUrl(url) && getSourceFiles(url, srcFiles)) // Any error will be logged in getSourceFiles { @@ -948,8 +948,8 @@ void CKioFonts::get(const KURL &url) // read this and just ask Xft/fontconfig for the font data. if(thumb) { - QByteArray array; - QTextOStream stream(array); + TQByteArray array; + TQTextOStream stream(array); emit mimeType("text/plain"); @@ -959,13 +959,13 @@ void CKioFonts::get(const KURL &url) totalSize(array.size()); data(array); processedSize(array.size()); - data(QByteArray()); + data(TQByteArray()); processedSize(array.size()); finished(); return; } - QString realPath, + TQString realPath, useMime; KDE_struct_stat buff; bool multiple=false; @@ -982,11 +982,11 @@ void CKioFonts::get(const KURL &url) if(tar.open(IO_WriteOnly)) { - QMap<QString, QString> map; + TQMap<TQString, TQString> map; getFontList(srcFiles, map); - QMap<QString, QString>::Iterator fIt(map.begin()), + TQMap<TQString, TQString>::Iterator fIt(map.begin()), fEnd(map.end()); // @@ -999,7 +999,7 @@ void CKioFonts::get(const KURL &url) } } - QCString realPathC(QFile::encodeName(realPath)); + TQCString realPathC(TQFile::encodeName(realPath)); KFI_DBUG << "real: " << realPathC << endl; if (-2==KDE_stat(realPathC.data(), &buff)) @@ -1024,7 +1024,7 @@ void CKioFonts::get(const KURL &url) KIO::filesize_t processed=0; char buffer[MAX_IPC_SIZE]; - QByteArray array; + TQByteArray array; while(1) { @@ -1050,7 +1050,7 @@ void CKioFonts::get(const KURL &url) processedSize(processed); } - data(QByteArray()); + data(TQByteArray()); close(fd); processedSize(buff.st_size); @@ -1080,9 +1080,9 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) bool changed=confirmUrl(url), nrs=nonRootSys(url); EFolder destFolder(getFolder(url)); - QString dest=itsFolders[destFolder].location+modifyName(url.fileName()), + TQString dest=itsFolders[destFolder].location+modifyName(url.fileName()), passwd; - QCString destC=QFile::encodeName(dest); + TQCString destC=TQFile::encodeName(dest); KDE_struct_stat buffDest; bool destExists=(KDE_lstat(destC.data(), &buffDest)!= -1); @@ -1111,7 +1111,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) // an AFM or PFM file // 3. If its OK, then get the fonts "name" from KTempFile tmpFile; - QCString tmpFileC(QFile::encodeName(tmpFile.name())); + TQCString tmpFileC(TQFile::encodeName(tmpFile.name())); tmpFile.setAutoDelete(true); @@ -1122,20 +1122,20 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) if(nrs) // Ask root to copy the font... { - QCString cmd; + TQCString cmd; if(!Misc::dExists(itsFolders[destFolder].location)) { cmd+="mkdir "; - cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); + cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); cmd+=" && chmod 0755 "; - cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); + cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); cmd+=" && "; } cmd+="cp -f "; - cmd+=QFile::encodeName(KProcess::quote(tmpFileC)); + cmd+=TQFile::encodeName(KProcess::quote(tmpFileC)); cmd+=" "; - cmd+=QFile::encodeName(KProcess::quote(destC)); + cmd+=TQFile::encodeName(KProcess::quote(destC)); cmd+=" && chmod 0644 "; cmd+=destC; @@ -1177,16 +1177,16 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) } } -bool CKioFonts::putReal(const QString &destOrig, const QCString &destOrigC, bool origExists, +bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bool origExists, int mode, bool resume) { bool markPartial=config()->readBoolEntry("MarkPartial", true); - QString dest; + TQString dest; if (markPartial) { - QString destPart(destOrig+QString::fromLatin1(".part")); - QCString destPartC(QFile::encodeName(destPart)); + TQString destPart(destOrig+TQString::fromLatin1(".part")); + TQCString destPartC(TQFile::encodeName(destPart)); dest = destPart; @@ -1218,7 +1218,7 @@ bool CKioFonts::putReal(const QString &destOrig, const QCString &destOrigC, bool // Catch errors when we try to open the file. } - QCString destC(QFile::encodeName(dest)); + TQCString destC(TQFile::encodeName(dest)); int fd; @@ -1244,7 +1244,7 @@ bool CKioFonts::putReal(const QString &destOrig, const QCString &destOrigC, bool // Loop until we got 0 (end of data) do { - QByteArray buffer; + TQByteArray buffer; dataReq(); // Request for data result = readData(buffer); @@ -1324,14 +1324,14 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) { //checkUrl(u) // CPD as per comment in ::put() - QStringList srcFiles; + TQStringList srcFiles; if(getSourceFiles(src, srcFiles)) // Any error will be logged in getSourceFiles { KURL dest(d); bool changed=confirmUrl(dest); EFolder destFolder(getFolder(dest)); - QMap<QString, QString> map; + TQMap<TQString, TQString> map; if(!fromFonts) map[src.path()]=src.fileName(); @@ -1345,28 +1345,28 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) { if(nonRootSys(dest)) { - QCString cmd; + TQCString cmd; int size=0; if(!Misc::dExists(itsFolders[destFolder].location)) { cmd+="mkdir "; - cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); + cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); cmd+=" && chmod 0755 "; - cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); + cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)); cmd+=" && "; } - QMap<QString, QString>::Iterator fIt(map.begin()), + TQMap<TQString, TQString>::Iterator fIt(map.begin()), fEnd(map.end()); for(; fIt!=fEnd; ++fIt) { cmd+="cp -f "; - cmd+=QFile::encodeName(KProcess::quote(fIt.key())); + cmd+=TQFile::encodeName(KProcess::quote(fIt.key())); cmd+=" "; - cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data()))); - int s=getSize(QFile::encodeName(fIt.key())); + cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data()))); + int s=getSize(TQFile::encodeName(fIt.key())); if(s>0) size+=s; if(++fIt!=fEnd) @@ -1379,7 +1379,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) totalSize(size); - QString passwd=getRootPasswd(); + TQString passwd=getRootPasswd(); if(doRootCmd(cmd, passwd)) { @@ -1396,13 +1396,13 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) } else { - QMap<QString, QString>::Iterator fIt(map.begin()), + TQMap<TQString, TQString>::Iterator fIt(map.begin()), fEnd(map.end()); for(; fIt!=fEnd; ++fIt) { - QCString realSrc(QFile::encodeName(fIt.key())), - realDest(QFile::encodeName(itsFolders[destFolder].location+modifyName(fIt.data()))); + TQCString realSrc(TQFile::encodeName(fIt.key())), + realDest(TQFile::encodeName(itsFolders[destFolder].location+modifyName(fIt.data()))); KDE_struct_stat buffSrc; if(-1==KDE_stat(realSrc.data(), &buffSrc)) @@ -1437,7 +1437,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) KIO::filesize_t processed = 0; char buffer[MAX_IPC_SIZE]; - QByteArray array; + TQByteArray array; while(1) { @@ -1521,34 +1521,34 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite) // Can't rename from/to file:/ -> therefore rename can only be from fonts:/System to fonts:/Personal, // or vice versa. - QStringList srcFiles; + TQStringList srcFiles; if(getSourceFiles(src, srcFiles)) // Any error will be logged in getSourceFiles { KURL dest(d); bool changed=confirmUrl(dest); EFolder destFolder(getFolder(dest)); - QMap<QString, QString> map; + TQMap<TQString, TQString> map; if(confirmMultiple(src, srcFiles, FOLDER_SYS==destFolder ? FOLDER_USER : FOLDER_SYS, OP_MOVE) && getFontList(srcFiles, map) && checkDestFiles(src, map, dest, destFolder, overwrite)) { - QMap<QString, QString>::Iterator fIt(map.begin()), + TQMap<TQString, TQString>::Iterator fIt(map.begin()), fEnd(map.end()); bool askPasswd=true, toSys=FOLDER_SYS==destFolder; - QCString userId, + TQCString userId, groupId, - destDir(QFile::encodeName(KProcess::quote(itsFolders[destFolder].location))); + destDir(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location))); userId.setNum(toSys ? 0 : getuid()); groupId.setNum(toSys ? 0 : getgid()); for(; fIt!=fEnd; ++fIt) { - QCString cmd, - destFile(QFile::encodeName(KProcess::quote(itsFolders[destFolder].location+fIt.data()))); + TQCString cmd, + destFile(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+fIt.data()))); if(toSys && !Misc::dExists(itsFolders[destFolder].location)) { @@ -1558,7 +1558,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite) } cmd+="mv -f "; - cmd+=QFile::encodeName(KProcess::quote(fIt.key())); + cmd+=TQFile::encodeName(KProcess::quote(fIt.key())); cmd+=" "; cmd+=destFile; cmd+=" && chmod -f 0644 "; @@ -1570,7 +1570,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite) cmd+=" "; cmd+=destFile; - QString sysDir, + TQString sysDir, userDir; if(FOLDER_SYS==destFolder) @@ -1610,28 +1610,28 @@ void CKioFonts::del(const KURL &url, bool) { KFI_DBUG << "del " << url.path() << endl; - QValueList<FcPattern *> *entries; + TQValueList<FcPattern *> *entries; if(checkUrl(url) && checkAllowed(url) && updateFontList() && (entries=getEntries(url)) && entries->count() && confirmMultiple(url, entries, getFolder(url), OP_DELETE)) { - QValueList<FcPattern *>::Iterator it, + TQValueList<FcPattern *>::Iterator it, end=entries->end(); CDirList modifiedDirs; bool clearList=KFI_KIO_NO_CLEAR!=url.query(); if(nonRootSys(url)) { - QCString cmd("rm -f"); + TQCString cmd("rm -f"); for(it=entries->begin(); it!=end; ++it) { - QString file(CFcEngine::getFcString(*it, FC_FILE)); + TQString file(CFcEngine::getFcString(*it, FC_FILE)); modifiedDirs.add(Misc::getDir(file)); cmd+=" "; - cmd+=QFile::encodeName(KProcess::quote(file)); + cmd+=TQFile::encodeName(KProcess::quote(file)); KURL::List urls; @@ -1645,7 +1645,7 @@ void CKioFonts::del(const KURL &url, bool) for(uIt=urls.begin(); uIt!=uEnd; ++uIt) { cmd+=" "; - cmd+=QFile::encodeName(KProcess::quote((*uIt).path())); + cmd+=TQFile::encodeName(KProcess::quote((*uIt).path())); } } } @@ -1662,9 +1662,9 @@ void CKioFonts::del(const KURL &url, bool) { for(it=entries->begin(); it!=end; ++it) { - QString file(CFcEngine::getFcString(*it, FC_FILE)); + TQString file(CFcEngine::getFcString(*it, FC_FILE)); - if (0!=unlink(QFile::encodeName(file).data())) + if (0!=unlink(TQFile::encodeName(file).data())) error(EACCES==errno || EPERM==errno ? KIO::ERR_ACCESS_DENIED : EISDIR==errno @@ -1685,7 +1685,7 @@ void CKioFonts::del(const KURL &url, bool) uEnd=urls.end(); for(uIt=urls.begin(); uIt!=uEnd; ++uIt) - unlink(QFile::encodeName((*uIt).path()).data()); + unlink(TQFile::encodeName((*uIt).path()).data()); } } } @@ -1732,13 +1732,13 @@ void CKioFonts::modified(EFolder folder, bool clearList, const CDirList &dirs) clearFontList(); // List of fonts has changed.../ } -void CKioFonts::special(const QByteArray &a) +void CKioFonts::special(const TQByteArray &a) { KFI_DBUG << "special" << endl; if(a.size()) { - QDataStream stream(a, IO_ReadOnly); + TQDataStream stream(a, IO_ReadOnly); int cmd; stream >> cmd; @@ -1760,14 +1760,14 @@ void CKioFonts::special(const QByteArray &a) finished(); break; default: - error( KIO::ERR_UNSUPPORTED_ACTION, QString::number(cmd)); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd)); } } else doModified(); } -void CKioFonts::createRootRefreshCmd(QCString &cmd, const CDirList &dirs, bool reparseCfg) +void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool reparseCfg) { if(reparseCfg) reparseConfig(); @@ -1784,7 +1784,7 @@ void CKioFonts::createRootRefreshCmd(QCString &cmd, const CDirList &dirs, bool r for(; it!=end; ++it) { - QCString tmpCmd; + TQCString tmpCmd; if(*it==itsFolders[FOLDER_SYS].location) { @@ -1800,7 +1800,7 @@ void CKioFonts::createRootRefreshCmd(QCString &cmd, const CDirList &dirs, bool r cmd+=" && kfontinst "; cmd+=tmpCmd; cmd+=" "; - cmd+=QFile::encodeName(KProcess::quote(*it)); + cmd+=TQFile::encodeName(KProcess::quote(*it)); } } } @@ -1809,7 +1809,7 @@ void CKioFonts::createRootRefreshCmd(QCString &cmd, const CDirList &dirs, bool r cmd+=" && kfontinst "; cmd+=itsNrsKfiParams; cmd+=" "; - cmd+=QFile::encodeName(KProcess::quote(itsFolders[FOLDER_SYS].location)); + cmd+=TQFile::encodeName(KProcess::quote(itsFolders[FOLDER_SYS].location)); } } @@ -1846,7 +1846,7 @@ void CKioFonts::doModified() for(; it!=end; ++it) { - Misc::doCmd("kfontinst", itsKfiParams, QFile::encodeName(*it)); + Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it)); KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl; } @@ -1859,7 +1859,7 @@ void CKioFonts::doModified() } else { - QCString cmd; + TQCString cmd; createRootRefreshCmd(cmd, itsFolders[FOLDER_SYS].modified, false); if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) @@ -1885,7 +1885,7 @@ void CKioFonts::doModified() for(; it!=end; ++it) { - Misc::doCmd("kfontinst", itsKfiParams, QFile::encodeName(*it)); + Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it)); KFI_DBUG << "RUN(non-root): kfontinst " << itsKfiParams << ' ' << *it << endl; } } @@ -1896,14 +1896,14 @@ void CKioFonts::doModified() } #define SYS_USER "root" -QString CKioFonts::getRootPasswd(bool askPasswd) +TQString CKioFonts::getRootPasswd(bool askPasswd) { KFI_DBUG << "getRootPasswd" << endl; KIO::AuthInfo authInfo; SuProcess proc(SYS_USER); bool error=false; int attempts=0; - QString errorMsg; + TQString errorMsg; authInfo.url=KURL(KFI_KIO_FONTS_PROTOCOL ":///"); authInfo.username=SYS_USER; @@ -1923,10 +1923,10 @@ QString CKioFonts::getRootPasswd(bool askPasswd) } else error=proc.checkInstall(authInfo.password.local8Bit()) ? true : false; - return error ? QString::null : authInfo.password; + return error ? TQString::null : authInfo.password; } -bool CKioFonts::doRootCmd(const char *cmd, const QString &passwd) +bool CKioFonts::doRootCmd(const char *cmd, const TQString &passwd) { KFI_DBUG << "doRootCmd " << cmd << endl; @@ -1950,7 +1950,7 @@ bool CKioFonts::confirmUrl(KURL &url) KFI_DBUG << "confirmUrl " << url.path() << endl; if(!itsRoot) { - QString sect(getSect(url.path())); + TQString sect(getSect(url.path())); if(!isSysFolder(sect) && !isUserFolder(sect)) { @@ -1971,12 +1971,12 @@ bool CKioFonts::confirmUrl(KURL &url) if(changeToSystem) { itsLastDest=DEST_SYS; - url.setPath(QChar('/')+i18n(KFI_KIO_FONTS_SYS)+QChar('/')+url.fileName()); + url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+url.fileName()); } else { itsLastDest=DEST_USER; - url.setPath(QChar('/')+i18n(KFI_KIO_FONTS_USER)+QChar('/')+url.fileName()); + url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+url.fileName()); } KFI_DBUG << "Changed URL to:" << url.path() << endl; @@ -2030,25 +2030,25 @@ bool CKioFonts::updateFontList() if (itsFontList) { - QString home(Misc::dirSyntax(QDir::homeDirPath())); + TQString home(Misc::dirSyntax(TQDir::homeDirPath())); for (int i = 0; i < itsFontList->nfont; i++) { EFolder folder=FOLDER_SYS; - QString file(Misc::fileSyntax(CFcEngine::getFcString(itsFontList->fonts[i], FC_FILE))); + TQString file(Misc::fileSyntax(CFcEngine::getFcString(itsFontList->fonts[i], FC_FILE))); if(!file.isEmpty()) { if(!itsRoot && 0==file.find(home)) folder=FOLDER_USER; - QValueList<FcPattern *> &patterns= + TQValueList<FcPattern *> &patterns= itsFolders[folder].fontMap[CFcEngine::createName(itsFontList->fonts[i])]; bool use=true; if(patterns.count()) // Check for duplicates... { - QValueList<FcPattern *>::Iterator it, + TQValueList<FcPattern *>::Iterator it, end=patterns.end(); for(it=patterns.begin(); use && it!=end; ++it) @@ -2076,10 +2076,10 @@ CKioFonts::EFolder CKioFonts::getFolder(const KURL &url) return itsRoot || isSysFolder(getSect(url.path())) ? FOLDER_SYS : FOLDER_USER; } -QMap<QString, QValueList<FcPattern *> >::Iterator CKioFonts::getMap(const KURL &url) +TQMap<TQString, TQValueList<FcPattern *> >::Iterator CKioFonts::getMap(const KURL &url) { EFolder folder(getFolder(url)); - QMap<QString, QValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.find(removeMultipleExtension(url)); + TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.find(removeMultipleExtension(url)); if(it==itsFolders[folder].fontMap.end()) // Perhaps it was fonts:/System/times.ttf ??? { @@ -2092,9 +2092,9 @@ QMap<QString, QValueList<FcPattern *> >::Iterator CKioFonts::getMap(const KURL & return it; } -QValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url) +TQValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url) { - QMap<QString, QValueList<FcPattern *> >::Iterator it=getMap(url); + TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=getMap(url); if(it!=itsFolders[getFolder(url)].fontMap.end()) return &(it.data()); @@ -2103,14 +2103,14 @@ QValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url) return NULL; } -FcPattern * CKioFonts::getEntry(EFolder folder, const QString &file, bool full) +FcPattern * CKioFonts::getEntry(EFolder folder, const TQString &file, bool full) { - QMap<QString, QValueList<FcPattern *> >::Iterator it, + TQMap<TQString, TQValueList<FcPattern *> >::Iterator it, end=itsFolders[folder].fontMap.end(); for(it=itsFolders[folder].fontMap.begin(); it!=end; ++it) { - QValueList<FcPattern *>::Iterator patIt, + TQValueList<FcPattern *>::Iterator patIt, patEnd=it.data().end(); for(patIt=it.data().begin(); patIt!=patEnd; ++patIt) @@ -2122,9 +2122,9 @@ FcPattern * CKioFonts::getEntry(EFolder folder, const QString &file, bool full) return NULL; } -bool CKioFonts::checkFile(const QString &file) +bool CKioFonts::checkFile(const TQString &file) { - QCString cFile(QFile::encodeName(file)); + TQCString cFile(TQFile::encodeName(file)); // // To speed things up, check the files extension 1st... @@ -2135,7 +2135,7 @@ bool CKioFonts::checkFile(const QString &file) // // No exension match, so try querying with FreeType... int count=0; - FcPattern *pat=FcFreeTypeQuery((const FcChar8 *)(QFile::encodeName(file).data()), 0, NULL, &count); + FcPattern *pat=FcFreeTypeQuery((const FcChar8 *)(TQFile::encodeName(file).data()), 0, NULL, &count); if(pat) { @@ -2148,15 +2148,15 @@ bool CKioFonts::checkFile(const QString &file) return false; } -bool CKioFonts::getSourceFiles(const KURL &src, QStringList &files) +bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files) { if(KFI_KIO_FONTS_PROTOCOL==src.protocol()) { - QValueList<FcPattern *> *entries=getEntries(src); + TQValueList<FcPattern *> *entries=getEntries(src); if(entries && entries->count()) { - QValueList<FcPattern *>::Iterator it, + TQValueList<FcPattern *>::Iterator it, end=entries->end(); for(it=entries->begin(); it!=end; ++it) @@ -2165,7 +2165,7 @@ bool CKioFonts::getSourceFiles(const KURL &src, QStringList &files) if(files.count()) { - QStringList::Iterator sIt, + TQStringList::Iterator sIt, sEnd=files.end(); for(sIt=files.begin(); sIt!=sEnd; ++sIt) @@ -2195,12 +2195,12 @@ bool CKioFonts::getSourceFiles(const KURL &src, QStringList &files) if(files.count()) { - QStringList::Iterator it, + TQStringList::Iterator it, end=files.end(); for(it=files.begin(); it!=end; ++it) { - QCString realSrc=QFile::encodeName(*it); + TQCString realSrc=TQFile::encodeName(*it); KDE_struct_stat buffSrc; if (-1==KDE_stat(realSrc.data(), &buffSrc)) @@ -2241,7 +2241,7 @@ bool CKioFonts::checkDestFile(const KURL &src, const KURL &dest, EFolder destFol return true; } -bool CKioFonts::checkDestFiles(const KURL &src, QMap<QString, QString> &map, const KURL &dest, EFolder destFolder, bool overwrite) +bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map, const KURL &dest, EFolder destFolder, bool overwrite) { // // Check whether files exist at destination... @@ -2256,7 +2256,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, QMap<QString, QString> &map, con if(!overwrite) { - QMap<QString, QString>::Iterator fIt(map.begin()), + TQMap<TQString, TQString>::Iterator fIt(map.begin()), fEnd(map.end()); for(; fIt!=fEnd; ++fIt) @@ -2273,14 +2273,14 @@ bool CKioFonts::checkDestFiles(const KURL &src, QMap<QString, QString> &map, con // // Gather the number and names of the font faces located in "files". If there is more than 1 face // (such as there would be for a TTC font), then ask the user for confirmation of the action. -bool CKioFonts::confirmMultiple(const KURL &url, const QStringList &files, EFolder folder, EOp op) +bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFolder folder, EOp op) { if(KFI_KIO_FONTS_PROTOCOL!=url.protocol()) return true; - QStringList::ConstIterator it, + TQStringList::ConstIterator it, end=files.end(); - QStringList fonts; + TQStringList fonts; for(it=files.begin(); it!=files.end(); ++it) { @@ -2288,7 +2288,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const QStringList &files, EFold if(pat) { - QString name(CFcEngine::createName(pat)); + TQString name(CFcEngine::createName(pat)); if(-1==fonts.findIndex(name)) fonts.append(name); @@ -2297,12 +2297,12 @@ bool CKioFonts::confirmMultiple(const KURL &url, const QStringList &files, EFold if(fonts.count()>1) { - QString out; - QStringList::Iterator it, + TQString out; + TQStringList::Iterator it, end=fonts.end(); for(it=fonts.begin(); it!=end; ++it) - out+=QString("<li>")+*it+QString("</li>"); + out+=TQString("<li>")+*it+TQString("</li>"); if(KMessageBox::No==messageBox(QuestionYesNo, OP_MOVE==op @@ -2328,16 +2328,16 @@ bool CKioFonts::confirmMultiple(const KURL &url, const QStringList &files, EFold return true; } -bool CKioFonts::confirmMultiple(const KURL &url, QValueList<FcPattern *> *patterns, EFolder folder, EOp op) +bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patterns, EFolder folder, EOp op) { if(KFI_KIO_FONTS_PROTOCOL!=url.protocol()) return true; - QStringList files; + TQStringList files; if(patterns && patterns->count()) { - QValueList<FcPattern *>::Iterator it, + TQValueList<FcPattern *>::Iterator it, end=patterns->end(); for(it=patterns->begin(); it!=end; ++it) @@ -2351,7 +2351,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk) { if(KFI_KIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path()))) { - QString sect(getSect(u.path())); + TQString sect(getSect(u.path())); if(itsRoot) { @@ -2381,12 +2381,12 @@ bool CKioFonts::checkAllowed(const KURL &u) { if (KFI_KIO_FONTS_PROTOCOL==u.protocol()) { - QString ds(Misc::dirSyntax(u.path())); + TQString ds(Misc::dirSyntax(u.path())); - if(ds==QString(QChar('/')+i18n(KFI_KIO_FONTS_USER)+QChar('/')) || - ds==QString(QChar('/')+i18n(KFI_KIO_FONTS_SYS)+QChar('/')) || - ds==QString(QChar('/')+QString::fromLatin1(KFI_KIO_FONTS_USER)+QChar('/')) || - ds==QString(QChar('/')+QString::fromLatin1(KFI_KIO_FONTS_SYS)+QChar('/'))) + if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) || + ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) || + ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || + ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) { error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".") .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \ @@ -2399,7 +2399,7 @@ bool CKioFonts::checkAllowed(const KURL &u) // // Create an AFM from a Type 1 (pfa/pfb) font and its PFM file... -void CKioFonts::createAfm(const QString &file, bool nrs, const QString &passwd) +void CKioFonts::createAfm(const TQString &file, bool nrs, const TQString &passwd) { if(nrs && passwd.isEmpty()) return; @@ -2409,12 +2409,12 @@ void CKioFonts::createAfm(const QString &file, bool nrs, const QString &passwd) if(type1 || pfm) { - QString afm=getMatch(file, "afm"); // pf2afm wants files with lowercase extension, so just check for lowercase! + TQString afm=getMatch(file, "afm"); // pf2afm wants files with lowercase extension, so just check for lowercase! // -- when a font is installed, the extensio is converted to lowercase anyway... if(afm.isEmpty()) // No point creating if AFM already exists! { - QString pfm, + TQString pfm, t1; if(type1) // Its a Type1, so look for existing PFM @@ -2432,16 +2432,16 @@ void CKioFonts::createAfm(const QString &file, bool nrs, const QString &passwd) if(!t1.isEmpty() && !pfm.isEmpty()) // Do we have both Type1 and PFM? { - QString name(t1.left(t1.length()-4)); // pf2afm wants name without extension... + TQString name(t1.left(t1.length()-4)); // pf2afm wants name without extension... if(nrs) { - QCString cmd("pf2afm "); - cmd+=QFile::encodeName(KProcess::quote(name)); + TQCString cmd("pf2afm "); + cmd+=TQFile::encodeName(KProcess::quote(name)); doRootCmd(cmd, passwd); } else - Misc::doCmd("pf2afm", QFile::encodeName(name)); + Misc::doCmd("pf2afm", TQFile::encodeName(name)); } } } diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h index abfd6b042..57dc8516a 100644 --- a/kcontrol/kfontinst/kio/KioFonts.h +++ b/kcontrol/kfontinst/kio/KioFonts.h @@ -34,10 +34,10 @@ #include <kio/slavebase.h> #include <kurl.h> #include <klocale.h> -#include <qstring.h> -#include <qcstring.h> -#include <qmap.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqcstring.h> +#include <tqmap.h> +#include <tqvaluelist.h> #include "Misc.h" #include "KfiConstants.h" @@ -80,24 +80,24 @@ class CKioFonts : public KIO::SlaveBase public: CDirList() { } - CDirList(const QString &str) : QStringList(str) { } + CDirList(const TQString &str) : TQStringList(str) { } - void add(const QString &d) { if (!contains(d)) append(d); } + void add(const TQString &d) { if (!contains(d)) append(d); } }; struct TFolder { - QString location; + TQString location; CDirList modified; - QMap<QString, QValueList<FcPattern *> > fontMap; // Maps from "Times New Roman" -> $HOME/.fonts/times.ttf + TQMap<TQString, TQValueList<FcPattern *> > fontMap; // Maps from "Times New Roman" -> $HOME/.fonts/times.ttf }; public: - CKioFonts(const QCString &pool, const QCString &app); + CKioFonts(const TQCString &pool, const TQCString &app); virtual ~CKioFonts(); - static QString getSect(const QString &f) { return f.section('/', 1, 1); } + static TQString getSect(const TQString &f) { return f.section('/', 1, 1); } void listDir(const KURL &url); void stat(const KURL &url); @@ -110,30 +110,30 @@ class CKioFonts : public KIO::SlaveBase private: - bool putReal(const QString &destOrig, const QCString &destOrigC, bool origExists, int mode, bool resume); + bool putReal(const TQString &destOrig, const TQCString &destOrigC, bool origExists, int mode, bool resume); void modified(EFolder folder, bool clearList=true, const CDirList &dirs=CDirList()); - void special(const QByteArray &a); - void createRootRefreshCmd(QCString &cmd, const CDirList &dirs=CDirList(), bool reparseCfg=true); + void special(const TQByteArray &a); + void createRootRefreshCmd(TQCString &cmd, const CDirList &dirs=CDirList(), bool reparseCfg=true); void doModified(); - QString getRootPasswd(bool askPasswd=true); - bool doRootCmd(const char *cmd, const QString &passwd); + TQString getRootPasswd(bool askPasswd=true); + bool doRootCmd(const char *cmd, const TQString &passwd); bool doRootCmd(const char *cmd, bool askPasswd=true) { return doRootCmd(cmd, getRootPasswd(askPasswd)); } bool confirmUrl(KURL &url); void clearFontList(); bool updateFontList(); EFolder getFolder(const KURL &url); - QMap<QString, QValueList<FcPattern *> >::Iterator getMap(const KURL &url); - QValueList<FcPattern *> * getEntries(const KURL &url); - FcPattern * getEntry(EFolder folder, const QString &file, bool full=false); - bool checkFile(const QString &file); - bool getSourceFiles(const KURL &src, QStringList &files); + TQMap<TQString, TQValueList<FcPattern *> >::Iterator getMap(const KURL &url); + TQValueList<FcPattern *> * getEntries(const KURL &url); + FcPattern * getEntry(EFolder folder, const TQString &file, bool full=false); + bool checkFile(const TQString &file); + bool getSourceFiles(const KURL &src, TQStringList &files); bool checkDestFile(const KURL &src, const KURL &dest, EFolder destFolder, bool overwrite); - bool checkDestFiles(const KURL &src, QMap<QString, QString> &map, const KURL &dest, EFolder destFolder, bool overwrite); - bool confirmMultiple(const KURL &url, const QStringList &files, EFolder folder, EOp op); - bool confirmMultiple(const KURL &url, QValueList<FcPattern *> *patterns, EFolder folder, EOp op); + bool checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map, const KURL &dest, EFolder destFolder, bool overwrite); + bool confirmMultiple(const KURL &url, const TQStringList &files, EFolder folder, EOp op); + bool confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patterns, EFolder folder, EOp op); bool checkUrl(const KURL &u, bool rootOk=false); bool checkAllowed(const KURL &u); - void createAfm(const QString &file, bool nrs=false, const QString &passwd=QString::null); + void createAfm(const TQString &file, bool nrs=false, const TQString &passwd=TQString::null); void reparseConfig(); private: @@ -144,7 +144,7 @@ class CKioFonts : public KIO::SlaveBase itsUsingXfsFpe, itsHasSys, itsAddToSysFc; - QString itsPasswd; + TQString itsPasswd; unsigned int itsFontChanges; EDest itsLastDest; time_t itsLastDestTime, diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 0b3e51767..44d180fd2 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -1,8 +1,8 @@ -#include <qpainter.h> -#include <qpixmap.h> -#include <qfontmetrics.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqfontmetrics.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kurl.h> #include <kconfig.h> #include <kglobalsettings.h> @@ -23,7 +23,7 @@ #define KFI_PREVIEW_STRING_KEY "String" #ifdef HAVE_XFT -#define KFI_DISPLAY(pix) (pix ? pix->x11Display() : QPaintDevice::x11AppDisplay()) +#define KFI_DISPLAY(pix) (pix ? pix->x11Display() : TQPaintDevice::x11AppDisplay()) #endif namespace KFI @@ -73,25 +73,25 @@ static int fcToQtWeight(int weight) case FC_WEIGHT_THIN: return 0; case FC_WEIGHT_ULTRALIGHT: - return QFont::Light>>1; + return TQFont::Light>>1; case FC_WEIGHT_LIGHT: - return QFont::Light; + return TQFont::Light; default: case FC_WEIGHT_NORMAL: - return QFont::Normal; + return TQFont::Normal; case FC_WEIGHT_MEDIUM: #ifdef KFI_HAVE_MEDIUM_WEIGHT - return (QFont::Normal+QFont::DemiBold)>>1; + return (TQFont::Normal+TQFont::DemiBold)>>1; #endif - return QFont::Normal; + return TQFont::Normal; case FC_WEIGHT_SEMIBOLD: - return QFont::DemiBold; + return TQFont::DemiBold; case FC_WEIGHT_BOLD: - return QFont::Bold; + return TQFont::Bold; case FC_WEIGHT_ULTRABOLD: - return (QFont::Bold+QFont::Black)>>1; + return (TQFont::Bold+TQFont::Black)>>1; case FC_WEIGHT_HEAVY: - return QFont::Black; + return TQFont::Black; } } @@ -130,24 +130,24 @@ static int fcToQtWidth(int weight) switch(weight) { case FC_WIDTH_ULTRACONDENSED: - return QFont::UltraCondensed; + return TQFont::UltraCondensed; case FC_WIDTH_EXTRACONDENSED: - return QFont::ExtraCondensed; + return TQFont::ExtraCondensed; case FC_WIDTH_CONDENSED: - return QFont::Condensed; + return TQFont::Condensed; case FC_WIDTH_SEMICONDENSED: - return QFont::SemiCondensed; + return TQFont::SemiCondensed; default: case FC_WIDTH_NORMAL: - return QFont::Unstretched; + return TQFont::Unstretched; case FC_WIDTH_SEMIEXPANDED: - return QFont::SemiExpanded; + return TQFont::SemiExpanded; case FC_WIDTH_EXPANDED: - return QFont::Expanded; + return TQFont::Expanded; case FC_WIDTH_EXTRAEXPANDED: - return QFont::ExtraExpanded; + return TQFont::ExtraExpanded; case FC_WIDTH_ULTRAEXPANDED: - return QFont::UltraExpanded; + return TQFont::UltraExpanded; } } #endif @@ -183,7 +183,7 @@ static int fcSpacing(int spacing) return FC_CHARCELL; } -static int strToWeight(const QString &str, QString &newStr) +static int strToWeight(const TQString &str, TQString &newStr) { if(0==str.find(i18n(KFI_WEIGHT_THIN), 0, false)) { @@ -261,7 +261,7 @@ static int strToWeight(const QString &str, QString &newStr) } #ifndef KFI_FC_NO_WIDTHS -static int strToWidth(const QString &str, QString &newStr) +static int strToWidth(const TQString &str, TQString &newStr) { if(0==str.find(i18n(KFI_WIDTH_ULTRACONDENSED), 0, false)) { @@ -314,7 +314,7 @@ static int strToWidth(const QString &str, QString &newStr) } #endif -static int strToSlant(const QString &str) +static int strToSlant(const TQString &str) { if(-1!=str.find(i18n(KFI_SLANT_ITALIC))) return FC_SLANT_ITALIC; @@ -323,9 +323,9 @@ static int strToSlant(const QString &str) return FC_SLANT_ROMAN; } -static void drawText(QPainter &painter, int x, int y, int width, const QString &str) +static void drawText(TQPainter &painter, int x, int y, int width, const TQString &str) { - QString s(str); + TQString s(str); bool addedElipses=false; width-=x*2; @@ -366,7 +366,7 @@ inline bool equalSlant(int a, int b) } #ifdef HAVE_XFT -static bool drawChar(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, const QString &text, int pos, +static bool drawChar(TQPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, const TQString &text, int pos, int &x, int &y, int w, int h, int fSize, int offset) { XGlyphInfo extents; @@ -389,7 +389,7 @@ static bool drawChar(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor return false; } -static bool drawString(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, const QString &text, +static bool drawString(TQPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, const TQString &text, int x, int &y, int h, int offset) { XGlyphInfo extents; @@ -406,7 +406,7 @@ static bool drawString(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColo return false; } -static bool drawGlyph(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, FT_UInt i, +static bool drawGlyph(TQPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, FT_UInt i, int &x, int &y, int &w, int &h, int fSize, int offset) { XGlyphInfo extents; @@ -430,10 +430,10 @@ static bool drawGlyph(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor inline int point2Pixel(int point) { - return (point*QPaintDevice::x11AppDpiX()+36)/72; + return (point*TQPaintDevice::x11AppDpiX()+36)/72; } -static bool hasStr(XftFont *font, QString &str) +static bool hasStr(XftFont *font, TQString &str) { unsigned int slen=str.length(), ch; @@ -457,7 +457,7 @@ CFcEngine::~CFcEngine() FcConfigAppFontClear(FcConfigGetCurrent()); } -QString CFcEngine::getName(const KURL &url, int faceNo) +TQString CFcEngine::getName(const KURL &url, int faceNo) { if(url!=itsLastUrl || faceNo!=itsIndex) parseUrl(url, faceNo); @@ -466,7 +466,7 @@ QString CFcEngine::getName(const KURL &url, int faceNo) } #ifdef HAVE_XFT -bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bool thumb) +bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, bool thumb) { bool rv=false; @@ -493,7 +493,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo pix.resize(w, h); pix.fill(Qt::white); - QPainter painter(&pix); + TQPainter painter(&pix); getSizes(&pix); @@ -519,7 +519,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo if(thumb) { - QString text(i18n("AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789")); + TQString text(i18n("AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789")); // // Calculate size of text... @@ -569,7 +569,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo } else { - QString lowercase(getLowercaseLetters()), + TQString lowercase(getLowercaseLetters()), uppercase(getUppercaseLetters()), punctuation(getPunctuation()), title(itsDescriptiveName.isEmpty() @@ -614,7 +614,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo y+=8; } - QString previewString(getPreviewString()); + TQString previewString(getPreviewString()); bool stop=false; if(!drawGlyphs) @@ -685,20 +685,20 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo } #endif -QString CFcEngine::getPreviewString() +TQString CFcEngine::getPreviewString() { KConfig cfg(KFI_UI_CFG_FILE); cfg.setGroup(KFI_PREVIEW_GROUP); - QString str(cfg.readEntry(KFI_PREVIEW_STRING_KEY)); + TQString str(cfg.readEntry(KFI_PREVIEW_STRING_KEY)); return str.isEmpty() ? i18n("A sentence that uses all of the letters of the alphabet", "The quick brown fox jumps over the lazy dog") : str; } -void CFcEngine::setPreviewString(const QString &str) +void CFcEngine::setPreviewString(const TQString &str) { KConfig cfg(KFI_UI_CFG_FILE); @@ -706,36 +706,36 @@ void CFcEngine::setPreviewString(const QString &str) cfg.writeEntry(KFI_PREVIEW_STRING_KEY, str); } -QString CFcEngine::getUppercaseLetters() +TQString CFcEngine::getUppercaseLetters() { return i18n("All of the letters of the alphabet, uppercase", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); } -QString CFcEngine::getLowercaseLetters() +TQString CFcEngine::getLowercaseLetters() { return i18n("All of the letters of the alphabet, lowercase", "abcdefghijklmnopqrstuvwxyz"); } -QString CFcEngine::getPunctuation() +TQString CFcEngine::getPunctuation() { return i18n("Numbers and characters", "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"); } -QString CFcEngine::getFcString(FcPattern *pat, const char *val, int faceNo) +TQString CFcEngine::getFcString(FcPattern *pat, const char *val, int faceNo) { - QString rv; + TQString rv; FcChar8 *fcStr; if(FcResultMatch==FcPatternGetString(pat, val, faceNo, &fcStr)) - rv=QString::fromUtf8((char *)fcStr); + rv=TQString::fromUtf8((char *)fcStr); return rv; } -QString CFcEngine::createName(FcPattern *pat, int faceNo) +TQString CFcEngine::createName(FcPattern *pat, int faceNo) { //CPD: TODO: the names *need* to match up with kfontchooser's... - QString name(getFcString(pat, FC_FAMILY, faceNo)), + TQString name(getFcString(pat, FC_FAMILY, faceNo)), str; int intVal; bool comma=false; @@ -745,7 +745,7 @@ QString CFcEngine::createName(FcPattern *pat, int faceNo) str=weightStr(intVal); if(!str.isEmpty()) { - name+=QString(", ")+str; + name+=TQString(", ")+str; comma=true; } } @@ -757,10 +757,10 @@ QString CFcEngine::createName(FcPattern *pat, int faceNo) { if(!comma) { - name+=QChar(','); + name+=TQChar(','); comma=true; } - name+=QChar(' ')+str; + name+=TQChar(' ')+str; } } @@ -769,14 +769,14 @@ QString CFcEngine::createName(FcPattern *pat, int faceNo) { str=widthStr(intVal); if(!str.isEmpty()) - name+=QChar(' ')+str; + name+=TQChar(' ')+str; } #endif return name; } -QString CFcEngine::weightStr(int weight, bool emptyNormal) +TQString CFcEngine::weightStr(int weight, bool emptyNormal) { switch(fcWeight(weight)) { @@ -787,7 +787,7 @@ QString CFcEngine::weightStr(int weight, bool emptyNormal) case FC_WEIGHT_LIGHT: return i18n(KFI_WEIGHT_LIGHT); case FC_WEIGHT_NORMAL: - return emptyNormal ? QString::null : i18n(KFI_WEIGHT_NORMAL); + return emptyNormal ? TQString::null : i18n(KFI_WEIGHT_NORMAL); case FC_WEIGHT_MEDIUM: return i18n(KFI_WEIGHT_MEDIUM); case FC_WEIGHT_DEMIBOLD: @@ -802,7 +802,7 @@ QString CFcEngine::weightStr(int weight, bool emptyNormal) } #ifndef KFI_FC_NO_WIDTHS -QString CFcEngine::widthStr(int width, bool emptyNormal) +TQString CFcEngine::widthStr(int width, bool emptyNormal) { switch(fcWidth(width)) { @@ -815,7 +815,7 @@ QString CFcEngine::widthStr(int width, bool emptyNormal) case FC_WIDTH_SEMICONDENSED: return i18n(KFI_WIDTH_SEMICONDENSED); case FC_WIDTH_NORMAL: - return emptyNormal ? QString::null : i18n(KFI_WIDTH_NORMAL); + return emptyNormal ? TQString::null : i18n(KFI_WIDTH_NORMAL); case FC_WIDTH_SEMIEXPANDED: return i18n(KFI_WIDTH_SEMIEXPANDED); case FC_WIDTH_EXPANDED: @@ -828,7 +828,7 @@ QString CFcEngine::widthStr(int width, bool emptyNormal) } #endif -QString CFcEngine::slantStr(int slant, bool emptyNormal) +TQString CFcEngine::slantStr(int slant, bool emptyNormal) { switch(fcSlant(slant)) { @@ -837,11 +837,11 @@ QString CFcEngine::slantStr(int slant, bool emptyNormal) case FC_SLANT_ITALIC: return i18n(KFI_SLANT_ITALIC); default: - return emptyNormal ? QString::null : i18n(KFI_SLANT_ROMAN); + return emptyNormal ? TQString::null : i18n(KFI_SLANT_ROMAN); } } -QString CFcEngine::spacingStr(int spacing) +TQString CFcEngine::spacingStr(int spacing) { switch(fcSpacing(spacing)) { @@ -854,11 +854,11 @@ QString CFcEngine::spacingStr(int spacing) } } -bool CFcEngine::getInfo(const KURL &url, int faceNo, QString &full, QString &family, QString &foundry, QString &weight, +bool CFcEngine::getInfo(const KURL &url, int faceNo, TQString &full, TQString &family, TQString &foundry, TQString &weight, #ifndef KFI_FC_NO_WIDTHS - QString &width, + TQString &width, #endif - QString &spacing, QString &slant) + TQString &spacing, TQString &slant) { if(parseUrl(url, faceNo, true)) { @@ -887,11 +887,11 @@ bool CFcEngine::getInfo(const KURL &url, int faceNo, QString &full, QString &fam return false; } -QFont CFcEngine::getQFont(const QString &name, int size) +TQFont CFcEngine::getQFont(const TQString &name, int size) { parseName(name, 0, false); - QFont font(itsName, size, fcToQtWeight(itsWeight), fcToQtSlant(itsSlant)); + TQFont font(itsName, size, fcToQtWeight(itsWeight), fcToQtSlant(itsSlant)); #ifndef KFI_FC_NO_WIDTHS font.setStretch(fcToQtWidth(itsWidth)); @@ -912,7 +912,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) if(KFI_KIO_FONTS_PROTOCOL==url.protocol()) { KIO::UDSEntry udsEntry; - QString name; + TQString name; FcInitReinitialize(); if(KIO::NetAccess::stat(url, udsEntry, NULL)) // Need to stat the url to get its font name... @@ -939,13 +939,13 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) else if(url.isLocalFile()) { // Now lets see if its from the thumbnail job! if so, then file will just contain the URL! - QFile file(url.path()); + TQFile file(url.path()); bool isThumbnailUrl=false; if(file.size()<2048 && file.open(IO_ReadOnly)) // Urls should be less than 2k, and fonts usually above! { - QString thumbUrl; - QTextStream stream(&file); + TQString thumbUrl; + TQTextStream stream(&file); thumbUrl=stream.readLine(); isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all); @@ -957,7 +957,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) itsName=url.path(); int count; - FcPattern *pat=FcFreeTypeQuery((const FcChar8 *)(QFile::encodeName(itsName).data()), 0, NULL, &count); + FcPattern *pat=FcFreeTypeQuery((const FcChar8 *)(TQFile::encodeName(itsName).data()), 0, NULL, &count); itsWeight=FC_WEIGHT_NORMAL; #ifndef KFI_FC_NO_WIDTHS @@ -984,7 +984,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) FcPatternDestroy(pat); } else - itsDescriptiveName=QString::null; + itsDescriptiveName=TQString::null; itsInstalled=false; itsIndex=faceNo; @@ -997,7 +997,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) return true; } -void CFcEngine::parseName(const QString &name, int faceNo, bool all) +void CFcEngine::parseName(const TQString &name, int faceNo, bool all) { int pos; @@ -1014,7 +1014,7 @@ void CFcEngine::parseName(const QString &name, int faceNo, bool all) } else { - QString style(name.mid(pos+2)); + TQString style(name.mid(pos+2)); itsWeight=strToWeight(style, style); #ifndef KFI_FC_NO_WIDTHS @@ -1052,7 +1052,7 @@ void CFcEngine::parseName(const QString &name, int faceNo, bool all) } #ifdef HAVE_XFT -XftFont * CFcEngine::getFont(int size, QPixmap *pix) +XftFont * CFcEngine::getFont(int size, TQPixmap *pix) { if(itsInstalled) return XftFontOpen(KFI_DISPLAY(pix), 0, @@ -1067,7 +1067,7 @@ XftFont * CFcEngine::getFont(int size, QPixmap *pix) else { FcPattern *pattern = FcPatternBuild(NULL, - FC_FILE, FcTypeString, QFile::encodeName(itsName).data(), + FC_FILE, FcTypeString, TQFile::encodeName(itsName).data(), FC_INDEX, FcTypeInteger, itsIndex, FC_PIXEL_SIZE, FcTypeDouble, (double)size, NULL); @@ -1075,7 +1075,7 @@ XftFont * CFcEngine::getFont(int size, QPixmap *pix) } } -void CFcEngine::getSizes(QPixmap *pix) +void CFcEngine::getSizes(TQPixmap *pix) { static const int constNumSizes=11; static const int constNumSizeRanges=2; @@ -1152,7 +1152,7 @@ void CFcEngine::getSizes(QPixmap *pix) FcResultMatch==FcPatternGetInteger(f->pattern, FC_WIDTH, 0, &iv) && equalWidth(iv, itsWidth) && #endif FcResultMatch==FcPatternGetString(f->pattern, FC_FAMILY, 0, &str) && str && - QString::fromUtf8((char *)str)==itsName) + TQString::fromUtf8((char *)str)==itsName) { itsSizes.push_back(constSizes[l][i]); gotSizes=true; diff --git a/kcontrol/kfontinst/lib/FcEngine.h b/kcontrol/kfontinst/lib/FcEngine.h index 4a09b8a55..594a9192a 100644 --- a/kcontrol/kfontinst/lib/FcEngine.h +++ b/kcontrol/kfontinst/lib/FcEngine.h @@ -5,9 +5,9 @@ #include "config.h" #endif -#include <qstring.h> -#include <qvaluevector.h> -#include <qfont.h> +#include <tqstring.h> +#include <tqvaluevector.h> +#include <tqfont.h> #include <kurl.h> #include <kdeversion.h> #include <fontconfig/fontconfig.h> @@ -53,33 +53,33 @@ class KDE_EXPORT CFcEngine ~CFcEngine(); #ifdef HAVE_XFT - bool draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bool thumb); + bool draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, bool thumb); #endif int getNumIndexes() { return itsIndexCount; } // Only valid after draw has been called! - QString getName(const KURL &url, int faceNo=0); - bool getInfo(const KURL &url, int faceNo, QString &full, QString &family, QString &foundry, QString &weight, + TQString getName(const KURL &url, int faceNo=0); + bool getInfo(const KURL &url, int faceNo, TQString &full, TQString &family, TQString &foundry, TQString &weight, #ifndef KFI_FC_NO_WIDTHS - QString &width, + TQString &width, #endif - QString &spacing, QString &slant); - QFont getQFont(const QString &name, int size); + TQString &spacing, TQString &slant); + TQFont getQFont(const TQString &name, int size); - const QValueVector<int> & sizes() const { return itsSizes; } + const TQValueVector<int> & sizes() const { return itsSizes; } int alphaSize() const { return itsAlphaSize; } - static QString getPreviewString(); - static void setPreviewString(const QString &str); - static QString getUppercaseLetters(); - static QString getLowercaseLetters(); - static QString getPunctuation(); - static QString getFcString(FcPattern *pat, const char *val, int faceNo=0); - static QString createName(FcPattern *pat, int faceNo=0); - static QString weightStr(int weight, bool emptyNormal=true); + static TQString getPreviewString(); + static void setPreviewString(const TQString &str); + static TQString getUppercaseLetters(); + static TQString getLowercaseLetters(); + static TQString getPunctuation(); + static TQString getFcString(FcPattern *pat, const char *val, int faceNo=0); + static TQString createName(FcPattern *pat, int faceNo=0); + static TQString weightStr(int weight, bool emptyNormal=true); #ifndef KFI_FC_NO_WIDTHS - static QString widthStr(int width, bool emptyNormal=true); + static TQString widthStr(int width, bool emptyNormal=true); #endif - static QString slantStr(int slant, bool emptyNormal=true); - static QString spacingStr(int spacing); + static TQString slantStr(int slant, bool emptyNormal=true); + static TQString spacingStr(int spacing); static const int constScalableSizes[]; static const int constDefaultAlphaSize; @@ -87,16 +87,16 @@ class KDE_EXPORT CFcEngine private: bool parseUrl(const KURL &url, int faceNo, bool all=false); - void parseName(const QString &name, int faceNo, bool all=false); + void parseName(const TQString &name, int faceNo, bool all=false); #ifdef HAVE_XFT - XftFont * getFont(int size, QPixmap *pix=NULL); - void getSizes(QPixmap *pix=NULL); + XftFont * getFont(int size, TQPixmap *pix=NULL); + void getSizes(TQPixmap *pix=NULL); #endif private: bool itsInstalled; - QString itsName, + TQString itsName, itsDescriptiveName, itsFoundry; int itsIndex, @@ -108,7 +108,7 @@ class KDE_EXPORT CFcEngine itsSlant, itsSpacing, itsAlphaSize; - QValueVector<int> itsSizes; + TQValueVector<int> itsSizes; KURL itsLastUrl; FcBool itsScalable; }; diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index 4606ad0ca..1e779b514 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////// #include "Misc.h" -#include <qfile.h> +#include <tqfile.h> #include <kprocess.h> #include <kstandarddirs.h> #include <klargefile.h> @@ -40,14 +40,14 @@ namespace KFI namespace Misc { -QString linkedTo(const QString &i) +TQString linkedTo(const TQString &i) { - QString d; + TQString d; if(isLink(i)) { char buffer[1000]; - int n=readlink(QFile::encodeName(i), buffer, 1000); + int n=readlink(TQFile::encodeName(i), buffer, 1000); if(n!=-1) { @@ -59,11 +59,11 @@ QString linkedTo(const QString &i) return d; } -QString dirSyntax(const QString &d) +TQString dirSyntax(const TQString &d) { if(!d.isEmpty()) { - QString ds(d); + TQString ds(d); ds.replace("//", "/"); @@ -78,11 +78,11 @@ QString dirSyntax(const QString &d) return d; } -QString xDirSyntax(const QString &d) +TQString xDirSyntax(const TQString &d) { if(!d.isEmpty()) { - QString ds(d); + TQString ds(d); ds.replace("//", "/"); @@ -96,9 +96,9 @@ QString xDirSyntax(const QString &d) return d; } -QString getDir(const QString &f) +TQString getDir(const TQString &f) { - QString d(f); + TQString d(f); int slashPos=d.findRev('/'); @@ -108,9 +108,9 @@ QString getDir(const QString &f) return dirSyntax(d); } -QString getFile(const QString &f) +TQString getFile(const TQString &f) { - QString d(f); + TQString d(f); int slashPos=d.findRev('/'); @@ -120,7 +120,7 @@ QString getFile(const QString &f) return d; } -bool createDir(const QString &dir) +bool createDir(const TQString &dir) { // // Clear any umask before dir is created @@ -131,7 +131,7 @@ bool createDir(const QString &dir) return status; } -bool doCmd(const QString &cmd, const QString &p1, const QString &p2, const QString &p3) +bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQString &p3) { KProcess proc; @@ -149,13 +149,13 @@ bool doCmd(const QString &cmd, const QString &p1, const QString &p2, const QStri return proc.normalExit() && proc.exitStatus()==0; } -QString changeExt(const QString &f, const QString &newExt) +TQString changeExt(const TQString &f, const TQString &newExt) { - QString newStr(f); + TQString newStr(f); int dotPos=newStr.findRev('.'); if(-1==dotPos) - newStr+=QChar('.')+newExt; + newStr+=TQChar('.')+newExt; else { newStr.remove(dotPos+1, newStr.length()); @@ -164,9 +164,9 @@ QString changeExt(const QString &f, const QString &newExt) return newStr; } -void createBackup(const QString &f) +void createBackup(const TQString &f) { - const QString constExt(".bak"); + const TQString constExt(".bak"); if(!fExists(f+constExt) && fExists(f)) doCmd("cp", "-f", f, f+constExt); @@ -179,7 +179,7 @@ void createBackup(const QString &f) // // Associated: /home/a/courier.afm /home/a/courier.pfm // -void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, QWidget *widget) +void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidget *widget) { const char *afm[]={"afm", "AFM", "Afm", "AFm", "AfM", "aFM", "aFm", "afM", NULL}, *pfm[]={"pfm", "PFM", "Pfm", "PFm", "PfM", "pFM", "pFm", "pfM", NULL}; @@ -217,18 +217,18 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, QWidge } } -time_t getTimeStamp(const QString &item) +time_t getTimeStamp(const TQString &item) { KDE_struct_stat info; - return !item.isEmpty() && 0==KDE_lstat(QFile::encodeName(item), &info) ? info.st_mtime : 0; + return !item.isEmpty() && 0==KDE_lstat(TQFile::encodeName(item), &info) ? info.st_mtime : 0; } -bool check(const QString &path, unsigned int fmt, bool checkW) +bool check(const TQString &path, unsigned int fmt, bool checkW) { KDE_struct_stat info; - QCString pathC(QFile::encodeName(path)); + TQCString pathC(TQFile::encodeName(path)); return 0==KDE_lstat(pathC, &info) && (info.st_mode&S_IFMT)==fmt && (!checkW || 0==::access(pathC, W_OK)); } diff --git a/kcontrol/kfontinst/lib/Misc.h b/kcontrol/kfontinst/lib/Misc.h index a624f44f9..d20f08358 100644 --- a/kcontrol/kfontinst/lib/Misc.h +++ b/kcontrol/kfontinst/lib/Misc.h @@ -33,8 +33,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <time.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kurl.h> class QWidget; @@ -50,25 +50,25 @@ namespace Misc DIR_PERMS = 0755 }; - extern KDE_EXPORT bool check(const QString &path, unsigned int fmt, bool checkW=false); - inline KDE_EXPORT bool fExists(const QString &p) { return check(p, S_IFREG, false); } - inline KDE_EXPORT bool dExists(const QString &p) { return check(p, S_IFDIR, false); } - inline KDE_EXPORT bool fWritable(const QString &p) { return check(p, S_IFREG, true); } - inline KDE_EXPORT bool dWritable(const QString &p) { return check(p, S_IFDIR, true); } - inline KDE_EXPORT bool isLink(const QString &i) { return check(i, S_IFLNK, false); } - extern KDE_EXPORT QString linkedTo(const QString &i); - extern KDE_EXPORT QString dirSyntax(const QString &d); // Has trailing slash: /file/path/ - extern KDE_EXPORT QString xDirSyntax(const QString &d); // No trailing slash: /file/path - inline KDE_EXPORT QString fileSyntax(const QString &f) { return xDirSyntax(f); } - extern KDE_EXPORT QString getDir(const QString &f); - extern KDE_EXPORT QString getFile(const QString &f); - extern KDE_EXPORT bool createDir(const QString &dir); - extern KDE_EXPORT QString changeExt(const QString &f, const QString &newExt); - extern KDE_EXPORT bool doCmd(const QString &cmd, const QString &p1=QString::null, const QString &p2=QString::null, const QString &p3=QString::null); + extern KDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false); + inline KDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); } + inline KDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); } + inline KDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); } + inline KDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); } + inline KDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); } + extern KDE_EXPORT TQString linkedTo(const TQString &i); + extern KDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/ + extern KDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path + inline KDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); } + extern KDE_EXPORT TQString getDir(const TQString &f); + extern KDE_EXPORT TQString getFile(const TQString &f); + extern KDE_EXPORT bool createDir(const TQString &dir); + extern KDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt); + extern KDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null); inline KDE_EXPORT bool root() { return 0==getuid(); } - extern KDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, QWidget *widget=NULL); - extern KDE_EXPORT void createBackup(const QString &f); - extern KDE_EXPORT time_t getTimeStamp(const QString &item); + extern KDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL); + extern KDE_EXPORT void createBackup(const TQString &f); + extern KDE_EXPORT time_t getTimeStamp(const TQString &item); } } diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp index 86794377b..363ebe064 100644 --- a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp +++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp @@ -28,9 +28,9 @@ #include "FontThumbnail.h" #include "KfiConstants.h" -#include <qimage.h> -#include <qbitmap.h> -#include <qpainter.h> +#include <tqimage.h> +#include <tqbitmap.h> +#include <tqpainter.h> #include <kiconloader.h> #include <kglobalsettings.h> #include <klocale.h> @@ -52,9 +52,9 @@ CFontThumbnail::CFontThumbnail() KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); } -bool CFontThumbnail::create(const QString &path, int width, int height, QImage &img) +bool CFontThumbnail::create(const TQString &path, int width, int height, TQImage &img) { - QPixmap pix; + TQPixmap pix; if(itsEngine.draw(KURL(path), width, height, pix, 0, true)) { diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.h b/kcontrol/kfontinst/thumbnail/FontThumbnail.h index c2d1294e4..456e38b65 100644 --- a/kcontrol/kfontinst/thumbnail/FontThumbnail.h +++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.h @@ -42,7 +42,7 @@ class CFontThumbnail : public ThumbCreator CFontThumbnail(); ~CFontThumbnail() {} - bool create(const QString &path, int width, int height, QImage &img); + bool create(const TQString &path, int width, int height, TQImage &img); Flags flags() const; private: diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp index ddd8171cb..3679be252 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.cpp +++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp @@ -29,15 +29,15 @@ #include "FontPreview.h" #include <kapplication.h> #include <klocale.h> -#include <qpainter.h> -#include <qimage.h> +#include <tqpainter.h> +#include <tqimage.h> #include <stdlib.h> namespace KFI { -CFontPreview::CFontPreview(QWidget *parent, const char *name) - : QWidget(parent, name), +CFontPreview::CFontPreview(TQWidget *parent, const char *name) + : TQWidget(parent, name), itsCurrentFace(1), itsLastWidth(0), itsLastHeight(0), @@ -71,7 +71,7 @@ void CFontPreview::showFont() } else { - QPixmap nullPix; + TQPixmap nullPix; setEraseColor(itsBgndCol); itsPixmap=nullPix; @@ -80,9 +80,9 @@ void CFontPreview::showFont() } } -void CFontPreview::paintEvent(QPaintEvent *) +void CFontPreview::paintEvent(TQPaintEvent *) { - QPainter paint(this); + TQPainter paint(this); if(itsPixmap.isNull()) { @@ -103,14 +103,14 @@ void CFontPreview::paintEvent(QPaintEvent *) } } -QSize CFontPreview::sizeHint() const +TQSize CFontPreview::sizeHint() const { - return QSize(132, 132); + return TQSize(132, 132); } -QSize CFontPreview::minimumSizeHint() const +TQSize CFontPreview::minimumSizeHint() const { - return QSize(32, 32); + return TQSize(32, 32); } } diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h index 673adeb2d..a57e9b9c9 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.h +++ b/kcontrol/kfontinst/viewpart/FontPreview.h @@ -29,11 +29,11 @@ // (C) Craig Drummond, 2001, 2002, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include <qstring.h> -#include <qpixmap.h> -#include <qsize.h> -#include <qwidget.h> -#include <qcolor.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqsize.h> +#include <tqwidget.h> +#include <tqcolor.h> #include <kurl.h> #include "FcEngine.h" @@ -46,12 +46,12 @@ class CFontPreview : public QWidget public: - CFontPreview(QWidget *parent, const char *name=NULL); + CFontPreview(TQWidget *parent, const char *name=NULL); virtual ~CFontPreview() {} - void paintEvent(QPaintEvent *); - QSize sizeHint() const; - QSize minimumSizeHint() const; + void paintEvent(TQPaintEvent *); + TQSize sizeHint() const; + TQSize minimumSizeHint() const; void showFont(const KURL &url); void showFont(); @@ -69,13 +69,13 @@ class CFontPreview : public QWidget private: CFcEngine itsEngine; - QPixmap itsPixmap; + TQPixmap itsPixmap; KURL itsCurrentUrl; int itsCurrentFace, itsLastWidth, itsLastHeight; - QColor itsBgndCol; - QString itsFontName; + TQColor itsBgndCol; + TQString itsFontName; }; } diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index aaa3bc5ff..14bda4024 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -32,18 +32,18 @@ #include "KfiConstants.h" #include "KfiPrint.h" #include <klocale.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qframe.h> -#include <qfile.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qvalidator.h> -#include <qregexp.h> -#include <qsettings.h> -#include <qstringlist.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqframe.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqvalidator.h> +#include <tqregexp.h> +#include <tqsettings.h> +#include <tqstringlist.h> +#include <tqtimer.h> #include <kio/netaccess.h> #include <kinstance.h> #include <kmessagebox.h> @@ -58,40 +58,40 @@ static KURL getDest(const KURL &url, bool system) { return KURL(KFI::Misc::root() - ? QString("fonts:/") + url.fileName() - : QString("fonts:/") + QString(system ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER)) - + QChar('/') + url.fileName()); + ? TQString("fonts:/") + url.fileName() + : TQString("fonts:/") + TQString(system ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER)) + + TQChar('/') + url.fileName()); } namespace KFI { -CFontViewPart::CFontViewPart(QWidget *parent, const char *name) +CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) { bool kcm=0==strcmp(name, "kcmfontinst"); - itsFrame=new QFrame(parent, "frame"); + itsFrame=new TQFrame(parent, "frame"); - QFrame *previewFrame=new QFrame(itsFrame); + TQFrame *previewFrame=new TQFrame(itsFrame); - itsToolsFrame=new QFrame(itsFrame); + itsToolsFrame=new TQFrame(itsFrame); - QVBoxLayout *layout=new QVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint()); - QGridLayout *previewLayout=new QGridLayout(previewFrame, 1, 1, 1, 1); - QHBoxLayout *toolsLayout=new QHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint()); + TQVBoxLayout *layout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint()); + TQGridLayout *previewLayout=new TQGridLayout(previewFrame, 1, 1, 1, 1); + TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint()); - itsFrame->setFrameShape(QFrame::NoFrame); - itsFrame->setFocusPolicy(QWidget::ClickFocus); - itsToolsFrame->setFrameShape(QFrame::NoFrame); - previewFrame->setFrameShadow(kcm ? QFrame::Sunken : QFrame::Raised); - previewFrame->setFrameShape(QFrame::Panel); + itsFrame->setFrameShape(TQFrame::NoFrame); + itsFrame->setFocusPolicy(TQWidget::ClickFocus); + itsToolsFrame->setFrameShape(TQFrame::NoFrame); + previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised); + previewFrame->setFrameShape(TQFrame::Panel); setInstance(new KInstance("kfontview")); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); - itsPreview->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); - itsFaceLabel=new QLabel(i18n("Face:"), itsToolsFrame); + itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame); itsFaceSelector=new KIntNumInput(1, itsToolsFrame); - itsInstallButton=new QPushButton(i18n("Install..."), itsToolsFrame, "button"); + itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button"); itsInstallButton->hide(); previewLayout->addWidget(itsPreview, 0, 0); layout->addWidget(previewFrame); @@ -100,17 +100,17 @@ CFontViewPart::CFontViewPart(QWidget *parent, const char *name) toolsLayout->addWidget(itsFaceSelector); itsFaceLabel->hide(); itsFaceSelector->hide(); - toolsLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum)); + toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum)); toolsLayout->addWidget(itsInstallButton); itsToolsFrame->hide(); - connect(itsPreview, SIGNAL(status(bool)), SLOT(previewStatus(bool))); - connect(itsInstallButton, SIGNAL(clicked()), SLOT(install())); - connect(itsFaceSelector, SIGNAL(valueChanged(int)), itsPreview, SLOT(showFace(int))); + connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool))); + connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install())); + connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int))); itsChangeTextAction=new KAction(i18n("Change Text..."), "text", KShortcut(), - this, SLOT(changeText()), actionCollection(), "changeText"); + this, TQT_SLOT(changeText()), actionCollection(), "changeText"); itsChangeTextAction->setEnabled(false); - itsPrintAction=KStdAction::print(this, SLOT(print()), actionCollection(), "print"); + itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print"); itsPrintAction->setEnabled(false); setXMLFile("kfontviewpart.rc"); @@ -143,7 +143,7 @@ bool CFontViewPart::openFile() { // NOTE: Cant do the real open here, as dont seem to be able to use KIO::NetAccess functions during initial start-up. // Bug report 111535 indicates that calling "konqueror <font>" crashes. - QTimer::singleShot(0, this, SLOT(timeout())); + TQTimer::singleShot(0, this, TQT_SLOT(timeout())); return true; } @@ -164,17 +164,17 @@ void CFontViewPart::timeout() // Not from fonts:/, so try to see if font is already installed... if(Misc::root()) { - destUrl=QString("fonts:/")+itsPreview->engine().getName(m_url); + destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url); itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); } else { - destUrl=QString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+QChar('/')+itsPreview->engine().getName(m_url); + destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url); if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget())) itsShowInstallButton=false; else { - destUrl=QString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+QChar('/')+itsPreview->engine().getName(m_url); + destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url); itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); } } @@ -255,8 +255,8 @@ void CFontViewPart::install() void CFontViewPart::changeText() { bool status; - QRegExpValidator validator(QRegExp(".*"), 0L); - QString oldStr(itsPreview->engine().getPreviewString()), + TQRegExpValidator validator(TQRegExp(".*"), 0L); + TQString oldStr(itsPreview->engine().getPreviewString()), newStr(KInputDialog::getText(i18n("Preview String"), i18n("Please enter new string:"), oldStr, &status, itsFrame, "preview string dialog", &validator)); @@ -270,7 +270,7 @@ void CFontViewPart::changeText() void CFontViewPart::print() { - QStringList items; + TQStringList items; items.append(itsPreview->engine().getName(m_url)); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h index 7ffdbb8f4..565ac3b7a 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.h +++ b/kcontrol/kfontinst/viewpart/FontViewPart.h @@ -49,7 +49,7 @@ class CFontViewPart : public KParts::ReadOnlyPart public: - CFontViewPart(QWidget *parent=0, const char *name=0); + CFontViewPart(TQWidget *parent=0, const char *name=0); virtual ~CFontViewPart() {} bool openURL(const KURL &url); @@ -69,10 +69,10 @@ class CFontViewPart : public KParts::ReadOnlyPart private: CFontPreview *itsPreview; - QPushButton *itsInstallButton; - QFrame *itsFrame, + TQPushButton *itsInstallButton; + TQFrame *itsFrame, *itsToolsFrame; - QLabel *itsFaceLabel; + TQLabel *itsFaceLabel; KIntNumInput *itsFaceSelector; KAction *itsChangeTextAction, *itsPrintAction; diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp index 52783c1a7..dd695a033 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp @@ -60,15 +60,15 @@ CFontViewPartFactory::~CFontViewPartFactory() theirInstance=0L; } -QObject * CFontViewPartFactory::createObject(QObject *parent, const char *name, const char *, const QStringList &) +TQObject * CFontViewPartFactory::createObject(TQObject *parent, const char *name, const char *, const TQStringList &) { if(parent && !parent->isWidgetType()) { - kdDebug() << "CFontViewPartFactory: parent does not inherit QWidget" << endl; + kdDebug() << "CFontViewPartFactory: parent does not inherit TQWidget" << endl; return 0L; } - return new CFontViewPart((QWidget*) parent, name); + return new CFontViewPart((TQWidget*) parent, name); } KInstance* CFontViewPartFactory::instance() diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h index 777d07ebe..d5999d8b0 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h @@ -45,7 +45,7 @@ class CFontViewPartFactory : public KLibFactory CFontViewPartFactory(); virtual ~CFontViewPartFactory(); - virtual QObject *createObject(QObject *parent = 0, const char *name = 0, const char *classname = "QObject", const QStringList &args = QStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList()); static KInstance * instance(); diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index 5ed5cf455..56540171e 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -43,14 +43,14 @@ namespace KFI { CFontViewerAppMainWindow::CFontViewerAppMainWindow() - : KParts::MainWindow((QWidget *)0L) + : KParts::MainWindow((TQWidget *)0L) { KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart"); if(factory) { - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart"); @@ -71,7 +71,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() if(!openURL.isEmpty()) itsPreview->openURL(openURL); - QSize defSize(450, 380); + TQSize defSize(450, 380); KConfigGroupSaver saver(kapp->config(), CFG_GROUP); resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize)); @@ -90,7 +90,7 @@ CFontViewerAppMainWindow::~CFontViewerAppMainWindow() void CFontViewerAppMainWindow::fileOpen() { - KURL url(KFileDialog::getOpenURL(QString::null, "application/x-font-ttf application/x-font-otf " + KURL url(KFileDialog::getOpenURL(TQString::null, "application/x-font-ttf application/x-font-otf " "application/x-font-ttc application/x-font-type1 " "application/x-font-bdf application/x-font-pcf ", this, i18n("Select Font to View"))); diff --git a/kcontrol/kfontinst/viewpart/KfiPrint.cpp b/kcontrol/kfontinst/viewpart/KfiPrint.cpp index 02366922a..5e2d9deeb 100644 --- a/kcontrol/kfontinst/viewpart/KfiPrint.cpp +++ b/kcontrol/kfontinst/viewpart/KfiPrint.cpp @@ -28,13 +28,13 @@ #include "KfiPrint.h" #include "FcEngine.h" -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qsettings.h> -#include <qstringlist.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqsettings.h> +#include <tqstringlist.h> #include <kprinter.h> -#include <qapplication.h> -#include <qeventloop.h> +#include <tqapplication.h> +#include <tqeventloop.h> #ifdef HAVE_LOCALE_H #include <locale.h> #endif @@ -70,13 +70,13 @@ static bool sufficientSpace(int y, int titleFontHeight, const int *sizes, int pa return (y+required)<pageHeight; } -bool printable(const QString &mime) +bool printable(const TQString &mime) { return "application/x-font-type1"==mime || "application/x-font-ttf"==mime || "application/x-font-otf"==mime || "application/x-font-ttc"==mime || "application/x-font-ghostscript"==mime; } -void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine &engine) +void printItems(const TQStringList &items, int size, TQWidget *parent, CFcEngine &engine) { #ifdef HAVE_LOCALE_H char *oldLocale=setlocale(LC_NUMERIC, "C"), @@ -88,13 +88,13 @@ void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine & if(printer.setup(parent)) { - QPainter painter; - QFont sans("sans", 12, QFont::Bold); - QSettings settings; + TQPainter painter; + TQFont sans("sans", 12, TQFont::Bold); + TQSettings settings; bool entryExists, embedFonts, set=false; - QString str(engine.getPreviewString()); + TQString str(engine.getPreviewString()); // // Cehck whether the user has enabled font embedding... @@ -107,7 +107,7 @@ void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine & printer.setResolution(72); painter.begin(&printer); - QPaintDeviceMetrics metrics(painter.device()); + TQPaintDeviceMetrics metrics(painter.device()); int margin=(int)((2/2.54)*metrics.logicalDpiY()), // 2 cm margins pageWidth=metrics.width()-(2*margin), pageHeight=metrics.height()-(2*margin), @@ -122,7 +122,7 @@ void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine & painter.setClipping(true); painter.setClipRect(margin, margin, pageWidth, pageHeight); - QStringList::ConstIterator it(items.begin()), + TQStringList::ConstIterator it(items.begin()), end(items.end()); for(; it!=end; ++it) @@ -130,7 +130,7 @@ void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine & unsigned int s=0; painter.setFont(sans); - QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput, 0); + TQApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 0); if(!firstFont && !sufficientSpace(y, painter.fontMetrics().height(), sizes, pageHeight, size)) { diff --git a/kcontrol/kfontinst/viewpart/KfiPrint.h b/kcontrol/kfontinst/viewpart/KfiPrint.h index 5b927a57a..01889273a 100644 --- a/kcontrol/kfontinst/viewpart/KfiPrint.h +++ b/kcontrol/kfontinst/viewpart/KfiPrint.h @@ -40,8 +40,8 @@ class CFcEngine; namespace Print { -extern void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine &engine); -extern bool printable(const QString &mime); +extern void printItems(const TQStringList &items, int size, TQWidget *parent, CFcEngine &engine); +extern bool printable(const TQString &mime); } } diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index 4605cbb09..372104c4a 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software */ -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qslider.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqslider.h> #include <kcolorbutton.h> #include <klocale.h> @@ -31,7 +31,7 @@ #include "advancedOptions.h" #include "main.h" -advancedDialog::advancedDialog(QWidget* parent, const char* name) +advancedDialog::advancedDialog(TQWidget* parent, const char* name) : KDialogBase(KDialogBase::Plain, i18n("Advanced Options"), Ok|Apply|Cancel, @@ -40,29 +40,29 @@ advancedDialog::advancedDialog(QWidget* parent, const char* name) name, false, false) { - connect(this, SIGNAL(applyClicked()), - this, SLOT(save())); - connect(this, SIGNAL(okClicked()), - this, SLOT(save())); + connect(this, TQT_SIGNAL(applyClicked()), + this, TQT_SLOT(save())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(save())); - QFrame* page = plainPage(); - QVBoxLayout* layout = new QVBoxLayout(page); + TQFrame* page = plainPage(); + TQVBoxLayout* layout = new TQVBoxLayout(page); m_advancedWidget = new advancedKickerOptions(page); layout->addWidget(m_advancedWidget); layout->addStretch(); setMinimumSize( sizeHint() ); - connect(m_advancedWidget->handles, SIGNAL(clicked(int)), - this, SLOT(changed())); - connect(m_advancedWidget->hideButtonSize, SIGNAL(valueChanged(int)), - this, SLOT(changed())); - connect(m_advancedWidget->tintColorB, SIGNAL(clicked()), - this, SLOT(changed())); - connect(m_advancedWidget->tintSlider, SIGNAL(valueChanged(int)), - this, SLOT(changed())); - connect(m_advancedWidget->menubarPanelTransparent, SIGNAL(clicked()), - this, SLOT(changed())); + connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)), + this, TQT_SLOT(changed())); + connect(m_advancedWidget->hideButtonSize, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(changed())); + connect(m_advancedWidget->tintColorB, TQT_SIGNAL(clicked()), + this, TQT_SLOT(changed())); + connect(m_advancedWidget->tintSlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(changed())); + connect(m_advancedWidget->menubarPanelTransparent, TQT_SIGNAL(clicked()), + this, TQT_SLOT(changed())); load(); } @@ -86,7 +86,7 @@ void advancedDialog::load() int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14); m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize); - QColor color = c.readColorEntry( "TintColor", &colorGroup().mid() ); + TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() ); m_advancedWidget->tintColorB->setColor( color ); int tintValue = c.readNumEntry( "TintValue", 33 ); m_advancedWidget->tintSlider->setValue( tintValue ); @@ -115,11 +115,11 @@ void advancedDialog::save() c.writeEntry("MenubarPanelTransparent", m_advancedWidget->menubarPanelTransparent->isChecked()); - QStringList elist = c.readListEntry("Extensions2"); - for (QStringList::Iterator it = elist.begin(); it != elist.end(); ++it) + TQStringList elist = c.readListEntry("Extensions2"); + for (TQStringList::Iterator it = elist.begin(); it != elist.end(); ++it) { // extension id - QString group(*it); + TQString group(*it); // is there a config group for this extension? if(!c.hasGroup(group) || diff --git a/kcontrol/kicker/advancedDialog.h b/kcontrol/kicker/advancedDialog.h index bbbcdd109..12a2ef4bd 100644 --- a/kcontrol/kicker/advancedDialog.h +++ b/kcontrol/kicker/advancedDialog.h @@ -29,7 +29,7 @@ class advancedDialog : public KDialogBase Q_OBJECT public: - advancedDialog(QWidget* parent, const char* name); + advancedDialog(TQWidget* parent, const char* name); ~advancedDialog(); protected slots: diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index 700dbd9ca..a8b7cdb20 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software */ -#include <qlayout.h> -#include <qgroupbox.h> -#include <qvbuttongroup.h> -#include <qwhatsthis.h> -#include <qradiobutton.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qvbox.h> -#include <qfileinfo.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqvbuttongroup.h> +#include <tqwhatsthis.h> +#include <tqradiobutton.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqvbox.h> +#include <tqfileinfo.h> #include <kconfig.h> #include <kglobal.h> @@ -38,25 +38,25 @@ #include "applettab_impl.h" #include "applettab_impl.moc" -AppletTab::AppletTab( QWidget *parent, const char* name ) +AppletTab::AppletTab( TQWidget *parent, const char* name ) : AppletTabBase (parent, name) { - connect(level_group, SIGNAL(clicked(int)), SLOT(level_changed(int))); + connect(level_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(level_changed(int))); - connect(lb_trusted, SIGNAL(selectionChanged(QListViewItem*)), - SLOT(trusted_selection_changed(QListViewItem*))); + connect(lb_trusted, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + TQT_SLOT(trusted_selection_changed(TQListViewItem*))); - connect(pb_add, SIGNAL(clicked()), SLOT(add_clicked())); - connect(pb_remove, SIGNAL(clicked()), SLOT(remove_clicked())); + connect(pb_add, TQT_SIGNAL(clicked()), TQT_SLOT(add_clicked())); + connect(pb_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove_clicked())); - connect(lb_available, SIGNAL(selectionChanged(QListViewItem*)), - SLOT(available_selection_changed(QListViewItem*))); + connect(lb_available, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + TQT_SLOT(available_selection_changed(TQListViewItem*))); pb_add->setEnabled(false); pb_remove->setEnabled(false); - QWhatsThis::add( level_group, i18n("Panel applets can be started in two different ways:" + TQWhatsThis::add( level_group, i18n("Panel applets can be started in two different ways:" " internally or externally. While 'internally' is the preferred way to load applets, this can" " raise stability or security problems when you are using poorly-programmed third-party applets." " To address these problems, applets can be marked 'trusted'. You might want to configure" @@ -67,18 +67,18 @@ AppletTab::AppletTab( QWidget *parent, const char* name ) " will be loaded internally, others will be loaded using an external wrapper application.</li>" " <li><em>Load all applets internally</em></li></ul>") ); - QWhatsThis::add( lb_trusted, i18n("Here you can see a list of applets that are marked" + TQWhatsThis::add( lb_trusted, i18n("Here you can see a list of applets that are marked" " 'trusted', i.e. will be loaded internally by Kicker in any case. To move an applet" " from the list of available applets to the trusted ones, or vice versa, select it and" " press the left or right buttons.") ); - QWhatsThis::add( pb_add, i18n("Click here to add the selected applet from the list of available," + TQWhatsThis::add( pb_add, i18n("Click here to add the selected applet from the list of available," " untrusted applets to the list of trusted applets.") ); - QWhatsThis::add( pb_remove, i18n("Click here to remove the selected applet from the list of trusted" + TQWhatsThis::add( pb_remove, i18n("Click here to remove the selected applet from the list of trusted" " applets to the list of available, untrusted applets.") ); - QWhatsThis::add( lb_available, i18n("Here you can see a list of available applets that you" + TQWhatsThis::add( lb_available, i18n("Here you can see a list of available applets that you" " currently do not trust. This does not mean you cannot use those applets, but rather that" " the panel's policy using them depends on your applet security level. To move an applet" " from the list of available applets to the trusted ones or vice versa, select it and" @@ -120,17 +120,17 @@ void AppletTab::load( bool useDefaults ) list_group->setEnabled(trusted_rb->isChecked()); - QStringList list = KGlobal::dirs()->findAllResources("applets", "*.desktop"); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + TQStringList list = KGlobal::dirs()->findAllResources("applets", "*.desktop"); + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - QFileInfo fi(*it); + TQFileInfo fi(*it); available << fi.baseName(); } if(c.hasKey("TrustedApplets")) { - QStringList list = c.readListEntry("TrustedApplets"); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + TQStringList list = c.readListEntry("TrustedApplets"); + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { if(available.contains(*it)) l_trusted << (*it); @@ -140,7 +140,7 @@ void AppletTab::load( bool useDefaults ) l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quicklauncher" << "kminipagerapplet" << "ktaskbarapplet" << "eyesapplet" << "kmixapplet"; - for ( QStringList::Iterator it = available.begin(); it != available.end(); ++it ) + for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it ) { if(!l_trusted.contains(*it)) l_available << (*it); @@ -170,9 +170,9 @@ void AppletTab::defaults() load( true ); } -QString AppletTab::quickHelp() const +TQString AppletTab::quickHelp() const { - return QString::null; + return TQString::null; } void AppletTab::level_changed(int) @@ -184,24 +184,24 @@ void AppletTab::level_changed(int) void AppletTab::updateTrusted() { lb_trusted->clear(); - for ( QStringList::Iterator it = l_trusted.begin(); it != l_trusted.end(); ++it ) - (void) new QListViewItem(lb_trusted, (*it)); + for ( TQStringList::Iterator it = l_trusted.begin(); it != l_trusted.end(); ++it ) + (void) new TQListViewItem(lb_trusted, (*it)); } void AppletTab::updateAvailable() { lb_available->clear(); - for ( QStringList::Iterator it = l_available.begin(); it != l_available.end(); ++it ) - (void) new QListViewItem(lb_available, (*it)); + for ( TQStringList::Iterator it = l_available.begin(); it != l_available.end(); ++it ) + (void) new TQListViewItem(lb_available, (*it)); } -void AppletTab::trusted_selection_changed(QListViewItem * item) +void AppletTab::trusted_selection_changed(TQListViewItem * item) { pb_remove->setEnabled(item != 0); setChanged(); } -void AppletTab::available_selection_changed(QListViewItem * item) +void AppletTab::available_selection_changed(TQListViewItem * item) { pb_add->setEnabled(item != 0); setChanged(); @@ -209,7 +209,7 @@ void AppletTab::available_selection_changed(QListViewItem * item) void AppletTab::add_clicked() { - QListViewItem *item = lb_available->selectedItem(); + TQListViewItem *item = lb_available->selectedItem(); if (!item) return; l_available.remove(item->text(0)); l_trusted.append(item->text(0)); @@ -221,7 +221,7 @@ void AppletTab::add_clicked() void AppletTab::remove_clicked() { - QListViewItem *item = lb_trusted->selectedItem(); + TQListViewItem *item = lb_trusted->selectedItem(); if (!item) return; l_trusted.remove(item->text(0)); l_available.append(item->text(0)); diff --git a/kcontrol/kicker/applettab_impl.h b/kcontrol/kicker/applettab_impl.h index 76c071c1a..715d3a322 100644 --- a/kcontrol/kicker/applettab_impl.h +++ b/kcontrol/kicker/applettab_impl.h @@ -21,7 +21,7 @@ #ifndef __applettab_impl_h__ #define __applettab_impl_h__ -#include <qwidget.h> +#include <tqwidget.h> #include "applettab.h" class QGroupBox; @@ -36,22 +36,22 @@ class AppletTab : public AppletTabBase Q_OBJECT public: - AppletTab( QWidget *parent=0, const char* name=0 ); + AppletTab( TQWidget *parent=0, const char* name=0 ); void load(); void load(bool useDefaults); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; signals: void changed(); protected slots: void level_changed(int level); - void trusted_selection_changed(QListViewItem *); - void available_selection_changed(QListViewItem *); + void trusted_selection_changed(TQListViewItem *); + void available_selection_changed(TQListViewItem *); void add_clicked(); void remove_clicked(); @@ -61,7 +61,7 @@ class AppletTab : public AppletTabBase void updateAddRemoveButton(); private: - QStringList available, l_available, l_trusted; + TQStringList available, l_available, l_trusted; }; #endif diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index 54ce23937..d1a0b2766 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software */ -#include <qapplication.h> +#include <tqapplication.h> #include <kdebug.h> #include <kdesktopfile.h> @@ -25,9 +25,9 @@ #include "extensionInfo.h" -ExtensionInfo::ExtensionInfo(const QString& desktopFile, - const QString& configFile, - const QString& configPath) +ExtensionInfo::ExtensionInfo(const TQString& desktopFile, + const TQString& configFile, + const TQString& configPath) : _configFile(configFile), _configPath(configPath), _desktopFile(desktopFile) @@ -73,13 +73,13 @@ void ExtensionInfo::load() } kdDebug()<<"BEFORE X-KDE-PanelExt-Positions parsing"<<endl; - QStringList allowedPos; + TQStringList allowedPos; allowedPos << "BOTTOM" << "TOP" << "LEFT" << "RIGHT" << "BOTTOM"; allowedPos= df.readListEntry("X-KDE-PanelExt-Positions", allowedPos); for (unsigned int i=0;i<allowedPos.count();i++) { - QString pos = allowedPos[i].upper(); + TQString pos = allowedPos[i].upper(); kdDebug() << pos << endl; if (pos == "LEFT") { @@ -170,7 +170,7 @@ void ExtensionInfo::configChanged() _orig_position = _position = position; } - int alignment = c.readNumEntry ("Alignment", QApplication::reverseLayout() ? 2 : 0); + int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0); if (alignment != _alignment && alignment != _orig_alignment) { _orig_alignment = _alignment = alignment; @@ -197,8 +197,8 @@ void ExtensionInfo::setDefaults() { // defaults _position = 3; - _alignment = QApplication::reverseLayout() ? 2 : 0; - _xineramaScreen = QApplication::desktop()->primaryScreen(); + _alignment = TQApplication::reverseLayout() ? 2 : 0; + _xineramaScreen = TQApplication::desktop()->primaryScreen(); _size = 2; _showLeftHB = false; _showRightHB = true; diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h index a8885c651..169322aa4 100644 --- a/kcontrol/kicker/extensionInfo.h +++ b/kcontrol/kicker/extensionInfo.h @@ -19,20 +19,20 @@ #ifndef __PANELINFO_H #define __PANELINFO_H -#include <qvaluelist.h> -#include <qlistview.h> +#include <tqvaluelist.h> +#include <tqlistview.h> #include <kpanelextension.h> class ExtensionInfo; -typedef QValueList<ExtensionInfo*> ExtensionInfoList; +typedef TQValueList<ExtensionInfo*> ExtensionInfoList; class ExtensionInfo { public: - ExtensionInfo(const QString& destopFile, - const QString& configFile, - const QString& configPath); + ExtensionInfo(const TQString& destopFile, + const TQString& configFile, + const TQString& configPath); ~ExtensionInfo() {}; void setDefaults(); @@ -40,12 +40,12 @@ class ExtensionInfo void load(); void configChanged(); - QString _configFile; - QString _configPath; - QString _desktopFile; + TQString _configFile; + TQString _configPath; + TQString _desktopFile; // Configuration settings - QString _name; + TQString _name; int _position; int _alignment; int _xineramaScreen; diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp index 95899d9dc..935fa5902 100644 --- a/kcontrol/kicker/hidingconfig.cpp +++ b/kcontrol/kicker/hidingconfig.cpp @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software */ -#include <qlayout.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqtimer.h> #include <klocale.h> #include <kdebug.h> @@ -28,10 +28,10 @@ #include "hidingconfig.h" #include "hidingconfig.moc" -HidingConfig::HidingConfig(QWidget *parent, const char *name) +HidingConfig::HidingConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new HidingTab(this); layout->addWidget(m_widget); layout->addStretch(); @@ -41,13 +41,13 @@ HidingConfig::HidingConfig(QWidget *parent, const char *name) //addConfig(KickerSettings::self(), m_widget); - connect(m_widget, SIGNAL(changed()), - this, SLOT(changed())); - connect(KickerConfig::the(), SIGNAL(aboutToNotifyKicker()), - this, SLOT(aboutToNotifyKicker())); + connect(m_widget, TQT_SIGNAL(changed()), + this, TQT_SLOT(changed())); + connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), + this, TQT_SLOT(aboutToNotifyKicker())); load(); - QTimer::singleShot(0, this, SLOT(notChanged())); + TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); } void HidingConfig::notChanged() @@ -90,5 +90,5 @@ void HidingConfig::defaults() // KConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - QTimer::singleShot(0, this, SLOT(changed())); + TQTimer::singleShot(0, this, TQT_SLOT(changed())); } diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h index c5b3d66a8..647be9631 100644 --- a/kcontrol/kicker/hidingconfig.h +++ b/kcontrol/kicker/hidingconfig.h @@ -27,7 +27,7 @@ class HidingConfig : public KCModule Q_OBJECT public: - HidingConfig(QWidget *parent = 0, const char *name = 0); + HidingConfig(TQWidget *parent = 0, const char *name = 0); void load(); void save(); diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp index e637b71c0..4a5a36e67 100644 --- a/kcontrol/kicker/hidingtab_impl.cpp +++ b/kcontrol/kicker/hidingtab_impl.cpp @@ -16,10 +16,10 @@ * along with this program; if not, write to the Free Software */ -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qslider.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqslider.h> #include <kcombobox.h> #include <kdebug.h> @@ -33,37 +33,37 @@ #include "hidingtab_impl.moc" -HidingTab::HidingTab(QWidget *parent, const char* name) +HidingTab::HidingTab(TQWidget *parent, const char* name) : HidingTabBase(parent, name), m_panelInfo(0) { // connections - connect(m_manual,SIGNAL(toggled(bool)), SIGNAL(changed())); - connect(m_automatic, SIGNAL(toggled(bool)), SIGNAL(changed())); - connect(m_automatic, SIGNAL(toggled(bool)), SLOT(backgroundModeClicked())); - connect(m_background,SIGNAL(toggled(bool)), SIGNAL(changed())); - connect(m_background, SIGNAL(toggled(bool)), SLOT(backgroundModeClicked())); - connect(m_hideSlider, SIGNAL(valueChanged(int)), SIGNAL(changed())); - connect(m_delaySpinBox, SIGNAL(valueChanged(int)), SIGNAL(changed())); - connect(m_animateHiding, SIGNAL(toggled(bool)), SIGNAL(changed())); - connect(m_delaySpinBox, SIGNAL(valueChanged(int)), SIGNAL(changed())); - connect(m_autoHideSwitch, SIGNAL(toggled(bool)), SIGNAL(changed())); - connect(m_backgroundRaise, SIGNAL(toggled(bool)), SIGNAL(changed())); - connect(m_backgroundPos, SIGNAL(activated(int)), SIGNAL(changed())); - connect(m_lHB, SIGNAL(toggled(bool)), SIGNAL(changed())); - connect(m_rHB, SIGNAL(toggled(bool)), SIGNAL(changed())); - - connect(KickerConfig::the(), SIGNAL(extensionInfoChanged()), - SLOT(infoUpdated())); - connect(KickerConfig::the(), SIGNAL(extensionAdded(ExtensionInfo*)), - SLOT(extensionAdded(ExtensionInfo*))); - connect(KickerConfig::the(), SIGNAL(extensionRemoved(ExtensionInfo*)), - SLOT(extensionRemoved(ExtensionInfo*))); + connect(m_manual,TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked())); + connect(m_background,TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked())); + connect(m_hideSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); + connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); + connect(m_animateHiding, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); + connect(m_autoHideSwitch, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_backgroundRaise, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_backgroundPos, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(m_lHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_rHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + + connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()), + TQT_SLOT(infoUpdated())); + connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)), + TQT_SLOT(extensionAdded(ExtensionInfo*))); + connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)), + TQT_SLOT(extensionRemoved(ExtensionInfo*))); // position tab tells hiding tab about extension selections and vice versa - connect(KickerConfig::the(), SIGNAL(positionPanelChanged(int)), - SLOT(switchPanel(int))); - connect(m_panelList, SIGNAL(activated(int)), - KickerConfig::the(), SIGNAL(hidingPanelChanged(int))); + connect(KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)), + TQT_SLOT(switchPanel(int))); + connect(m_panelList, TQT_SIGNAL(activated(int)), + KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int))); } void HidingTab::load() diff --git a/kcontrol/kicker/hidingtab_impl.h b/kcontrol/kicker/hidingtab_impl.h index 69e39dea0..34bc6a372 100644 --- a/kcontrol/kicker/hidingtab_impl.h +++ b/kcontrol/kicker/hidingtab_impl.h @@ -29,7 +29,7 @@ class HidingTab : public HidingTabBase Q_OBJECT public: - HidingTab(QWidget *parent = 0, const char* name = 0); + HidingTab(TQWidget *parent = 0, const char* name = 0); void load(); void save(); diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp index 7f43f2c05..7475ad7b0 100644 --- a/kcontrol/kicker/lookandfeelconfig.cpp +++ b/kcontrol/kicker/lookandfeelconfig.cpp @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software */ -#include <qlayout.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqtimer.h> #include <klocale.h> #include <kdebug.h> @@ -28,10 +28,10 @@ #include "lookandfeelconfig.h" #include "lookandfeelconfig.moc" -LookAndFeelConfig::LookAndFeelConfig(QWidget *parent, const char *name) +LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new LookAndFeelTab(this); layout->addWidget(m_widget); layout->addStretch(); @@ -41,13 +41,13 @@ LookAndFeelConfig::LookAndFeelConfig(QWidget *parent, const char *name) addConfig(KickerSettings::self(), m_widget); - connect(m_widget, SIGNAL(changed()), - this, SLOT(changed())); - connect(KickerConfig::the(), SIGNAL(aboutToNotifyKicker()), - this, SLOT(aboutToNotifyKicker())); + connect(m_widget, TQT_SIGNAL(changed()), + this, TQT_SLOT(changed())); + connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), + this, TQT_SLOT(aboutToNotifyKicker())); load(); - QTimer::singleShot(0, this, SLOT(notChanged())); + TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); } void LookAndFeelConfig::notChanged() @@ -90,5 +90,5 @@ void LookAndFeelConfig::defaults() // KConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - QTimer::singleShot(0, this, SLOT(changed())); + TQTimer::singleShot(0, this, TQT_SLOT(changed())); } diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h index 93b331432..7b91cc52f 100644 --- a/kcontrol/kicker/lookandfeelconfig.h +++ b/kcontrol/kicker/lookandfeelconfig.h @@ -27,7 +27,7 @@ class LookAndFeelConfig : public KCModule Q_OBJECT public: - LookAndFeelConfig(QWidget *parent = 0, const char *name = 0); + LookAndFeelConfig(TQWidget *parent = 0, const char *name = 0); void load(); void save(); diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index ad1c6a8d8..24c640a1d 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -18,10 +18,10 @@ * along with this program; if not, write to the Free Software */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qradiobutton.h> -#include <qregexp.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqregexp.h> #include <kcolorbutton.h> #include <kdebug.h> @@ -44,25 +44,25 @@ #include <iostream> using namespace std; -LookAndFeelTab::LookAndFeelTab( QWidget *parent, const char* name ) +LookAndFeelTab::LookAndFeelTab( TQWidget *parent, const char* name ) : LookAndFeelTabBase(parent, name), m_advDialog(0) { - connect(m_kmenuTile, SIGNAL(activated(int)), SIGNAL(changed())); - connect(m_desktopTile, SIGNAL(activated(int)), SIGNAL(changed())); - connect(m_browserTile, SIGNAL(activated(int)), SIGNAL(changed())); - connect(m_urlTile, SIGNAL(activated(int)), SIGNAL(changed())); - connect(m_windowListTile, SIGNAL(activated(int)), SIGNAL(changed())); + connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_kmenuTile, SIGNAL(activated(int)), SLOT(kmenuTileChanged(int))); - connect(m_desktopTile, SIGNAL(activated(int)), SLOT(desktopTileChanged(int))); - connect(m_browserTile, SIGNAL(activated(int)), SLOT(browserTileChanged(int))); - connect(m_urlTile, SIGNAL(activated(int)), SLOT(urlTileChanged(int))); - connect(m_windowListTile, SIGNAL(activated(int)), SLOT(wlTileChanged(int))); + connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SLOT(kmenuTileChanged(int))); + connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SLOT(desktopTileChanged(int))); + connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SLOT(browserTileChanged(int))); + connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SLOT(urlTileChanged(int))); + connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SLOT(wlTileChanged(int))); - connect(kcfg_ColorizeBackground, SIGNAL(toggled(bool)), SLOT(browseTheme())); + connect(kcfg_ColorizeBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(browseTheme())); - connect(kcfg_BackgroundTheme->lineEdit(), SIGNAL(lostFocus()), SLOT(browseTheme())); + connect(kcfg_BackgroundTheme->lineEdit(), TQT_SIGNAL(lostFocus()), TQT_SLOT(browseTheme())); kcfg_BackgroundTheme->setFilter(KImageIO::pattern(KImageIO::Reading)); kcfg_BackgroundTheme->setCaption(i18n("Select Image File")); @@ -74,12 +74,12 @@ void LookAndFeelTab::browseTheme() browseTheme(kcfg_BackgroundTheme->url()); } -void LookAndFeelTab::browseTheme(const QString& newtheme) +void LookAndFeelTab::browseTheme(const TQString& newtheme) { if (newtheme.isEmpty()) { kcfg_BackgroundTheme->clear(); - m_backgroundLabel->setPixmap(QPixmap()); + m_backgroundLabel->setPixmap(TQPixmap()); emit changed(); return; } @@ -92,7 +92,7 @@ void LookAndFeelTab::launchAdvancedDialog() if (!m_advDialog) { m_advDialog = new advancedDialog(this, "advancedDialog"); - connect(m_advDialog, SIGNAL(finished()), this, SLOT(finishAdvancedDialog())); + connect(m_advDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(finishAdvancedDialog())); m_advDialog->show(); } m_advDialog->setActiveWindow(); @@ -114,13 +114,13 @@ void LookAndFeelTab::enableTransparency(bool useTransparency) kcfg_ColorizeBackground->setDisabled(useTransparency || !useBgTheme); } -void LookAndFeelTab::previewBackground(const QString& themepath, bool isNew) +void LookAndFeelTab::previewBackground(const TQString& themepath, bool isNew) { - QString theme = themepath; + TQString theme = themepath; if (theme[0] != '/') theme = locate("data", "kicker/" + theme); - QImage tmpImg(theme); + TQImage tmpImg(theme); if(!tmpImg.isNull()) { tmpImg = tmpImg.smoothScale(m_backgroundLabel->contentsRect().width(), @@ -144,7 +144,7 @@ void LookAndFeelTab::previewBackground(const QString& themepath, bool isNew) i18n("Error loading theme image file.\n\n%1\n%2") .arg(theme, themepath)); kcfg_BackgroundTheme->clear(); - m_backgroundLabel->setPixmap(QPixmap()); + m_backgroundLabel->setPixmap(TQPixmap()); } void LookAndFeelTab::load() @@ -161,7 +161,7 @@ void LookAndFeelTab::load(bool useDefaults) config.setGroup("General"); bool use_theme = kcfg_UseBackgroundTheme->isChecked(); - QString theme = kcfg_BackgroundTheme->lineEdit()->text().stripWhiteSpace(); + TQString theme = kcfg_BackgroundTheme->lineEdit()->text().stripWhiteSpace(); bool transparent = kcfg_Transparent->isChecked(); @@ -174,7 +174,7 @@ void LookAndFeelTab::load(bool useDefaults) previewBackground(theme, false); } - QString tile; + TQString tile; config.setGroup("buttons"); kmenuTileChanged(m_kmenuTile->currentItem()); @@ -319,22 +319,22 @@ void LookAndFeelTab::fillTileCombos() m_tilename.clear(); m_tilename << "" << "Colorize"; - QStringList list = KGlobal::dirs()->findAllResources("tiles","*_tiny_up.png"); + TQStringList list = KGlobal::dirs()->findAllResources("tiles","*_tiny_up.png"); int minHeight = 0; - for (QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - QString tile = (*it); - QPixmap pix(tile); - QFileInfo fi(tile); + TQString tile = (*it); + TQPixmap pix(tile); + TQFileInfo fi(tile); tile = fi.fileName(); tile.truncate(tile.find("_tiny_up.png")); m_tilename << tile; // Transform tile to words with title case // The same is done when generating messages for translation - QStringList words = QStringList::split(QRegExp("[_ ]"), tile); - for (QStringList::iterator w = words.begin(); w != words.end(); ++w) + TQStringList words = TQStringList::split(TQRegExp("[_ ]"), tile); + for (TQStringList::iterator w = words.begin(); w != words.end(); ++w) (*w)[0] = (*w)[0].upper(); tile = i18n(words.join(" ").utf8()); diff --git a/kcontrol/kicker/lookandfeeltab_impl.h b/kcontrol/kicker/lookandfeeltab_impl.h index 54ef5b00d..704a359db 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.h +++ b/kcontrol/kicker/lookandfeeltab_impl.h @@ -31,25 +31,25 @@ class LookAndFeelTab : public LookAndFeelTabBase Q_OBJECT public: - LookAndFeelTab(QWidget *parent = 0, const char* name = 0); + LookAndFeelTab(TQWidget *parent = 0, const char* name = 0); void load(); void load(bool useDefaults); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; signals: void changed(); protected: void fillTileCombos(); - void previewBackground(const QString& themepath, bool isNew); + void previewBackground(const TQString& themepath, bool isNew); protected slots: void browseTheme(); - void browseTheme(const QString&); + void browseTheme(const TQString&); void enableTransparency( bool ); void launchAdvancedDialog(); @@ -62,8 +62,8 @@ protected slots: void wlTileChanged(int i); private: - QPixmap theme_preview; - QStringList m_tilename; + TQPixmap theme_preview; + TQStringList m_tilename; advancedDialog *m_advDialog; }; diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index 50be83e89..bfdb3a491 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software */ -#include <qlayout.h> +#include <tqlayout.h> #include <dcopclient.h> @@ -28,7 +28,7 @@ #include <kaboutdata.h> #include <kdialog.h> -LookAndFeelConfig::LookAndFeelConfig(QWidget *parent, const char *name) +LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { @@ -42,13 +42,13 @@ LookAndFeelConfig::LookAndFeelConfig(QWidget *parent, const char *name) setAboutData( about ); KickerConfig::initScreenNumber(); - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lookandfeeltab = new LookAndFeelTab(this); layout->addWidget(lookandfeeltab); layout->addStretch(); - connect(lookandfeeltab, SIGNAL(changed()), SLOT(configChanged())); + connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged())); load(); } @@ -81,7 +81,7 @@ void LookAndFeelConfig::defaults() emit changed(true); } -QString LookAndFeelConfig::quickHelp() const +TQString LookAndFeelConfig::quickHelp() const { return i18n("<h1>Panel</h1> Here you can configure the KDE panel (also" " referred to as 'kicker'). This includes options like the position and" diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h index 356becf5e..085f87e43 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.h +++ b/kcontrol/kicker/lookandfeeltab_kcm.h @@ -27,12 +27,12 @@ class LookAndFeelConfig : public KCModule Q_OBJECT public: - LookAndFeelConfig(QWidget *parent = 0L, const char *name = 0L); + LookAndFeelConfig(TQWidget *parent = 0L, const char *name = 0L); void load(); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; public slots: void configChanged(); diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index 26ec93b39..e60746db8 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software */ -#include <qcombobox.h> +#include <tqcombobox.h> #include <dcopclient.h> #include <kaboutdata.h> @@ -51,8 +51,8 @@ KickerConfig *KickerConfig::the() return m_self; } -KickerConfig::KickerConfig(QWidget *parent, const char *name) - : QObject(parent, name), +KickerConfig::KickerConfig(TQWidget *parent, const char *name) + : TQObject(parent, name), DCOPObject("KickerConfig"), configFileWatch(new KDirWatch(this)), m_currentPanelIndex(0) @@ -64,19 +64,19 @@ KickerConfig::KickerConfig(QWidget *parent, const char *name) init(); kapp->dcopClient()->setNotifications(true); - connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(QString)", - "jumpToPanel(QString)", false); - kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", QByteArray()); - - connect(this, SIGNAL(hidingPanelChanged(int)), - this, SLOT(setCurrentPanelIndex(int))); - connect(this, SIGNAL(positionPanelChanged(int)), - this, SLOT(setCurrentPanelIndex(int))); + connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(TQString)", + "jumpToPanel(TQString)", false); + kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray()); + + connect(this, TQT_SIGNAL(hidingPanelChanged(int)), + this, TQT_SLOT(setCurrentPanelIndex(int))); + connect(this, TQT_SIGNAL(positionPanelChanged(int)), + this, TQT_SLOT(setCurrentPanelIndex(int))); } KickerConfig::~KickerConfig() { - // QValueList::setAutoDelete where for art thou? + // TQValueList::setAutoDelete where for art thou? ExtensionInfoList::iterator it = m_extensionInfo.begin(); while (it != m_extensionInfo.end()) { @@ -90,7 +90,7 @@ KickerConfig::~KickerConfig() // this method may get called multiple times during the life of the control panel! void KickerConfig::init() { - disconnect(configFileWatch, SIGNAL(dirty(const QString&)), this, SLOT(configChanged(const QString&))); + disconnect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&))); configFileWatch->stopScan(); for (ExtensionInfoList::iterator it = m_extensionInfo.begin(); it != m_extensionInfo.end(); @@ -99,8 +99,8 @@ void KickerConfig::init() configFileWatch->removeFile((*it)->_configPath); } - QString configname = configName(); - QString configpath = KGlobal::dirs()->findResource("config", configname); + TQString configname = configName(); + TQString configpath = KGlobal::dirs()->findResource("config", configname); if (configpath.isEmpty()) configpath = locateLocal("config", configname); KSharedConfig::Ptr config = KSharedConfig::openConfig(configname); @@ -108,7 +108,7 @@ void KickerConfig::init() if (m_extensionInfo.isEmpty()) { // our list is empty, so add the main kicker config - m_extensionInfo.append(new ExtensionInfo(QString::null, configname, configpath)); + m_extensionInfo.append(new ExtensionInfo(TQString::null, configname, configpath)); configFileWatch->addFile(configpath); } else @@ -128,7 +128,7 @@ void KickerConfig::init() setupExtensionInfo(*config, true, true); - connect(configFileWatch, SIGNAL(dirty(const QString&)), this, SLOT(configChanged(const QString&))); + connect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&))); configFileWatch->startScan(); } @@ -139,7 +139,7 @@ void KickerConfig::restartKicker() { kapp->dcopClient()->attach(); } - QCString appname; + TQCString appname; appname = "kicker"; kapp->dcopClient()->send(appname, appname, "restart", ""); } @@ -156,8 +156,8 @@ void KickerConfig::notifyKicker() kapp->dcopClient()->attach(); } - QByteArray data; - QCString appname; + TQByteArray data; + TQCString appname; if (m_screenNumber == 0) { @@ -174,17 +174,17 @@ void KickerConfig::notifyKicker() void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool reloadIfExists) { config.setGroup("General"); - QStringList elist = config.readListEntry("Extensions2"); + TQStringList elist = config.readListEntry("Extensions2"); // all of our existing extensions // we'll remove ones we find which are still there the oldExtensions, and delete // all the extensions that remain (e.g. are no longer active) ExtensionInfoList oldExtensions(m_extensionInfo); - for (QStringList::Iterator it = elist.begin(); it != elist.end(); ++it) + for (TQStringList::Iterator it = elist.begin(); it != elist.end(); ++it) { // extension id - QString group(*it); + TQString group(*it); // is there a config group for this extension? if (!config.hasGroup(group) || group.contains("Extension") < 1) @@ -195,9 +195,9 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re // set config group config.setGroup(group); - QString df = KGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile")); - QString configname = config.readEntry("ConfigFile"); - QString configpath = KGlobal::dirs()->findResource("config", configname); + TQString df = KGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile")); + TQString configname = config.readEntry("ConfigFile"); + TQString configpath = KGlobal::dirs()->findResource("config", configname); if (checkExists) { @@ -245,7 +245,7 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re } } -void KickerConfig::configChanged(const QString& configPath) +void KickerConfig::configChanged(const TQString& configPath) { if (configPath.endsWith(configName())) { @@ -268,7 +268,7 @@ void KickerConfig::configChanged(const QString& configPath) emit extensionChanged(configPath); } -void KickerConfig::populateExtensionInfoList(QComboBox* list) +void KickerConfig::populateExtensionInfoList(TQComboBox* list) { list->clear(); for (ExtensionInfoList::iterator it = m_extensionInfo.begin(); it != m_extensionInfo.end(); ++it) @@ -300,7 +300,7 @@ void KickerConfig::saveExtentionInfo() } } -void KickerConfig::jumpToPanel(const QString& panelConfig) +void KickerConfig::jumpToPanel(const TQString& panelConfig) { ExtensionInfoList::iterator it = m_extensionInfo.begin(); int index = 0; @@ -323,7 +323,7 @@ void KickerConfig::jumpToPanel(const QString& panelConfig) emit positionPanelChanged(index); } -QString KickerConfig::configName() +TQString KickerConfig::configName() { if (m_screenNumber == 0) { @@ -331,7 +331,7 @@ QString KickerConfig::configName() } else { - return QString("kicker-screen-%1rc").arg(m_screenNumber); + return TQString("kicker-screen-%1rc").arg(m_screenNumber); } } @@ -340,7 +340,7 @@ void KickerConfig::setCurrentPanelIndex(int index) m_currentPanelIndex = index; } -QString KickerConfig::quickHelp() const +TQString KickerConfig::quickHelp() const { return i18n("<h1>Panel</h1> Here you can configure the KDE panel (also" " referred to as 'kicker'). This includes options like the position and" @@ -371,7 +371,7 @@ KAboutData *KickerConfig::aboutData() extern "C" { - KDE_EXPORT KCModule *create_kicker(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_kicker(TQWidget *parent, const char *name) { KCModuleContainer *container = new KCModuleContainer(parent, "kcmkicker"); container->addModule("kicker_config_arrangement"); @@ -381,26 +381,26 @@ extern "C" return container; } - KDE_EXPORT KCModule *create_kicker_arrangement(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) { KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); return new PositionConfig(parent, "kcmkicker"); } - KDE_EXPORT KCModule *create_kicker_hiding(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) { KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); return new HidingConfig(parent, "kcmkicker"); } - KDE_EXPORT KCModule *create_kicker_menus(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_kicker_menus(TQWidget *parent, const char * /*name*/) { return new MenuConfig(parent, "kcmkicker"); } - KDE_EXPORT KCModule *create_kicker_appearance(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) { KImageIO::registerFormats(); KGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") + diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h index 1797f7637..1af4fbf8d 100644 --- a/kcontrol/kicker/main.h +++ b/kcontrol/kicker/main.h @@ -27,7 +27,7 @@ class QComboBox; class KAboutData; class KDirWatch; -class KickerConfig : public QObject, public DCOPObject +class KickerConfig : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -36,22 +36,22 @@ public: static KickerConfig *the(); ~KickerConfig(); - void populateExtensionInfoList(QComboBox* list); + void populateExtensionInfoList(TQComboBox* list); void reloadExtensionInfo(); void saveExtentionInfo(); const ExtensionInfoList& extensionsInfo(); - QString configName(); + TQString configName(); void notifyKicker(); void restartKicker(); - QString quickHelp() const; + TQString quickHelp() const; KAboutData *aboutData(); int currentPanelIndex() const { return m_currentPanelIndex; } k_dcop: - void jumpToPanel(const QString& panelConfig); + void jumpToPanel(const TQString& panelConfig); signals: void positionPanelChanged(int); @@ -59,8 +59,8 @@ signals: void extensionInfoChanged(); void extensionAdded(ExtensionInfo*); void extensionRemoved(ExtensionInfo*); - void extensionChanged(const QString&); - void extensionAboutToChange(const QString&); + void extensionChanged(const TQString&); + void extensionAboutToChange(const TQString&); void aboutToNotifyKicker(); protected: @@ -68,11 +68,11 @@ protected: void setupExtensionInfo(KConfig& c, bool checkExists, bool reloadIfExists = false); protected slots: - void configChanged(const QString&); + void configChanged(const TQString&); void setCurrentPanelIndex(int); private: - KickerConfig(QWidget *parent = 0, const char *name = 0); + KickerConfig(TQWidget *parent = 0, const char *name = 0); static KickerConfig *m_self; diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp index 5bc1964b1..03ca57582 100644 --- a/kcontrol/kicker/menuconfig.cpp +++ b/kcontrol/kicker/menuconfig.cpp @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software */ -#include <qlayout.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqtimer.h> #include <klocale.h> #include <kdebug.h> @@ -28,10 +28,10 @@ #include "menuconfig.h" #include "menuconfig.moc" -MenuConfig::MenuConfig(QWidget *parent, const char *name) +MenuConfig::MenuConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new MenuTab(this); layout->addWidget(m_widget); layout->addStretch(); @@ -41,13 +41,13 @@ MenuConfig::MenuConfig(QWidget *parent, const char *name) addConfig(KickerSettings::self(), m_widget); - connect(m_widget, SIGNAL(changed()), - this, SLOT(changed())); - connect(KickerConfig::the(), SIGNAL(aboutToNotifyKicker()), - this, SLOT(aboutToNotifyKicker())); + connect(m_widget, TQT_SIGNAL(changed()), + this, TQT_SLOT(changed())); + connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), + this, TQT_SLOT(aboutToNotifyKicker())); load(); - QTimer::singleShot(0, this, SLOT(notChanged())); + TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); } void MenuConfig::notChanged() @@ -90,5 +90,5 @@ void MenuConfig::defaults() // KConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changedm, // while we manage some of the widgets ourselves - QTimer::singleShot(0, this, SLOT(changed())); + TQTimer::singleShot(0, this, TQT_SLOT(changed())); } diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h index 3d73f1922..490684076 100644 --- a/kcontrol/kicker/menuconfig.h +++ b/kcontrol/kicker/menuconfig.h @@ -27,7 +27,7 @@ class MenuConfig : public KCModule Q_OBJECT public: - MenuConfig(QWidget *parent = 0, const char *name = 0); + MenuConfig(TQWidget *parent = 0, const char *name = 0); void load(); void save(); diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 935f04684..df06945be 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -15,12 +15,12 @@ * along with this program; if not, write to the Free Software */ -#include <qcheckbox.h> -#include <qdir.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qradiobutton.h> +#include <tqcheckbox.h> +#include <tqdir.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> #include <kapplication.h> #include <kdebug.h> @@ -42,19 +42,19 @@ #include "menutab_impl.h" #include "menutab_impl.moc" -kSubMenuItem::kSubMenuItem(QListView* parent, - const QString& visibleName, - const QString& desktopFile, - const QPixmap& icon, +kSubMenuItem::kSubMenuItem(TQListView* parent, + const TQString& visibleName, + const TQString& desktopFile, + const TQPixmap& icon, bool checked) - : QCheckListItem(parent, visibleName, QCheckListItem::CheckBox), + : TQCheckListItem(parent, visibleName, TQCheckListItem::CheckBox), m_desktopFile(desktopFile) { setPixmap(0, icon); setOn(checked); } -QString kSubMenuItem::desktopFile() +TQString kSubMenuItem::desktopFile() { return m_desktopFile; } @@ -64,32 +64,32 @@ void kSubMenuItem::stateChange(bool state) emit toggled(state); } -MenuTab::MenuTab( QWidget *parent, const char* name ) +MenuTab::MenuTab( TQWidget *parent, const char* name ) : MenuTabBase (parent, name), m_bookmarkMenu(0), m_quickBrowserMenu(0) { // connections - connect(m_editKMenuButton, SIGNAL(clicked()), SLOT(launchMenuEditor())); - connect(btnCustomKMenuIcon, SIGNAL(clicked()), SLOT(launchIconEditor())); - connect(kcfg_KMenuText, SIGNAL(textChanged(QString)), SLOT(kmenuChanged())); - connect(kcfg_ShowKMenuText, SIGNAL(toggled(bool)), SLOT(kmenuChanged())); - //connect(kcfg_ButtonFont, SIGNAL(fontSelected(const QFont &)), SLOT(kmenuChanged())); - connect(maxrecentdocs, SIGNAL(valueChanged(int)), this, SLOT(changed())); + connect(m_editKMenuButton, TQT_SIGNAL(clicked()), TQT_SLOT(launchMenuEditor())); + connect(btnCustomKMenuIcon, TQT_SIGNAL(clicked()), TQT_SLOT(launchIconEditor())); + connect(kcfg_KMenuText, TQT_SIGNAL(textChanged(TQString)), TQT_SLOT(kmenuChanged())); + connect(kcfg_ShowKMenuText, TQT_SIGNAL(toggled(bool)), TQT_SLOT(kmenuChanged())); + //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged())); + connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); KIconLoader * ldr = KGlobal::iconLoader(); - QPixmap kmenu_icon; + TQPixmap kmenu_icon; m_kmenu_icon = KickerSettings::customKMenuIcon(); if (m_kmenu_icon.isNull() == true) { - m_kmenu_icon = QString("kmenu"); + m_kmenu_icon = TQString("kmenu"); } kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall); btnCustomKMenuIcon->setPixmap(kmenu_icon); KConfig *config; - config = new KConfig(QString::fromLatin1("kdeglobals"), false, false); - config->setGroup(QString::fromLatin1("RecentDocuments")); - maxrecentdocs->setValue(config->readNumEntry(QString::fromLatin1("MaxEntries"), 10)); + config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::fromLatin1("RecentDocuments")); + maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10)); m_browserGroupLayout->setColStretch( 1, 1 ); m_pRecentOrderGroupLayout->setColStretch( 1, 1 ); @@ -113,29 +113,29 @@ void MenuTab::load( bool useDefaults ) // show the bookmark menu? m_bookmarkMenu = new kSubMenuItem(m_subMenus, i18n("Bookmarks"), - QString::null, + TQString::null, SmallIcon("bookmark"), c->readBoolEntry("UseBookmarks", false)); - connect(m_bookmarkMenu, SIGNAL(toggled(bool)), SIGNAL(changed())); + connect(m_bookmarkMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); // show the quick menus menu? m_quickBrowserMenu = new kSubMenuItem(m_subMenus, i18n("Quick Browser"), - QString::null, + TQString::null, SmallIcon("kdisknav"), c->readBoolEntry("UseBrowser", false)); - connect(m_quickBrowserMenu, SIGNAL(toggled(bool)), SIGNAL(changed())); + connect(m_quickBrowserMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - QStringList ext_default; + TQStringList ext_default; ext_default << "prefmenu.desktop" << "systemmenu.desktop"; - QStringList ext = c->readListEntry("Extensions", ext_default); - QStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext"); + TQStringList ext = c->readListEntry("Extensions", ext_default); + TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext"); kSubMenuItem* menuItem(0); - for (QStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit) + for (TQStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit) { - QDir d(*dit, "*.desktop"); - QStringList av = d.entryList(); - for (QStringList::ConstIterator it=av.begin(); it!=av.end(); ++it) + TQDir d(*dit, "*.desktop"); + TQStringList av = d.entryList(); + for (TQStringList::ConstIterator it=av.begin(); it!=av.end(); ++it) { KDesktopFile df(d.absFilePath(*it), true); menuItem = new kSubMenuItem(m_subMenus, @@ -143,7 +143,7 @@ void MenuTab::load( bool useDefaults ) *it, SmallIcon(df.readIcon()), qFind(ext.begin(), ext.end(), *it) != ext.end()); - connect(menuItem, SIGNAL(toggled(bool)), SIGNAL(changed())); + connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); } } @@ -159,8 +159,8 @@ void MenuTab::save() c->setGroup("menus"); - QStringList ext; - QListViewItem *item(0); + TQStringList ext; + TQListViewItem *item(0); for (item = m_subMenus->firstChild(); item; item = item->nextSibling()) { bool isOn = static_cast<kSubMenuItem*>(item)->isOn(); @@ -188,8 +188,8 @@ void MenuTab::save() // Save recent documents KConfig *config; - config = new KConfig(QString::fromLatin1("kdeglobals"), false, false); - config->setGroup(QString::fromLatin1("RecentDocuments")); + config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::fromLatin1("RecentDocuments")); config->writeEntry("MaxEntries", maxrecentdocs->value()); config->sync(); @@ -206,7 +206,7 @@ void MenuTab::defaults() void MenuTab::launchMenuEditor() { if ( KApplication::startServiceByDesktopName( "kmenuedit", - QString::null /*url*/, + TQString::null /*url*/, 0 /*error*/, 0 /*dcopservice*/, 0 /*pid*/, @@ -223,13 +223,13 @@ void MenuTab::launchMenuEditor() void MenuTab::launchIconEditor() { KIconDialog dlg(this); - QString newIcon = dlg.selectIcon(KIcon::Small, KIcon::Application); + TQString newIcon = dlg.selectIcon(KIcon::Small, KIcon::Application); if (newIcon.isEmpty()) return; m_kmenu_icon = newIcon; KIconLoader * ldr = KGlobal::iconLoader(); - QPixmap kmenu_icon; + TQPixmap kmenu_icon; kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall); btnCustomKMenuIcon->setPixmap(kmenu_icon); m_kmenu_button_changed = true; diff --git a/kcontrol/kicker/menutab_impl.h b/kcontrol/kicker/menutab_impl.h index 71c669048..3d0e09748 100644 --- a/kcontrol/kicker/menutab_impl.h +++ b/kcontrol/kicker/menutab_impl.h @@ -18,23 +18,23 @@ #ifndef __menutab_impl_h__ #define __menutab_impl_h__ -#include <qlistview.h> +#include <tqlistview.h> #include "menutab.h" -class kSubMenuItem : public QObject, public QCheckListItem +class kSubMenuItem : public TQObject, public QCheckListItem { Q_OBJECT public: - kSubMenuItem(QListView* parent, - const QString& visibleName, - const QString& desktopFile, - const QPixmap& icon, + kSubMenuItem(TQListView* parent, + const TQString& visibleName, + const TQString& desktopFile, + const TQPixmap& icon, bool checked); ~kSubMenuItem() {} - QString desktopFile(); + TQString desktopFile(); signals: void toggled(bool); @@ -42,7 +42,7 @@ class kSubMenuItem : public QObject, public QCheckListItem protected: void stateChange(bool state); - QString m_desktopFile; + TQString m_desktopFile; }; class MenuTab : public MenuTabBase @@ -50,7 +50,7 @@ class MenuTab : public MenuTabBase Q_OBJECT public: - MenuTab( QWidget *parent=0, const char* name=0 ); + MenuTab( TQWidget *parent=0, const char* name=0 ); void load(); void load( bool useDefaults ); @@ -68,7 +68,7 @@ public slots: protected: kSubMenuItem *m_bookmarkMenu; kSubMenuItem *m_quickBrowserMenu; - QString m_kmenu_icon; + TQString m_kmenu_icon; bool m_kmenu_button_changed; }; diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp index 86a94ed21..6e5dcdeb2 100644 --- a/kcontrol/kicker/positionconfig.cpp +++ b/kcontrol/kicker/positionconfig.cpp @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software */ -#include <qlayout.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqtimer.h> #include <klocale.h> #include <kdebug.h> @@ -28,10 +28,10 @@ #include "positionconfig.h" #include "positionconfig.moc" -PositionConfig::PositionConfig(QWidget *parent, const char *name) +PositionConfig::PositionConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new PositionTab(this); layout->addWidget(m_widget); layout->addStretch(); @@ -41,13 +41,13 @@ PositionConfig::PositionConfig(QWidget *parent, const char *name) //addConfig(KickerSettings::self(), m_widget); - connect(m_widget, SIGNAL(changed()), - this, SLOT(changed())); - connect(KickerConfig::the(), SIGNAL(aboutToNotifyKicker()), - this, SLOT(aboutToNotifyKicker())); + connect(m_widget, TQT_SIGNAL(changed()), + this, TQT_SLOT(changed())); + connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), + this, TQT_SLOT(aboutToNotifyKicker())); load(); - QTimer::singleShot(0, this, SLOT(notChanged())); + TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); } void PositionConfig::notChanged() @@ -90,5 +90,5 @@ void PositionConfig::defaults() // KConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - QTimer::singleShot(0, this, SLOT(changed())); + TQTimer::singleShot(0, this, TQT_SLOT(changed())); } diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h index 8fc1c885f..bf29473b4 100644 --- a/kcontrol/kicker/positionconfig.h +++ b/kcontrol/kicker/positionconfig.h @@ -27,7 +27,7 @@ class PositionConfig : public KCModule Q_OBJECT public: - PositionConfig(QWidget *parent = 0, const char *name = 0); + PositionConfig(TQWidget *parent = 0, const char *name = 0); void load(); void save(); diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index 22f38e0a1..5bc9e2eb1 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -18,14 +18,14 @@ #include <stdlib.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qslider.h> -#include <qtooltip.h> -#include <qtimer.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqslider.h> +#include <tqtooltip.h> +#include <tqtimer.h> #include <kapplication.h> #include <kdebug.h> @@ -50,7 +50,7 @@ extern const int maxX = 150; extern const int maxY = 114; extern const int margin = 1; -PositionTab::PositionTab(QWidget *parent, const char* name) +PositionTab::PositionTab(TQWidget *parent, const char* name) : PositionTabBase(parent, name), m_pretendPanel(0), m_desktopPreview(0), @@ -58,103 +58,103 @@ PositionTab::PositionTab(QWidget *parent, const char* name) m_panelPos(PosBottom), m_panelAlign(AlignLeft) { - QPixmap monitor(locate("data", "kcontrol/pics/monitor.png")); + TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png")); m_monitorImage->setPixmap(monitor); m_monitorImage->setFixedSize(m_monitorImage->sizeHint()); - m_pretendDesktop = new QWidget(m_monitorImage, "pretendBG"); + m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG"); m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY); - m_pretendPanel = new QFrame(m_monitorImage, "pretendPanel"); + m_pretendPanel = new TQFrame(m_monitorImage, "pretendPanel"); m_pretendPanel->setGeometry(offsetX + margin, maxY + offsetY - 10, maxX - margin, 10 - margin); - m_pretendPanel->setFrameShape(QFrame::MenuBarPanel); + m_pretendPanel->setFrameShape(TQFrame::MenuBarPanel); /* * set the tooltips on the buttons properly for RTL langs */ if (kapp->reverseLayout()) { - QToolTip::add(locationTopRight, i18n("Top left")); - QToolTip::add(locationTop, i18n("Top center")); - QToolTip::add(locationTopLeft, i18n("Top right" ) ); - QToolTip::add(locationRightTop, i18n("Left top")); - QToolTip::add(locationRight, i18n("Left center")); - QToolTip::add(locationRightBottom, i18n("Left bottom")); - QToolTip::add(locationBottomRight, i18n("Bottom left")); - QToolTip::add(locationBottom, i18n("Bottom center")); - QToolTip::add(locationBottomLeft, i18n("Bottom right")); - QToolTip::add(locationLeftTop, i18n("Right top")); - QToolTip::add(locationLeft, i18n("Right center")); - QToolTip::add(locationLeftBottom, i18n("Right bottom")); + TQToolTip::add(locationTopRight, i18n("Top left")); + TQToolTip::add(locationTop, i18n("Top center")); + TQToolTip::add(locationTopLeft, i18n("Top right" ) ); + TQToolTip::add(locationRightTop, i18n("Left top")); + TQToolTip::add(locationRight, i18n("Left center")); + TQToolTip::add(locationRightBottom, i18n("Left bottom")); + TQToolTip::add(locationBottomRight, i18n("Bottom left")); + TQToolTip::add(locationBottom, i18n("Bottom center")); + TQToolTip::add(locationBottomLeft, i18n("Bottom right")); + TQToolTip::add(locationLeftTop, i18n("Right top")); + TQToolTip::add(locationLeft, i18n("Right center")); + TQToolTip::add(locationLeftBottom, i18n("Right bottom")); } else { - QToolTip::add(locationTopLeft, i18n("Top left")); - QToolTip::add(locationTop, i18n("Top center")); - QToolTip::add(locationTopRight, i18n("Top right" ) ); - QToolTip::add(locationLeftTop, i18n("Left top")); - QToolTip::add(locationLeft, i18n("Left center")); - QToolTip::add(locationLeftBottom, i18n("Left bottom")); - QToolTip::add(locationBottomLeft, i18n("Bottom left")); - QToolTip::add(locationBottom, i18n("Bottom center")); - QToolTip::add(locationBottomRight, i18n("Bottom right")); - QToolTip::add(locationRightTop, i18n("Right top")); - QToolTip::add(locationRight, i18n("Right center")); - QToolTip::add(locationRightBottom, i18n("Right bottom")); + TQToolTip::add(locationTopLeft, i18n("Top left")); + TQToolTip::add(locationTop, i18n("Top center")); + TQToolTip::add(locationTopRight, i18n("Top right" ) ); + TQToolTip::add(locationLeftTop, i18n("Left top")); + TQToolTip::add(locationLeft, i18n("Left center")); + TQToolTip::add(locationLeftBottom, i18n("Left bottom")); + TQToolTip::add(locationBottomLeft, i18n("Bottom left")); + TQToolTip::add(locationBottom, i18n("Bottom center")); + TQToolTip::add(locationBottomRight, i18n("Bottom right")); + TQToolTip::add(locationRightTop, i18n("Right top")); + TQToolTip::add(locationRight, i18n("Right center")); + TQToolTip::add(locationRightBottom, i18n("Right bottom")); } // connections - connect(m_locationGroup, SIGNAL(clicked(int)), SIGNAL(changed())); - connect(m_xineramaScreenComboBox, SIGNAL(highlighted(int)), SIGNAL(changed())); + connect(m_locationGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); + connect(m_xineramaScreenComboBox, TQT_SIGNAL(highlighted(int)), TQT_SIGNAL(changed())); - connect(m_identifyButton,SIGNAL(clicked()),SLOT(showIdentify())); + connect(m_identifyButton,TQT_SIGNAL(clicked()),TQT_SLOT(showIdentify())); - for(int s=0; s < QApplication::desktop()->numScreens(); s++) + for(int s=0; s < TQApplication::desktop()->numScreens(); s++) { /* populate the combobox for the available screens */ - m_xineramaScreenComboBox->insertItem(QString::number(s+1)); + m_xineramaScreenComboBox->insertItem(TQString::number(s+1)); } m_xineramaScreenComboBox->insertItem(i18n("All Screens")); // hide the xinerama chooser widgets if there is no need for them - if (QApplication::desktop()->numScreens() < 2) + if (TQApplication::desktop()->numScreens() < 2) { m_identifyButton->hide(); m_xineramaScreenComboBox->hide(); m_xineramaScreenLabel->hide(); } - connect(m_percentSlider, SIGNAL(valueChanged(int)), SIGNAL(changed())); - connect(m_percentSpinBox, SIGNAL(valueChanged(int)), SIGNAL(changed())); - connect(m_expandCheckBox, SIGNAL(clicked()), SIGNAL(changed())); + connect(m_percentSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); + connect(m_percentSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); + connect(m_expandCheckBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed())); - connect(m_sizeGroup, SIGNAL(clicked(int)), SIGNAL(changed())); - connect(m_customSlider, SIGNAL(valueChanged(int)), SIGNAL(changed())); - connect(m_customSpinbox, SIGNAL(valueChanged(int)), SIGNAL(changed())); + connect(m_sizeGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); + connect(m_customSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); + connect(m_customSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); m_desktopPreview = new KVirtualBGRenderer(0); - connect(m_desktopPreview, SIGNAL(imageDone(int)), - SLOT(slotBGPreviewReady(int))); - - connect(KickerConfig::the(), SIGNAL(extensionInfoChanged()), - SLOT(infoUpdated())); - connect(KickerConfig::the(), SIGNAL(extensionAdded(ExtensionInfo*)), - SLOT(extensionAdded(ExtensionInfo*))); - connect(KickerConfig::the(), SIGNAL(extensionRemoved(ExtensionInfo*)), - SLOT(extensionRemoved(ExtensionInfo*))); - connect(KickerConfig::the(), SIGNAL(extensionChanged(const QString&)), - SLOT(extensionChanged(const QString&))); - connect(KickerConfig::the(), SIGNAL(extensionAboutToChange(const QString&)), - SLOT(extensionAboutToChange(const QString&))); + connect(m_desktopPreview, TQT_SIGNAL(imageDone(int)), + TQT_SLOT(slotBGPreviewReady(int))); + + connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()), + TQT_SLOT(infoUpdated())); + connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)), + TQT_SLOT(extensionAdded(ExtensionInfo*))); + connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)), + TQT_SLOT(extensionRemoved(ExtensionInfo*))); + connect(KickerConfig::the(), TQT_SIGNAL(extensionChanged(const TQString&)), + TQT_SLOT(extensionChanged(const TQString&))); + connect(KickerConfig::the(), TQT_SIGNAL(extensionAboutToChange(const TQString&)), + TQT_SLOT(extensionAboutToChange(const TQString&))); // position tab tells hiding tab about extension selections and vice versa - connect(KickerConfig::the(), SIGNAL(hidingPanelChanged(int)), - SLOT(jumpToPanel(int))); - connect(m_panelList, SIGNAL(activated(int)), - KickerConfig::the(), SIGNAL(positionPanelChanged(int))); - - connect(m_panelSize, SIGNAL(activated(int)), - SLOT(sizeChanged(int))); - connect(m_panelSize, SIGNAL(activated(int)), - SIGNAL(changed())); + connect(KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)), + TQT_SLOT(jumpToPanel(int))); + connect(m_panelList, TQT_SIGNAL(activated(int)), + KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int))); + + connect(m_panelSize, TQT_SIGNAL(activated(int)), + TQT_SLOT(sizeChanged(int))); + connect(m_panelSize, TQT_SIGNAL(activated(int)), + TQT_SIGNAL(changed())); } PositionTab::~PositionTab() @@ -191,9 +191,9 @@ void PositionTab::defaults() m_percentSlider->setValue( 100 ); // use all space available m_percentSpinBox->setValue( 100 ); // use all space available m_expandCheckBox->setChecked( true ); // expand as required - m_xineramaScreenComboBox->setCurrentItem(QApplication::desktop()->primaryScreen()); + m_xineramaScreenComboBox->setCurrentItem(TQApplication::desktop()->primaryScreen()); - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) { // RTL lang aligns right m_panelAlign = AlignRight; @@ -220,7 +220,7 @@ void PositionTab::sizeChanged(int which) void PositionTab::movePanel(int whichButton) { - QPushButton* pushed = reinterpret_cast<QPushButton*>(m_locationGroup->find(whichButton)); + TQPushButton* pushed = reinterpret_cast<TQPushButton*>(m_locationGroup->find(whichButton)); if (pushed == locationTopLeft) { @@ -490,7 +490,7 @@ void PositionTab::slotBGPreviewReady(int) m_pretendDesktop->setBackgroundPixmap(m_desktopPreview->pixmap()); #if 0 KPixmap pm; - if (QPixmap::defaultDepth() < 15) + if (TQPixmap::defaultDepth() < 15) { pm.convertFromImage(*m_desktopPreview->image(), KPixmap::LowColor); } @@ -559,12 +559,12 @@ void PositionTab::switchPanel(int panelItem) m_sizeGroup->setEnabled(m_panelInfo->_resizeable); m_panelPos = m_panelInfo->_position; m_panelAlign = m_panelInfo->_alignment; - if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < QApplication::desktop()->numScreens()) + if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens()) m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen); else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */ m_xineramaScreenComboBox->setCurrentItem(m_xineramaScreenComboBox->count()-1); else - m_xineramaScreenComboBox->setCurrentItem(QApplication::desktop()->primaryScreen()); + m_xineramaScreenComboBox->setCurrentItem(TQApplication::desktop()->primaryScreen()); setPositionButtons(); @@ -633,7 +633,7 @@ void PositionTab::infoUpdated() switchPanel(0); } -void PositionTab::extensionAboutToChange(const QString& configPath) +void PositionTab::extensionAboutToChange(const TQString& configPath) { ExtensionInfo* extension = (KickerConfig::the()->extensionsInfo())[m_panelList->currentItem()]; if (extension && extension->_configPath == configPath) @@ -642,7 +642,7 @@ void PositionTab::extensionAboutToChange(const QString& configPath) } } -void PositionTab::extensionChanged(const QString& configPath) +void PositionTab::extensionChanged(const TQString& configPath) { ExtensionInfo* extension = (KickerConfig::the()->extensionsInfo())[m_panelList->currentItem()]; if (extension && extension->_configPath == configPath) @@ -684,26 +684,26 @@ void PositionTab::storeInfo() void PositionTab::showIdentify() { - for(int s=0; s < QApplication::desktop()->numScreens();s++) + for(int s=0; s < TQApplication::desktop()->numScreens();s++) { - QLabel *screenLabel = new QLabel(0,"Screen Identify", WDestructiveClose | WStyle_Customize | WX11BypassWM ); + TQLabel *screenLabel = new TQLabel(0,"Screen Identify", WDestructiveClose | WStyle_Customize | WX11BypassWM ); - QFont identifyFont(KGlobalSettings::generalFont()); + TQFont identifyFont(KGlobalSettings::generalFont()); identifyFont.setPixelSize(100); screenLabel->setFont(identifyFont); - screenLabel->setFrameStyle(QFrame::Panel); - screenLabel->setFrameShadow(QFrame::Plain); + screenLabel->setFrameStyle(TQFrame::Panel); + screenLabel->setFrameShadow(TQFrame::Plain); screenLabel->setAlignment(Qt::AlignCenter); screenLabel->setNum(s + 1); // BUGLET: we should not allow the identification to be entered again // until the timer fires. - QTimer::singleShot(1500, screenLabel, SLOT(close())); + TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); - QPoint screenCenter(QApplication::desktop()->screenGeometry(s).center()); - QRect targetGeometry(QPoint(0,0),screenLabel->sizeHint()); + TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); diff --git a/kcontrol/kicker/positiontab_impl.h b/kcontrol/kicker/positiontab_impl.h index 6c7cdc5ea..6bfcf5ad4 100644 --- a/kcontrol/kicker/positiontab_impl.h +++ b/kcontrol/kicker/positiontab_impl.h @@ -32,7 +32,7 @@ class PositionTab : public PositionTabBase Q_OBJECT public: - PositionTab(QWidget *parent, const char* name = 0); + PositionTab(TQWidget *parent, const char* name = 0); ~PositionTab(); enum positions { PosLeft = 0, PosRight, PosTop, PosBottom }; @@ -56,15 +56,15 @@ protected slots: void showIdentify(); void extensionAdded(ExtensionInfo*); void extensionRemoved(ExtensionInfo* info); - void extensionChanged(const QString&); - void extensionAboutToChange(const QString&); + void extensionChanged(const TQString&); + void extensionAboutToChange(const TQString&); void sizeChanged(int); void switchPanel(int); void jumpToPanel(int); private: - QFrame* m_pretendPanel; - QWidget* m_pretendDesktop; + TQFrame* m_pretendPanel; + TQWidget* m_pretendDesktop; KVirtualBGRenderer* m_desktopPreview; ExtensionInfo* m_panelInfo; diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp index 8b730ae77..d98cba302 100644 --- a/kcontrol/kio/cache.cpp +++ b/kcontrol/kio/cache.cpp @@ -19,13 +19,13 @@ Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> #include <kdebug.h> #include <klocale.h> @@ -38,10 +38,10 @@ #include "cache.h" #include "cache_ui.h" -KCacheConfigDialog::KCacheConfigDialog( QWidget* parent ) +KCacheConfigDialog::KCacheConfigDialog( TQWidget* parent ) :KCModule( parent, "kcmkio" ) { - QVBoxLayout* mainLayout = new QVBoxLayout(this, 0, 0); + TQVBoxLayout* mainLayout = new TQVBoxLayout(this, 0, 0); m_dlg = new CacheDlgUI(this); mainLayout->addWidget(m_dlg); mainLayout->addStretch(); @@ -66,10 +66,10 @@ void KCacheConfigDialog::load() m_dlg->rbCacheIfPossible->setChecked( true ); // Config changed notifications... - connect ( m_dlg->cbUseCache, SIGNAL(toggled(bool)), SLOT(configChanged()) ); - connect ( m_dlg->bgCachePolicy, SIGNAL(clicked (int)), SLOT(configChanged()) ); - connect ( m_dlg->sbMaxCacheSize, SIGNAL(valueChanged(int)), SLOT(configChanged()) ); - connect ( m_dlg->pbClearCache, SIGNAL(clicked()), SLOT(slotClearCache()) ); + connect ( m_dlg->cbUseCache, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) ); + connect ( m_dlg->bgCachePolicy, TQT_SIGNAL(clicked (int)), TQT_SLOT(configChanged()) ); + connect ( m_dlg->sbMaxCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(configChanged()) ); + connect ( m_dlg->pbClearCache, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearCache()) ); emit changed( false ); } @@ -100,7 +100,7 @@ void KCacheConfigDialog::defaults() m_dlg->sbMaxCacheSize->setValue( DEFAULT_MAX_CACHE_SIZE ); } -QString KCacheConfigDialog::quickHelp() const +TQString KCacheConfigDialog::quickHelp() const { return i18n( "<h1>Cache</h1><p>This module lets you configure your cache settings.</p>" "<p>The cache is an internal memory in Konqueror where recently " diff --git a/kcontrol/kio/cache.h b/kcontrol/kio/cache.h index d2d12e5e2..07ff0a6c8 100644 --- a/kcontrol/kio/cache.h +++ b/kcontrol/kio/cache.h @@ -31,13 +31,13 @@ class KCacheConfigDialog : public KCModule Q_OBJECT public: - KCacheConfigDialog( QWidget* parent = 0 ); + KCacheConfigDialog( TQWidget* parent = 0 ); ~KCacheConfigDialog() {}; virtual void load(); virtual void save(); virtual void defaults(); - QString quickHelp() const; + TQString quickHelp() const; protected slots: void configChanged(); diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp index 08949c27b..00a87567e 100644 --- a/kcontrol/kio/fakeuaprovider.cpp +++ b/kcontrol/kio/fakeuaprovider.cpp @@ -27,16 +27,16 @@ #include "fakeuaprovider.h" #define UA_PTOS(x) (*it)->property(x).toString() -#define QFL(x) QString::fromLatin1(x) +#define QFL(x) TQString::fromLatin1(x) FakeUASProvider::FakeUASProvider() { m_bIsDirty = true; } -FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const QString& uaStr ) +FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr ) { - QStringList split; + TQStringList split; int pos = (uaStr).find("::"); if ( pos == -1 ) @@ -50,7 +50,7 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const QString& } else { - split = QStringList::split("::", uaStr); + split = TQStringList::split("::", uaStr); } if ( m_lstIdentity.contains(split[1]) ) @@ -76,7 +76,7 @@ void FakeUASProvider::loadFromDesktopFiles() void FakeUASProvider::parseDescription() { - QString tmp; + TQString tmp; KTrader::OfferList::ConstIterator it = m_providers.begin(); KTrader::OfferList::ConstIterator lastItem = m_providers.end(); @@ -90,24 +90,24 @@ void FakeUASProvider::parseDescription() struct utsname utsn; uname( &utsn ); - tmp.replace( QFL("appSysName"), QString(utsn.sysname) ); - tmp.replace( QFL("appSysRelease"), QString(utsn.release) ); - tmp.replace( QFL("appMachineType"), QString(utsn.machine) ); + tmp.replace( QFL("appSysName"), TQString(utsn.sysname) ); + tmp.replace( QFL("appSysRelease"), TQString(utsn.release) ); + tmp.replace( QFL("appMachineType"), TQString(utsn.machine) ); - QStringList languageList = KGlobal::locale()->languageList(); + TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - QStringList::Iterator it = languageList.find( QString::fromLatin1("C") ); + TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.contains( QString::fromLatin1("en") ) > 0 ) + if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = QString::fromLatin1("en"); + (*it) = TQString::fromLatin1("en"); } } - tmp.replace( QFL("appLanguage"), QString("%1").arg(languageList.join(", ")) ); + tmp.replace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) ); tmp.replace( QFL("appPlatform"), QFL("X11") ); } @@ -117,12 +117,12 @@ void FakeUASProvider::parseDescription() m_lstIdentity << tmp; - tmp = QString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE")); + tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE")); if ( tmp.stripWhiteSpace().isEmpty() ) - tmp = QString("%1 %2").arg(UA_PTOS("X-KDE-UA-" + tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-" "NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")); else - tmp = QString("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-" + tmp = TQString("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-" "NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp); m_lstAlias << tmp; @@ -131,44 +131,44 @@ void FakeUASProvider::parseDescription() m_bIsDirty = false; } -QString FakeUASProvider::aliasStr( const QString& name ) +TQString FakeUASProvider::aliasStr( const TQString& name ) { int id = userAgentStringList().findIndex(name); if ( id == -1 ) - return QString::null; + return TQString::null; else return m_lstAlias[id]; } -QString FakeUASProvider::agentStr( const QString& name ) +TQString FakeUASProvider::agentStr( const TQString& name ) { int id = userAgentAliasList().findIndex(name); if ( id == -1 ) - return QString::null; + return TQString::null; else return m_lstIdentity[id]; } -QStringList FakeUASProvider::userAgentStringList() +TQStringList FakeUASProvider::userAgentStringList() { if ( m_bIsDirty ) { loadFromDesktopFiles(); if ( !m_providers.count() ) - return QStringList(); + return TQStringList(); parseDescription(); } return m_lstIdentity; } -QStringList FakeUASProvider::userAgentAliasList () +TQStringList FakeUASProvider::userAgentAliasList () { if ( m_bIsDirty ) { loadFromDesktopFiles(); if ( !m_providers.count() ) - return QStringList(); + return TQStringList(); parseDescription(); } return m_lstAlias; diff --git a/kcontrol/kio/fakeuaprovider.h b/kcontrol/kio/fakeuaprovider.h index fedf155bf..3e9f600dd 100644 --- a/kcontrol/kio/fakeuaprovider.h +++ b/kcontrol/kio/fakeuaprovider.h @@ -36,11 +36,11 @@ public: FakeUASProvider(); ~FakeUASProvider(){}; - StatusCode createNewUAProvider( const QString& ); - QString aliasStr( const QString& ); - QString agentStr( const QString& ); - QStringList userAgentStringList(); - QStringList userAgentAliasList(); + StatusCode createNewUAProvider( const TQString& ); + TQString aliasStr( const TQString& ); + TQString agentStr( const TQString& ); + TQStringList userAgentStringList(); + TQStringList userAgentAliasList(); bool isListDirty() const { return m_bIsDirty; } void setListDirty( bool dirty ) { m_bIsDirty = dirty; } @@ -50,8 +50,8 @@ protected: private: KTrader::OfferList m_providers; - QStringList m_lstIdentity; - QStringList m_lstAlias; + TQStringList m_lstIdentity; + TQStringList m_lstAlias; bool m_bIsDirty; }; #endif diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp index f25a28011..8233f0d20 100644 --- a/kcontrol/kio/kcookiesmain.cpp +++ b/kcontrol/kio/kcookiesmain.cpp @@ -3,8 +3,8 @@ // First version of cookies configuration by Waldo Bastian <bastian@kde.org> // This dialog box created by David Faure <faure@kde.org> -#include <qlayout.h> -#include <qtabwidget.h> +#include <tqlayout.h> +#include <tqtabwidget.h> #include <klocale.h> #include <kapplication.h> @@ -16,14 +16,14 @@ #include "kcookiespolicies.h" #include "kcookiesmanagement.h" -KCookiesMain::KCookiesMain(QWidget *parent) +KCookiesMain::KCookiesMain(TQWidget *parent) : KCModule(parent, "kcmkio") { management = 0; bool managerOK = true; DCOPReply reply = DCOPRef( "kded", "kded" ).call( "loadModule", - QCString( "kcookiejar" ) ); + TQCString( "kcookiejar" ) ); if( !reply.isValid() ) { @@ -34,19 +34,19 @@ KCookiesMain::KCookiesMain(QWidget *parent) "are stored on your computer.")); } - QVBoxLayout *layout = new QVBoxLayout(this); - tab = new QTabWidget(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); + tab = new TQTabWidget(this); layout->addWidget(tab); policies = new KCookiesPolicies(this); tab->addTab(policies, i18n("&Policy")); - connect(policies, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(policies, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); if( managerOK ) { management = new KCookiesManagement(this); tab->addTab(management, i18n("&Management")); - connect(management, SIGNAL(changed(bool)), SIGNAL(changed(bool))); + connect(management, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); } } @@ -78,7 +78,7 @@ void KCookiesMain::defaults() management->defaults(); } -QString KCookiesMain::quickHelp() const +TQString KCookiesMain::quickHelp() const { return i18n("<h1>Cookies</h1> Cookies contain information that Konqueror" " (or other KDE applications using the HTTP protocol) stores on your" diff --git a/kcontrol/kio/kcookiesmain.h b/kcontrol/kio/kcookiesmain.h index fef111100..802f89c17 100644 --- a/kcontrol/kio/kcookiesmain.h +++ b/kcontrol/kio/kcookiesmain.h @@ -17,7 +17,7 @@ class KCookiesMain : public KCModule { Q_OBJECT public: - KCookiesMain(QWidget *parent = 0L); + KCookiesMain(TQWidget *parent = 0L); ~KCookiesMain(); KCookiesPolicies* policyDlg() { return policies; } @@ -25,11 +25,11 @@ public: virtual void load(); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; private: - QTabWidget* tab; + TQTabWidget* tab; KCookiesPolicies* policies; KCookiesManagement* management; }; diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp index 58e983439..f2cd45c42 100644 --- a/kcontrol/kio/kcookiesmanagement.cpp +++ b/kcontrol/kio/kcookiesmanagement.cpp @@ -19,15 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qapplication.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qgroupbox.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qdatetime.h> -#include <qtoolbutton.h> +#include <tqapplication.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqdatetime.h> +#include <tqtoolbutton.h> #include <kidna.h> #include <kdebug.h> @@ -49,24 +49,24 @@ struct CookieProp { - QString host; - QString name; - QString value; - QString domain; - QString path; - QString expireDate; - QString secure; + TQString host; + TQString name; + TQString value; + TQString domain; + TQString path; + TQString expireDate; + TQString secure; bool allLoaded; }; -CookieListViewItem::CookieListViewItem(QListView *parent, QString dom) - :QListViewItem(parent) +CookieListViewItem::CookieListViewItem(TQListView *parent, TQString dom) + :TQListViewItem(parent) { init( 0, dom ); } -CookieListViewItem::CookieListViewItem(QListViewItem *parent, CookieProp *cookie) - :QListViewItem(parent) +CookieListViewItem::CookieListViewItem(TQListViewItem *parent, CookieProp *cookie) + :TQListViewItem(parent) { init( cookie ); } @@ -76,7 +76,7 @@ CookieListViewItem::~CookieListViewItem() delete mCookie; } -void CookieListViewItem::init( CookieProp* cookie, QString domain, +void CookieListViewItem::init( CookieProp* cookie, TQString domain, bool cookieLoaded ) { mCookie = cookie; @@ -91,38 +91,38 @@ CookieProp* CookieListViewItem::leaveCookie() return ret; } -QString CookieListViewItem::text(int f) const +TQString CookieListViewItem::text(int f) const { if (mCookie) - return f == 0 ? QString::null : KIDNA::toUnicode(mCookie->host); + return f == 0 ? TQString::null : KIDNA::toUnicode(mCookie->host); else - return f == 0 ? KIDNA::toUnicode(mDomain) : QString::null; + return f == 0 ? KIDNA::toUnicode(mDomain) : TQString::null; } -KCookiesManagement::KCookiesManagement(QWidget *parent) +KCookiesManagement::KCookiesManagement(TQWidget *parent) : KCModule(parent, "kcmkio") { // Toplevel layout - QVBoxLayout* mainLayout = new QVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); dlg = new KCookiesManagementDlgUI (this); - dlg->tbClearSearchLine->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); + dlg->tbClearSearchLine->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); dlg->kListViewSearchLine->setListView(dlg->lvCookies); mainLayout->addWidget(dlg); dlg->lvCookies->setSorting(0); - connect(dlg->lvCookies, SIGNAL(expanded(QListViewItem*)), SLOT(getCookies(QListViewItem*)) ); - connect(dlg->lvCookies, SIGNAL(selectionChanged(QListViewItem*)), SLOT(showCookieDetails(QListViewItem*)) ); + connect(dlg->lvCookies, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(getCookies(TQListViewItem*)) ); + connect(dlg->lvCookies, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(showCookieDetails(TQListViewItem*)) ); - connect(dlg->pbDelete, SIGNAL(clicked()), SLOT(deleteCookie())); - connect(dlg->pbDeleteAll, SIGNAL(clicked()), SLOT(deleteAllCookies())); - connect(dlg->pbReload, SIGNAL(clicked()), SLOT(getDomains())); - connect(dlg->pbPolicy, SIGNAL(clicked()), SLOT(doPolicy())); + connect(dlg->pbDelete, TQT_SIGNAL(clicked()), TQT_SLOT(deleteCookie())); + connect(dlg->pbDeleteAll, TQT_SIGNAL(clicked()), TQT_SLOT(deleteAllCookies())); + connect(dlg->pbReload, TQT_SIGNAL(clicked()), TQT_SLOT(getDomains())); + connect(dlg->pbPolicy, TQT_SIGNAL(clicked()), TQT_SLOT(doPolicy())); - connect(dlg->lvCookies, SIGNAL(doubleClicked (QListViewItem *)), SLOT(doPolicy())); + connect(dlg->lvCookies, TQT_SIGNAL(doubleClicked (TQListViewItem *)), TQT_SLOT(doPolicy())); deletedCookies.setAutoDelete(true); m_bDeleteAll = false; mainWidget = parent; @@ -147,8 +147,8 @@ void KCookiesManagement::save() { if(!DCOPRef("kded", "kcookiejar").send("deleteAllCookies")) { - QString caption = i18n ("DCOP Communication Error"); - QString message = i18n ("Unable to delete all the cookies as requested."); + TQString caption = i18n ("DCOP Communication Error"); + TQString message = i18n ("Unable to delete all the cookies as requested."); KMessageBox::sorry (this, message,caption); return; } @@ -156,19 +156,19 @@ void KCookiesManagement::save() } // Certain groups of cookies were deleted... - QStringList::Iterator dIt = deletedDomains.begin(); + TQStringList::Iterator dIt = deletedDomains.begin(); while( dIt != deletedDomains.end() ) { - QByteArray call; - QByteArray reply; - QCString replyType; - QDataStream callStream(call, IO_WriteOnly); + TQByteArray call; + TQByteArray reply; + TQCString replyType; + TQDataStream callStream(call, IO_WriteOnly); callStream << *dIt; if( !DCOPRef("kded", "kcookiejar").send("deleteCookiesFromDomain", (*dIt)) ) { - QString caption = i18n ("DCOP Communication Error"); - QString message = i18n ("Unable to delete cookies as requested."); + TQString caption = i18n ("DCOP Communication Error"); + TQString message = i18n ("Unable to delete cookies as requested."); KMessageBox::sorry (this, message,caption); return; } @@ -178,12 +178,12 @@ void KCookiesManagement::save() // Individual cookies were deleted... bool success = true; // Maybe we can go on... - QDictIterator<CookiePropList> cookiesDom(deletedCookies); + TQDictIterator<CookiePropList> cookiesDom(deletedCookies); while(cookiesDom.current()) { CookiePropList *list = cookiesDom.current(); - QPtrListIterator<CookieProp> cookie(*list); + TQPtrListIterator<CookieProp> cookie(*list); while(*cookie) { @@ -236,7 +236,7 @@ void KCookiesManagement::clearCookieDetails() dlg->leSecure->clear(); } -QString KCookiesManagement::quickHelp() const +TQString KCookiesManagement::quickHelp() const { return i18n("<h1>Cookies Management Quick Help</h1>" ); } @@ -247,14 +247,14 @@ void KCookiesManagement::getDomains() if( !reply.isValid() ) { - QString caption = i18n ("Information Lookup Failure"); - QString message = i18n ("Unable to retrieve information about the " + TQString caption = i18n ("Information Lookup Failure"); + TQString message = i18n ("Unable to retrieve information about the " "cookies stored on your computer."); KMessageBox::sorry (this, message, caption); return; } - QStringList domains = reply; + TQStringList domains = reply; if ( dlg->lvCookies->childCount() ) { @@ -263,7 +263,7 @@ void KCookiesManagement::getDomains() } CookieListViewItem *dom; - for(QStringList::Iterator dIt = domains.begin(); dIt != domains.end(); dIt++) + for(TQStringList::Iterator dIt = domains.begin(); dIt != domains.end(); dIt++) { dom = new CookieListViewItem(dlg->lvCookies, *dIt); dom->setExpandable(true); @@ -273,25 +273,25 @@ void KCookiesManagement::getDomains() dlg->pbDeleteAll->setEnabled(dlg->lvCookies->childCount()); } -void KCookiesManagement::getCookies(QListViewItem *cookieDom) +void KCookiesManagement::getCookies(TQListViewItem *cookieDom) { CookieListViewItem* ckd = static_cast<CookieListViewItem*>(cookieDom); if ( ckd->cookiesLoaded() ) return; - QValueList<int> fields; + TQValueList<int> fields; fields << 0 << 1 << 2 << 3; DCOPReply reply = DCOPRef ("kded", "kcookiejar").call ("findCookies", - DCOPArg(fields, "QValueList<int>"), + DCOPArg(fields, "TQValueList<int>"), ckd->domain(), - QString::null, - QString::null, - QString::null); + TQString::null, + TQString::null, + TQString::null); if(reply.isValid()) { - QStringList fieldVal = reply; - QStringList::Iterator fIt = fieldVal.begin(); + TQStringList fieldVal = reply; + TQStringList::Iterator fIt = fieldVal.begin(); while(fIt != fieldVal.end()) { @@ -310,11 +310,11 @@ void KCookiesManagement::getCookies(QListViewItem *cookieDom) bool KCookiesManagement::cookieDetails(CookieProp *cookie) { - QValueList<int> fields; + TQValueList<int> fields; fields << 4 << 5 << 7; DCOPReply reply = DCOPRef ("kded", "kcookiejar").call ("findCookies", - DCOPArg(fields, "QValueList<int>"), + DCOPArg(fields, "TQValueList<int>"), cookie->domain, cookie->host, cookie->path, @@ -322,9 +322,9 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie) if( !reply.isValid() ) return false; - QStringList fieldVal = reply; + TQStringList fieldVal = reply; - QStringList::Iterator c = fieldVal.begin(); + TQStringList::Iterator c = fieldVal.begin(); cookie->value = *c++; unsigned tmp = (*c++).toUInt(); @@ -332,7 +332,7 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie) cookie->expireDate = i18n("End of session"); else { - QDateTime expDate; + TQDateTime expDate; expDate.setTime_t(tmp); cookie->expireDate = KGlobal::locale()->formatDateTime(expDate); } @@ -343,7 +343,7 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie) return true; } -void KCookiesManagement::showCookieDetails(QListViewItem* item) +void KCookiesManagement::showCookieDetails(TQListViewItem* item) { kdDebug () << "::showCookieDetails... " << endl; CookieProp *cookie = static_cast<CookieListViewItem*>(item)->cookie(); @@ -379,7 +379,7 @@ void KCookiesManagement::doPolicy() { CookieProp *cookie = item->cookie(); - QString domain = cookie->domain; + TQString domain = cookie->domain; if( domain.isEmpty() ) { @@ -402,7 +402,7 @@ void KCookiesManagement::doPolicy() } -void KCookiesManagement::deleteCookie(QListViewItem* deleteItem) +void KCookiesManagement::deleteCookie(TQListViewItem* deleteItem) { CookieListViewItem *item = static_cast<CookieListViewItem*>( deleteItem ); if( item->cookie() ) @@ -433,7 +433,7 @@ void KCookiesManagement::deleteCookie() { deleteCookie(dlg->lvCookies->currentItem()); - QListViewItem* currentItem = dlg->lvCookies->currentItem(); + TQListViewItem* currentItem = dlg->lvCookies->currentItem(); if ( currentItem ) { @@ -461,7 +461,7 @@ void KCookiesManagement::deleteAllCookies() } else { - QListViewItem* item = dlg->lvCookies->firstChild(); + TQListViewItem* item = dlg->lvCookies->firstChild(); while (item) { diff --git a/kcontrol/kio/kcookiesmanagement.h b/kcontrol/kio/kcookiesmanagement.h index 636be0ed3..cd7f4c62a 100644 --- a/kcontrol/kio/kcookiesmanagement.h +++ b/kcontrol/kio/kcookiesmanagement.h @@ -24,9 +24,9 @@ #ifndef __KCOOKIESMANAGEMENT_H #define __KCOOKIESMANAGEMENT_H -#include <qdict.h> -#include <qstringlist.h> -#include <qlistview.h> +#include <tqdict.h> +#include <tqstringlist.h> +#include <tqlistview.h> #include <kcmodule.h> @@ -39,23 +39,23 @@ struct CookieProp; class CookieListViewItem : public QListViewItem { public: - CookieListViewItem(QListView *parent, QString dom); - CookieListViewItem(QListViewItem *parent, CookieProp *cookie); + CookieListViewItem(TQListView *parent, TQString dom); + CookieListViewItem(TQListViewItem *parent, CookieProp *cookie); ~CookieListViewItem(); - QString domain() const { return mDomain; } + TQString domain() const { return mDomain; } CookieProp* cookie() const { return mCookie; } CookieProp* leaveCookie(); void setCookiesLoaded() { mCookiesLoaded = true; } bool cookiesLoaded() const { return mCookiesLoaded; } - virtual QString text(int f) const; + virtual TQString text(int f) const; private: void init( CookieProp* cookie, - QString domain = QString::null, + TQString domain = TQString::null, bool cookieLoaded=false ); CookieProp *mCookie; - QString mDomain; + TQString mDomain; bool mCookiesLoaded; }; @@ -64,25 +64,25 @@ class KCookiesManagement : public KCModule Q_OBJECT public: - KCookiesManagement(QWidget *parent = 0 ); + KCookiesManagement(TQWidget *parent = 0 ); ~KCookiesManagement(); virtual void load(); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; private slots: void deleteCookie(); void deleteAllCookies(); void getDomains(); - void getCookies(QListViewItem*); - void showCookieDetails(QListViewItem*); + void getCookies(TQListViewItem*); + void showCookieDetails(TQListViewItem*); void doPolicy(); private: void reset (); - void deleteCookie(QListViewItem*); + void deleteCookie(TQListViewItem*); bool cookieDetails(CookieProp *cookie); void clearCookieDetails(); bool policyenabled(); @@ -90,12 +90,12 @@ private: private: bool m_bDeleteAll; - QWidget* mainWidget; + TQWidget* mainWidget; KCookiesManagementDlgUI* dlg; - QStringList deletedDomains; - typedef QPtrList<CookieProp> CookiePropList; - QDict<CookiePropList> deletedCookies; + TQStringList deletedDomains; + typedef TQPtrList<CookieProp> CookiePropList; + TQDict<CookiePropList> deletedCookies; }; #endif // __KCOOKIESMANAGEMENT_H diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index 7ee302ec1..63f4dd21a 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -22,15 +22,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qheader.h> -#include <qvbox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qtoolbutton.h> -#include <qvbuttongroup.h> +#include <tqheader.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqtoolbutton.h> +#include <tqvbuttongroup.h> #include <kiconloader.h> #include <kidna.h> @@ -46,18 +46,18 @@ #include "kcookiespolicies.h" #include "kcookiespoliciesdlg_ui.h" -KCookiesPolicies::KCookiesPolicies(QWidget *parent) +KCookiesPolicies::KCookiesPolicies(TQWidget *parent) :KCModule(parent, "kcmkio") { - QVBoxLayout *mainLayout = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, 0); dlg = new KCookiesPolicyDlgUI (this); dlg->lvDomainPolicy->header()->setStretchEnabled(true, 0); dlg->lvDomainPolicy->setColumnWidthMode(0, KListView::Manual); dlg->lvDomainPolicy->setColumnWidthMode(1, KListView::Maximum); - dlg->tbClearSearchLine->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); + dlg->tbClearSearchLine->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); dlg->kListViewSearchLine->setListView(dlg->lvDomainPolicy); - QValueList<int> columns; + TQValueList<int> columns; columns.append(0); dlg->kListViewSearchLine->setSearchColumns(columns); @@ -107,7 +107,7 @@ void KCookiesPolicies::autoAcceptSessionCookies ( bool enable ) dlg->gbDomainSpecific->setEnabled( !enable ); } -void KCookiesPolicies::addNewPolicy(const QString& domain) +void KCookiesPolicies::addNewPolicy(const TQString& domain) { PolicyDlg pdlg (i18n("New Cookie Policy"), this); pdlg.setEnableHostEdit (true, domain); @@ -119,13 +119,13 @@ void KCookiesPolicies::addNewPolicy(const QString& domain) if (pdlg.exec() && !pdlg.domain().isEmpty()) { - QString domain = KIDNA::toUnicode(pdlg.domain()); + TQString domain = KIDNA::toUnicode(pdlg.domain()); int advice = pdlg.advice(); if ( !handleDuplicate(domain, advice) ) { const char* strAdvice = KCookieAdvice::adviceToStr(advice); - QListViewItem* index = new QListViewItem (dlg->lvDomainPolicy, + TQListViewItem* index = new TQListViewItem (dlg->lvDomainPolicy, domain, i18n(strAdvice)); m_pDomainPolicy.insert (index, strAdvice); configChanged(); @@ -136,17 +136,17 @@ void KCookiesPolicies::addNewPolicy(const QString& domain) void KCookiesPolicies::addPressed() { - addNewPolicy (QString::null); + addNewPolicy (TQString::null); } void KCookiesPolicies::changePressed() { - QListViewItem* index = dlg->lvDomainPolicy->currentItem(); + TQListViewItem* index = dlg->lvDomainPolicy->currentItem(); if (!index) return; - QString oldDomain = index->text(0); + TQString oldDomain = index->text(0); PolicyDlg pdlg (i18n("Change Cookie Policy"), this); pdlg.setPolicy (KCookieAdvice::strToAdvice(m_pDomainPolicy[index])); @@ -154,7 +154,7 @@ void KCookiesPolicies::changePressed() if( pdlg.exec() && !pdlg.domain().isEmpty()) { - QString newDomain = KIDNA::toUnicode(pdlg.domain()); + TQString newDomain = KIDNA::toUnicode(pdlg.domain()); int advice = pdlg.advice(); if (newDomain == oldDomain || !handleDuplicate(newDomain, advice)) { @@ -166,14 +166,14 @@ void KCookiesPolicies::changePressed() } } -bool KCookiesPolicies::handleDuplicate( const QString& domain, int advice ) +bool KCookiesPolicies::handleDuplicate( const TQString& domain, int advice ) { - QListViewItem* item = dlg->lvDomainPolicy->firstChild(); + TQListViewItem* item = dlg->lvDomainPolicy->firstChild(); while ( item != 0 ) { if ( item->text(0) == domain ) { - QString msg = i18n("<qt>A policy already exists for" + TQString msg = i18n("<qt>A policy already exists for" "<center><b>%1</b></center>" "Do you want to replace it?</qt>").arg(domain); int res = KMessageBox::warningContinueCancel(this, msg, @@ -197,8 +197,8 @@ bool KCookiesPolicies::handleDuplicate( const QString& domain, int advice ) void KCookiesPolicies::deletePressed() { - QListViewItem* nextItem = 0L; - QListViewItem* item = dlg->lvDomainPolicy->firstChild (); + TQListViewItem* nextItem = 0L; + TQListViewItem* item = dlg->lvDomainPolicy->firstChild (); while (item != 0L) { @@ -241,21 +241,21 @@ void KCookiesPolicies::updateButtons() dlg->pbDeleteAll->setEnabled ( hasItems ); } -void KCookiesPolicies::updateDomainList(const QStringList &domainConfig) +void KCookiesPolicies::updateDomainList(const TQStringList &domainConfig) { dlg->lvDomainPolicy->clear(); - QStringList::ConstIterator it = domainConfig.begin(); + TQStringList::ConstIterator it = domainConfig.begin(); for (; it != domainConfig.end(); ++it) { - QString domain; + TQString domain; KCookieAdvice::Value advice = KCookieAdvice::Dunno; splitDomainAdvice(*it, domain, advice); if (!domain.isEmpty()) { - QListViewItem* index = new QListViewItem( dlg->lvDomainPolicy, KIDNA::toUnicode(domain), + TQListViewItem* index = new TQListViewItem( dlg->lvDomainPolicy, KIDNA::toUnicode(domain), i18n(KCookieAdvice::adviceToStr(advice)) ); m_pDomainPolicy[index] = KCookieAdvice::adviceToStr(advice); } @@ -264,7 +264,7 @@ void KCookiesPolicies::updateDomainList(const QStringList &domainConfig) void KCookiesPolicies::selectionChanged () { - QListViewItem* item = dlg->lvDomainPolicy->firstChild (); + TQListViewItem* item = dlg->lvDomainPolicy->firstChild (); d_itemsSelected = 0; @@ -323,40 +323,40 @@ void KCookiesPolicies::load() } // Connect the main swicth :) Enable/disable cookie support - connect( dlg->cbEnableCookies, SIGNAL( toggled(bool) ), - SLOT( cookiesEnabled(bool) ) ); - connect( dlg->cbEnableCookies, SIGNAL( toggled(bool) ), - SLOT( configChanged() ) ); + connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( cookiesEnabled(bool) ) ); + connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( configChanged() ) ); // Connect the preference check boxes... - connect ( dlg->cbRejectCrossDomainCookies, SIGNAL(clicked()), - SLOT(configChanged())); - connect ( dlg->cbAutoAcceptSessionCookies, SIGNAL(toggled(bool)), - SLOT(configChanged())); - connect ( dlg->cbIgnoreCookieExpirationDate, SIGNAL(toggled(bool)), - SLOT(configChanged())); - - connect ( dlg->cbAutoAcceptSessionCookies, SIGNAL(toggled(bool)), - SLOT(autoAcceptSessionCookies(bool))); - connect ( dlg->cbIgnoreCookieExpirationDate, SIGNAL(toggled(bool)), - SLOT(ignoreCookieExpirationDate(bool))); + connect ( dlg->cbRejectCrossDomainCookies, TQT_SIGNAL(clicked()), + TQT_SLOT(configChanged())); + connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(configChanged())); + connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(configChanged())); + + connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(autoAcceptSessionCookies(bool))); + connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(ignoreCookieExpirationDate(bool))); // Connect the default cookie policy radio buttons... - connect(dlg->bgDefault, SIGNAL(clicked(int)), SLOT(configChanged())); + connect(dlg->bgDefault, TQT_SIGNAL(clicked(int)), TQT_SLOT(configChanged())); // Connect signals from the domain specific policy listview. - connect( dlg->lvDomainPolicy, SIGNAL(selectionChanged()), - SLOT(selectionChanged()) ); - connect( dlg->lvDomainPolicy, SIGNAL(doubleClicked (QListViewItem *)), - SLOT(changePressed() ) ); - connect( dlg->lvDomainPolicy, SIGNAL(returnPressed ( QListViewItem * )), - SLOT(changePressed() ) ); + connect( dlg->lvDomainPolicy, TQT_SIGNAL(selectionChanged()), + TQT_SLOT(selectionChanged()) ); + connect( dlg->lvDomainPolicy, TQT_SIGNAL(doubleClicked (TQListViewItem *)), + TQT_SLOT(changePressed() ) ); + connect( dlg->lvDomainPolicy, TQT_SIGNAL(returnPressed ( TQListViewItem * )), + TQT_SLOT(changePressed() ) ); // Connect the buttons... - connect( dlg->pbNew, SIGNAL(clicked()), SLOT( addPressed() ) ); - connect( dlg->pbChange, SIGNAL( clicked() ), SLOT( changePressed() ) ); - connect( dlg->pbDelete, SIGNAL( clicked() ), SLOT( deletePressed() ) ); - connect( dlg->pbDeleteAll, SIGNAL( clicked() ), SLOT( deleteAllPressed() ) ); + connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) ); + connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) ); + connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) ); + connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) ); } void KCookiesPolicies::save() @@ -377,7 +377,7 @@ void KCookiesPolicies::save() state = dlg->cbIgnoreCookieExpirationDate->isChecked(); cfg.writeEntry( "IgnoreExpirationDate", state ); - QString advice; + TQString advice; if (dlg->rbPolicyAccept->isChecked()) advice = KCookieAdvice::adviceToStr(KCookieAdvice::Accept); else if (dlg->rbPolicyReject->isChecked()) @@ -387,12 +387,12 @@ void KCookiesPolicies::save() cfg.writeEntry("CookieGlobalAdvice", advice); - QStringList domainConfig; - QListViewItem *at = dlg->lvDomainPolicy->firstChild(); + TQStringList domainConfig; + TQListViewItem *at = dlg->lvDomainPolicy->firstChild(); while( at ) { - domainConfig.append(QString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); + domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); at = at->nextSibling(); } @@ -431,7 +431,7 @@ void KCookiesPolicies::defaults() updateButtons(); } -void KCookiesPolicies::splitDomainAdvice (const QString& cfg, QString &domain, +void KCookiesPolicies::splitDomainAdvice (const TQString& cfg, TQString &domain, KCookieAdvice::Value &advice) { int sepPos = cfg.findRev(':'); @@ -444,7 +444,7 @@ void KCookiesPolicies::splitDomainAdvice (const QString& cfg, QString &domain, advice = KCookieAdvice::strToAdvice( cfg.mid( sepPos+1 ) ); } -QString KCookiesPolicies::quickHelp() const +TQString KCookiesPolicies::quickHelp() const { return i18n("<h1>Cookies</h1> Cookies contain information that Konqueror" " (or any other KDE application using the HTTP protocol) stores" diff --git a/kcontrol/kio/kcookiespolicies.h b/kcontrol/kio/kcookiespolicies.h index 5b2eaf086..b6f1de2e0 100644 --- a/kcontrol/kio/kcookiespolicies.h +++ b/kcontrol/kio/kcookiespolicies.h @@ -26,7 +26,7 @@ #ifndef __KCOOKIESPOLICIES_H #define __KCOOKIESPOLICIES_H -#include <qmap.h> +#include <tqmap.h> #include <kcmodule.h> #include "policydlg.h" @@ -41,15 +41,15 @@ class KCookiesPolicies : public KCModule Q_OBJECT public: - KCookiesPolicies(QWidget *parent = 0); + KCookiesPolicies(TQWidget *parent = 0); ~KCookiesPolicies(); virtual void load(); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; - void addNewPolicy(const QString& domain); + void addNewPolicy(const TQString& domain); protected slots: void autoAcceptSessionCookies ( bool ); @@ -66,16 +66,16 @@ protected slots: void addPressed(); private: - void updateDomainList(const QStringList& list); - bool handleDuplicate( const QString& domain, int ); - void splitDomainAdvice (const QString& configStr, QString &domain, + void updateDomainList(const TQStringList& list); + bool handleDuplicate( const TQString& domain, int ); + void splitDomainAdvice (const TQString& configStr, TQString &domain, KCookieAdvice::Value &advice); private: int d_itemsSelected; bool d_configChanged; KCookiesPolicyDlgUI* dlg; - QMap<QListViewItem*, const char*> m_pDomainPolicy; + TQMap<TQListViewItem*, const char*> m_pDomainPolicy; }; #endif // __KCOOKIESPOLICIES_H diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp index eaad2b1b6..22accb4e9 100644 --- a/kcontrol/kio/kenvvarproxydlg.cpp +++ b/kcontrol/kio/kenvvarproxydlg.cpp @@ -21,11 +21,11 @@ #include <stdlib.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> #include <kdebug.h> #include <klocale.h> @@ -42,16 +42,16 @@ #define NO_PROXY "NO_PROXY,no_proxy" -static QString getProxyEnv(const QString& var) +static TQString getProxyEnv(const TQString& var) { - return QString::fromLocal8Bit(::getenv(var.local8Bit().data())); + return TQString::fromLocal8Bit(::getenv(var.local8Bit().data())); } -static bool autoDetectProxySetting(const QString& type, QString& proxyEnv) +static bool autoDetectProxySetting(const TQString& type, TQString& proxyEnv) { - QStringList list = QStringList::split( ',', type); - QStringList::ConstIterator it = list.begin(); - QStringList::ConstIterator end = list.end(); + TQStringList list = TQStringList::split( ',', type); + TQStringList::ConstIterator it = list.begin(); + TQStringList::ConstIterator end = list.end(); for(; it != end; ++it) { @@ -65,7 +65,7 @@ static bool autoDetectProxySetting(const QString& type, QString& proxyEnv) return false; } -KEnvVarProxyDlg::KEnvVarProxyDlg( QWidget* parent, const char* name ) +KEnvVarProxyDlg::KEnvVarProxyDlg( TQWidget* parent, const char* name ) :KProxyDialogBase( parent, name, true, i18n( "Variable Proxy Configuration" ) ) { @@ -83,9 +83,9 @@ void KEnvVarProxyDlg::init() { m_bHasValidData = false; - connect( mDlg->cbShowValue, SIGNAL( clicked() ), SLOT( showValuePressed() ) ); - connect( mDlg->pbVerify, SIGNAL( clicked() ), SLOT( verifyPressed() ) ); - connect( mDlg->pbDetect, SIGNAL( clicked() ), SLOT( autoDetectPressed() ) ); + connect( mDlg->cbShowValue, TQT_SIGNAL( clicked() ), TQT_SLOT( showValuePressed() ) ); + connect( mDlg->pbVerify, TQT_SIGNAL( clicked() ), TQT_SLOT( verifyPressed() ) ); + connect( mDlg->pbDetect, TQT_SIGNAL( clicked() ), TQT_SLOT( autoDetectPressed() ) ); } void KEnvVarProxyDlg::setProxyData( const KProxyData& data ) @@ -103,7 +103,7 @@ void KEnvVarProxyDlg::setProxyData( const KProxyData& data ) mEnvVarsMap["ftp"] = data.proxyList["ftp"]; // Setup NO Proxy For... - QString noProxyFor = data.noProxyFor.join(""); + TQString noProxyFor = data.noProxyFor.join(""); if (!getProxyEnv(noProxyFor).isEmpty()) mEnvVarsMap["noProxy"] = noProxyFor; @@ -133,10 +133,10 @@ void KEnvVarProxyDlg::verifyPressed() { if ( !validate() ) { - QString msg = i18n("You must specify at least one valid proxy " + TQString msg = i18n("You must specify at least one valid proxy " "environment variable."); - QString details = i18n("<qt>Make sure you entered the actual environment " + TQString details = i18n("<qt>Make sure you entered the actual environment " "variable name rather than its value. For " "example, if the environment variable is <br><b>" "HTTP_PROXY=http://localhost:3128</b><br> you need " @@ -163,24 +163,24 @@ void KEnvVarProxyDlg::autoDetectPressed() setHighLight (mDlg->lbNoProxy, false); // Detect HTTP proxy settings... - found |= autoDetectProxySetting (QString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); + found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); // Detect HTTPS proxy settings... - found |= autoDetectProxySetting (QString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); + found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); // Detect FTP proxy settings... - found |= autoDetectProxySetting (QString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); + found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); // Detect the NO_PROXY settings... - found |= autoDetectProxySetting (QString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); + found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); if ( !found ) { - QString msg = i18n("Did not detect any environment variables " + TQString msg = i18n("Did not detect any environment variables " "commonly used to set system wide proxy " "information."); - QString details = i18n("<qt>To learn about the variable names the " + TQString details = i18n("<qt>To learn about the variable names the " "automatic detection process searches for, " "press OK, click on the quick help button " "on the window title bar of the " @@ -197,7 +197,7 @@ void KEnvVarProxyDlg::autoDetectPressed() void KEnvVarProxyDlg::updateVariables() { - QString text = mDlg->leHttp->text(); + TQString text = mDlg->leHttp->text(); if (mEnvVarsMap["http"] != text) mEnvVarsMap["http"] = text; @@ -258,22 +258,22 @@ bool KEnvVarProxyDlg::validate(bool erase) bool notFound = getProxyEnv(mEnvVarsMap["http"]).isEmpty(); m_bHasValidData |= !notFound; setHighLight (mDlg->lbHttp, notFound); - if(notFound && erase) mEnvVarsMap["http"] = QString::null; + if(notFound && erase) mEnvVarsMap["http"] = TQString::null; notFound = getProxyEnv(mEnvVarsMap["https"]).isEmpty(); m_bHasValidData |= !notFound; setHighLight (mDlg->lbHttps, notFound); - if(notFound && erase) mEnvVarsMap["https"] = QString::null; + if(notFound && erase) mEnvVarsMap["https"] = TQString::null; notFound = getProxyEnv(mEnvVarsMap["ftp"]).isEmpty(); m_bHasValidData |= !notFound; setHighLight (mDlg->lbFtp, notFound); - if(notFound && erase) mEnvVarsMap["ftp"] = QString::null; + if(notFound && erase) mEnvVarsMap["ftp"] = TQString::null; notFound = getProxyEnv(mEnvVarsMap["noProxy"]).isEmpty(); m_bHasValidData |= !notFound; setHighLight (mDlg->lbNoProxy, notFound); - if(notFound && erase) mEnvVarsMap["noProxy"] = QString::null; + if(notFound && erase) mEnvVarsMap["noProxy"] = TQString::null; return m_bHasValidData; } @@ -282,10 +282,10 @@ void KEnvVarProxyDlg::slotOk() { if(!validate(true)) { - QString msg = i18n("You must specify at least one valid proxy " + TQString msg = i18n("You must specify at least one valid proxy " "environment variable."); - QString details = i18n("<qt>Make sure you entered the actual environment " + TQString details = i18n("<qt>Make sure you entered the actual environment " "variable name rather than its value. For " "example, if the environment variable is <br><b>" "HTTP_PROXY=http://localhost:3128</b><br> you need " diff --git a/kcontrol/kio/kenvvarproxydlg.h b/kcontrol/kio/kenvvarproxydlg.h index bf4c073a6..3ddbc989f 100644 --- a/kcontrol/kio/kenvvarproxydlg.h +++ b/kcontrol/kio/kenvvarproxydlg.h @@ -21,7 +21,7 @@ #ifndef KENVVAR_PROXY_DIALOG_H #define KENVVAR_PROXY_DIALOG_H -#include <qmap.h> +#include <tqmap.h> #include "kproxydlgbase.h" @@ -32,7 +32,7 @@ class KEnvVarProxyDlg : public KProxyDialogBase Q_OBJECT public: - KEnvVarProxyDlg( QWidget* parent = 0, const char* name = 0 ); + KEnvVarProxyDlg( TQWidget* parent = 0, const char* name = 0 ); ~KEnvVarProxyDlg(); virtual const KProxyData data() const; @@ -52,6 +52,6 @@ protected: private: EnvVarProxyDlgUI* mDlg; - QMap<QString, QString> mEnvVarsMap; + TQMap<TQString, TQString> mEnvVarsMap; }; #endif diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp index 9a3df6afb..92e8a98e6 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -19,12 +19,12 @@ Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qspinbox.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> #include <kdebug.h> #include <klocale.h> @@ -42,7 +42,7 @@ #include "kmanualproxydlg.h" -KManualProxyDlg::KManualProxyDlg( QWidget* parent, const char* name ) +KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name ) :KProxyDialogBase( parent, name, true, i18n("Manual Proxy Configuration") ) { @@ -50,7 +50,7 @@ KManualProxyDlg::KManualProxyDlg( QWidget* parent, const char* name ) setMainWidget( mDlg ); mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) ); - QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed, + TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() ); mDlg->pbCopyDown->setSizePolicy( sizePolicy ); @@ -63,19 +63,19 @@ void KManualProxyDlg::init() mDlg->sbHttps->setRange( 0, MAX_PORT_VALUE ); mDlg->sbFtp->setRange( 0, MAX_PORT_VALUE ); - connect( mDlg->pbNew, SIGNAL( clicked() ), SLOT( newPressed() ) ); - connect( mDlg->pbChange, SIGNAL( clicked() ), SLOT( changePressed() ) ); - connect( mDlg->pbDelete, SIGNAL( clicked() ), SLOT( deletePressed() ) ); - connect( mDlg->pbDeleteAll, SIGNAL( clicked() ), SLOT( deleteAllPressed() ) ); + connect( mDlg->pbNew, TQT_SIGNAL( clicked() ), TQT_SLOT( newPressed() ) ); + connect( mDlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) ); + connect( mDlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) ); + connect( mDlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) ); - connect( mDlg->lbExceptions, SIGNAL(selectionChanged()), SLOT(updateButtons()) ); - connect( mDlg->lbExceptions, SIGNAL(doubleClicked (QListBoxItem *)), SLOT(changePressed())); + connect( mDlg->lbExceptions, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) ); + connect( mDlg->lbExceptions, TQT_SIGNAL(doubleClicked (TQListBoxItem *)), TQT_SLOT(changePressed())); - connect( mDlg->cbSameProxy, SIGNAL( toggled(bool) ), SLOT( sameProxy(bool) ) ); - connect( mDlg->pbCopyDown, SIGNAL( clicked() ), SLOT( copyDown() ) ); + connect( mDlg->cbSameProxy, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( sameProxy(bool) ) ); + connect( mDlg->pbCopyDown, TQT_SIGNAL( clicked() ), TQT_SLOT( copyDown() ) ); - connect( mDlg->leHttp, SIGNAL(textChanged(const QString&)), SLOT(textChanged(const QString&)) ); - connect( mDlg->sbHttp, SIGNAL(valueChanged(int)), SLOT(valueChanged (int)) ); + connect( mDlg->leHttp, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); + connect( mDlg->sbHttp, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChanged (int)) ); } void KManualProxyDlg::setProxyData( const KProxyData &data ) @@ -142,7 +142,7 @@ void KManualProxyDlg::setProxyData( const KProxyData &data ) } } - QStringList::ConstIterator it = data.noProxyFor.begin(); + TQStringList::ConstIterator it = data.noProxyFor.begin(); for( ; it != data.noProxyFor.end(); ++it ) { // "no_proxy" is a keyword used by the environment variable @@ -182,7 +182,7 @@ const KProxyData KManualProxyDlg::data() const if ( mDlg->lbExceptions->count() ) { - QListBoxItem* item = mDlg->lbExceptions->firstItem(); + TQListBoxItem* item = mDlg->lbExceptions->firstItem(); for( ; item != 0L; item = item->next() ) data.noProxyFor << item->text(); } @@ -210,7 +210,7 @@ void KManualProxyDlg::sameProxy( bool enable ) mOldHttpsPort = mDlg->sbHttps->value(); int port = mDlg->sbHttp->value(); - QString text = mDlg->leHttp->text(); + TQString text = mDlg->leHttp->text(); mDlg->leFtp->setText (text); mDlg->leHttps->setText (text); @@ -276,7 +276,7 @@ bool KManualProxyDlg::validate() return (count > 0); } -void KManualProxyDlg::textChanged(const QString& text) +void KManualProxyDlg::textChanged(const TQString& text) { if (!mDlg->cbSameProxy->isChecked()) return; @@ -332,17 +332,17 @@ void KManualProxyDlg::slotOk() } } -bool KManualProxyDlg::handleDuplicate( const QString& site ) +bool KManualProxyDlg::handleDuplicate( const TQString& site ) { - QListBoxItem* item = mDlg->lbExceptions->firstItem(); + TQListBoxItem* item = mDlg->lbExceptions->firstItem(); while ( item != 0 ) { if ( item->text().findRev( site ) != -1 && item != mDlg->lbExceptions->selectedItem() ) { - QString msg = i18n("You entered a duplicate address. " + TQString msg = i18n("You entered a duplicate address. " "Please try again."); - QString details = i18n("<qt><center><b>%1</b></center> " + TQString details = i18n("<qt><center><b>%1</b></center> " "is already in the list.</qt>").arg(site); KMessageBox::detailedError( this, msg, details, i18n("Duplicate Entry") ); return true; @@ -355,14 +355,14 @@ bool KManualProxyDlg::handleDuplicate( const QString& site ) void KManualProxyDlg::newPressed() { - QString result; + TQString result; if( getException(result, i18n("New Exception")) && !handleDuplicate(result) ) mDlg->lbExceptions->insertItem( result ); } void KManualProxyDlg::changePressed() { - QString result; + TQString result; if( getException( result, i18n("Change Exception"), mDlg->lbExceptions->currentText() ) && !handleDuplicate( result ) ) @@ -392,11 +392,11 @@ void KManualProxyDlg::updateButtons() mDlg->pbChange->setEnabled( itemSelected ); } -QString KManualProxyDlg::urlFromInput(const KLineEdit* edit, - const QSpinBox* spin) const +TQString KManualProxyDlg::urlFromInput(const KLineEdit* edit, + const TQSpinBox* spin) const { if (!edit) - return QString::null; + return TQString::null; KURL u( edit->text() ); @@ -406,11 +406,11 @@ QString KManualProxyDlg::urlFromInput(const KLineEdit* edit, return u.url(); } -bool KManualProxyDlg::isValidURL( const QString& _url, KURL* result ) const +bool KManualProxyDlg::isValidURL( const TQString& _url, KURL* result ) const { KURL url (_url); - QStringList filters; + TQStringList filters; filters << "kshorturifilter" << "localdomainurifilter"; // If the typed URL is malformed, and the filters cannot filter it @@ -419,7 +419,7 @@ bool KManualProxyDlg::isValidURL( const QString& _url, KURL* result ) const !url.hasHost() ) return false; - QString host (url.host()); + TQString host (url.host()); // We only check for a relevant subset of characters that are // not allowed in <authority> component of a URL. @@ -432,11 +432,11 @@ bool KManualProxyDlg::isValidURL( const QString& _url, KURL* result ) const return true; } -void KManualProxyDlg::showErrorMsg( const QString& caption, - const QString& message ) +void KManualProxyDlg::showErrorMsg( const TQString& caption, + const TQString& message ) { - QString cap( caption ); - QString msg( message ); + TQString cap( caption ); + TQString msg( message ); if ( cap.isNull() ) cap = i18n("Invalid Entry"); @@ -444,7 +444,7 @@ void KManualProxyDlg::showErrorMsg( const QString& caption, if ( msg.isNull() ) msg = i18n("The address you have entered is not valid."); - QString details = i18n("<qt>Make sure none of the addresses or URLs you " + TQString details = i18n("<qt>Make sure none of the addresses or URLs you " "specified contain invalid or wildcard characters " "such as spaces, asterisks (*), or question marks(?).<p>" "<u>Examples of VALID entries:</u><br/>" @@ -457,11 +457,11 @@ void KManualProxyDlg::showErrorMsg( const QString& caption, KMessageBox::detailedError( this, msg, details, cap ); } -bool KManualProxyDlg::getException ( QString& result, - const QString& caption, - const QString& value ) +bool KManualProxyDlg::getException ( TQString& result, + const TQString& caption, + const TQString& value ) { - QString label; + TQString label; // Specify the appropriate message... if ( mDlg->cbReverseProxy->isChecked() ) @@ -471,7 +471,7 @@ bool KManualProxyDlg::getException ( QString& result, label = i18n("Enter the address or URL that should be excluded from " "using the above proxy settings:"); - QString whatsThis = i18n("<qt>Enter a valid address or url.<p>" + TQString whatsThis = i18n("<qt>Enter a valid address or url.<p>" "<b><u>NOTE:</u></b> Wildcard matching such as " "<code>*.kde.org</code> is not supported. If you want " "to match any host in the <code>.kde.org</code> domain, " @@ -480,7 +480,7 @@ bool KManualProxyDlg::getException ( QString& result, bool ok; result = KInputDialog::text( caption, label, value, &ok, 0, 0, 0, - QString::null, whatsThis ); + TQString::null, whatsThis ); // If the user pressed cancel, do nothing... if (!ok) diff --git a/kcontrol/kio/kmanualproxydlg.h b/kcontrol/kio/kmanualproxydlg.h index a21e3775c..ee8682e28 100644 --- a/kcontrol/kio/kmanualproxydlg.h +++ b/kcontrol/kio/kmanualproxydlg.h @@ -33,7 +33,7 @@ class KManualProxyDlg : public KProxyDialogBase Q_OBJECT public: - KManualProxyDlg( QWidget* parent = 0, const char* name = 0 ); + KManualProxyDlg( TQWidget* parent = 0, const char* name = 0 ); ~KManualProxyDlg() {}; virtual void setProxyData( const KProxyData &data ); @@ -49,7 +49,7 @@ protected slots: void copyDown(); void sameProxy( bool ); void valueChanged (int value); - void textChanged (const QString&); + void textChanged (const TQString&); void newPressed(); void updateButtons(); @@ -58,20 +58,20 @@ protected slots: void deleteAllPressed(); private: - QString urlFromInput( const KLineEdit* edit, const QSpinBox* spin ) const; - bool isValidURL( const QString&, KURL* = 0 ) const; - bool handleDuplicate( const QString& ); - bool getException ( QString&, const QString&, - const QString& value = QString::null ); - void showErrorMsg( const QString& caption = QString::null, - const QString& message = QString::null ); + TQString urlFromInput( const KLineEdit* edit, const TQSpinBox* spin ) const; + bool isValidURL( const TQString&, KURL* = 0 ) const; + bool handleDuplicate( const TQString& ); + bool getException ( TQString&, const TQString&, + const TQString& value = TQString::null ); + void showErrorMsg( const TQString& caption = TQString::null, + const TQString& message = TQString::null ); private: ManualProxyDlgUI* mDlg; int mOldFtpPort; int mOldHttpsPort; - QString mOldFtpText; - QString mOldHttpsText; + TQString mOldFtpText; + TQString mOldHttpsText; }; #endif diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp index c7f9d7d20..bbe7a76bd 100644 --- a/kcontrol/kio/kproxydlg.cpp +++ b/kcontrol/kio/kproxydlg.cpp @@ -19,14 +19,14 @@ Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qregexp.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qtabwidget.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqregexp.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqtabwidget.h> #include <klocale.h> #include <klineedit.h> @@ -40,12 +40,12 @@ #include "kproxydlg.h" #include "kproxydlg_ui.h" -KProxyOptions::KProxyOptions (QWidget* parent ) +KProxyOptions::KProxyOptions (TQWidget* parent ) :KCModule (parent, "kcmkio") { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); - mTab = new QTabWidget(this); + mTab = new TQTabWidget(this); layout->addWidget(mTab); mProxy = new KProxyDialog(mTab); @@ -54,9 +54,9 @@ KProxyOptions::KProxyOptions (QWidget* parent ) mTab->addTab(mProxy, i18n("&Proxy")); mTab->addTab(mSocks, i18n("&SOCKS")); - connect(mProxy, SIGNAL(changed(bool)), SIGNAL(changed(bool))); - connect(mSocks, SIGNAL(changed(bool)), SIGNAL(changed(bool))); - connect(mTab, SIGNAL(currentChanged(QWidget *)), SIGNAL(quickHelpChanged())); + connect(mProxy, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(mSocks, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(mTab, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SIGNAL(quickHelpChanged())); } KProxyOptions::~KProxyOptions() @@ -81,9 +81,9 @@ void KProxyOptions::defaults() mSocks->defaults(); } -QString KProxyOptions::quickHelp() const +TQString KProxyOptions::quickHelp() const { - QWidget *w = mTab->currentPage(); + TQWidget *w = mTab->currentPage(); if (w && w->inherits("KCModule")) { @@ -91,14 +91,14 @@ QString KProxyOptions::quickHelp() const return m->quickHelp(); } - return QString::null; + return TQString::null; } -KProxyDialog::KProxyDialog( QWidget* parent) +KProxyDialog::KProxyDialog( TQWidget* parent) :KCModule( parent, "kcmkio" ) { - QVBoxLayout* mainLayout = new QVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout* mainLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mDlg = new KProxyDialogUI( this ); @@ -106,27 +106,27 @@ KProxyDialog::KProxyDialog( QWidget* parent) mainLayout->addStretch(); // signals and slots connections - connect( mDlg->rbNoProxy, SIGNAL( toggled(bool) ), - SLOT( slotUseProxyChanged() ) ); + connect( mDlg->rbNoProxy, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( slotUseProxyChanged() ) ); - connect( mDlg->rbAutoDiscover, SIGNAL( toggled(bool) ), - SLOT( slotChanged() ) ); - connect( mDlg->rbAutoScript, SIGNAL( toggled(bool) ), - SLOT( slotChanged() ) ); + connect( mDlg->rbAutoDiscover, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( slotChanged() ) ); + connect( mDlg->rbAutoScript, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( slotChanged() ) ); - connect( mDlg->rbPrompt, SIGNAL( toggled(bool) ), - SLOT( slotChanged() ) ); - connect( mDlg->rbPresetLogin, SIGNAL( toggled(bool) ), - SLOT( slotChanged() ) ); + connect( mDlg->rbPrompt, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( slotChanged() ) ); + connect( mDlg->rbPresetLogin, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( slotChanged() ) ); - connect( mDlg->cbPersConn, SIGNAL( toggled(bool) ), - SLOT( slotChanged() ) ); + connect( mDlg->cbPersConn, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( slotChanged() ) ); - connect( mDlg->location, SIGNAL( textChanged(const QString&) ), - SLOT( slotChanged() ) ); + connect( mDlg->location, TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotChanged() ) ); - connect( mDlg->pbEnvSetup, SIGNAL( clicked() ), SLOT( setupEnvProxy() ) ); - connect( mDlg->pbManSetup, SIGNAL( clicked() ), SLOT( setupManProxy() ) ); + connect( mDlg->pbEnvSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupEnvProxy() ) ); + connect( mDlg->pbManSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupManProxy() ) ); load(); } @@ -150,7 +150,7 @@ void KProxyDialog::load() mData->proxyList["ftp"] = proto.proxyFor( "ftp" ); mData->proxyList["script"] = proto.proxyConfigScript(); mData->useReverseProxy = proto.useReverseProxy(); - mData->noProxyFor = QStringList::split( QRegExp("[',''\t'' ']"), + mData->noProxyFor = TQStringList::split( TQRegExp("[',''\t'' ']"), proto.noProxyForRaw() ); mDlg->gbAuth->setEnabled( useProxy ); @@ -306,7 +306,7 @@ void KProxyDialog::setupManProxy() dlgManual.setProxyData( *mData ); - if ( dlgManual.exec() == QDialog::Accepted ) + if ( dlgManual.exec() == TQDialog::Accepted ) { *mData = dlgManual.data(); mDlg->rbManual->setChecked(true); @@ -320,7 +320,7 @@ void KProxyDialog::setupEnvProxy() dlgEnv.setProxyData( *mData ); - if ( dlgEnv.exec() == QDialog::Accepted ) + if ( dlgEnv.exec() == TQDialog::Accepted ) { *mData = dlgEnv.data(); mDlg->rbEnvVar->setChecked(true); @@ -343,7 +343,7 @@ void KProxyDialog::slotUseProxyChanged() emit changed( true ); } -QString KProxyDialog::quickHelp() const +TQString KProxyDialog::quickHelp() const { return i18n( "<h1>Proxy</h1>" "<p>A proxy server is an intermediate program that sits between " @@ -357,9 +357,9 @@ QString KProxyDialog::quickHelp() const "<p><u>Note:</u> Some proxy servers provide both services.</p>" ); } -void KProxyDialog::showInvalidMessage( const QString& _msg ) +void KProxyDialog::showInvalidMessage( const TQString& _msg ) { - QString msg; + TQString msg; if( !_msg.isEmpty() ) msg = _msg; diff --git a/kcontrol/kio/kproxydlg.h b/kcontrol/kio/kproxydlg.h index bbac5641d..d8ef1db9e 100644 --- a/kcontrol/kio/kproxydlg.h +++ b/kcontrol/kio/kproxydlg.h @@ -22,7 +22,7 @@ #ifndef _KPROXYDIALOG_H #define _KPROXYDIALOG_H -#include <qstring.h> +#include <tqstring.h> #include <kcmodule.h> @@ -36,18 +36,18 @@ class KProxyOptions : public KCModule Q_OBJECT public: - KProxyOptions( QWidget* parent = 0 ); + KProxyOptions( TQWidget* parent = 0 ); ~KProxyOptions(); virtual void load(); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; private: KCModule* mProxy; KCModule* mSocks; - QTabWidget* mTab; + TQTabWidget* mTab; }; class KProxyDialog : public KCModule @@ -55,13 +55,13 @@ class KProxyDialog : public KCModule Q_OBJECT public: - KProxyDialog( QWidget* parent = 0 ); + KProxyDialog( TQWidget* parent = 0 ); ~KProxyDialog(); virtual void load(); virtual void save(); virtual void defaults(); - QString quickHelp() const; + TQString quickHelp() const; private slots: void slotChanged(); @@ -71,7 +71,7 @@ private slots: void setupEnvProxy(); private: - void showInvalidMessage( const QString& _msg = QString::null ); + void showInvalidMessage( const TQString& _msg = TQString::null ); private: KProxyDialogUI* mDlg; diff --git a/kcontrol/kio/kproxydlgbase.cpp b/kcontrol/kio/kproxydlgbase.cpp index c901037e3..e95625713 100644 --- a/kcontrol/kio/kproxydlgbase.cpp +++ b/kcontrol/kio/kproxydlgbase.cpp @@ -56,19 +56,19 @@ void KProxyData::init() } -KProxyDialogBase::KProxyDialogBase( QWidget* parent, const char* name, - bool modal, const QString &caption ) +KProxyDialogBase::KProxyDialogBase( TQWidget* parent, const char* name, + bool modal, const TQString &caption ) :KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ) { m_bHasValidData = false; } -void KProxyDialogBase::setHighLight (QWidget* widget, bool highlight) +void KProxyDialogBase::setHighLight (TQWidget* widget, bool highlight) { if (!widget) return; - QFont f = widget->font(); + TQFont f = widget->font(); f.setBold( highlight ); widget->setFont( f ); } diff --git a/kcontrol/kio/kproxydlgbase.h b/kcontrol/kio/kproxydlgbase.h index 7c39f31c0..06ffa8753 100644 --- a/kcontrol/kio/kproxydlgbase.h +++ b/kcontrol/kio/kproxydlgbase.h @@ -22,9 +22,9 @@ #ifndef KPROXY_DIALOG_BASE_H #define KPROXY_DIALOG_BASE_H -#include <qmap.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kdialogbase.h> #include <kprotocolmanager.h> @@ -40,9 +40,9 @@ public: bool useReverseProxy; bool showEnvVarValue; - QStringList noProxyFor; + TQStringList noProxyFor; KProtocolManager::ProxyType type; - QMap<QString, QString> proxyList; + TQMap<TQString, TQString> proxyList; private: void init(); @@ -52,8 +52,8 @@ private: class KProxyDialogBase : public KDialogBase { public: - KProxyDialogBase( QWidget* parent = 0, const char* name = 0, - bool modal = false, const QString &caption = QString::null); + KProxyDialogBase( TQWidget* parent = 0, const char* name = 0, + bool modal = false, const TQString &caption = TQString::null); virtual ~KProxyDialogBase() {}; @@ -62,7 +62,7 @@ public: virtual void setProxyData (const KProxyData&)=0; protected: - void setHighLight (QWidget* widget = 0, bool highlight = false); + void setHighLight (TQWidget* widget = 0, bool highlight = false); bool m_bHasValidData; }; #endif diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp index a251c0aed..50d56d86e 100644 --- a/kcontrol/kio/ksaveioconfig.cpp +++ b/kcontrol/kio/ksaveioconfig.cpp @@ -82,7 +82,7 @@ void KSaveIOConfig::reparseConfiguration () void KSaveIOConfig::setReadTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( QString::null ); + cfg->setGroup( TQString::null ); cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -90,7 +90,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout ) void KSaveIOConfig::setConnectTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( QString::null ); + cfg->setGroup( TQString::null ); cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -98,7 +98,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout ) void KSaveIOConfig::setProxyConnectTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( QString::null ); + cfg->setGroup( TQString::null ); cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -106,7 +106,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout ) void KSaveIOConfig::setResponseTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( QString::null ); + cfg->setGroup( TQString::null ); cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -115,7 +115,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout ) void KSaveIOConfig::setMarkPartial( bool _mode ) { KConfig* cfg = config (); - cfg->setGroup( QString::null ); + cfg->setGroup( TQString::null ); cfg->writeEntry( "MarkPartial", _mode ); cfg->sync(); } @@ -123,7 +123,7 @@ void KSaveIOConfig::setMarkPartial( bool _mode ) void KSaveIOConfig::setMinimumKeepSize( int _size ) { KConfig* cfg = config (); - cfg->setGroup( QString::null ); + cfg->setGroup( TQString::null ); cfg->writeEntry( "MinimumKeepSize", _size ); cfg->sync(); } @@ -131,7 +131,7 @@ void KSaveIOConfig::setMinimumKeepSize( int _size ) void KSaveIOConfig::setAutoResume( bool _mode ) { KConfig* cfg = config (); - cfg->setGroup( QString::null ); + cfg->setGroup( TQString::null ); cfg->writeEntry( "AutoResume", _mode ); cfg->sync(); } @@ -153,7 +153,7 @@ void KSaveIOConfig::setMaxCacheSize( int cache_size ) void KSaveIOConfig::setCacheControl(KIO::CacheControl policy) { KConfig* cfg = http_config (); - QString tmp = KIO::getCacheControlString(policy); + TQString tmp = KIO::getCacheControlString(policy); cfg->writeEntry("cache", tmp); cfg->sync(); } @@ -189,7 +189,7 @@ void KSaveIOConfig::setProxyAuthMode(KProtocolManager::ProxyAuthMode mode) cfg->sync(); } -void KSaveIOConfig::setNoProxyFor( const QString& _noproxy ) +void KSaveIOConfig::setNoProxyFor( const TQString& _noproxy ) { KConfig* cfg = config (); cfg->setGroup( "Proxy Settings" ); @@ -197,8 +197,8 @@ void KSaveIOConfig::setNoProxyFor( const QString& _noproxy ) cfg->sync(); } -void KSaveIOConfig::setProxyFor( const QString& protocol, - const QString& _proxy ) +void KSaveIOConfig::setProxyFor( const TQString& protocol, + const TQString& _proxy ) { KConfig* cfg = config (); cfg->setGroup( "Proxy Settings" ); @@ -206,7 +206,7 @@ void KSaveIOConfig::setProxyFor( const QString& protocol, cfg->sync(); } -void KSaveIOConfig::setProxyConfigScript( const QString& _url ) +void KSaveIOConfig::setProxyConfigScript( const TQString& _url ) { KConfig* cfg = config (); cfg->setGroup( "Proxy Settings" ); @@ -217,7 +217,7 @@ void KSaveIOConfig::setProxyConfigScript( const QString& _url ) void KSaveIOConfig::setPersistentProxyConnection( bool enable ) { KConfig* cfg = config (); - cfg->setGroup( QString::null ); + cfg->setGroup( TQString::null ); cfg->writeEntry( "PersistentProxyConnection", enable ); cfg->sync(); } @@ -225,33 +225,33 @@ void KSaveIOConfig::setPersistentProxyConnection( bool enable ) void KSaveIOConfig::setPersistentConnections( bool enable ) { KConfig* cfg = config (); - cfg->setGroup( QString::null ); + cfg->setGroup( TQString::null ); cfg->writeEntry( "PersistentConnections", enable ); cfg->sync(); } -void KSaveIOConfig::updateRunningIOSlaves (QWidget *parent) +void KSaveIOConfig::updateRunningIOSlaves (TQWidget *parent) { // Inform all running io-slaves about the changes... // if we cannot update, ioslaves inform the end user... - if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", QString::null)) + if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null)) { - QString caption = i18n("Update Failed"); - QString message = i18n("You have to restart the running applications " + TQString caption = i18n("Update Failed"); + TQString message = i18n("You have to restart the running applications " "for these changes to take effect."); KMessageBox::information (parent, message, caption); return; } } -void KSaveIOConfig::updateProxyScout( QWidget * parent ) +void KSaveIOConfig::updateProxyScout( TQWidget * parent ) { // Inform the proxyscout kded module about changes // if we cannot update, ioslaves inform the end user... if (!DCOPRef("kded", "proxyscout").send("reset")) { - QString caption = i18n("Update Failed"); - QString message = i18n("You have to restart KDE " + TQString caption = i18n("Update Failed"); + TQString message = i18n("You have to restart KDE " "for these changes to take effect."); KMessageBox::information (parent, message, caption); return; diff --git a/kcontrol/kio/ksaveioconfig.h b/kcontrol/kio/ksaveioconfig.h index 3a6528ed2..2bf107131 100644 --- a/kcontrol/kio/ksaveioconfig.h +++ b/kcontrol/kio/ksaveioconfig.h @@ -60,11 +60,11 @@ public: static void setProxyAuthMode( KProtocolManager::ProxyAuthMode ); - static void setProxyConfigScript( const QString& ); + static void setProxyConfigScript( const TQString& ); - static void setProxyFor( const QString&, const QString& ); + static void setProxyFor( const TQString&, const TQString& ); - static void setNoProxyFor( const QString& ); + static void setNoProxyFor( const TQString& ); /** Miscelaneous Settings */ @@ -80,10 +80,10 @@ public: /** Update all running io-slaves */ - static void updateRunningIOSlaves (QWidget * parent = 0L); + static void updateRunningIOSlaves (TQWidget * parent = 0L); /** Update proxy scout */ - static void updateProxyScout( QWidget * parent = 0L ); + static void updateProxyScout( TQWidget * parent = 0L ); protected: static KConfig* config (); diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp index dfe2eb0f8..96821defa 100644 --- a/kcontrol/kio/main.cpp +++ b/kcontrol/kio/main.cpp @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qfile.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtabwidget.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtabwidget.h> #include <kcmoduleloader.h> #include <klocale.h> @@ -40,44 +40,44 @@ extern "C" { - KDE_EXPORT KCModule *create_cookie(QWidget *parent, const char /**name*/) + KDE_EXPORT KCModule *create_cookie(TQWidget *parent, const char /**name*/) { return new KCookiesMain(parent); } - KDE_EXPORT KCModule *create_smb(QWidget *parent, const char /**name*/) + KDE_EXPORT KCModule *create_smb(TQWidget *parent, const char /**name*/) { return new SMBRoOptions(parent); } - KDE_EXPORT KCModule *create_useragent(QWidget *parent, const char /**name*/) + KDE_EXPORT KCModule *create_useragent(TQWidget *parent, const char /**name*/) { return new UserAgentDlg(parent); } - KDE_EXPORT KCModule *create_proxy(QWidget *parent, const char /**name*/) + KDE_EXPORT KCModule *create_proxy(TQWidget *parent, const char /**name*/) { return new KProxyOptions(parent); } - KDE_EXPORT KCModule *create_cache(QWidget *parent, const char /**name*/) + KDE_EXPORT KCModule *create_cache(TQWidget *parent, const char /**name*/) { return new KCacheConfigDialog( parent ); } - KDE_EXPORT KCModule *create_netpref(QWidget *parent, const char /**name*/) + KDE_EXPORT KCModule *create_netpref(TQWidget *parent, const char /**name*/) { return new KIOPreferences(parent); } - KDE_EXPORT KCModule *create_lanbrowser(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_lanbrowser(TQWidget *parent, const char *) { return new LanBrowser(parent); } } -LanBrowser::LanBrowser(QWidget *parent) +LanBrowser::LanBrowser(TQWidget *parent) :KCModule(parent,"kcmkio") ,layout(this) ,tabs(this) @@ -103,27 +103,27 @@ LanBrowser::LanBrowser(QWidget *parent) smbPage = create_smb(&tabs, 0); tabs.addTab(smbPage, i18n("&Windows Shares")); - connect(smbPage,SIGNAL(changed(bool)), SLOT( changed() )); + connect(smbPage,TQT_SIGNAL(changed(bool)), TQT_SLOT( changed() )); lisaPage = KCModuleLoader::loadModule("kcmlisa", KCModuleLoader::None, &tabs); if (lisaPage) { tabs.addTab(lisaPage,i18n("&LISa Daemon")); - connect(lisaPage,SIGNAL(changed()), SLOT( changed() )); + connect(lisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); } // resLisaPage = KCModuleLoader::loadModule("kcmreslisa", &tabs); // if (resLisaPage) // { // tabs.addTab(resLisaPage,i18n("R&esLISa Daemon")); -// connect(resLisaPage,SIGNAL(changed()), SLOT( changed() )); +// connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); // } kioLanPage = KCModuleLoader::loadModule("kcmkiolan", KCModuleLoader::None, &tabs); if (kioLanPage) { tabs.addTab(kioLanPage,i18n("lan:/ Iosla&ve")); - connect(kioLanPage,SIGNAL(changed()), SLOT( changed() )); + connect(kioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); } setButtons(Apply|Help); diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h index d2499c5e4..70a64c44a 100644 --- a/kcontrol/kio/main.h +++ b/kcontrol/kio/main.h @@ -30,13 +30,13 @@ class LanBrowser:public KCModule { Q_OBJECT public: - LanBrowser(QWidget *parent=0); + LanBrowser(TQWidget *parent=0); virtual void load(); virtual void save(); private: - QVBoxLayout layout; - QTabWidget tabs; + TQVBoxLayout layout; + TQTabWidget tabs; KCModule *smbPage; KCModule *lisaPage; // KCModule *resLisaPage; diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp index 6aa20c4e7..1c1de3316 100644 --- a/kcontrol/kio/netpref.cpp +++ b/kcontrol/kio/netpref.cpp @@ -1,7 +1,7 @@ -#include <qlayout.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qvgroupbox.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqvgroupbox.h> #include <kio/ioslave_defaults.h> #include <knuminput.h> @@ -14,13 +14,13 @@ #define MAX_TIMEOUT_VALUE 3600 -KIOPreferences::KIOPreferences( QWidget* parent ) +KIOPreferences::KIOPreferences( TQWidget* parent ) :KCModule( parent, "kcmkio" ) { - QVBoxLayout* mainLayout = new QVBoxLayout( this, 0, + TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - gb_Timeout = new QVGroupBox( i18n("Timeout Values"), this, "gb_Timeout" ); - QWhatsThis::add( gb_Timeout, i18n("Here you can set timeout values. " + gb_Timeout = new TQVGroupBox( i18n("Timeout Values"), this, "gb_Timeout" ); + TQWhatsThis::add( gb_Timeout, i18n("Here you can set timeout values. " "You might want to tweak them if your " "connection is very slow. The maximum " "allowed value is %1 seconds.").arg(MAX_TIMEOUT_VALUE)); @@ -29,43 +29,43 @@ KIOPreferences::KIOPreferences( QWidget* parent ) sb_socketRead = new KIntNumInput( gb_Timeout, "sb_socketRead" ); sb_socketRead->setSuffix( i18n( " sec" ) ); sb_socketRead->setLabel( i18n( "Soc&ket read:" ), AlignVCenter); - connect(sb_socketRead, SIGNAL(valueChanged ( int )), - this, SLOT(configChanged())); + connect(sb_socketRead, TQT_SIGNAL(valueChanged ( int )), + this, TQT_SLOT(configChanged())); sb_proxyConnect = new KIntNumInput( sb_socketRead, 0, gb_Timeout, 10, "sb_proxyConnect" ); sb_proxyConnect->setSuffix( i18n( " sec" ) ); sb_proxyConnect->setLabel( i18n( "Pro&xy connect:" ), AlignVCenter); - connect(sb_proxyConnect, SIGNAL(valueChanged ( int )), - this, SLOT(configChanged())); + connect(sb_proxyConnect, TQT_SIGNAL(valueChanged ( int )), + this, TQT_SLOT(configChanged())); sb_serverConnect = new KIntNumInput( sb_proxyConnect, 0, gb_Timeout, 10, "sb_serverConnect" ); sb_serverConnect->setSuffix( i18n( " sec" ) ); sb_serverConnect->setLabel( i18n("Server co&nnect:"), AlignVCenter); - connect(sb_serverConnect, SIGNAL(valueChanged ( int )), - this, SLOT(configChanged())); + connect(sb_serverConnect, TQT_SIGNAL(valueChanged ( int )), + this, TQT_SLOT(configChanged())); sb_serverResponse = new KIntNumInput( sb_serverConnect, 0, gb_Timeout, 10, "sb_serverResponse" ); sb_serverResponse->setSuffix( i18n( " sec" ) ); sb_serverResponse->setLabel( i18n("&Server response:"), AlignVCenter); - connect(sb_serverResponse, SIGNAL(valueChanged ( int )), - this, SLOT(configChanged())); - - gb_Ftp = new QVGroupBox( i18n( "FTP Options" ), this, "gb_Ftp" ); - cb_ftpEnablePasv = new QCheckBox( i18n( "Enable passive &mode (PASV)" ), gb_Ftp ); - QWhatsThis::add(cb_ftpEnablePasv, i18n( "Enables FTP's \"passive\" mode. This is required to allow FTP to work from behind firewalls." )); - cb_ftpMarkPartial = new QCheckBox( i18n( "Mark &partially uploaded files" ), gb_Ftp ); - QWhatsThis::add(cb_ftpMarkPartial, i18n( "<p>Marks partially uploaded FTP files.</p>" + connect(sb_serverResponse, TQT_SIGNAL(valueChanged ( int )), + this, TQT_SLOT(configChanged())); + + gb_Ftp = new TQVGroupBox( i18n( "FTP Options" ), this, "gb_Ftp" ); + cb_ftpEnablePasv = new TQCheckBox( i18n( "Enable passive &mode (PASV)" ), gb_Ftp ); + TQWhatsThis::add(cb_ftpEnablePasv, i18n( "Enables FTP's \"passive\" mode. This is required to allow FTP to work from behind firewalls." )); + cb_ftpMarkPartial = new TQCheckBox( i18n( "Mark &partially uploaded files" ), gb_Ftp ); + TQWhatsThis::add(cb_ftpMarkPartial, i18n( "<p>Marks partially uploaded FTP files.</p>" "<p>When this option is enabled, partially uploaded files " "will have a \".part\" extension. This extension will be removed " "once the transfer is complete.</p>")); mainLayout->addWidget( gb_Ftp ); - connect(cb_ftpEnablePasv, SIGNAL(toggled(bool)), SLOT(configChanged())); - connect(cb_ftpMarkPartial, SIGNAL(toggled(bool)), SLOT(configChanged())); + connect(cb_ftpEnablePasv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); + connect(cb_ftpMarkPartial, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); mainLayout->addStretch(); @@ -126,7 +126,7 @@ void KIOPreferences::defaults() emit changed(true); } -QString KIOPreferences::quickHelp() const +TQString KIOPreferences::quickHelp() const { return i18n("<h1>Network Preferences</h1>Here you can define" " the behavior of KDE programs when using Internet" diff --git a/kcontrol/kio/netpref.h b/kcontrol/kio/netpref.h index 2e269d4cd..ff8a7ffcf 100644 --- a/kcontrol/kio/netpref.h +++ b/kcontrol/kio/netpref.h @@ -17,23 +17,23 @@ class KIOPreferences : public KCModule Q_OBJECT public: - KIOPreferences( QWidget* parent = 0); + KIOPreferences( TQWidget* parent = 0); ~KIOPreferences(); void load(); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; protected slots: void configChanged() { emit changed(true); } private: - QVGroupBox* gb_Ftp; - QVGroupBox* gb_Timeout; - QCheckBox* cb_ftpEnablePasv; - QCheckBox* cb_ftpMarkPartial; + TQVGroupBox* gb_Ftp; + TQVGroupBox* gb_Timeout; + TQCheckBox* cb_ftpEnablePasv; + TQCheckBox* cb_ftpMarkPartial; KIntNumInput* sb_socketRead; KIntNumInput* sb_proxyConnect; diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp index 8e59c4bb0..463806266 100644 --- a/kcontrol/kio/policydlg.cpp +++ b/kcontrol/kio/policydlg.cpp @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qvalidator.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqvalidator.h> #include <klineedit.h> #include <kcombobox.h> @@ -33,12 +33,12 @@ class DomainLineValidator : public QValidator { public: - DomainLineValidator(QObject *parent) - :QValidator(parent, "domainValidator") + DomainLineValidator(TQObject *parent) + :TQValidator(parent, "domainValidator") { } - State validate(QString &input, int &) const + State validate(TQString &input, int &) const { if (input.isEmpty() || (input == ".")) return Intermediate; @@ -56,7 +56,7 @@ public: }; -PolicyDlg::PolicyDlg (const QString& caption, QWidget *parent, +PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, const char *name) : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, true) { @@ -67,14 +67,14 @@ PolicyDlg::PolicyDlg (const QString& caption, QWidget *parent, m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 ); enableButtonOK( false ); - connect(m_dlgUI->leDomain, SIGNAL(textChanged(const QString&)), - SLOT(slotTextChanged(const QString&))); + connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(slotTextChanged(const TQString&))); setFixedSize (sizeHint()); m_dlgUI->leDomain->setFocus (); } -void PolicyDlg::setEnableHostEdit( bool state, const QString& host ) +void PolicyDlg::setEnableHostEdit( bool state, const TQString& host ) { if ( !host.isEmpty() ) m_dlgUI->leDomain->setText( host ); @@ -95,12 +95,12 @@ int PolicyDlg::advice () const return m_dlgUI->cbPolicy->currentItem() + 1; } -QString PolicyDlg::domain () const +TQString PolicyDlg::domain () const { return m_dlgUI->leDomain->text(); } -void PolicyDlg::slotTextChanged( const QString& text ) +void PolicyDlg::slotTextChanged( const TQString& text ) { enableButtonOK( text.length() > 1 ); } diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h index dcdca5136..815b4d01d 100644 --- a/kcontrol/kio/policydlg.h +++ b/kcontrol/kio/policydlg.h @@ -19,7 +19,7 @@ #ifndef _POLICYDLG_H #define _POLICYDLG_H -#include <qstring.h> +#include <tqstring.h> #include <kdialogbase.h> @@ -47,16 +47,16 @@ public: } } - static KCookieAdvice::Value strToAdvice (const QString& advice) + static KCookieAdvice::Value strToAdvice (const TQString& advice) { if (advice.isEmpty()) return KCookieAdvice::Dunno; - if (advice.find (QString::fromLatin1("accept"), 0, false) == 0) + if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0) return KCookieAdvice::Accept; - else if (advice.find (QString::fromLatin1("reject"), 0, false) == 0) + else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0) return KCookieAdvice::Reject; - else if (advice.find (QString::fromLatin1("ask"), 0, false) == 0) + else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0) return KCookieAdvice::Ask; return KCookieAdvice::Dunno; @@ -68,18 +68,18 @@ class PolicyDlg : public KDialogBase Q_OBJECT public: - PolicyDlg (const QString& caption, QWidget *parent = 0, + PolicyDlg (const TQString& caption, TQWidget *parent = 0, const char *name = 0); ~PolicyDlg (){}; int advice() const; - QString domain() const; + TQString domain() const; - void setEnableHostEdit( bool, const QString& host = QString::null ); + void setEnableHostEdit( bool, const TQString& host = TQString::null ); void setPolicy (int policy); protected slots: - void slotTextChanged( const QString& ); + void slotTextChanged( const TQString& ); private: PolicyDlgUI* m_dlgUI; diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index dc075c793..90dfd9170 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -18,9 +18,9 @@ Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qlabel.h> -#include <qtextcodec.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqtextcodec.h> #include <klocale.h> #include <kconfig.h> @@ -35,49 +35,49 @@ #endif -SMBRoOptions::SMBRoOptions(QWidget *parent) +SMBRoOptions::SMBRoOptions(TQWidget *parent) : KCModule(parent, "kcmkio") { - QGridLayout *layout = new QGridLayout(this,2,-1,KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(), KDialog::spacingHint()); - QLabel *label=new QLabel(i18n("This is the configuration for the samba client only, not the server."),this); + TQLabel *label=new TQLabel(i18n("This is the configuration for the samba client only, not the server."),this); layout->addMultiCellWidget(label,0,0,0,1); - m_userLe=new QLineEdit(this); - label=new QLabel(m_userLe,i18n("Default user name:"),this); + m_userLe=new TQLineEdit(this); + label=new TQLabel(m_userLe,i18n("Default user name:"),this); layout->addWidget(label,1,0); layout->addWidget(m_userLe,1,1); - m_passwordLe=new QLineEdit(this); - m_passwordLe->setEchoMode(QLineEdit::Password); - label=new QLabel(m_passwordLe,i18n("Default password:"),this); + m_passwordLe=new TQLineEdit(this); + m_passwordLe->setEchoMode(TQLineEdit::Password); + label=new TQLabel(m_passwordLe,i18n("Default password:"),this); layout->addWidget(label,2,0); layout->addWidget(m_passwordLe,2,1); -/* m_workgroupLe=new QLineEdit(this); - label=new QLabel(m_workgroupLe,i18n("Workgroup:"),this); +/* m_workgroupLe=new TQLineEdit(this); + label=new TQLabel(m_workgroupLe,i18n("Workgroup:"),this); layout->addWidget(label,3,0); layout->addWidget(m_workgroupLe,3,1); - m_showHiddenShares=new QCheckBox(i18n("Show hidden shares"),this); + m_showHiddenShares=new TQCheckBox(i18n("Show hidden shares"),this); layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1); m_encodingList = new KComboBox( false, this ); - QStringList _strList = KGlobal::charsets()->availableEncodingNames(); + TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); m_encodingList->insertStringList( _strList ); - label = new QLabel( m_encodingList, i18n( "MS Windows encoding:" ), this ); + label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this ); layout->addWidget( label, 3, 0 ); layout->addWidget( m_encodingList, 3, 1 ); */ - layout->addWidget(new QWidget(this),4,0); + layout->addWidget(new TQWidget(this),4,0); -// connect(m_showHiddenShares, SIGNAL(toggled(bool)), this, SLOT(changed())); - connect(m_userLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed())); - connect(m_passwordLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed())); -// connect(m_workgroupLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed())); -// connect( m_encodingList, SIGNAL( activated( const QString & ) ), this , SLOT( changed() ) ); +// connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); + connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); + connect(m_passwordLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); +// connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); +// connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) ); layout->setRowStretch(4, 1); @@ -93,29 +93,29 @@ void SMBRoOptions::load() { KConfig *cfg = new KConfig("kioslaverc"); - QString tmp; + TQString tmp; cfg->setGroup( "Browser Settings/SMBro" ); m_userLe->setText(cfg->readEntry("User")); // m_workgroupLe->setText(cfg->readEntry("Workgroup")); // m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false)); -// QStringList _strList = KGlobal::charsets()->availableEncodingNames(); -// QString m_encoding = QTextCodec::codecForLocale()->name(); +// TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); +// TQString m_encoding = TQTextCodec::codecForLocale()->name(); // m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) ); // unscramble - QString scrambled = cfg->readEntry( "Password" ); - QString password = ""; + TQString scrambled = cfg->readEntry( "Password" ); + TQString password = ""; for (uint i=0; i<scrambled.length()/3; i++) { - QChar qc1 = scrambled[i*3]; - QChar qc2 = scrambled[i*3+1]; - QChar qc3 = scrambled[i*3+2]; + TQChar qc1 = scrambled[i*3]; + TQChar qc2 = scrambled[i*3+1]; + TQChar qc3 = scrambled[i*3+2]; unsigned int a1 = qc1.latin1() - '0'; unsigned int a2 = qc2.latin1() - 'A'; unsigned int a3 = qc3.latin1() - '0'; unsigned int num = ((a1 & 0x3F) << 10) | ((a2& 0x1F) << 5) | (a3 & 0x1F); - password[i] = QChar((uchar)((num - 17) ^ 173)); // restore + password[i] = TQChar((uchar)((num - 17) ^ 173)); // restore } m_passwordLe->setText(password); @@ -135,11 +135,11 @@ void SMBRoOptions::save() //taken from Nicola Brodu's smb ioslave //it's not really secure, but at //least better than storing the plain password - QString password(m_passwordLe->text()); - QString scrambled; + TQString password(m_passwordLe->text()); + TQString scrambled; for (uint i=0; i<password.length(); i++) { - QChar c = password[i]; + TQChar c = password[i]; unsigned int num = (c.unicode() ^ 173) + 17; unsigned int a1 = (num & 0xFC00) >> 10; unsigned int a2 = (num & 0x3E0) >> 5; @@ -166,7 +166,7 @@ void SMBRoOptions::changed() emit KCModule::changed(true); } -QString SMBRoOptions::quickHelp() const +TQString SMBRoOptions::quickHelp() const { return i18n("<h1>Windows Shares</h1>Konqueror is able to access shared " "windows filesystems if properly configured. If there is a " diff --git a/kcontrol/kio/smbrodlg.h b/kcontrol/kio/smbrodlg.h index d72972516..b1696e1e2 100644 --- a/kcontrol/kio/smbrodlg.h +++ b/kcontrol/kio/smbrodlg.h @@ -21,9 +21,9 @@ #ifndef __SMBRODLG_H #define __SMBRODLG_H -#include <qwidget.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqwidget.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <kcmodule.h> @@ -33,22 +33,22 @@ class SMBRoOptions : public KCModule { Q_OBJECT public: - SMBRoOptions(QWidget *parent = 0); + SMBRoOptions(TQWidget *parent = 0); ~SMBRoOptions(); virtual void load(); virtual void save(); virtual void defaults(); - QString quickHelp() const; + TQString quickHelp() const; private slots: void changed(); private: - QLineEdit *m_userLe; - QLineEdit *m_passwordLe; -// QLineEdit *m_workgroupLe; //currently unused, Alex -// QCheckBox *m_showHiddenShares; //currently unused, Alex + TQLineEdit *m_userLe; + TQLineEdit *m_passwordLe; +// TQLineEdit *m_workgroupLe; //currently unused, Alex +// TQCheckBox *m_showHiddenShares; //currently unused, Alex // KComboBox *m_encodingList; //currently unused }; diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp index 9c6678a5d..fd1ce7d8e 100644 --- a/kcontrol/kio/socks.cpp +++ b/kcontrol/kio/socks.cpp @@ -20,10 +20,10 @@ */ -#include <qlayout.h> -#include <qlabel.h> -#include <qvbuttongroup.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqvbuttongroup.h> +#include <tqcheckbox.h> #include <kfiledialog.h> #include <klistview.h> @@ -34,7 +34,7 @@ #include "socks.h" #include <kaboutdata.h> -KSocksConfig::KSocksConfig(QWidget *parent) +KSocksConfig::KSocksConfig(TQWidget *parent) : KCModule(parent, "kcmkio") { @@ -48,30 +48,30 @@ KSocksConfig::KSocksConfig(QWidget *parent) setAboutData( about ); - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); base = new SocksBase(this); layout->add(base); - connect(base->_c_enableSocks, SIGNAL(clicked()), this, SLOT(enableChanged())); - connect(base->bg, SIGNAL(clicked(int)), this, SLOT(methodChanged(int))); + connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); + connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int))); // The custom library - connect(base->_c_customPath, SIGNAL(openFileDialog(KURLRequester *)), this, SLOT(chooseCustomLib(KURLRequester *))); - connect(base->_c_customPath, SIGNAL(textChanged(const QString&)), - this, SLOT(customPathChanged(const QString&))); + connect(base->_c_customPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *))); + connect(base->_c_customPath, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(customPathChanged(const TQString&))); // Additional libpaths - connect(base->_c_newPath, SIGNAL(openFileDialog(KURLRequester *)), this, SLOT(chooseCustomLib(KURLRequester *))); - connect(base->_c_newPath, SIGNAL(returnPressed(const QString&)), - this, SLOT(addThisLibrary(const QString&))); - connect(base->_c_newPath, SIGNAL(textChanged(const QString&)), - this, SLOT(libTextChanged(const QString&))); - connect(base->_c_add, SIGNAL(clicked()), this, SLOT(addLibrary())); - connect(base->_c_remove, SIGNAL(clicked()), this, SLOT(removeLibrary())); - connect(base->_c_libs, SIGNAL(selectionChanged()), this, SLOT(libSelection())); + connect(base->_c_newPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *))); + connect(base->_c_newPath, TQT_SIGNAL(returnPressed(const TQString&)), + this, TQT_SLOT(addThisLibrary(const TQString&))); + connect(base->_c_newPath, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(libTextChanged(const TQString&))); + connect(base->_c_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(addLibrary())); + connect(base->_c_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeLibrary())); + connect(base->_c_libs, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(libSelection())); // The "Test" button - connect(base->_c_test, SIGNAL(clicked()), this, SLOT(testClicked())); + connect(base->_c_test, TQT_SIGNAL(clicked()), this, TQT_SLOT(testClicked())); // The config backend load(); @@ -110,7 +110,7 @@ void KSocksConfig::methodChanged(int id) } -void KSocksConfig::customPathChanged(const QString&) +void KSocksConfig::customPathChanged(const TQString&) { emit changed(true); } @@ -140,7 +140,7 @@ void KSocksConfig::testClicked() void KSocksConfig::chooseCustomLib(KURLRequester * url) { url->setMode( KFile::Directory ); -/* QString newFile = KFileDialog::getOpenFileName(); +/* TQString newFile = KFileDialog::getOpenFileName(); if (newFile.length() > 0) { base->_c_customPath->setURL(newFile); emit changed(true); @@ -149,7 +149,7 @@ void KSocksConfig::chooseCustomLib(KURLRequester * url) -void KSocksConfig::libTextChanged(const QString& lib) +void KSocksConfig::libTextChanged(const TQString& lib) { if (lib.length() > 0) base-> _c_add->setEnabled(true); @@ -157,10 +157,10 @@ void KSocksConfig::libTextChanged(const QString& lib) } -void KSocksConfig::addThisLibrary(const QString& lib) +void KSocksConfig::addThisLibrary(const TQString& lib) { if (lib.length() > 0) { - new QListViewItem(base->_c_libs, lib); + new TQListViewItem(base->_c_libs, lib); base->_c_newPath->clear(); base->_c_add->setEnabled(false); base->_c_newPath->setFocus(); @@ -177,7 +177,7 @@ void KSocksConfig::addLibrary() void KSocksConfig::removeLibrary() { - QListViewItem *thisitem = base->_c_libs->selectedItem(); + TQListViewItem *thisitem = base->_c_libs->selectedItem(); base->_c_libs->takeItem(thisitem); delete thisitem; base->_c_libs->clearSelection(); @@ -207,17 +207,17 @@ void KSocksConfig::load() } base->_c_customPath->setURL(config.readPathEntry("SOCKS_lib")); - QListViewItem *thisitem; + TQListViewItem *thisitem; while ((thisitem = base->_c_libs->firstChild())) { base->_c_libs->takeItem(thisitem); delete thisitem; } - QStringList libs = config.readPathListEntry("SOCKS_lib_path"); - for(QStringList::Iterator it = libs.begin(); + TQStringList libs = config.readPathListEntry("SOCKS_lib_path"); + for(TQStringList::Iterator it = libs.begin(); it != libs.end(); ++it ) { - new QListViewItem(base->_c_libs, *it); + new TQListViewItem(base->_c_libs, *it); } base->_c_libs->clearSelection(); base->_c_remove->setEnabled(false); @@ -232,9 +232,9 @@ void KSocksConfig::save() config.writeEntry("SOCKS_enable",base-> _c_enableSocks->isChecked(), true, true); config.writeEntry("SOCKS_method", base->bg->id(base->bg->selected()), true, true); config.writePathEntry("SOCKS_lib", base->_c_customPath->url(), true, true); - QListViewItem *thisitem = base->_c_libs->firstChild(); + TQListViewItem *thisitem = base->_c_libs->firstChild(); - QStringList libs; + TQStringList libs; while (thisitem) { libs << thisitem->text(0); thisitem = thisitem->itemBelow(); @@ -254,7 +254,7 @@ void KSocksConfig::defaults() base->_c_customLabel->setEnabled(false); base->_c_customPath->setEnabled(false); base->_c_customPath->setURL(""); - QListViewItem *thisitem; + TQListViewItem *thisitem; while ((thisitem = base->_c_libs->firstChild())) { base->_c_libs->takeItem(thisitem); delete thisitem; @@ -265,7 +265,7 @@ void KSocksConfig::defaults() emit changed(true); } -QString KSocksConfig::quickHelp() const +TQString KSocksConfig::quickHelp() const { return i18n("<h1>SOCKS</h1><p>This module allows you to configure KDE support" " for a SOCKS server or proxy.</p><p>SOCKS is a protocol to traverse firewalls" diff --git a/kcontrol/kio/socks.h b/kcontrol/kio/socks.h index 1d950f607..69f4ab4fd 100644 --- a/kcontrol/kio/socks.h +++ b/kcontrol/kio/socks.h @@ -37,7 +37,7 @@ class KSocksConfig : public KCModule { Q_OBJECT public: - KSocksConfig(QWidget *parent); + KSocksConfig(TQWidget *parent); virtual ~KSocksConfig(); SocksBase *base; @@ -47,7 +47,7 @@ public: void defaults(); int buttons(); - QString quickHelp() const; + TQString quickHelp() const; public slots: void configChanged(); @@ -57,10 +57,10 @@ private slots: void methodChanged(int id); void testClicked(); void chooseCustomLib(KURLRequester *url); - void customPathChanged(const QString&); + void customPathChanged(const TQString&); void addLibrary(); - void libTextChanged(const QString& lib); - void addThisLibrary(const QString& lib); + void libTextChanged(const TQString& lib); + void addThisLibrary(const TQString& lib); void removeLibrary(); void libSelection(); diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp index 3b71b29f4..9e945948d 100644 --- a/kcontrol/kio/uagentproviderdlg.cpp +++ b/kcontrol/kio/uagentproviderdlg.cpp @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> #include <kdebug.h> #include <klocale.h> @@ -32,7 +32,7 @@ #include "uagentproviderdlg.h" #include "uagentproviderdlg_ui.h" -UALineEdit::UALineEdit( QWidget *parent, const char *name ) +UALineEdit::UALineEdit( TQWidget *parent, const char *name ) :KLineEdit( parent, name ) { // For now do not accept any drops since they might contain @@ -41,10 +41,10 @@ UALineEdit::UALineEdit( QWidget *parent, const char *name ) setAcceptDrops( false ); } -void UALineEdit::keyPressEvent( QKeyEvent* e ) +void UALineEdit::keyPressEvent( TQKeyEvent* e ) { int key = e->key(); - QString keycode = e->text(); + TQString keycode = e->text(); if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period || (cursorPosition() > 0 && key == Qt::Key_Minus) || (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) ) @@ -55,13 +55,13 @@ void UALineEdit::keyPressEvent( QKeyEvent* e ) e->accept(); } -UAProviderDlg::UAProviderDlg( const QString& caption, QWidget *parent, +UAProviderDlg::UAProviderDlg( const TQString& caption, TQWidget *parent, FakeUASProvider* provider, const char *name ) :KDialog(parent, name, true), m_provider(provider) { setCaption ( caption ); - QVBoxLayout* mainLayout = new QVBoxLayout(this, 0, 0); + TQVBoxLayout* mainLayout = new TQVBoxLayout(this, 0, 0); dlg = new UAProviderDlgUI (this); mainLayout->addWidget(dlg); @@ -82,14 +82,14 @@ UAProviderDlg::~UAProviderDlg() void UAProviderDlg::init() { - connect( dlg->pbOk, SIGNAL(clicked()), SLOT(accept()) ); - connect( dlg->pbCancel, SIGNAL(clicked()), SLOT(reject()) ); + connect( dlg->pbOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( dlg->pbCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); - connect( dlg->leSite, SIGNAL(textChanged(const QString&)), - SLOT(slotTextChanged( const QString&)) ); + connect( dlg->leSite, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(slotTextChanged( const TQString&)) ); - connect( dlg->cbAlias, SIGNAL(activated(const QString&)), - SLOT(slotActivated(const QString&)) ); + connect( dlg->cbAlias, TQT_SIGNAL(activated(const TQString&)), + TQT_SLOT(slotActivated(const TQString&)) ); dlg->cbAlias->clear(); dlg->cbAlias->insertStringList( m_provider->userAgentAliasList() ); @@ -99,7 +99,7 @@ void UAProviderDlg::init() dlg->leSite->setFocus(); } -void UAProviderDlg::slotActivated( const QString& text ) +void UAProviderDlg::slotActivated( const TQString& text ) { if ( text.isEmpty() ) dlg->leIdentity->setText( "" ); @@ -109,17 +109,17 @@ void UAProviderDlg::slotActivated( const QString& text ) dlg->pbOk->setEnabled( (!dlg->leSite->text().isEmpty() && !text.isEmpty()) ); } -void UAProviderDlg::slotTextChanged( const QString& text ) +void UAProviderDlg::slotTextChanged( const TQString& text ) { dlg->pbOk->setEnabled( (!text.isEmpty() && !dlg->cbAlias->currentText().isEmpty()) ); } -void UAProviderDlg::setSiteName( const QString& text ) +void UAProviderDlg::setSiteName( const TQString& text ) { dlg->leSite->setText( text ); } -void UAProviderDlg::setIdentity( const QString& text ) +void UAProviderDlg::setIdentity( const TQString& text ) { int id = dlg->cbAlias->listBox()->index( dlg->cbAlias->listBox()->findItem(text) ); dlg->cbAlias->setCurrentItem( id ); @@ -128,20 +128,20 @@ void UAProviderDlg::setIdentity( const QString& text ) dlg->cbAlias->setFocus(); } -QString UAProviderDlg::siteName() +TQString UAProviderDlg::siteName() { - QString site_name=dlg->leSite->text().lower(); + TQString site_name=dlg->leSite->text().lower(); site_name = site_name.remove( "https://" ); site_name = site_name.remove( "http://" ); return site_name; } -QString UAProviderDlg::identity() +TQString UAProviderDlg::identity() { return dlg->cbAlias->currentText(); } -QString UAProviderDlg::alias() +TQString UAProviderDlg::alias() { return dlg->leIdentity->text(); } diff --git a/kcontrol/kio/uagentproviderdlg.h b/kcontrol/kio/uagentproviderdlg.h index 67b38d42e..3e60edb54 100644 --- a/kcontrol/kio/uagentproviderdlg.h +++ b/kcontrol/kio/uagentproviderdlg.h @@ -32,10 +32,10 @@ class UALineEdit : public KLineEdit Q_OBJECT public: - UALineEdit( QWidget *parent, const char *name=0 ); + UALineEdit( TQWidget *parent, const char *name=0 ); protected: - virtual void keyPressEvent( QKeyEvent * ); + virtual void keyPressEvent( TQKeyEvent * ); }; class UAProviderDlg : public KDialog @@ -43,20 +43,20 @@ class UAProviderDlg : public KDialog Q_OBJECT public: - UAProviderDlg( const QString& caption, QWidget *parent = 0, + UAProviderDlg( const TQString& caption, TQWidget *parent = 0, FakeUASProvider* provider = 0, const char *name = 0 ); ~UAProviderDlg(); - void setSiteName( const QString& ); - void setIdentity( const QString& ); + void setSiteName( const TQString& ); + void setIdentity( const TQString& ); - QString siteName(); - QString identity(); - QString alias(); + TQString siteName(); + TQString identity(); + TQString alias(); protected slots: - void slotActivated( const QString& ); - void slotTextChanged( const QString& ); + void slotActivated( const TQString& ); + void slotTextChanged( const TQString& ); protected: void init(); diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index b8256b946..c34d5cadc 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -22,14 +22,14 @@ Boston, MA 02110-1301, USA. */ -#include <qvbox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> -#include <qvbuttongroup.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqvbuttongroup.h> #include <kdebug.h> #include <kconfig.h> @@ -46,32 +46,32 @@ #include "useragentdlg.h" #include "useragentdlg_ui.h" -UserAgentDlg::UserAgentDlg( QWidget * parent ) +UserAgentDlg::UserAgentDlg( TQWidget * parent ) :KCModule( parent, "kcmkio" ) { - QVBoxLayout *mainLayout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); dlg = new UserAgentDlgUI (this); mainLayout->addWidget(dlg); dlg->lvDomainPolicyList->setSorting(0); - connect( dlg->cbSendUAString, SIGNAL(clicked()), SLOT(configChanged()) ); + connect( dlg->cbSendUAString, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); - connect( dlg->gbDefaultId, SIGNAL(clicked(int)), - SLOT(changeDefaultUAModifiers(int))); + connect( dlg->gbDefaultId, TQT_SIGNAL(clicked(int)), + TQT_SLOT(changeDefaultUAModifiers(int))); - connect( dlg->lvDomainPolicyList, SIGNAL(selectionChanged()), - SLOT(selectionChanged()) ); - connect( dlg->lvDomainPolicyList, SIGNAL(doubleClicked (QListViewItem *)), - SLOT(changePressed()) ); - connect( dlg->lvDomainPolicyList, SIGNAL( returnPressed ( QListViewItem * ) ), - SLOT( changePressed() )); + connect( dlg->lvDomainPolicyList, TQT_SIGNAL(selectionChanged()), + TQT_SLOT(selectionChanged()) ); + connect( dlg->lvDomainPolicyList, TQT_SIGNAL(doubleClicked (TQListViewItem *)), + TQT_SLOT(changePressed()) ); + connect( dlg->lvDomainPolicyList, TQT_SIGNAL( returnPressed ( TQListViewItem * ) ), + TQT_SLOT( changePressed() )); - connect( dlg->pbNew, SIGNAL(clicked()), SLOT( addPressed() ) ); - connect( dlg->pbChange, SIGNAL( clicked() ), SLOT( changePressed() ) ); - connect( dlg->pbDelete, SIGNAL( clicked() ), SLOT( deletePressed() ) ); - connect( dlg->pbDeleteAll, SIGNAL( clicked() ), SLOT( deleteAllPressed() ) ); + connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) ); + connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) ); + connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) ); + connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) ); load(); } @@ -90,23 +90,23 @@ void UserAgentDlg::load() m_config = new KConfig("kio_httprc", false, false); m_provider = new FakeUASProvider(); - QStringList list = m_config->groupList(); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + TQStringList list = m_config->groupList(); + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { if ( (*it) == "<default>") continue; - QString domain = *it; + TQString domain = *it; m_config->setGroup(*it); - QString agentStr = m_config->readEntry("UserAgent"); + TQString agentStr = m_config->readEntry("UserAgent"); if (!agentStr.isEmpty()) { - QString realName = m_provider->aliasStr(agentStr); - (void) new QListViewItem( dlg->lvDomainPolicyList, domain.lower(), realName, agentStr ); + TQString realName = m_provider->aliasStr(agentStr); + (void) new TQListViewItem( dlg->lvDomainPolicyList, domain.lower(), realName, agentStr ); } } // Update buttons and checkboxes... - m_config->setGroup(QString::null); + m_config->setGroup(TQString::null); bool b = m_config->readBoolEntry("SendUserAgent", true); dlg->cbSendUAString->setChecked( b ); m_ua_keys = m_config->readEntry("UserAgentKeys", DEFAULT_USER_AGENT_KEYS).lower(); @@ -148,28 +148,28 @@ void UserAgentDlg::defaults() void UserAgentDlg::save() { - QStringList deleteList; + TQStringList deleteList; // This is tricky because we have to take care to delete entries // as well. - QStringList list = m_config->groupList(); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + TQStringList list = m_config->groupList(); + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { if ( (*it) == "<default>") continue; - QString domain = *it; + TQString domain = *it; m_config->setGroup(*it); if (m_config->hasKey("UserAgent")) deleteList.append(*it); } - QListViewItem* it = dlg->lvDomainPolicyList->firstChild(); + TQListViewItem* it = dlg->lvDomainPolicyList->firstChild(); while(it) { - QString domain = it->text(0); + TQString domain = it->text(0); if (domain[0] == '.') domain = domain.mid(1); - QString userAgent = it->text(2); + TQString userAgent = it->text(2); m_config->setGroup(domain); m_config->writeEntry("UserAgent", userAgent); deleteList.remove(domain); @@ -177,7 +177,7 @@ void UserAgentDlg::save() it = it->nextSibling(); } - m_config->setGroup(QString::null); + m_config->setGroup(TQString::null); m_config->writeEntry("SendUserAgent", dlg->cbSendUAString->isChecked()); m_config->writeEntry("UserAgentKeys", m_ua_keys ); m_config->sync(); @@ -187,7 +187,7 @@ void UserAgentDlg::save() { // Remove entries from local file. KSimpleConfig cfg("kio_httprc"); - for ( QStringList::Iterator it = deleteList.begin(); + for ( TQStringList::Iterator it = deleteList.begin(); it != deleteList.end(); ++it ) { cfg.setGroup(*it); @@ -198,12 +198,12 @@ void UserAgentDlg::save() m_config->reparseConfiguration(); // Check everything is gone, reset to blank otherwise. - for ( QStringList::Iterator it = deleteList.begin(); + for ( TQStringList::Iterator it = deleteList.begin(); it != deleteList.end(); ++it ) { m_config->setGroup(*it); if (m_config->hasKey("UserAgent")) - m_config->writeEntry("UserAgent", QString::null); + m_config->writeEntry("UserAgent", TQString::null); } m_config->sync(); } @@ -213,16 +213,16 @@ void UserAgentDlg::save() emit changed( false ); } -bool UserAgentDlg::handleDuplicate( const QString& site, - const QString& identity, - const QString& alias ) +bool UserAgentDlg::handleDuplicate( const TQString& site, + const TQString& identity, + const TQString& alias ) { - QListViewItem* item = dlg->lvDomainPolicyList->firstChild(); + TQListViewItem* item = dlg->lvDomainPolicyList->firstChild(); while ( item != 0 ) { if ( item->text(0) == site ) { - QString msg = i18n("<qt><center>Found an existing identification for" + TQString msg = i18n("<qt><center>Found an existing identification for" "<br/><b>%1</b><br/>" "Do you want to replace it?</center>" "</qt>").arg(site); @@ -247,11 +247,11 @@ void UserAgentDlg::addPressed() { UAProviderDlg pdlg ( i18n("Add Identification"), this, m_provider ); - if ( pdlg.exec() == QDialog::Accepted ) + if ( pdlg.exec() == TQDialog::Accepted ) { if ( !handleDuplicate( pdlg.siteName(), pdlg.identity(), pdlg.alias() ) ) { - QListViewItem* index = new QListViewItem( dlg->lvDomainPolicyList, + TQListViewItem* index = new TQListViewItem( dlg->lvDomainPolicyList, pdlg.siteName(), pdlg.identity(), pdlg.alias() ); @@ -266,18 +266,18 @@ void UserAgentDlg::changePressed() { UAProviderDlg pdlg ( i18n("Modify Identification"), this, m_provider ); - QListViewItem *index = dlg->lvDomainPolicyList->currentItem(); + TQListViewItem *index = dlg->lvDomainPolicyList->currentItem(); if(!index) return; - QString old_site = index->text(0); + TQString old_site = index->text(0); pdlg.setSiteName( old_site ); pdlg.setIdentity( index->text(1) ); - if ( pdlg.exec() == QDialog::Accepted ) + if ( pdlg.exec() == TQDialog::Accepted ) { - QString new_site = pdlg.siteName(); + TQString new_site = pdlg.siteName(); if ( new_site == old_site || !handleDuplicate( new_site, pdlg.identity(), pdlg.alias() ) ) { @@ -291,8 +291,8 @@ void UserAgentDlg::changePressed() void UserAgentDlg::deletePressed() { - QListViewItem* item; - QListViewItem* nextItem = 0; + TQListViewItem* item; + TQListViewItem* nextItem = 0; item = dlg->lvDomainPolicyList->firstChild (); @@ -353,7 +353,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int ) dlg->cbOSVersion->setEnabled(m_ua_keys.contains('o')); - QString modVal = KProtocolManager::defaultUserAgent( m_ua_keys ); + TQString modVal = KProtocolManager::defaultUserAgent( m_ua_keys ); if ( dlg->leDefaultId->text() != modVal ) { dlg->leDefaultId->setSqueezedText(modVal); @@ -363,7 +363,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int ) void UserAgentDlg::selectionChanged () { - QListViewItem* item; + TQListViewItem* item; d_itemsSelected = 0; item = dlg->lvDomainPolicyList->firstChild (); @@ -378,7 +378,7 @@ void UserAgentDlg::selectionChanged () updateButtons (); } -QString UserAgentDlg::quickHelp() const +TQString UserAgentDlg::quickHelp() const { return i18n( "<h1>Browser Identification</h1> " "The browser-identification module allows you to have full " diff --git a/kcontrol/kio/useragentdlg.h b/kcontrol/kio/useragentdlg.h index 56534e142..f5b20ac0d 100644 --- a/kcontrol/kio/useragentdlg.h +++ b/kcontrol/kio/useragentdlg.h @@ -36,13 +36,13 @@ class UserAgentDlg : public KCModule Q_OBJECT public: - UserAgentDlg ( QWidget * parent = 0) ; + UserAgentDlg ( TQWidget * parent = 0) ; ~UserAgentDlg(); virtual void load(); virtual void save(); virtual void defaults(); - QString quickHelp() const; + TQString quickHelp() const; private slots: void updateButtons(); @@ -57,7 +57,7 @@ private slots: void changeDefaultUAModifiers( int ); private: - bool handleDuplicate( const QString&, const QString&, const QString& ); + bool handleDuplicate( const TQString&, const TQString&, const TQString& ); enum { SHOW_OS = 0, @@ -68,7 +68,7 @@ private: }; // Useragent modifiers... - QString m_ua_keys; + TQString m_ua_keys; // Fake user-agent modifiers... FakeUASProvider* m_provider; diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index 8cd4d16a5..edfa28e48 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -18,12 +18,12 @@ */ -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qslider.h> -#include <qvbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqslider.h> +#include <tqvbox.h> #include <dcopclient.h> @@ -42,12 +42,12 @@ static const int COL_FILENAME = 1; -typedef KGenericFactory<KCMKNotify, QWidget> NotifyFactory; +typedef KGenericFactory<KCMKNotify, TQWidget> NotifyFactory; K_EXPORT_COMPONENT_FACTORY( kcm_knotify, NotifyFactory("kcmnotify") ) using namespace KNotify; -KCMKNotify::KCMKNotify(QWidget *parent, const char *name, const QStringList & ) +KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & ) : KCModule(NotifyFactory::instance(), parent, name), m_playerSettings( 0L ) { @@ -64,25 +64,25 @@ KCMKNotify::KCMKNotify(QWidget *parent, const char *name, const QStringList & ) "any additional visual or audible alert." "</ul>")); - QVBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n( "Event source:" ), this ); + TQLabel *label = new TQLabel( i18n( "Event source:" ), this ); m_appCombo = new KComboBox( false, this, "app combo" ); - QHBoxLayout *hbox = new QHBoxLayout( layout ); + TQHBoxLayout *hbox = new TQHBoxLayout( layout ); hbox->addWidget( label ); hbox->addWidget( m_appCombo, 10 ); m_notifyWidget = new KNotifyWidget( this, "knotify widget", true ); - connect( m_notifyWidget, SIGNAL( changed( bool )), SIGNAL( changed(bool))); + connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool))); layout->addWidget( m_notifyWidget ); - connect( m_appCombo, SIGNAL( activated( const QString& ) ), - SLOT( slotAppActivated( const QString& )) ); + connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( slotAppActivated( const TQString& )) ); - connect( m_notifyWidget->m_playerButton, SIGNAL( clicked() ), - SLOT( slotPlayerSettings())); + connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotPlayerSettings())); KAboutData* ab = new KAboutData( "kcmknotify", I18N_NOOP("KNotify"), "3.0", @@ -109,7 +109,7 @@ KCMKNotify::~KCMKNotify() } } -Application * KCMKNotify::applicationByDescription( const QString& text ) +Application * KCMKNotify::applicationByDescription( const TQString& text ) { // not really efficient, but this is not really time-critical ApplicationList& allApps = m_notifyWidget->allApps(); @@ -123,7 +123,7 @@ Application * KCMKNotify::applicationByDescription( const QString& text ) return 0L; } -void KCMKNotify::slotAppActivated( const QString& text ) +void KCMKNotify::slotAppActivated( const TQString& text ) { Application *app = applicationByDescription( text ); if ( app ) @@ -162,10 +162,10 @@ void KCMKNotify::load( bool useDefaults ) m_appCombo->clear(); m_notifyWidget->clear(); - QStringList fullpaths = + TQStringList fullpaths = KGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true ); - QStringList::ConstIterator it = fullpaths.begin(); + TQStringList::ConstIterator it = fullpaths.begin(); for ( ; it != fullpaths.end(); ++it) m_notifyWidget->addApplicationEvents( *it ); @@ -176,7 +176,7 @@ void KCMKNotify::load( bool useDefaults ) KConfig config( "knotifyrc", true, false ); config.setReadDefaults( useDefaults ); config.setGroup( "Misc" ); - QString select = config.readEntry( "LastConfiguredApp" ); + TQString select = config.readEntry( "LastConfiguredApp" ); if( select.isEmpty()) select = "knotify"; // default to system notifications bool selected = false; @@ -215,13 +215,13 @@ void KCMKNotify::save() /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -PlayerSettingsDialog::PlayerSettingsDialog( QWidget *parent, bool modal ) +PlayerSettingsDialog::PlayerSettingsDialog( TQWidget *parent, bool modal ) : KDialogBase( parent, "player settings dialog", modal, i18n("Player Settings"), Ok|Apply|Cancel, Ok, true ) { - QFrame *frame = makeMainWidget(); + TQFrame *frame = makeMainWidget(); - QVBoxLayout *topLayout = new QVBoxLayout( frame, 0, + TQVBoxLayout *topLayout = new TQVBoxLayout( frame, 0, KDialog::spacingHint() ); m_ui = new PlayerSettingsUI(frame); @@ -231,10 +231,10 @@ PlayerSettingsDialog::PlayerSettingsDialog( QWidget *parent, bool modal ) dataChanged = false; enableButton(Apply, false); - connect( m_ui->cbExternal, SIGNAL( toggled( bool ) ), this, SLOT( externalToggled( bool ) ) ); - connect( m_ui->grpPlayers, SIGNAL( clicked( int ) ), this, SLOT( slotChanged() ) ); - connect( m_ui->volumeSlider, SIGNAL( valueChanged ( int ) ), this, SLOT( slotChanged() ) ); - connect( m_ui->reqExternal, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotChanged() ) ); + connect( m_ui->cbExternal, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( externalToggled( bool ) ) ); + connect( m_ui->grpPlayers, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( m_ui->volumeSlider, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( m_ui->reqExternal, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotChanged() ) ); } void PlayerSettingsDialog::load( bool useDefaults ) diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h index 2ee2f3ef6..1b1f5e34c 100644 --- a/kcontrol/knotify/knotify.h +++ b/kcontrol/knotify/knotify.h @@ -23,7 +23,7 @@ #ifndef _KNOTIFY_H #define _KNOTIFY_H -#include <qstring.h> +#include <tqstring.h> #include <kcmodule.h> #include <kdialogbase.h> @@ -49,7 +49,7 @@ class KCMKNotify : public KCModule Q_OBJECT public: - KCMKNotify(QWidget *parent, const char *name, const QStringList &); + KCMKNotify(TQWidget *parent, const char *name, const TQStringList &); virtual ~KCMKNotify(); virtual void defaults(); @@ -60,11 +60,11 @@ public slots: virtual void load(); private slots: - void slotAppActivated( const QString& app ); + void slotAppActivated( const TQString& app ); void slotPlayerSettings(); private: - KNotify::Application *applicationByDescription( const QString& text ); + KNotify::Application *applicationByDescription( const TQString& text ); KComboBox *m_appCombo; KNotify::KNotifyWidget *m_notifyWidget; @@ -77,7 +77,7 @@ class PlayerSettingsDialog : public KDialogBase Q_OBJECT public: - PlayerSettingsDialog( QWidget *parent, bool modal ); + PlayerSettingsDialog( TQWidget *parent, bool modal ); void load( bool useDefaults ); void save(); diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 4bb782eeb..af6c12cc4 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -18,13 +18,13 @@ // Behaviour options for konqueror -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qvbuttongroup.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqvbuttongroup.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> #include <dcopclient.h> @@ -38,43 +38,43 @@ #include "behaviour.h" -KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, QWidget *parent, const char * ) +KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent, const char * ) : KCModule(parent, "kcmkonq"), g_pConfig(config), groupname(group) { - QLabel * label; + TQLabel * label; setQuickHelp( i18n("<h1>Konqueror Behavior</h1> You can configure how Konqueror behaves as a file manager here.")); - QVBoxLayout *lay = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - QVGroupBox * miscGb = new QVGroupBox(i18n("Misc Options"), this); + TQVGroupBox * miscGb = new TQVGroupBox(i18n("Misc Options"), this); lay->addWidget( miscGb ); - QHBox *hbox = new QHBox(miscGb); - QVBox *vbox = new QVBox(hbox); + TQHBox *hbox = new TQHBox(miscGb); + TQVBox *vbox = new TQVBox(hbox); // ---- - winPixmap = new QLabel(hbox); - winPixmap->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); - winPixmap->setPixmap(QPixmap(locate("data", + winPixmap = new TQLabel(hbox); + winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); + winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/onlyone.png"))); winPixmap->setFixedSize( winPixmap->sizeHint() ); // ---- - cbNewWin = new QCheckBox(i18n("Open folders in separate &windows"), vbox); - QWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when " + cbNewWin = new TQCheckBox(i18n("Open folders in separate &windows"), vbox); + TQWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when " "you open a folder, rather than showing that folder's contents in the current window.")); - connect(cbNewWin, SIGNAL(clicked()), this, SLOT(changed())); - connect(cbNewWin, SIGNAL(toggled(bool)), SLOT(updateWinPixmap(bool))); + connect(cbNewWin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbNewWin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateWinPixmap(bool))); // ---- - cbListProgress = new QCheckBox( i18n( "&Show network operations in a single window" ), vbox ); - connect(cbListProgress, SIGNAL(clicked()), this, SLOT(changed())); + cbListProgress = new TQCheckBox( i18n( "&Show network operations in a single window" ), vbox ); + connect(cbListProgress, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbListProgress, i18n("Checking this option will group the" + TQWhatsThis::add( cbListProgress, i18n("Checking this option will group the" " progress information for all network file transfers into a single window" " with a list. When the option is not checked, all transfers appear in a" " separate window.") ); @@ -82,83 +82,83 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, QWidget *pa // -- - cbShowTips = new QCheckBox( i18n( "Show file &tips" ), vbox ); - connect(cbShowTips, SIGNAL(clicked()), this, SLOT(changed())); + cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox ); + connect(cbShowTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a " + TQWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a " "small popup window with additional information about that file")); - connect(cbShowTips, SIGNAL(toggled(bool)), SLOT(slotShowTips(bool))); + connect(cbShowTips, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShowTips(bool))); /* - //connect(cbShowTips, SIGNAL(toggled(bool)), sbToolTip, SLOT(setEnabled(bool))); - //connect(cbShowTips, SIGNAL(toggled(bool)), fileTips, SLOT(setEnabled(bool))); + //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), sbToolTip, TQT_SLOT(setEnabled(bool))); + //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), fileTips, TQT_SLOT(setEnabled(bool))); fileTips->setBuddy(sbToolTip); - QString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some " + TQString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some " "additional information about that file. Here, you can set how many items of information " "are displayed"); - QWhatsThis::add( fileTips, tipstr ); - QWhatsThis::add( sbToolTip, tipstr ); + TQWhatsThis::add( fileTips, tipstr ); + TQWhatsThis::add( sbToolTip, tipstr ); */ - QHBox *hboxpreview = new QHBox(vbox); - QWidget* spacer = new QWidget( hboxpreview ); + TQHBox *hboxpreview = new TQHBox(vbox); + TQWidget* spacer = new TQWidget( hboxpreview ); spacer->setMinimumSize( 20, 0 ); - spacer->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum ); + spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); - cbShowPreviewsInTips = new QCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); - connect(cbShowPreviewsInTips, SIGNAL(clicked()), this, SLOT(changed())); + cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); + connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the " + TQWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the " "popup window to contain a larger preview for the file, when moving the mouse over it.")); - cbRenameDirectlyIcon = new QCheckBox(i18n("Rename icons in&line"), vbox); - QWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be " + cbRenameDirectlyIcon = new TQCheckBox(i18n("Rename icons in&line"), vbox); + TQWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be " "renamed by clicking directly on the icon name. ")); - connect(cbRenameDirectlyIcon, SIGNAL(clicked()), this, SLOT(changed())); + connect(cbRenameDirectlyIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QHBoxLayout *hlay = new QHBoxLayout( lay ); + TQHBoxLayout *hlay = new TQHBoxLayout( lay ); - label = new QLabel(i18n("Home &URL:"), this); + label = new TQLabel(i18n("Home &URL:"), this); hlay->addWidget( label ); homeURL = new KURLRequester(this); homeURL->setMode(KFile::Directory); homeURL->setCaption(i18n("Select Home Folder")); hlay->addWidget( homeURL ); - connect(homeURL, SIGNAL(textChanged(const QString &)), this, SLOT(changed())); + connect(homeURL, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); label->setBuddy(homeURL); - QString homestr = i18n("This is the URL (e.g. a folder or a web page) where " + TQString homestr = i18n("This is the URL (e.g. a folder or a web page) where " "Konqueror will jump to when the \"Home\" button is pressed. " "This is usually your home folder, symbolized by a 'tilde' (~)."); - QWhatsThis::add( label, homestr ); - QWhatsThis::add( homeURL, homestr ); + TQWhatsThis::add( label, homestr ); + TQWhatsThis::add( homeURL, homestr ); - lay->addItem(new QSpacerItem(0,20,QSizePolicy::Fixed,QSizePolicy::Fixed)); + lay->addItem(new TQSpacerItem(0,20,TQSizePolicy::Fixed,TQSizePolicy::Fixed)); - cbShowDeleteCommand = new QCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this ); + cbShowDeleteCommand = new TQCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this ); lay->addWidget( cbShowDeleteCommand ); - connect(cbShowDeleteCommand, SIGNAL(clicked()), this, SLOT(changed())); + connect(cbShowDeleteCommand, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed " + TQWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed " "on the desktop and in the file manager's context menus. " "You can always delete files by holding the Shift key " "while calling 'Move to Trash'.")); - QButtonGroup *bg = new QVButtonGroup( i18n("Ask Confirmation For"), this ); + TQButtonGroup *bg = new TQVButtonGroup( i18n("Ask Confirmation For"), this ); bg->layout()->setSpacing( KDialog::spacingHint() ); - QWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask" + TQWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask" " for a confirmation when you \"delete\" a file." " <ul><li><em>Move To Trash:</em> moves the file to your trash folder," " from where it can be recovered very easily.</li>" " <li><em>Delete:</em> simply deletes the file.</li>" " </li></ul>") ); - connect(bg, SIGNAL( clicked( int ) ), SLOT( changed() )); + connect(bg, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( changed() )); - cbMoveToTrash = new QCheckBox( i18n("&Move to trash"), bg ); + cbMoveToTrash = new TQCheckBox( i18n("&Move to trash"), bg ); - cbDelete = new QCheckBox( i18n("D&elete"), bg ); + cbDelete = new TQCheckBox( i18n("D&elete"), bg ); lay->addWidget(bg); @@ -234,7 +234,7 @@ void KBehaviourOptions::save() g_pConfig->setGroup( groupname ); g_pConfig->writeEntry( "AlwaysNewWin", cbNewWin->isChecked() ); - g_pConfig->writePathEntry( "HomeURL", homeURL->url().isEmpty()? QString("~") : homeURL->url() ); + g_pConfig->writePathEntry( "HomeURL", homeURL->url().isEmpty()? TQString("~") : homeURL->url() ); g_pConfig->writeEntry( "ShowFileTips", cbShowTips->isChecked() ); g_pConfig->writeEntry( "ShowPreviewsInFileTips", cbShowPreviewsInTips->isChecked() ); @@ -265,7 +265,7 @@ void KBehaviourOptions::save() } // Send signal to konqueror - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); @@ -275,10 +275,10 @@ void KBehaviourOptions::save() void KBehaviourOptions::updateWinPixmap(bool b) { if (b) - winPixmap->setPixmap(QPixmap(locate("data", + winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/overlapping.png"))); else - winPixmap->setPixmap(QPixmap(locate("data", + winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/onlyone.png"))); } diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h index 9db3a36ba..2cfcb95fb 100644 --- a/kcontrol/konq/behaviour.h +++ b/kcontrol/konq/behaviour.h @@ -37,7 +37,7 @@ class KBehaviourOptions : public KCModule { Q_OBJECT public: - KBehaviourOptions(KConfig *config, QString group, QWidget *parent=0, const char *name=0); + KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0); ~KBehaviourOptions(); virtual void load(); virtual void load( bool useDefaults ); @@ -51,25 +51,25 @@ protected slots: private: KConfig *g_pConfig; - QString groupname; + TQString groupname; - QCheckBox *cbNewWin; - QCheckBox *cbListProgress; + TQCheckBox *cbNewWin; + TQCheckBox *cbListProgress; - QLabel *winPixmap; + TQLabel *winPixmap; KURLRequester *homeURL; - QVButtonGroup *bgOneProcess; - //QLabel *fileTips; - //QSpinBox *sbToolTip; - QCheckBox *cbShowTips; - QCheckBox *cbShowPreviewsInTips; - QCheckBox *cbRenameDirectlyIcon; + TQVButtonGroup *bgOneProcess; + //TQLabel *fileTips; + //TQSpinBox *sbToolTip; + TQCheckBox *cbShowTips; + TQCheckBox *cbShowPreviewsInTips; + TQCheckBox *cbRenameDirectlyIcon; - QCheckBox *cbMoveToTrash; - QCheckBox *cbDelete; - QCheckBox *cbShowDeleteCommand; + TQCheckBox *cbMoveToTrash; + TQCheckBox *cbDelete; + TQCheckBox *cbShowDeleteCommand; }; #endif // __BEHAVIOUR_H__ diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index 5ab82579d..cb1b5c47e 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -16,9 +16,9 @@ Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qtabwidget.h> -#include <qfile.h> +#include <tqlayout.h> +#include <tqtabwidget.h> +#include <tqfile.h> #include <klocale.h> #include <kdialog.h> @@ -30,11 +30,11 @@ #include "previews.h" #include "browser.h" -KBrowserOptions::KBrowserOptions(KConfig *config, QString group, QWidget *parent, const char *name) +KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *parent, const char *name) : KCModule( parent, "kcmkonq" ) { - QVBoxLayout *layout = new QVBoxLayout(this); - QTabWidget *tab = new QTabWidget(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); + TQTabWidget *tab = new TQTabWidget(this); layout->addWidget(tab); appearance = new KonqFontOptions(config, group, false, tab, name); @@ -57,14 +57,14 @@ KBrowserOptions::KBrowserOptions(KConfig *config, QString group, QWidget *parent tab->addTab(kuick, i18n("&Quick Copy && Move")); } - connect(appearance, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); - connect(behavior, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); - connect(previews, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); + connect(appearance, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(behavior, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(previews, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); if (kuick) - connect(kuick, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); + connect(kuick, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); - connect(tab, SIGNAL(currentChanged(QWidget *)), - this, SIGNAL(quickHelpChanged())); + connect(tab, TQT_SIGNAL(currentChanged(TQWidget *)), + this, TQT_SIGNAL(quickHelpChanged())); m_tab = tab; } @@ -95,15 +95,15 @@ void KBrowserOptions::save() kuick->save(); } -QString KBrowserOptions::quickHelp() const +TQString KBrowserOptions::quickHelp() const { - QWidget *w = m_tab->currentPage(); + TQWidget *w = m_tab->currentPage(); if (w->inherits("KCModule")) { KCModule *m = static_cast<KCModule *>(w); return m->quickHelp(); } - return QString::null; + return TQString::null; } #include "browser.moc" diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h index 26727de1b..f8856fd74 100644 --- a/kcontrol/konq/browser.h +++ b/kcontrol/konq/browser.h @@ -31,12 +31,12 @@ class KBrowserOptions : public KCModule { Q_OBJECT public: - KBrowserOptions(KConfig *config, QString group, QWidget *parent=0, const char *name=0); + KBrowserOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0); virtual void load(); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; private: @@ -44,7 +44,7 @@ private: KCModule *behavior; KCModule *previews; KCModule *kuick; - QTabWidget *m_tab; + TQTabWidget *m_tab; }; #endif diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index c2478b587..98275995c 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -17,12 +17,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qslider.h> +#include <tqlabel.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqslider.h> #include <kapplication.h> #include <kglobal.h> @@ -40,7 +40,7 @@ extern "C" { - KDE_EXPORT KCModule *create_virtualdesktops(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/) { return new KDesktopConfig(parent, "kcmkonq"); } @@ -51,7 +51,7 @@ extern "C" // be able to TAB through those line edits fast. So don't send me mails // asking why I did not implement a more intelligent/smaller GUI. -KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/) +KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) : KCModule(parent, "kcmkonq") { @@ -59,24 +59,24 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/) Q_ASSERT(maxDesktops % 2 == 0); - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); // number group - QGroupBox *number_group = new QGroupBox(this); + TQGroupBox *number_group = new TQGroupBox(this); - QHBoxLayout *lay = new QHBoxLayout(number_group, + TQHBoxLayout *lay = new TQHBoxLayout(number_group, KDialog::marginHint(), KDialog::spacingHint()); - QLabel *label = new QLabel(i18n("N&umber of desktops: "), number_group); + TQLabel *label = new TQLabel(i18n("N&umber of desktops: "), number_group); _numInput = new KIntNumInput(4, number_group); _numInput->setRange(1, maxDesktops, 1, true); - connect(_numInput, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int))); - connect(_numInput, SIGNAL(valueChanged(int)), SLOT( changed() )); + connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); + connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); label->setBuddy( _numInput ); - QString wtstr = i18n( "Here you can set how many virtual desktops you want on your KDE desktop. Move the slider to change the value." ); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( _numInput, wtstr ); + TQString wtstr = i18n( "Here you can set how many virtual desktops you want on your KDE desktop. Move the slider to change the value." ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( _numInput, wtstr ); lay->addWidget(label); lay->addWidget(_numInput); @@ -85,25 +85,25 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/) layout->addWidget(number_group); // name group - QGroupBox *name_group = new QGroupBox(i18n("Desktop &Names"), this); + TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this); name_group->setColumnLayout(4, Horizontal); for(int i = 0; i < (maxDesktops/2); i++) { - _nameLabel[i] = new QLabel(i18n("Desktop %1:").arg(i+1), name_group); + _nameLabel[i] = new TQLabel(i18n("Desktop %1:").arg(i+1), name_group); _nameInput[i] = new KLineEdit(name_group); - _nameLabel[i+(maxDesktops/2)] = new QLabel(i18n("Desktop %1:").arg(i+(maxDesktops/2)+1), name_group); + _nameLabel[i+(maxDesktops/2)] = new TQLabel(i18n("Desktop %1:").arg(i+(maxDesktops/2)+1), name_group); _nameInput[i+(maxDesktops/2)] = new KLineEdit(name_group); - QWhatsThis::add( _nameLabel[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) ); - QWhatsThis::add( _nameInput[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) ); - QWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); - QWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); - - connect(_nameInput[i], SIGNAL(textChanged(const QString&)), - SLOT( changed() )); - connect(_nameInput[i+(maxDesktops/2)], SIGNAL(textChanged(const QString&)), - SLOT( changed() )); + TQWhatsThis::add( _nameLabel[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) ); + TQWhatsThis::add( _nameInput[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) ); + TQWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); + TQWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); + + connect(_nameInput[i], TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT( changed() )); + connect(_nameInput[i+(maxDesktops/2)], TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT( changed() )); } for(int i = 1; i < maxDesktops; i++) @@ -111,8 +111,8 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/) layout->addWidget(name_group); - _wheelOption = new QCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this); - connect(_wheelOption,SIGNAL(toggled(bool)), SLOT( changed() )); + _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this); + connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); layout->addWidget(_wheelOption); layout->addStretch(1); @@ -135,7 +135,7 @@ void KDesktopConfig::load( bool useDefaults ) if (qt_xdisplay()) konq_screen_number = DefaultScreen(qt_xdisplay()); - QCString groupname; + TQCString groupname; if (konq_screen_number == 0) groupname = "Desktops"; else @@ -148,8 +148,8 @@ void KDesktopConfig::load( bool useDefaults ) kwinconfig->setGroup("Desktops"); for(int i = 1; i <= maxDesktops; i++) { - QString key_name(QString("Name_") + QString::number(i)); - QString name = QString::fromUtf8(info.desktopName(i)); + TQString key_name(TQString("Name_") + TQString::number(i)); + TQString name = TQString::fromUtf8(info.desktopName(i)); if (name.isEmpty()) // Get name from configuration if none is set in the WM. { name = kwinconfig->readEntry(key_name, i18n("Desktop %1").arg(i)); @@ -166,7 +166,7 @@ void KDesktopConfig::load( bool useDefaults ) delete kwinconfig; kwinconfig = 0; - QString configfile; + TQString configfile; if (konq_screen_number == 0) configfile = "kdesktoprc"; else @@ -210,7 +210,7 @@ void KDesktopConfig::save() if (qt_xdisplay()) konq_screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; else @@ -224,7 +224,7 @@ void KDesktopConfig::save() // Tell kdesktop about the new config file if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h index 291d5dd8f..548af65b0 100644 --- a/kcontrol/konq/desktop.h +++ b/kcontrol/konq/desktop.h @@ -35,7 +35,7 @@ class KDesktopConfig : public KCModule Q_OBJECT public: - KDesktopConfig(QWidget *parent = 0L, const char *name = 0L); + KDesktopConfig(TQWidget *parent = 0L, const char *name = 0L); void load(); void load( bool useDefaults ); @@ -47,9 +47,9 @@ class KDesktopConfig : public KCModule private: KIntNumInput *_numInput; - QLabel *_nameLabel[maxDesktops]; + TQLabel *_nameLabel[maxDesktops]; KLineEdit *_nameInput[maxDesktops]; - QCheckBox *_wheelOption; + TQCheckBox *_wheelOption; bool _wheelOptionImmutable; bool _labelImmutable[maxDesktops]; }; diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index e8052bfb0..7a7f50a76 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -22,14 +22,14 @@ #include "desktopbehavior_impl.h" -#include <qlayout.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qtabwidget.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqpushbutton.h> +#include <tqbuttongroup.h> +#include <tqtabwidget.h> +#include <tqwhatsthis.h> #include <klistview.h> #include <kservice.h> #include <klocale.h> @@ -46,13 +46,13 @@ const int customMenu1ID = 5; const int customMenu2ID = 6; -DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, QWidget *parent, const char * ) +DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * ) : KCModule( parent, "kcmkonq" ) { - QVBoxLayout* layout = new QVBoxLayout(this); + TQVBoxLayout* layout = new TQVBoxLayout(this); m_behavior = new DesktopBehavior(config, this); layout->addWidget(m_behavior); - connect(m_behavior, SIGNAL(changed()), this, SLOT(changed())); + connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); } void DesktopBehaviorModule::changed() @@ -63,59 +63,59 @@ void DesktopBehaviorModule::changed() class DesktopBehaviorPreviewItem : public QCheckListItem { public: - DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, QListView *parent, + DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent, const KService::Ptr &plugin, bool on) - : QCheckListItem(parent, plugin->name(), CheckBox), + : TQCheckListItem(parent, plugin->name(), CheckBox), m_rootOpts(rootOpts) { m_pluginName = plugin->desktopEntryName(); setOn(on); } - DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, QListView *parent, + DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent, bool on) - : QCheckListItem(parent, i18n("Sound Files"), CheckBox), + : TQCheckListItem(parent, i18n("Sound Files"), CheckBox), m_rootOpts(rootOpts) { m_pluginName = "audio/"; setOn(on); } - const QString &pluginName() const { return m_pluginName; } + const TQString &pluginName() const { return m_pluginName; } protected: virtual void stateChange( bool ) { m_rootOpts->changed(); } private: DesktopBehavior *m_rootOpts; - QString m_pluginName; + TQString m_pluginName; }; class DesktopBehaviorMediaItem : public QCheckListItem { public: - DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, QListView *parent, - const QString name, const QString mimetype, bool on) - : QCheckListItem(parent, name, CheckBox), + DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, TQListView *parent, + const TQString name, const TQString mimetype, bool on) + : TQCheckListItem(parent, name, CheckBox), m_rootOpts(rootOpts),m_mimeType(mimetype){setOn(on);} - const QString &mimeType() const { return m_mimeType; } + const TQString &mimeType() const { return m_mimeType; } protected: virtual void stateChange( bool ) { m_rootOpts->changed(); } private: DesktopBehavior *m_rootOpts; - QString m_mimeType; + TQString m_mimeType; }; static const int choiceCount=7; static const char * s_choices[7] = { "", "WindowListMenu", "DesktopMenu", "AppMenu", "BookmarksMenu", "CustomMenu1", "CustomMenu2" }; -DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * ) +DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * ) : DesktopBehaviorBase( parent, "kcmkonq" ), g_pConfig(config) { - QString strMouseButton1, strMouseButton3, strButtonTxt1, strButtonTxt3; + TQString strMouseButton1, strMouseButton3, strButtonTxt1, strButtonTxt3; /* * The text on this form depends on the mouse setting, which can be right @@ -124,14 +124,14 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * */ bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); - m_bHasMedia = KProtocolInfo::isKnownProtocol(QString::fromLatin1("media")); + m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); - connect(desktopMenuGroup, SIGNAL(clicked(int)), this, SIGNAL(changed())); - connect(iconsEnabledBox, SIGNAL(clicked()), this, SLOT(enableChanged())); - connect(showHiddenBox, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(vrootBox, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(autoLineupIconsBox, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(toolTipBox, SIGNAL(clicked()), this, SIGNAL(changed())); + connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed())); + connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); + connect(showHiddenBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); + connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); + connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); + connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); strMouseButton1 = i18n("&Left button:"); strButtonTxt1 = i18n( "You can choose what happens when" @@ -150,10 +150,10 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * leftLabel->setText( strMouseButton1 ); leftLabel->setBuddy( leftComboBox ); fillMenuCombo( leftComboBox ); - connect(leftEditButton, SIGNAL(clicked()), this, SLOT(editButtonPressed())); - connect(leftComboBox, SIGNAL(activated(int)), this, SIGNAL(changed())); - connect(leftComboBox, SIGNAL(activated(int)), this, SLOT(comboBoxChanged())); - QString wtstr = strButtonTxt1 + + connect(leftEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); + connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); + connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); + TQString wtstr = strButtonTxt1 + i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>" " <li><em>Window list menu:</em> a menu showing all windows on all" " virtual desktops pops up. You can click on the desktop name to switch" @@ -167,14 +167,14 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * " <li><em>Application menu:</em> the \"K\" menu pops up. This might be" " useful for quickly accessing applications if you like to keep the" " panel (also known as \"Kicker\") hidden from view.</li></ul>"); - QWhatsThis::add( leftLabel, wtstr ); - QWhatsThis::add( leftComboBox, wtstr ); + TQWhatsThis::add( leftLabel, wtstr ); + TQWhatsThis::add( leftComboBox, wtstr ); middleLabel->setBuddy( middleComboBox ); fillMenuCombo( middleComboBox ); - connect(middleEditButton, SIGNAL(clicked()), this, SLOT(editButtonPressed())); - connect(middleComboBox, SIGNAL(activated(int)), this, SIGNAL(changed())); - connect(middleComboBox, SIGNAL(activated(int)), this, SLOT(comboBoxChanged())); + connect(middleEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); + connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); + connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); wtstr = i18n("You can choose what happens when" " you click the middle button of your pointing device on the desktop:" " <ul><li><em>No action:</em> as you might guess, nothing happens!</li>" @@ -190,15 +190,15 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * " <li><em>Application menu:</em> the \"K\" menu pops up. This might be" " useful for quickly accessing applications if you like to keep the" " panel (also known as \"Kicker\") hidden from view.</li></ul>"); - QWhatsThis::add( middleLabel, wtstr ); - QWhatsThis::add( middleComboBox, wtstr ); + TQWhatsThis::add( middleLabel, wtstr ); + TQWhatsThis::add( middleComboBox, wtstr ); rightLabel->setText( strMouseButton3 ); rightLabel->setBuddy( rightComboBox ); fillMenuCombo( rightComboBox ); - connect(rightEditButton, SIGNAL(clicked()), this, SLOT(editButtonPressed())); - connect(rightComboBox, SIGNAL(activated(int)), this, SIGNAL(changed())); - connect(rightComboBox, SIGNAL(activated(int)), this, SLOT(comboBoxChanged())); + connect(rightEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); + connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); + connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); wtstr = strButtonTxt3 + i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>" " <li><em>Window list menu:</em> a menu showing all windows on all" @@ -213,12 +213,12 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * " <li><em>Application menu:</em> the \"K\" menu pops up. This might be" " useful for quickly accessing applications if you like to keep the" " panel (also known as \"Kicker\") hidden from view.</li></ul>"); - QWhatsThis::add( rightLabel, wtstr ); - QWhatsThis::add( rightComboBox, wtstr ); + TQWhatsThis::add( rightLabel, wtstr ); + TQWhatsThis::add( rightComboBox, wtstr ); if (m_bHasMedia) { - connect(enableMediaBox, SIGNAL(clicked()), this, SLOT(enableChanged())); + connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); } else { @@ -233,10 +233,10 @@ void DesktopBehavior::fillMediaListView() mediaListView->clear(); mediaListView->setRootIsDecorated(false); KMimeType::List mimetypes = KMimeType::allMimeTypes(); - QValueListIterator<KMimeType::Ptr> it2(mimetypes.begin()); + TQValueListIterator<KMimeType::Ptr> it2(mimetypes.begin()); g_pConfig->setGroup( "Media" ); enableMediaBox->setChecked(g_pConfig->readBoolEntry("enabled",false)); - QString excludedMedia=g_pConfig->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); + TQString excludedMedia=g_pConfig->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); for (; it2 != mimetypes.end(); ++it2) { if ( ((*it2)->name().startsWith("media/")) ) { @@ -254,7 +254,7 @@ void DesktopBehavior::saveMediaListView() g_pConfig->setGroup( "Media" ); g_pConfig->writeEntry("enabled",enableMediaBox->isChecked()); - QStringList exclude; + TQStringList exclude; for (DesktopBehaviorMediaItem *it=static_cast<DesktopBehaviorMediaItem *>(mediaListView->firstChild()); it; it=static_cast<DesktopBehaviorMediaItem *>(it->nextSibling())) { @@ -264,7 +264,7 @@ void DesktopBehavior::saveMediaListView() } -void DesktopBehavior::fillMenuCombo( QComboBox * combo ) +void DesktopBehavior::fillMenuCombo( TQComboBox * combo ) { combo->insertItem( i18n("No Action") ); combo->insertItem( i18n("Window List Menu") ); @@ -289,7 +289,7 @@ void DesktopBehavior::load( bool useDefaults ) //bool bVertAlign = g_pConfig->readBoolEntry("VertAlign", DEFAULT_VERT_ALIGN); KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); previewListView->clear(); - QStringList previews = g_pConfig->readListEntry("Preview"); + TQStringList previews = g_pConfig->readListEntry("Preview"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName())); new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/")); @@ -314,7 +314,7 @@ void DesktopBehavior::load( bool useDefaults ) // g_pConfig->setGroup( "Mouse Buttons" ); - QString s; + TQString s; s = g_pConfig->readEntry( "Left", "" ); for ( int c = 0 ; c < choiceCount ; c ++ ) if (s == s_choices[c]) @@ -344,7 +344,7 @@ void DesktopBehavior::save() { g_pConfig->setGroup( "Desktop Icons" ); g_pConfig->writeEntry("ShowHidden", showHiddenBox->isChecked()); - QStringList previews; + TQStringList previews; for ( DesktopBehaviorPreviewItem *item = static_cast<DesktopBehaviorPreviewItem *>( previewListView->firstChild() ); item; item = static_cast<DesktopBehaviorPreviewItem *>( item->nextSibling() ) ) @@ -380,10 +380,10 @@ void DesktopBehavior::save() // Tell kdesktop about the new config file if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - QByteArray data; + TQByteArray data; int konq_screen_number = KApplication::desktop()->primaryScreen(); - QCString appname; + TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; else @@ -432,7 +432,7 @@ void DesktopBehavior::editButtonPressed() if (sender() == rightEditButton) i = rightComboBox->currentItem(); - QString cfgFile; + TQString cfgFile; if (i == customMenu1ID) cfgFile = "kdesktop_custom_menu1"; if (i == customMenu2ID) @@ -453,7 +453,7 @@ void DesktopBehavior::editButtonPressed() } } -QString DesktopBehavior::quickHelp() const +TQString DesktopBehavior::quickHelp() const { return i18n("<h1>Behavior</h1>\n" "This module allows you to choose various options\n" diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h index 0417e8994..851df09f2 100644 --- a/kcontrol/konq/desktopbehavior_impl.h +++ b/kcontrol/konq/desktopbehavior_impl.h @@ -29,12 +29,12 @@ class DesktopBehavior : public DesktopBehaviorBase { Q_OBJECT public: - DesktopBehavior(KConfig *config, QWidget *parent = 0L, const char *name = 0L ); + DesktopBehavior(KConfig *config, TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); virtual void load( bool useDefaults ); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; friend class DesktopBehaviorPreviewItem; friend class DesktopBehaviorMediaItem; @@ -53,7 +53,7 @@ private: void saveMediaListView(); // Combo for the menus - void fillMenuCombo( QComboBox * combo ); + void fillMenuCombo( TQComboBox * combo ); typedef enum { NOTHING = 0, WINDOWLISTMENU, DESKTOPMENU, APPMENU, BOOKMARKSMENU=12 } menuChoice; bool m_bHasMedia; @@ -64,7 +64,7 @@ class DesktopBehaviorModule : public KCModule Q_OBJECT public: - DesktopBehaviorModule(KConfig *config, QWidget *parent = 0L, const char *name = 0L ); + DesktopBehaviorModule(KConfig *config, TQWidget *parent = 0L, const char *name = 0L ); virtual void load() { m_behavior->load(); emit KCModule::changed( false ); } virtual void save() { m_behavior->save(); emit KCModule::changed( false ); } virtual void defaults() { m_behavior->defaults(); emit KCModule::changed( true ); } diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 66cc3962c..98c804adc 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -19,10 +19,10 @@ #include <assert.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <dcopclient.h> @@ -40,16 +40,16 @@ //----------------------------------------------------------------------------- -KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, QWidget *parent, const char* /*name*/) +KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent, const char* /*name*/) : KCModule( parent, "kcmkonq" ), g_pConfig(config), groupname(group), m_bDesktop(desktop) { - QLabel *label; - QString wtstr; + TQLabel *label; + TQString wtstr; int row = 0; int LASTLINE = m_bDesktop ? 8 : 10; // this can be different :) #define LASTCOLUMN 2 - QGridLayout *lay = new QGridLayout(this,LASTLINE+1,LASTCOLUMN+1, 0, + TQGridLayout *lay = new TQGridLayout(this,LASTLINE+1,LASTCOLUMN+1, 0, KDialog::spacingHint()); lay->setRowStretch(LASTLINE,10); lay->setColStretch(LASTCOLUMN,10); @@ -57,132 +57,132 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, Q row++; m_pStandard = new KFontCombo( this ); - label = new QLabel( m_pStandard, i18n("&Standard font:"), this ); + label = new TQLabel( m_pStandard, i18n("&Standard font:"), this ); lay->addWidget(label,row,0); lay->addMultiCellWidget(m_pStandard,row,row,1,1); wtstr = i18n("This is the font used to display text in Konqueror windows."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pStandard, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pStandard, wtstr ); row++; - connect( m_pStandard, SIGNAL( activated(const QString&) ), - SLOT( slotStandardFont(const QString&) ) ); - connect( m_pStandard, SIGNAL( activated(const QString&) ), - SLOT(changed() ) ); - connect( m_pStandard, SIGNAL( textChanged(const QString&) ), - SLOT( slotStandardFont(const QString&) ) ); - connect( m_pStandard, SIGNAL( textChanged(const QString&) ), - SLOT(changed() ) ); - - m_pSize = new QSpinBox( 4,18,1,this ); - label = new QLabel( m_pSize, i18n("Font si&ze:"), this ); + connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT(changed() ) ); + connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT(changed() ) ); + + m_pSize = new TQSpinBox( 4,18,1,this ); + label = new TQLabel( m_pSize, i18n("Font si&ze:"), this ); lay->addWidget(label,row,0); lay->addMultiCellWidget(m_pSize,row,row,1,1); - connect( m_pSize, SIGNAL( valueChanged(int) ), - this, SLOT( slotFontSize(int) ) ); + connect( m_pSize, TQT_SIGNAL( valueChanged(int) ), + this, TQT_SLOT( slotFontSize(int) ) ); row+=2; wtstr = i18n("This is the font size used to display text in Konqueror windows."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pSize, wtstr ); - int hAlign = QApplication::reverseLayout() ? AlignRight : AlignLeft; + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pSize, wtstr ); + int hAlign = TQApplication::reverseLayout() ? AlignRight : AlignLeft; // #define COLOR_BUTTON_COL 1 m_pNormalText = new KColorButton( normalTextColor, this ); - label = new QLabel( m_pNormalText, i18n("Normal te&xt color:"), this ); + label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this ); lay->addWidget(label,row,0); lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,hAlign); wtstr = i18n("This is the color used to display text in Konqueror windows."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pNormalText, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pNormalText, wtstr ); - connect( m_pNormalText, SIGNAL( changed( const QColor & ) ), - SLOT( slotNormalTextColorChanged( const QColor & ) ) ); + connect( m_pNormalText, TQT_SIGNAL( changed( const TQColor & ) ), + TQT_SLOT( slotNormalTextColorChanged( const TQColor & ) ) ); /* row++; - label = new QLabel( i18n("Highlighted text color:"), this ); + label = new TQLabel( i18n("Highlighted text color:"), this ); lay->addWidget(label,row,0); m_pHighlightedText = new KColorButton( highlightedTextColor, this ); lay->addWidget(m_pHighlightedText,row,COLOR_BUTTON_COL,hAlign); wtstr = i18n("This is the color used to display selected text in Konqueror windows."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pHighlightedText, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pHighlightedText, wtstr ); - connect( m_pHighlightedText, SIGNAL( changed( const QColor & ) ), - SLOT( slotHighlightedTextColorChanged( const QColor & ) ) ); + connect( m_pHighlightedText, TQT_SIGNAL( changed( const TQColor & ) ), + TQT_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) ); */ row++; if ( m_bDesktop ) { - m_cbTextBackground = new QCheckBox( i18n("&Text background color:"), this ); + m_cbTextBackground = new TQCheckBox( i18n("&Text background color:"), this ); lay->addWidget(m_cbTextBackground,row,0); - connect( m_cbTextBackground, SIGNAL( clicked() ), - SLOT( slotTextBackgroundClicked() ) ); + connect( m_cbTextBackground, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotTextBackgroundClicked() ) ); m_pTextBackground = new KColorButton( textBackgroundColor, this ); lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,hAlign); wtstr = i18n("This is the color used behind the text for the icons on the desktop."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pTextBackground, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pTextBackground, wtstr ); - connect( m_pTextBackground, SIGNAL( changed( const QColor & ) ), - SLOT( slotTextBackgroundColorChanged( const QColor & ) ) ); + connect( m_pTextBackground, TQT_SIGNAL( changed( const TQColor & ) ), + TQT_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) ); row++; } else { - m_pNbLines = new QSpinBox( 1, 10, 1, this ); - QLabel* label = new QLabel( m_pNbLines, i18n("H&eight for icon text:"), this ); + m_pNbLines = new TQSpinBox( 1, 10, 1, this ); + TQLabel* label = new TQLabel( m_pNbLines, i18n("H&eight for icon text:"), this ); lay->addWidget( label, row, 0 ); lay->addWidget( m_pNbLines, row, 1 ); - connect( m_pNbLines, SIGNAL( valueChanged(int) ), - this, SLOT( changed() ) ); - connect( m_pNbLines, SIGNAL( valueChanged(int) ), - SLOT( slotPNbLinesChanged(int)) ); + connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ), + this, TQT_SLOT( changed() ) ); + connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ), + TQT_SLOT( slotPNbLinesChanged(int)) ); - QString thwt = i18n("This is the maximum number of lines that can be" + TQString thwt = i18n("This is the maximum number of lines that can be" " used to draw icon text. Long file names are" " truncated at the end of the last line."); - QWhatsThis::add( label, thwt ); - QWhatsThis::add( m_pNbLines, thwt ); + TQWhatsThis::add( label, thwt ); + TQWhatsThis::add( m_pNbLines, thwt ); row++; // width for the items in multicolumn icon view - m_pNbWidth = new QSpinBox( 1, 100000, 1, this ); + m_pNbWidth = new TQSpinBox( 1, 100000, 1, this ); - label = new QLabel( m_pNbWidth, i18n("&Width for icon text:"), this ); + label = new TQLabel( m_pNbWidth, i18n("&Width for icon text:"), this ); lay->addWidget( label, row, 0 ); lay->addWidget( m_pNbWidth, row, 1 ); - connect( m_pNbWidth, SIGNAL( valueChanged(int) ), - this, SLOT( changed() ) ); - connect( m_pNbWidth, SIGNAL( valueChanged(int) ), - SLOT( slotPNbWidthChanged(int)) ); + connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ), + this, TQT_SLOT( changed() ) ); + connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ), + TQT_SLOT( slotPNbWidthChanged(int)) ); thwt = i18n( "This is the maximum width for the icon text when konqueror " "is used in multi column view mode." ); - QWhatsThis::add( label, thwt ); - QWhatsThis::add( m_pNbWidth, thwt ); + TQWhatsThis::add( label, thwt ); + TQWhatsThis::add( m_pNbWidth, thwt ); row++; } - cbUnderline = new QCheckBox(i18n("&Underline filenames"), this); + cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this); lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,hAlign); - connect(cbUnderline, SIGNAL(clicked()), this, SLOT(changed())); + connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames" + TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames" " being underlined, so that they look like links on a web page. Note:" " to complete the analogy, make sure that single click activation is" " enabled in the mouse control module.") ); @@ -191,11 +191,11 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, Q { row++; - m_pSizeInBytes = new QCheckBox(i18n("Display file sizes in b&ytes"), this); + m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this); lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,hAlign ); - connect( m_pSizeInBytes, SIGNAL(clicked()), this, SLOT(changed()) ); + connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) ); - QWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes" + TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes" " being displayed in bytes. Otherwise file sizes are" " being displayed in kilobytes or megabytes if appropriate.") ); } @@ -213,7 +213,7 @@ void KonqFontOptions::slotFontSize(int i) changed(); } -void KonqFontOptions::slotStandardFont(const QString& n ) +void KonqFontOptions::slotStandardFont(const TQString& n ) { m_stdName = n; } @@ -239,12 +239,12 @@ void KonqFontOptions::load( bool useDefaults ) g_pConfig->setGroup(groupname); - QFont stdFont = g_pConfig->readFontEntry( "StandardFont" ); + TQFont stdFont = g_pConfig->readFontEntry( "StandardFont" ); m_stdName = stdFont.family(); m_fSize = stdFont.pointSize(); - // we have to use QFontInfo, in case the font was specified with a pixel size + // we have to use TQFontInfo, in case the font was specified with a pixel size if ( m_fSize == -1 ) - m_fSize = QFontInfo(stdFont).pointSize(); + m_fSize = TQFontInfo(stdFont).pointSize(); normalTextColor = KGlobalSettings::textColor(); normalTextColor = g_pConfig->readColorEntry( "NormalTextColor", &normalTextColor ); @@ -308,13 +308,13 @@ void KonqFontOptions::save() { g_pConfig->setGroup(groupname); - QFont stdFont( m_stdName, m_fSize ); + TQFont stdFont( m_stdName, m_fSize ); g_pConfig->writeEntry( "StandardFont", stdFont ); g_pConfig->writeEntry( "NormalTextColor", normalTextColor ); //g_pConfig->writeEntry( "HighlightedTextColor", highlightedTextColor ); if ( m_bDesktop ) - g_pConfig->writeEntry( "ItemTextBackground", m_cbTextBackground->isChecked() ? textBackgroundColor : QColor()); + g_pConfig->writeEntry( "ItemTextBackground", m_cbTextBackground->isChecked() ? textBackgroundColor : TQColor()); else { g_pConfig->writeEntry( "TextHeight", m_pNbLines->value() ); @@ -329,14 +329,14 @@ void KonqFontOptions::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); // Tell kdesktop about the new config file int konq_screen_number = KApplication::desktop()->primaryScreen(); - QCString appname; + TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; else @@ -350,7 +350,7 @@ void KonqFontOptions::slotTextBackgroundClicked() changed(); } -void KonqFontOptions::slotNormalTextColorChanged( const QColor &col ) +void KonqFontOptions::slotNormalTextColorChanged( const TQColor &col ) { if ( normalTextColor != col ) { @@ -360,7 +360,7 @@ void KonqFontOptions::slotNormalTextColorChanged( const QColor &col ) } /* -void KonqFontOptions::slotHighlightedTextColorChanged( const QColor &col ) +void KonqFontOptions::slotHighlightedTextColorChanged( const TQColor &col ) { if ( highlightedTextColor != col ) { @@ -370,7 +370,7 @@ void KonqFontOptions::slotHighlightedTextColorChanged( const QColor &col ) } */ -void KonqFontOptions::slotTextBackgroundColorChanged( const QColor &col ) +void KonqFontOptions::slotTextBackgroundColorChanged( const TQColor &col ) { if ( textBackgroundColor != col ) { @@ -379,7 +379,7 @@ void KonqFontOptions::slotTextBackgroundColorChanged( const QColor &col ) } } -QString KonqFontOptions::quickHelp() const +TQString KonqFontOptions::quickHelp() const { return i18n("<h1>Appearance</h1> You can configure how Konqueror looks as a file manager here."); } diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h index 18473c18d..8b77f9c75 100644 --- a/kcontrol/konq/fontopts.h +++ b/kcontrol/konq/fontopts.h @@ -34,8 +34,8 @@ #ifndef __KONQFONT_OPTIONS_H__ #define __KONQFONT_OPTIONS_H__ -#include <qstringlist.h> -#include <qspinbox.h> +#include <tqstringlist.h> +#include <tqspinbox.h> #include <kcmodule.h> @@ -53,8 +53,8 @@ class KonqFontOptions : public KCModule { Q_OBJECT public: - KonqFontOptions(KConfig *config, QString group, bool desktop, QWidget *parent=0, const char *name=0); - QString quickHelp() const; + KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0); + TQString quickHelp() const; virtual void load(); virtual void load( bool readDefaults ); @@ -63,12 +63,12 @@ public: public slots: void slotFontSize(int i); - void slotStandardFont(const QString& n); + void slotStandardFont(const TQString& n); void slotTextBackgroundClicked(); - void slotNormalTextColorChanged( const QColor &col ); - //void slotHighlightedTextColorChanged( const QColor &col ); - void slotTextBackgroundColorChanged( const QColor &col ); + void slotNormalTextColorChanged( const TQColor &col ); + //void slotHighlightedTextColorChanged( const TQColor &col ); + void slotTextBackgroundColorChanged( const TQColor &col ); private slots: void slotPNbLinesChanged(int value); @@ -80,33 +80,33 @@ private: private: KConfig *g_pConfig; - QString groupname; + TQString groupname; bool m_bDesktop; /* - QRadioButton* m_pSmall; - QRadioButton* m_pMedium; - QRadioButton* m_pLarge; + TQRadioButton* m_pSmall; + TQRadioButton* m_pMedium; + TQRadioButton* m_pLarge; */ KFontCombo* m_pStandard; - QSpinBox* m_pSize; + TQSpinBox* m_pSize; int m_fSize; - QString m_stdName; + TQString m_stdName; KColorButton* m_pBg; KColorButton* m_pNormalText; //KColorButton* m_pHighlightedText; - QCheckBox* m_cbTextBackground; + TQCheckBox* m_cbTextBackground; KColorButton* m_pTextBackground; - QColor normalTextColor; - //QColor highlightedTextColor; - QColor textBackgroundColor; - - QSpinBox* m_pNbLines; - QSpinBox* m_pNbWidth; - QCheckBox* cbUnderline; - QCheckBox* m_pSizeInBytes; + TQColor normalTextColor; + //TQColor highlightedTextColor; + TQColor textBackgroundColor; + + TQSpinBox* m_pNbLines; + TQSpinBox* m_pNbWidth; + TQCheckBox* cbUnderline; + TQCheckBox* m_pSizeInBytes; }; #endif diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp index dc9a08380..e79fbd9ce 100644 --- a/kcontrol/konq/main.cpp +++ b/kcontrol/konq/main.cpp @@ -33,10 +33,10 @@ #include <kconfig.h> #include <kapplication.h> -static QCString configname() +static TQCString configname() { int desktop = KApplication::desktop()->primaryScreen(); - QCString name; + TQCString name; if (desktop == 0) name = "kdesktoprc"; else @@ -48,48 +48,48 @@ static QCString configname() extern "C" { - KDE_EXPORT KCModule *create_browser(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_browser(TQWidget *parent, const char *name) { KConfig *config = new KConfig("konquerorrc", false, true); return new KBrowserOptions(config, "FMSettings", parent, name); } - KDE_EXPORT KCModule *create_behavior(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_behavior(TQWidget *parent, const char *name) { KConfig *config = new KConfig("konquerorrc", false, true); return new KBehaviourOptions(config, "FMSettings", parent, name); } - KDE_EXPORT KCModule *create_appearance(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_appearance(TQWidget *parent, const char *name) { KConfig *config = new KConfig("konquerorrc", false, true); return new KonqFontOptions(config, "FMSettings", false, parent, name); } - KDE_EXPORT KCModule *create_previews(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_previews(TQWidget *parent, const char *name) { return new KPreviewOptions(parent, name); } - KDE_EXPORT KCModule *create_dbehavior(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_dbehavior(TQWidget *parent, const char* /*name*/) { KConfig *config = new KConfig(configname(), false, false); return new DesktopBehaviorModule(config, parent); } - KDE_EXPORT KCModule *create_dappearance(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_dappearance(TQWidget *parent, const char* /*name*/) { KConfig *config = new KConfig(configname(), false, false); return new KonqFontOptions(config, "FMSettings", true, parent); } - KDE_EXPORT KCModule *create_dpath(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_dpath(TQWidget *parent, const char* /*name*/) { //KConfig *config = new KConfig(configname(), false, false); return new DesktopPathConfig(parent); } - KDE_EXPORT KCModule *create_ddesktop(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_ddesktop(TQWidget *parent, const char* /*name*/) { return new KDesktopConfig(parent, "VirtualDesktops"); } diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 20d9a4499..0e3ea0861 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -19,10 +19,10 @@ // File previews configuration // -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <dcopclient.h> @@ -42,12 +42,12 @@ class PreviewCheckListItem : public QCheckListItem { public: - PreviewCheckListItem( QListView *parent, const QString &text ) - : QCheckListItem( parent, text, CheckBoxController ) + PreviewCheckListItem( TQListView *parent, const TQString &text ) + : TQCheckListItem( parent, text, CheckBoxController ) {} - PreviewCheckListItem( QListViewItem *parent, const QString &text ) - : QCheckListItem( parent, text, CheckBox ) + PreviewCheckListItem( TQListViewItem *parent, const TQString &text ) + : TQCheckListItem( parent, text, CheckBox ) {} protected: @@ -57,12 +57,12 @@ class PreviewCheckListItem : public QCheckListItem } }; -KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) +KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ ) : KCModule( parent, "kcmkonq" ) { - QVBoxLayout *lay = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *lay = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - lay->addWidget( new QLabel( i18n("<p>Allow previews, \"Folder Icons Reflect Contents\", and " + lay->addWidget( new TQLabel( i18n("<p>Allow previews, \"Folder Icons Reflect Contents\", and " "retrieval of meta-data on protocols:</p>"), this ) ); setQuickHelp( i18n("<h1>Preview Options</h1> Here you can modify the behavior " @@ -81,7 +81,7 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) listView->addColumn( i18n( "Select Protocols" ) ); listView->setFullWidth( true ); - QHBoxLayout *hbox = new QHBoxLayout( lay ); + TQHBoxLayout *hbox = new TQHBoxLayout( lay ); hbox->addWidget( listView ); hbox->addStretch(); @@ -90,9 +90,9 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) PreviewCheckListItem *inetItems = new PreviewCheckListItem( listView, i18n( "Internet Protocols" ) ); - QStringList protocolList = KProtocolInfo::protocols(); + TQStringList protocolList = KProtocolInfo::protocols(); protocolList.sort(); - QStringList::Iterator it = protocolList.begin(); + TQStringList::Iterator it = protocolList.begin(); KURL url; url.setPath("/"); @@ -102,7 +102,7 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) url.setProtocol( *it ); if ( KProtocolInfo::supportsListing( url ) ) { - QCheckListItem *item; + TQCheckListItem *item; if ( KProtocolInfo::protocolClass( *it ) == ":local" ) item = new PreviewCheckListItem( localItems, ( *it ) ); else @@ -115,13 +115,13 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) listView->setOpen( localItems, true ); listView->setOpen( inetItems, true ); - QWhatsThis::add( listView, + TQWhatsThis::add( listView, i18n("This option makes it possible to choose when the file previews, " "smart folder icons, and meta-data in the File Manager should be activated.\n" "In the list of protocols that appear, select which ones are fast " "enough for you to allow previews to be generated.") ); - QLabel *label = new QLabel( i18n( "&Maximum file size:" ), this ); + TQLabel *label = new TQLabel( i18n( "&Maximum file size:" ), this ); lay->addWidget( label ); m_maxSize = new KDoubleNumInput( this ); @@ -130,24 +130,24 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) m_maxSize->setPrecision( 1 ); label->setBuddy( m_maxSize ); lay->addWidget( m_maxSize ); - connect( m_maxSize, SIGNAL( valueChanged(double) ), SLOT( changed() ) ); + connect( m_maxSize, TQT_SIGNAL( valueChanged(double) ), TQT_SLOT( changed() ) ); - m_boostSize = new QCheckBox(i18n("&Increase size of previews relative to icons"), this); - connect( m_boostSize, SIGNAL( toggled(bool) ), SLOT( changed() ) ); + m_boostSize = new TQCheckBox(i18n("&Increase size of previews relative to icons"), this); + connect( m_boostSize, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) ); lay->addWidget(m_boostSize); - m_useFileThumbnails = new QCheckBox(i18n("&Use thumbnails embedded in files"), this); - connect( m_useFileThumbnails, SIGNAL( toggled(bool) ), SLOT( changed() ) ); + m_useFileThumbnails = new TQCheckBox(i18n("&Use thumbnails embedded in files"), this); + connect( m_useFileThumbnails, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) ); lay->addWidget(m_useFileThumbnails); - QWhatsThis::add( m_useFileThumbnails, + TQWhatsThis::add( m_useFileThumbnails, i18n("Select this to use thumbnails that are found inside some " "file types (e.g. JPEG). This will increase speed and reduce " "disk usage. Deselect it if you have files that have been processed " "by programs which create inaccurate thumbnails, such as ImageMagick.") ); - lay->addWidget( new QWidget(this), 10 ); + lay->addWidget( new TQWidget(this), 10 ); load(); } @@ -160,10 +160,10 @@ void KPreviewOptions::load(bool useDefaults) // *** load and apply to GUI *** KGlobal::config()->setReadDefaults(useDefaults); KConfigGroup group( KGlobal::config(), "PreviewSettings" ); - QPtrListIterator<QCheckListItem> it( m_items ); + TQPtrListIterator<TQCheckListItem> it( m_items ); for ( ; it.current() ; ++it ) { - QString protocol( it.current()->text() ); + TQString protocol( it.current()->text() ); if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) // file should be enabled in case is not defined because if not so // than preview's lost when size is changed from default one @@ -192,9 +192,9 @@ void KPreviewOptions::defaults() void KPreviewOptions::save() { KConfigGroup group( KGlobal::config(), "PreviewSettings" ); - QPtrListIterator<QCheckListItem> it( m_items ); + TQPtrListIterator<TQCheckListItem> it( m_items ); for ( ; it.current() ; ++it ) { - QString protocol( it.current()->text() ); + TQString protocol( it.current()->text() ); group.writeEntry( protocol, it.current()->isOn(), true, true ); } // config key is in bytes, numinput is in MB @@ -205,7 +205,7 @@ void KPreviewOptions::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h index b91e7b563..0e8d112f2 100644 --- a/kcontrol/konq/previews.h +++ b/kcontrol/konq/previews.h @@ -31,7 +31,7 @@ Configuration of the maximum image size */ -#include <qstring.h> +#include <tqstring.h> #include <kcmodule.h> @@ -44,7 +44,7 @@ class KPreviewOptions : public KCModule { Q_OBJECT public: - KPreviewOptions( QWidget *parent = 0L, const char *name = 0L ); + KPreviewOptions( TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); virtual void save(); virtual void defaults(); @@ -56,10 +56,10 @@ public slots: void changed(); private: - QPtrList<QCheckListItem> m_items; + TQPtrList<TQCheckListItem> m_items; KDoubleNumInput *m_maxSize; - QCheckBox *m_boostSize; - QCheckBox *m_useFileThumbnails; + TQCheckBox *m_boostSize; + TQCheckBox *m_useFileThumbnails; }; #endif diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index 1a14c68e3..f4111cfda 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -14,12 +14,12 @@ #include <config.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> #include <dcopclient.h> @@ -43,10 +43,10 @@ //----------------------------------------------------------------------------- -DesktopPathConfig::DesktopPathConfig(QWidget *parent, const char * ) +DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) : KCModule( parent, "kcmkonq" ) { - QLabel * tmpLabel; + TQLabel * tmpLabel; #undef RO_LASTROW #undef RO_LASTCOL @@ -54,7 +54,7 @@ DesktopPathConfig::DesktopPathConfig(QWidget *parent, const char * ) #define RO_LASTCOL 2 int row = 0; - QGridLayout *lay = new QGridLayout(this, RO_LASTROW+1, RO_LASTCOL+1, + TQGridLayout *lay = new TQGridLayout(this, RO_LASTROW+1, RO_LASTCOL+1, 0, KDialog::spacingHint()); lay->setRowStretch(RO_LASTROW,10); // last line grows @@ -71,48 +71,48 @@ DesktopPathConfig::DesktopPathConfig(QWidget *parent, const char * ) // Desktop Paths row++; - tmpLabel = new QLabel(i18n("Des&ktop path:"), this); + tmpLabel = new TQLabel(i18n("Des&ktop path:"), this); lay->addWidget(tmpLabel, row, 0); urDesktop = new KURLRequester(this); urDesktop->setMode( KFile::Directory ); tmpLabel->setBuddy( urDesktop ); lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL); - connect(urDesktop, SIGNAL(textChanged(const QString &)), this, SLOT(changed())); - QString wtstr = i18n("This folder contains all the files" + connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + TQString wtstr = i18n("This folder contains all the files" " which you see on your desktop. You can change the location of this" " folder if you want to, and the contents will move automatically" " to the new location as well."); - QWhatsThis::add( tmpLabel, wtstr ); - QWhatsThis::add( urDesktop, wtstr ); + TQWhatsThis::add( tmpLabel, wtstr ); + TQWhatsThis::add( urDesktop, wtstr ); row++; - tmpLabel = new QLabel(i18n("A&utostart path:"), this); + tmpLabel = new TQLabel(i18n("A&utostart path:"), this); lay->addWidget(tmpLabel, row, 0); urAutostart = new KURLRequester(this); urAutostart->setMode( KFile::Directory ); tmpLabel->setBuddy( urAutostart ); lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL); - connect(urAutostart, SIGNAL(textChanged(const QString &)), this, SLOT(changed())); + connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); wtstr = i18n("This folder contains applications or" " links to applications (shortcuts) that you want to have started" " automatically whenever KDE starts. You can change the location of this" " folder if you want to, and the contents will move automatically" " to the new location as well."); - QWhatsThis::add( tmpLabel, wtstr ); - QWhatsThis::add( urAutostart, wtstr ); + TQWhatsThis::add( tmpLabel, wtstr ); + TQWhatsThis::add( urAutostart, wtstr ); row++; - tmpLabel = new QLabel(i18n("D&ocuments path:"), this); + tmpLabel = new TQLabel(i18n("D&ocuments path:"), this); lay->addWidget(tmpLabel, row, 0); urDocument = new KURLRequester(this); urDocument->setMode( KFile::Directory ); tmpLabel->setBuddy( urDocument ); lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL); - connect(urDocument, SIGNAL(textChanged(const QString &)), this, SLOT(changed())); + connect(urDocument, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); wtstr = i18n("This folder will be used by default to " "load or save documents from or to."); - QWhatsThis::add( tmpLabel, wtstr ); - QWhatsThis::add( urDocument, wtstr ); + TQWhatsThis::add( tmpLabel, wtstr ); + TQWhatsThis::add( urDocument, wtstr ); // -- Bottom -- Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above @@ -133,10 +133,10 @@ void DesktopPathConfig::load( bool useDefaults ) config.setGroup("Paths"); urAutostart->setURL( config.readPathEntry( "Autostart" , KGlobalSettings::autostartPath() )); - KConfig xdguserconfig( QDir::homeDirPath()+"/.config/user-dirs.dirs" ); + KConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); - urDesktop->setURL( xdguserconfig.readPathEntry( "XDG_DESKTOP_DIR" , QDir::homeDirPath() + "/Desktop" ).remove( "\"" )); - urDocument->setURL( xdguserconfig.readPathEntry( "XDG_DOCUMENTS_DIR", QDir::homeDirPath()).remove( "\"" )); + urDesktop->setURL( xdguserconfig.readPathEntry( "XDG_DESKTOP_DIR" , TQDir::homeDirPath() + "/Desktop" ).remove( "\"" )); + urDocument->setURL( xdguserconfig.readPathEntry( "XDG_DOCUMENTS_DIR", TQDir::homeDirPath()).remove( "\"" )); emit changed( useDefaults ); } @@ -149,7 +149,7 @@ void DesktopPathConfig::defaults() void DesktopPathConfig::save() { KConfig *config = KGlobal::config(); - KConfig *xdgconfig = new KConfig( QDir::homeDirPath()+"/.config/user-dirs.dirs" ); + KConfig *xdgconfig = new KConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); KConfigGroupSaver cgs( config, "Paths" ); bool pathChanged = false; @@ -178,7 +178,7 @@ void DesktopPathConfig::save() // * Not inside destination -> move first // !!! kdDebug() << "desktopURL=" << desktopURL.url() << endl; - QString urlDesktop = urDesktop->url(); + TQString urlDesktop = urDesktop->url(); if ( !urlDesktop.endsWith( "/" )) urlDesktop+="/"; @@ -227,8 +227,8 @@ void DesktopPathConfig::save() if ( !newDocumentURL.equals( documentURL, true ) ) { bool pathOk = true; - QString path = urDocument->url(); - if (!QDir(path).exists()) + TQString path = urDocument->url(); + if (!TQDir(path).exists()) { if (!KStandardDirs::makeDir(path)) { @@ -257,10 +257,10 @@ void DesktopPathConfig::save() // Tell kdesktop about the new config file if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - QByteArray data; + TQByteArray data; int konq_screen_number = KApplication::desktop()->primaryScreen(); - QCString appname; + TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; else @@ -268,7 +268,7 @@ void DesktopPathConfig::save() kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); } -bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QString & type ) +bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQString & type ) { if (!src.isLocalFile() || !dest.isLocalFile()) return true; @@ -278,14 +278,14 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QStr arg(type).arg(src.path()).arg(dest.path()), i18n("Confirmation Required"),i18n("Move"),KStdGuiItem::cancel() ) == KMessageBox::Yes ) { - bool destExists = QFile::exists(dest.path()); + bool destExists = TQFile::exists(dest.path()); if (destExists) { m_copyToDest = dest; m_copyFromSrc = src; KIO::ListJob* job = KIO::listDir( src ); - connect( job, SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), - this, SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) ); + connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), + this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) ); qApp->enter_loop(); if (m_ok) @@ -296,7 +296,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QStr else { KIO::Job * job = KIO::move( src, dest ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); // wait for job qApp->enter_loop(); } @@ -324,7 +324,7 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li } KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest ); - connect( moveJob, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); qApp->enter_loop(); } qApp->exit_loop(); diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h index 3a7b7ee3f..482c4a765 100644 --- a/kcontrol/konq/rootopts.h +++ b/kcontrol/konq/rootopts.h @@ -13,7 +13,7 @@ #define __ROOT_OPTIONS_H -#include <qstring.h> +#include <tqstring.h> #include <kcmodule.h> #include <kio/global.h> @@ -37,7 +37,7 @@ class DesktopPathConfig : public KCModule { Q_OBJECT public: - DesktopPathConfig(QWidget *parent = 0L, const char *name = 0L ); + DesktopPathConfig(TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); virtual void load( bool useDefaults ); virtual void save(); @@ -52,7 +52,7 @@ private: KURLRequester *urAutostart; KURLRequester *urDocument; - bool moveDir( const KURL & src, const KURL & dest, const QString & type ); + bool moveDir( const KURL & src, const KURL & dest, const TQString & type ); bool m_ok; KURL m_copyToDest; // used when the destination directory already exists KURL m_copyFromSrc; diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp index 93a576043..681863cb6 100644 --- a/kcontrol/konqhtml/advancedTabDialog.cpp +++ b/kcontrol/konqhtml/advancedTabDialog.cpp @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software */ -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qslider.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqslider.h> #include <kapplication.h> #include <dcopclient.h> @@ -34,7 +34,7 @@ #include "advancedTabOptions.h" #include "main.h" -advancedTabDialog::advancedTabDialog(QWidget* parent, KConfig* config, const char* name) +advancedTabDialog::advancedTabDialog(TQWidget* parent, KConfig* config, const char* name) : KDialogBase(KDialogBase::Plain, i18n("Advanced Options"), KDialogBase::Ok | @@ -46,25 +46,25 @@ advancedTabDialog::advancedTabDialog(QWidget* parent, KConfig* config, const cha true, true), m_pConfig(config) { - connect(this, SIGNAL(applyClicked()), - this, SLOT(save())); - connect(this, SIGNAL(okClicked()), - this, SLOT(save())); + connect(this, TQT_SIGNAL(applyClicked()), + this, TQT_SLOT(save())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(save())); actionButton(Apply)->setEnabled(false); - QFrame* page = plainPage(); - QVBoxLayout* layout = new QVBoxLayout(page); + TQFrame* page = plainPage(); + TQVBoxLayout* layout = new TQVBoxLayout(page); m_advancedWidget = new advancedTabOptions(page); layout->addWidget(m_advancedWidget); layout->addSpacing( 20 ); layout->addStretch(); - connect(m_advancedWidget->m_pNewTabsInBackground, SIGNAL(clicked()), this, SLOT(changed())); - connect(m_advancedWidget->m_pOpenAfterCurrentPage, SIGNAL(clicked()), this, SLOT(changed())); - connect(m_advancedWidget->m_pTabConfirm, SIGNAL(clicked()), this, SLOT(changed())); - connect(m_advancedWidget->m_pTabCloseActivatePrevious, SIGNAL(clicked()), this, SLOT(changed())); - connect(m_advancedWidget->m_pPermanentCloseButton, SIGNAL(clicked()), this, SLOT(changed())); - connect(m_advancedWidget->m_pKonquerorTabforExternalURL, SIGNAL(clicked()), this, SLOT(changed())); - connect(m_advancedWidget->m_pPopupsWithinTabs, SIGNAL(clicked()), this, SLOT(changed())); + connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(m_advancedWidget->m_pPermanentCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(m_advancedWidget->m_pKonquerorTabforExternalURL, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(m_advancedWidget->m_pPopupsWithinTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); load(); } @@ -105,7 +105,7 @@ void advancedTabDialog::save() if ( m_advancedWidget->m_pTabConfirm->isChecked() ) m_pConfig->deleteEntry( "MultipleTabConfirm" ); else m_pConfig->writeEntry( "MultipleTabConfirm", true ); - QByteArray data; + TQByteArray data; if ( !KApplication::kApplication()->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); KApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); diff --git a/kcontrol/konqhtml/advancedTabDialog.h b/kcontrol/konqhtml/advancedTabDialog.h index 728e8928b..3e340b5b8 100644 --- a/kcontrol/konqhtml/advancedTabDialog.h +++ b/kcontrol/konqhtml/advancedTabDialog.h @@ -29,7 +29,7 @@ class advancedTabDialog : public KDialogBase Q_OBJECT public: - advancedTabDialog(QWidget* parent, KConfig *config, const char* name); + advancedTabDialog(TQWidget* parent, KConfig *config, const char* name); ~advancedTabDialog(); protected slots: diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 15cbd036a..0c15acebe 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -1,9 +1,9 @@ -#include <qfontdatabase.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqfontdatabase.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> #include <dcopclient.h> @@ -25,7 +25,7 @@ #include "appearance.moc" -KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *parent, const char *) +KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent, const char *) : KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group), fSize( 10 ), fMinSize( HTML_DEFAULT_MIN_FONT_SIZE ) @@ -34,37 +34,37 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget * "which fonts Konqueror should use to display the web " "pages you view.")); - QString wtstr; + TQString wtstr; - QGridLayout *lay = new QGridLayout(this, 1 ,1 , 0, KDialog::spacingHint()); + TQGridLayout *lay = new TQGridLayout(this, 1 ,1 , 0, KDialog::spacingHint()); int r = 0; int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons - QGroupBox* gb = new QGroupBox( 1, QGroupBox::Horizontal, i18n("Font Si&ze"), this ); + TQGroupBox* gb = new TQGroupBox( 1, TQGroupBox::Horizontal, i18n("Font Si&ze"), this ); lay->addMultiCellWidget(gb, r, r, E, W); - QWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") ); + TQWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") ); m_minSize = new KIntNumInput( fMinSize, gb ); m_minSize->setLabel( i18n( "M&inimum font size:" ) ); m_minSize->setRange( 2, 30 ); - connect( m_minSize, SIGNAL( valueChanged( int ) ), this, SLOT( slotMinimumFontSize( int ) ) ); - connect( m_minSize, SIGNAL( valueChanged( int ) ), this, SLOT( changed() ) ); - QWhatsThis::add( m_minSize, i18n( "Konqueror will never display text smaller than " + connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotMinimumFontSize( int ) ) ); + connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) ); + TQWhatsThis::add( m_minSize, i18n( "Konqueror will never display text smaller than " "this size,<br>overriding any other settings" ) ); m_MedSize = new KIntNumInput( m_minSize, fSize, gb ); m_MedSize->setLabel( i18n( "&Medium font size:" ) ); m_MedSize->setRange( 2, 30 ); - connect( m_MedSize, SIGNAL( valueChanged( int ) ), this, SLOT( slotFontSize( int ) ) ); - connect( m_MedSize, SIGNAL( valueChanged( int ) ), this, SLOT( changed() ) ); - QWhatsThis::add( m_MedSize, + connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotFontSize( int ) ) ); + connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) ); + TQWhatsThis::add( m_MedSize, i18n("This is the relative font size Konqueror uses " "to display web sites.") ); - QStringList emptyList; + TQStringList emptyList; - QLabel* label = new QLabel( i18n("S&tandard font:"), this ); + TQLabel* label = new TQLabel( i18n("S&tandard font:"), this ); lay->addWidget( label , ++r, E); m_pFonts[0] = new KFontCombo( emptyList, this ); @@ -73,19 +73,19 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget * lay->addMultiCellWidget(m_pFonts[0], r, r, M, W); wtstr = i18n("This is the font used to display normal text in a web page."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pFonts[0], wtstr ); - - connect( m_pFonts[0], SIGNAL( activated(const QString&) ), - SLOT( slotStandardFont(const QString&) ) ); - connect( m_pFonts[0], SIGNAL( activated(const QString&) ), - SLOT(changed() ) ); - connect( m_pFonts[0]->lineEdit(), SIGNAL( textChanged(const QString&) ), - SLOT( slotStandardFont(const QString&) ) ); - connect( m_pFonts[0], SIGNAL( textChanged(const QString&) ), - SLOT(changed() ) ); - - label = new QLabel( i18n( "&Fixed font:"), this ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pFonts[0], wtstr ); + + connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT(changed() ) ); + connect( m_pFonts[0]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pFonts[0], TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT(changed() ) ); + + label = new TQLabel( i18n( "&Fixed font:"), this ); lay->addWidget( label, ++r, E ); m_pFonts[1] = new KFontCombo( emptyList, this ); @@ -94,19 +94,19 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget * lay->addMultiCellWidget(m_pFonts[1], r, r, M, W); wtstr = i18n("This is the font used to display fixed-width (i.e. non-proportional) text."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pFonts[1], wtstr ); - - connect( m_pFonts[1], SIGNAL( activated(const QString&) ), - SLOT( slotFixedFont(const QString&) ) ); - connect( m_pFonts[1], SIGNAL( activated(const QString&) ), - SLOT(changed() ) ); - connect( m_pFonts[1]->lineEdit(), SIGNAL( textChanged(const QString&) ), - SLOT( slotFixedFont(const QString&) ) ); - connect( m_pFonts[1], SIGNAL( textChanged(const QString&) ), - SLOT(changed() ) ); - - label = new QLabel( i18n( "S&erif font:" ), this ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pFonts[1], wtstr ); + + connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT( slotFixedFont(const TQString&) ) ); + connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT(changed() ) ); + connect( m_pFonts[1]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotFixedFont(const TQString&) ) ); + connect( m_pFonts[1], TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT(changed() ) ); + + label = new TQLabel( i18n( "S&erif font:" ), this ); lay->addWidget( label, ++r, E ); m_pFonts[2] = new KFontCombo( emptyList, this ); @@ -115,19 +115,19 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget * lay->addMultiCellWidget( m_pFonts[2], r, r, M, W ); wtstr= i18n( "This is the font used to display text that is marked up as serif." ); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pFonts[2], wtstr ); - - connect( m_pFonts[2], SIGNAL( activated( const QString& ) ), - SLOT( slotSerifFont( const QString& ) ) ); - connect( m_pFonts[2], SIGNAL( activated( const QString& ) ), - SLOT( changed() ) ); - connect( m_pFonts[2]->lineEdit(), SIGNAL( textChanged(const QString&) ), - SLOT( slotSerifFont(const QString&) ) ); - connect( m_pFonts[2], SIGNAL( textChanged(const QString&) ), - SLOT(changed() ) ); - - label = new QLabel( i18n( "Sa&ns serif font:" ), this ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pFonts[2], wtstr ); + + connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( slotSerifFont( const TQString& ) ) ); + connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( changed() ) ); + connect( m_pFonts[2]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotSerifFont(const TQString&) ) ); + connect( m_pFonts[2], TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT(changed() ) ); + + label = new TQLabel( i18n( "Sa&ns serif font:" ), this ); lay->addWidget( label, ++r, E ); m_pFonts[3] = new KFontCombo( emptyList, this ); @@ -136,20 +136,20 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget * lay->addMultiCellWidget( m_pFonts[3], r, r, M, W ); wtstr= i18n( "This is the font used to display text that is marked up as sans-serif." ); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pFonts[3], wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pFonts[3], wtstr ); - connect( m_pFonts[3], SIGNAL( activated( const QString& ) ), - SLOT( slotSansSerifFont( const QString& ) ) ); - connect( m_pFonts[3], SIGNAL( activated( const QString& ) ), - SLOT( changed() ) ); - connect( m_pFonts[3]->lineEdit(), SIGNAL( textChanged(const QString&) ), - SLOT( slotSansSerifFont(const QString&) ) ); - connect( m_pFonts[3], SIGNAL( textChanged(const QString&) ), - SLOT(changed() ) ); + connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( slotSansSerifFont( const TQString& ) ) ); + connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( changed() ) ); + connect( m_pFonts[3]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotSansSerifFont(const TQString&) ) ); + connect( m_pFonts[3], TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT(changed() ) ); - label = new QLabel( i18n( "C&ursive font:" ), this ); + label = new TQLabel( i18n( "C&ursive font:" ), this ); lay->addWidget( label, ++r, E ); m_pFonts[4] = new KFontCombo( emptyList, this ); @@ -158,20 +158,20 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget * lay->addMultiCellWidget( m_pFonts[4], r, r, M, W ); wtstr= i18n( "This is the font used to display text that is marked up as italic." ); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pFonts[4], wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pFonts[4], wtstr ); - connect( m_pFonts[4], SIGNAL( activated( const QString& ) ), - SLOT( slotCursiveFont( const QString& ) ) ); - connect( m_pFonts[4], SIGNAL( activated( const QString& ) ), - SLOT( changed() ) ); - connect( m_pFonts[4]->lineEdit(), SIGNAL( textChanged(const QString&) ), - SLOT( slotCursiveFont(const QString&) ) ); - connect( m_pFonts[4], SIGNAL( textChanged(const QString&) ), - SLOT(changed() ) ); + connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( slotCursiveFont( const TQString& ) ) ); + connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( changed() ) ); + connect( m_pFonts[4]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotCursiveFont(const TQString&) ) ); + connect( m_pFonts[4], TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT(changed() ) ); - label = new QLabel( i18n( "Fantas&y font:" ), this ); + label = new TQLabel( i18n( "Fantas&y font:" ), this ); lay->addWidget( label, ++r, E ); m_pFonts[5] = new KFontCombo( emptyList, this ); @@ -180,37 +180,37 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget * lay->addMultiCellWidget( m_pFonts[5], r, r, M, W ); wtstr= i18n( "This is the font used to display text that is marked up as a fantasy font." ); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pFonts[5], wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pFonts[5], wtstr ); - connect( m_pFonts[5], SIGNAL( activated( const QString& ) ), - SLOT( slotFantasyFont( const QString& ) ) ); - connect( m_pFonts[5], SIGNAL( activated( const QString& ) ), - SLOT( changed() ) ); - connect( m_pFonts[5]->lineEdit(), SIGNAL( textChanged(const QString&) ), - SLOT( slotFantasyFont(const QString&) ) ); - connect( m_pFonts[5], SIGNAL( textChanged(const QString&) ), - SLOT(changed() ) ); + connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( slotFantasyFont( const TQString& ) ) ); + connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( changed() ) ); + connect( m_pFonts[5]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotFantasyFont(const TQString&) ) ); + connect( m_pFonts[5], TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT(changed() ) ); - label = new QLabel( i18n( "Font &size adjustment for this encoding:" ), this ); + label = new TQLabel( i18n( "Font &size adjustment for this encoding:" ), this ); lay->addWidget( label, ++r, M ); - m_pFontSizeAdjust = new QSpinBox( -5, 5, 1, this ); + m_pFontSizeAdjust = new TQSpinBox( -5, 5, 1, this ); label->setBuddy( m_pFontSizeAdjust ); lay->addMultiCellWidget( m_pFontSizeAdjust, r, r, M+1, W ); - connect( m_pFontSizeAdjust, SIGNAL( valueChanged( int ) ), - SLOT( slotFontSizeAdjust( int ) ) ); - connect( m_pFontSizeAdjust, SIGNAL( valueChanged( int ) ), - SLOT( changed() ) ); + connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ), + TQT_SLOT( slotFontSizeAdjust( int ) ) ); + connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ), + TQT_SLOT( changed() ) ); - label = new QLabel( i18n( "Default encoding:"), this ); + label = new TQLabel( i18n( "Default encoding:"), this ); //++r; //lay->addMultiCellWidget( label, r, r, E, E+1); lay->addWidget( label, ++r, E); - m_pEncoding = new QComboBox( false, this ); + m_pEncoding = new TQComboBox( false, this ); label->setBuddy( m_pEncoding ); encodings = KGlobal::charsets()->availableEncodingNames(); encodings.prepend(i18n("Use Language Encoding")); @@ -219,17 +219,17 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget * wtstr = i18n( "Select the default encoding to be used; normally, you will be fine with 'Use language encoding' " "and should not have to change this."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pEncoding, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pEncoding, wtstr ); - connect( m_pEncoding, SIGNAL( activated(const QString& ) ), - SLOT( slotEncoding(const QString&) ) ); - connect( m_pEncoding, SIGNAL( activated(const QString& ) ), - SLOT( changed() ) ); + connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ), + TQT_SLOT( slotEncoding(const TQString&) ) ); + connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ), + TQT_SLOT( changed() ) ); ++r; lay->setRowStretch(r, 8); - QFontDatabase db; + TQFontDatabase db; m_families = db.families(); @@ -268,47 +268,47 @@ void KAppearanceOptions::slotMinimumFontSize( int i ) } -void KAppearanceOptions::slotStandardFont(const QString& n ) +void KAppearanceOptions::slotStandardFont(const TQString& n ) { fonts[0] = n; } -void KAppearanceOptions::slotFixedFont(const QString& n ) +void KAppearanceOptions::slotFixedFont(const TQString& n ) { fonts[1] = n; } -void KAppearanceOptions::slotSerifFont( const QString& n ) +void KAppearanceOptions::slotSerifFont( const TQString& n ) { fonts[2] = n; } -void KAppearanceOptions::slotSansSerifFont( const QString& n ) +void KAppearanceOptions::slotSansSerifFont( const TQString& n ) { fonts[3] = n; } -void KAppearanceOptions::slotCursiveFont( const QString& n ) +void KAppearanceOptions::slotCursiveFont( const TQString& n ) { fonts[4] = n; } -void KAppearanceOptions::slotFantasyFont( const QString& n ) +void KAppearanceOptions::slotFantasyFont( const TQString& n ) { fonts[5] = n; } void KAppearanceOptions::slotFontSizeAdjust( int value ) { - fonts[6] = QString::number( value ); + fonts[6] = TQString::number( value ); } -void KAppearanceOptions::slotEncoding(const QString& n) +void KAppearanceOptions::slotEncoding(const TQString& n) { encodingName = n; } @@ -336,23 +336,23 @@ void KAppearanceOptions::load( bool useDefaults ) if (fSize < fMinSize) fSize = fMinSize; - defaultFonts = QStringList(); + defaultFonts = TQStringList(); defaultFonts.append( READ_ENTRY( "StandardFont", KGlobalSettings::generalFont().family() ) ); defaultFonts.append( READ_ENTRY( "FixedFont", KGlobalSettings::fixedFont().family() ) ); defaultFonts.append( READ_ENTRY( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) ); defaultFonts.append( READ_ENTRY( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) ); defaultFonts.append( READ_ENTRY( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) ); defaultFonts.append( READ_ENTRY( "FantasyFont", HTML_DEFAULT_VIEW_FANTASY_FONT ) ); - defaultFonts.append( QString("0") ); // default font size adjustment + defaultFonts.append( TQString("0") ); // default font size adjustment if (m_pConfig->hasKey("Fonts")) fonts = m_pConfig->readListEntry( "Fonts" ); else fonts = khtmlrc.readListEntry( "Fonts" ); while (fonts.count() < 7) - fonts.append(QString::null); + fonts.append(TQString::null); - encodingName = READ_ENTRY( "DefaultEncoding", QString::null ); + encodingName = READ_ENTRY( "DefaultEncoding", TQString::null ); //kdDebug(0) << "encoding = " << encodingName << endl; updateGUI(); @@ -373,14 +373,14 @@ void KAppearanceOptions::updateGUI() { //kdDebug() << "KAppearanceOptions::updateGUI " << charset << endl; for ( int f = 0; f < 6; f++ ) { - QString ff = fonts[f]; + TQString ff = fonts[f]; if (ff.isEmpty()) ff = defaultFonts[f]; m_pFonts[f]->setCurrentFont(ff); } int i = 0; - for ( QStringList::Iterator it = encodings.begin(); it != encodings.end(); ++it, ++i ) + for ( TQStringList::Iterator it = encodings.begin(); it != encodings.end(); ++it, ++i ) if ( encodingName == *it ) m_pEncoding->setCurrentItem( i ); if(encodingName.isEmpty()) @@ -407,7 +407,7 @@ void KAppearanceOptions::save() m_pConfig->writeEntry( "DefaultEncoding", encodingName ); m_pConfig->sync(); - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h index dd16626bd..8b01f4055 100644 --- a/kcontrol/konqhtml/appearance.h +++ b/kcontrol/konqhtml/appearance.h @@ -11,8 +11,8 @@ #ifndef __APPEARANCE_H__ #define __APPEARANCE_H__ -#include <qwidget.h> -#include <qmap.h> +#include <tqwidget.h> +#include <tqmap.h> #include <kcmodule.h> @@ -23,7 +23,7 @@ class KAppearanceOptions : public KCModule { Q_OBJECT public: - KAppearanceOptions(KConfig *config, QString group, QWidget *parent=0, const char *name=0); + KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0); ~KAppearanceOptions(); virtual void load(); @@ -34,13 +34,13 @@ public: public slots: void slotFontSize( int ); void slotMinimumFontSize( int ); - void slotStandardFont(const QString& n); - void slotFixedFont(const QString& n); - void slotSerifFont( const QString& n ); - void slotSansSerifFont( const QString& n ); - void slotCursiveFont( const QString& n ); - void slotFantasyFont( const QString& n ); - void slotEncoding( const QString& n); + void slotStandardFont(const TQString& n); + void slotFixedFont(const TQString& n); + void slotSerifFont( const TQString& n ); + void slotSansSerifFont( const TQString& n ); + void slotCursiveFont( const TQString& n ); + void slotFantasyFont( const TQString& n ); + void slotEncoding( const TQString& n); void slotFontSizeAdjust( int value ); private: @@ -49,22 +49,22 @@ private: private: KConfig *m_pConfig; - QString m_groupname; - QStringList m_families; + TQString m_groupname; + TQStringList m_families; KIntNumInput* m_minSize; KIntNumInput* m_MedSize; KIntNumInput* m_pageDPI; KFontCombo* m_pFonts[6]; - QComboBox* m_pEncoding; - QSpinBox *m_pFontSizeAdjust; + TQComboBox* m_pEncoding; + TQSpinBox *m_pFontSizeAdjust; int fSize; int fMinSize; - QStringList encodings; - QStringList fonts; - QStringList defaultFonts; - QString encodingName; + TQStringList encodings; + TQStringList fonts; + TQStringList defaultFonts; + TQString encodingName; }; #endif // __APPEARANCE_H__ diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index a55221f43..29dccb14b 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -19,9 +19,9 @@ */ -#include <qlayout.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> #include <kconfig.h> #include <klistview.h> @@ -32,13 +32,13 @@ #include "policies.h" #include "policydlg.h" -DomainListView::DomainListView(KConfig *config,const QString &title, - QWidget *parent,const char *name) : - QGroupBox(title, parent, name), config(config) { +DomainListView::DomainListView(KConfig *config,const TQString &title, + TQWidget *parent,const char *name) : + TQGroupBox(title, parent, name), config(config) { setColumnLayout(0, Qt::Vertical); layout()->setSpacing(0); layout()->setMargin(0); - QGridLayout* thisLayout = new QGridLayout(layout()); + TQGridLayout* thisLayout = new TQGridLayout(layout()); thisLayout->setAlignment(Qt::AlignTop); thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); @@ -46,44 +46,44 @@ DomainListView::DomainListView(KConfig *config,const QString &title, domainSpecificLV = new KListView(this); domainSpecificLV->addColumn(i18n("Host/Domain")); domainSpecificLV->addColumn(i18n("Policy"), 100); - connect(domainSpecificLV,SIGNAL(doubleClicked(QListViewItem *)), SLOT(changePressed())); - connect(domainSpecificLV,SIGNAL(returnPressed(QListViewItem *)), SLOT(changePressed())); - connect(domainSpecificLV, SIGNAL( executed( QListViewItem *)), SLOT( updateButton())); - connect(domainSpecificLV, SIGNAL(selectionChanged()), SLOT(updateButton())); + connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed())); + connect(domainSpecificLV,TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(changePressed())); + connect(domainSpecificLV, TQT_SIGNAL( executed( TQListViewItem *)), TQT_SLOT( updateButton())); + connect(domainSpecificLV, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButton())); thisLayout->addMultiCellWidget(domainSpecificLV, 0, 5, 0, 0); - addDomainPB = new QPushButton(i18n("&New..."), this); + addDomainPB = new TQPushButton(i18n("&New..."), this); thisLayout->addWidget(addDomainPB, 0, 1); - connect(addDomainPB, SIGNAL(clicked()), SLOT(addPressed())); + connect(addDomainPB, TQT_SIGNAL(clicked()), TQT_SLOT(addPressed())); - changeDomainPB = new QPushButton( i18n("Chan&ge..."), this); + changeDomainPB = new TQPushButton( i18n("Chan&ge..."), this); thisLayout->addWidget(changeDomainPB, 1, 1); - connect(changeDomainPB, SIGNAL(clicked()), this, SLOT(changePressed())); + connect(changeDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(changePressed())); - deleteDomainPB = new QPushButton(i18n("De&lete"), this); + deleteDomainPB = new TQPushButton(i18n("De&lete"), this); thisLayout->addWidget(deleteDomainPB, 2, 1); - connect(deleteDomainPB, SIGNAL(clicked()), this, SLOT(deletePressed())); + connect(deleteDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(deletePressed())); - importDomainPB = new QPushButton(i18n("&Import..."), this); + importDomainPB = new TQPushButton(i18n("&Import..."), this); thisLayout->addWidget(importDomainPB, 3, 1); - connect(importDomainPB, SIGNAL(clicked()), this, SLOT(importPressed())); + connect(importDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(importPressed())); importDomainPB->setEnabled(false); importDomainPB->hide(); - exportDomainPB = new QPushButton(i18n("&Export..."), this); + exportDomainPB = new TQPushButton(i18n("&Export..."), this); thisLayout->addWidget(exportDomainPB, 4, 1); - connect(exportDomainPB, SIGNAL(clicked()), this, SLOT(exportPressed())); + connect(exportDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(exportPressed())); exportDomainPB->setEnabled(false); exportDomainPB->hide(); - QSpacerItem* spacer = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding); + TQSpacerItem* spacer = new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding); thisLayout->addItem(spacer, 5, 1); - QWhatsThis::add( addDomainPB, i18n("Click on this button to manually add a host or domain " + TQWhatsThis::add( addDomainPB, i18n("Click on this button to manually add a host or domain " "specific policy.") ); - QWhatsThis::add( changeDomainPB, i18n("Click on this button to change the policy for the " + TQWhatsThis::add( changeDomainPB, i18n("Click on this button to change the policy for the " "host or domain selected in the list box.") ); - QWhatsThis::add( deleteDomainPB, i18n("Click on this button to delete the policy for the " + TQWhatsThis::add( deleteDomainPB, i18n("Click on this button to delete the policy for the " "host or domain selected in the list box.") ); updateButton(); } @@ -98,7 +98,7 @@ DomainListView::~DomainListView() { void DomainListView::updateButton() { - QListViewItem *index = domainSpecificLV->currentItem(); + TQListViewItem *index = domainSpecificLV->currentItem(); bool enable = ( index != 0 ); changeDomainPB->setEnabled( enable ); deleteDomainPB->setEnabled( enable ); @@ -113,7 +113,7 @@ void DomainListView::addPressed() PolicyDialog pDlg(pol, this); setupPolicyDlg(AddButton,pDlg,pol); if( pDlg.exec() ) { - QListViewItem* index = new QListViewItem( domainSpecificLV, pDlg.domain(), + TQListViewItem* index = new TQListViewItem( domainSpecificLV, pDlg.domain(), pDlg.featureEnabledPolicyText() ); pol->setDomain(pDlg.domain()); domainPolicies.insert(index, pol); @@ -127,7 +127,7 @@ void DomainListView::addPressed() void DomainListView::changePressed() { - QListViewItem *index = domainSpecificLV->currentItem(); + TQListViewItem *index = domainSpecificLV->currentItem(); if ( index == 0 ) { KMessageBox::information( 0, i18n("You must first select a policy to be changed." ) ); @@ -156,7 +156,7 @@ void DomainListView::changePressed() void DomainListView::deletePressed() { - QListViewItem *index = domainSpecificLV->currentItem(); + TQListViewItem *index = domainSpecificLV->currentItem(); if ( index == 0 ) { KMessageBox::information( 0, i18n("You must first select a policy to delete." ) ); @@ -183,37 +183,37 @@ void DomainListView::exportPressed() // PENDING(kalle) Implement this. } -void DomainListView::initialize(const QStringList &domainList) +void DomainListView::initialize(const TQStringList &domainList) { domainSpecificLV->clear(); domainPolicies.clear(); // JavaPolicies pol(m_pConfig,m_groupname,false); - for (QStringList::ConstIterator it = domainList.begin(); + for (TQStringList::ConstIterator it = domainList.begin(); it != domainList.end(); ++it) { - QString domain = *it; + TQString domain = *it; Policies *pol = createPolicies(); pol->setDomain(domain); pol->load(); - QString policy; + TQString policy; if (pol->isFeatureEnabledPolicyInherited()) policy = i18n("Use Global"); else if (pol->isFeatureEnabled()) policy = i18n("Accept"); else policy = i18n("Reject"); - QListViewItem *index = - new QListViewItem( domainSpecificLV, domain, policy ); + TQListViewItem *index = + new TQListViewItem( domainSpecificLV, domain, policy ); domainPolicies[index] = pol; } } -void DomainListView::save(const QString &group, const QString &domainListKey) { - QStringList domainList; +void DomainListView::save(const TQString &group, const TQString &domainListKey) { + TQStringList domainList; DomainPolicyMap::Iterator it = domainPolicies.begin(); for (; it != domainPolicies.end(); ++it) { - QListViewItem *current = it.key(); + TQListViewItem *current = it.key(); Policies *pol = it.data(); pol->save(); domainList.append(current->text(0)); diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h index 3fb3f102e..b0f5ab2fb 100644 --- a/kcontrol/konqhtml/domainlistview.h +++ b/kcontrol/konqhtml/domainlistview.h @@ -22,8 +22,8 @@ #ifndef __DOMAINLISTVIEW_H__ #define __DOMAINLISTVIEW_H__ -#include <qgroupbox.h> -#include <qmap.h> +#include <tqgroupbox.h> +#include <tqmap.h> class QListViewItem; class QPushButton; @@ -51,7 +51,7 @@ class PolicyDialog; * * @author Leo Savernik */ -class DomainListView : public QGroupBox { +class DomainListView : public TQGroupBox { Q_OBJECT public: /** Enumerates the available buttons. @@ -67,7 +67,7 @@ public: * @param parent parent widget * @param name internal name for debugging */ - DomainListView(KConfig *config,const QString &title,QWidget *parent, + DomainListView(KConfig *config,const TQString &title,TQWidget *parent, const char *name = 0); virtual ~DomainListView(); @@ -87,31 +87,31 @@ public: * * Note: The add button already contains a default "what's this" text. */ - QPushButton *addButton() const { return addDomainPB; } + TQPushButton *addButton() const { return addDomainPB; } /** * returns the change push-button. * * Note: The change button already contains a default "what's this" text. */ - QPushButton *changeButton() const { return changeDomainPB; } + TQPushButton *changeButton() const { return changeDomainPB; } /** * returns the delete push-button. * * Note: The delete button already contains a default "what's this" text. */ - QPushButton *deleteButton() const { return deleteDomainPB; } + TQPushButton *deleteButton() const { return deleteDomainPB; } /** * returns the import push-button. */ - QPushButton *importButton() const { return importDomainPB; } + TQPushButton *importButton() const { return importDomainPB; } /** * returns the export push-button. */ - QPushButton *exportButton() const { return exportDomainPB; } + TQPushButton *exportButton() const { return exportDomainPB; } /** * Initializes the list view with the given list of domains as well @@ -121,7 +121,7 @@ public: * * @param domainList given list of domains */ - void initialize(const QStringList &domainList); + void initialize(const TQStringList &domainList); /** * saves the current state of all domains to the configuration object. @@ -129,7 +129,7 @@ public: * @param domainListKey the name of the key which the list of domains * is stored under. */ - void save(const QString &group, const QString &domainListKey); + void save(const TQString &group, const TQString &domainListKey); signals: @@ -195,13 +195,13 @@ protected: KListView *domainSpecificLV; - QPushButton* addDomainPB; - QPushButton* changeDomainPB; - QPushButton* deleteDomainPB; - QPushButton* importDomainPB; - QPushButton* exportDomainPB; + TQPushButton* addDomainPB; + TQPushButton* changeDomainPB; + TQPushButton* deleteDomainPB; + TQPushButton* importDomainPB; + TQPushButton* exportDomainPB; - typedef QMap<QListViewItem*, Policies *> DomainPolicyMap; + typedef TQMap<TQListViewItem*, Policies *> DomainPolicyMap; DomainPolicyMap domainPolicies; }; diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index a1a68b63e..79ab4d45a 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -23,23 +23,23 @@ #include <kfiledialog.h> #include <dcopclient.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qgroupbox.h> -#include <qhbox.h> -#include <qvbox.h> -#include <qlineedit.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qregexp.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqregexp.h> #include "filteropts.h" #include "filteropts.moc" -KCMFilter::KCMFilter(KConfig *config, QString group, - QWidget *parent, const char * ) +KCMFilter::KCMFilter(KConfig *config, TQString group, + TQWidget *parent, const char * ) : KCModule( parent, "kcmkonqhtml" ), mConfig( config ), mGroupname( group ), @@ -47,53 +47,53 @@ KCMFilter::KCMFilter(KConfig *config, QString group, { setButtons(Default|Apply); - QVBoxLayout *topLayout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - mEnableCheck = new QCheckBox(i18n("Enable filters"), this); + mEnableCheck = new TQCheckBox(i18n("Enable filters"), this); topLayout->addWidget( mEnableCheck ); - mKillCheck = new QCheckBox(i18n("Hide filtered images"), this); + mKillCheck = new TQCheckBox(i18n("Hide filtered images"), this); topLayout->addWidget( mKillCheck ); - QGroupBox *topBox = new QGroupBox( 1, Horizontal, i18n("URL Expressions to Filter"), this ); + TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("URL Expressions to Filter"), this ); topLayout->addWidget( topBox ); - mListBox = new QListBox( topBox ); - mListBox->setSelectionMode(QListBox::Extended); - new QLabel( i18n("Expression (e.g. http://www.site.com/ad/*):"), topBox); - mString = new QLineEdit( topBox ); + mListBox = new TQListBox( topBox ); + mListBox->setSelectionMode(TQListBox::Extended); + new TQLabel( i18n("Expression (e.g. http://www.site.com/ad/*):"), topBox); + mString = new TQLineEdit( topBox ); - QHBox *buttonBox = new QHBox( topBox ); + TQHBox *buttonBox = new TQHBox( topBox ); buttonBox->setSpacing( KDialog::spacingHint() ); - mInsertButton = new QPushButton( i18n("Insert"), buttonBox ); - connect( mInsertButton, SIGNAL( clicked() ), SLOT( insertFilter() ) ); - mUpdateButton = new QPushButton( i18n("Update"), buttonBox ); - connect( mUpdateButton, SIGNAL( clicked() ), SLOT( updateFilter() ) ); - mRemoveButton = new QPushButton( i18n("Remove"), buttonBox ); - connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeFilter() ) ); + mInsertButton = new TQPushButton( i18n("Insert"), buttonBox ); + connect( mInsertButton, TQT_SIGNAL( clicked() ), TQT_SLOT( insertFilter() ) ); + mUpdateButton = new TQPushButton( i18n("Update"), buttonBox ); + connect( mUpdateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateFilter() ) ); + mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox ); + connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeFilter() ) ); - mImportButton = new QPushButton(i18n("Import..."),buttonBox); - connect( mImportButton, SIGNAL( clicked() ), SLOT( importFilters() ) ); - mExportButton = new QPushButton(i18n("Export..."),buttonBox); - connect( mExportButton, SIGNAL( clicked() ), SLOT( exportFilters() ) ); + mImportButton = new TQPushButton(i18n("Import..."),buttonBox); + connect( mImportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( importFilters() ) ); + mExportButton = new TQPushButton(i18n("Export..."),buttonBox); + connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportFilters() ) ); - connect( mEnableCheck, SIGNAL( clicked()), this, SLOT( slotEnableChecked())); - connect( mKillCheck, SIGNAL( clicked()), this, SLOT( slotKillChecked())); - connect( mListBox, SIGNAL( selectionChanged ()),this, SLOT( slotItemSelected())); + connect( mEnableCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotEnableChecked())); + connect( mKillCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotKillChecked())); + connect( mListBox, TQT_SIGNAL( selectionChanged ()),this, TQT_SLOT( slotItemSelected())); /* * Whats this items */ - QWhatsThis::add( mEnableCheck, i18n("Enable or disable AdBlocK filters. When enabled a set of expressions " + TQWhatsThis::add( mEnableCheck, i18n("Enable or disable AdBlocK filters. When enabled a set of expressions " "to be blocked should be defined in the filter list for blocking to " "take effect.")); - QWhatsThis::add( mKillCheck, i18n("When enabled blocked images will be removed from the page completely " + TQWhatsThis::add( mKillCheck, i18n("When enabled blocked images will be removed from the page completely " "otherwise a placeholder 'blocked' image will be used.")); - QWhatsThis::add( mListBox, i18n("This is the list of URL filters that will be applied to all linked " + TQWhatsThis::add( mListBox, i18n("This is the list of URL filters that will be applied to all linked " "images and frames. The filters are processed in order so place " "more generic filters towards the top of the list.")); - QWhatsThis::add( mString, i18n("Enter an expression to filter. Expressions can be defined as either " + TQWhatsThis::add( mString, i18n("Enter an expression to filter. Expressions can be defined as either " "a filename style wildcard e.g. http://www.site.com/ads* or as a full " "regular expression by surrounding the string with '/' e.g. " " //(ad|banner)\\./")); @@ -154,15 +154,15 @@ void KCMFilter::updateButton() void KCMFilter::importFilters() { - QString inFile = KFileDialog::getOpenFileName(); + TQString inFile = KFileDialog::getOpenFileName(); if (inFile.length() > 0) { - QFile f(inFile); + TQFile f(inFile); if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); - QStringList paths; - QString line; + TQTextStream ts( &f ); + TQStringList paths; + TQString line; while (!ts.atEnd()) { line = ts.readLine(); @@ -175,14 +175,14 @@ void KCMFilter::importFilters() { if (line.length()>2 && line[0]=='/' && line[line.length()-1] == '/') { - QString inside = line.mid(1, line.length()-2); - QRegExp rx(inside); + TQString inside = line.mid(1, line.length()-2); + TQRegExp rx(inside); if (!rx.isValid()) continue; } else { - QRegExp rx(line); + TQRegExp rx(line); rx.setWildcard(true); if (!rx.isValid()) continue; @@ -202,14 +202,14 @@ void KCMFilter::importFilters() void KCMFilter::exportFilters() { - QString outFile = KFileDialog::getSaveFileName(); + TQString outFile = KFileDialog::getSaveFileName(); if (outFile.length() > 0) { - QFile f(outFile); + TQFile f(outFile); if ( f.open( IO_WriteOnly ) ) { - QTextStream ts( &f ); - ts.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream ts( &f ); + ts.setEncoding( TQTextStream::UnicodeUTF8 ); ts << "[AdBlock]" << endl; uint i; @@ -237,13 +237,13 @@ void KCMFilter::save() uint i; for( i = 0; i < mListBox->count(); ++i ) { - QString key = "Filter-" + QString::number(i); + TQString key = "Filter-" + TQString::number(i); mConfig->writeEntry(key, mListBox->text(i)); } mConfig->writeEntry("Count",mListBox->count()); mConfig->sync(); - DCOPClient::mainClient()->send("konqueror*","KonquerorIface","reparseConfiguration()",QByteArray()); + DCOPClient::mainClient()->send("konqueror*","KonquerorIface","reparseConfiguration()",TQByteArray()); } void KCMFilter::load() @@ -253,7 +253,7 @@ void KCMFilter::load() void KCMFilter::load( bool useDefaults ) { - QStringList paths; + TQStringList paths; mConfig->setReadDefaults( useDefaults ); @@ -261,12 +261,12 @@ void KCMFilter::load( bool useDefaults ) mEnableCheck->setChecked( mConfig->readBoolEntry("Enabled",false)); mKillCheck->setChecked( mConfig->readBoolEntry("Shrink",false)); - QMap<QString,QString> entryMap = mConfig->entryMap( mGroupname ); - QMap<QString,QString>::ConstIterator it; + TQMap<TQString,TQString> entryMap = mConfig->entryMap( mGroupname ); + TQMap<TQString,TQString>::ConstIterator it; int num = mConfig->readNumEntry("Count",0); for (int i=0; i<num; ++i) { - QString key = "Filter-" + QString::number(i); + TQString key = "Filter-" + TQString::number(i); it = entryMap.find(key); if (it != entryMap.end()) paths.append(it.data()); @@ -319,7 +319,7 @@ void KCMFilter::updateFilter() updateButton(); } -QString KCMFilter::quickHelp() const +TQString KCMFilter::quickHelp() const { return i18n("<h1>Konqueror AdBlocK</h1> Konqueror AdBlocK allows you to create a list of filters" " that are checked against linked images and frames. URL's that match are either discarded or" diff --git a/kcontrol/konqhtml/filteropts.h b/kcontrol/konqhtml/filteropts.h index 28fcaa652..6957bedc4 100644 --- a/kcontrol/konqhtml/filteropts.h +++ b/kcontrol/konqhtml/filteropts.h @@ -32,14 +32,14 @@ class KCMFilter : public KCModule { Q_OBJECT public: - KCMFilter( KConfig* config, QString group, QWidget* parent = 0, const char* name = 0 ); + KCMFilter( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); ~KCMFilter(); void load(); void load( bool useDefaults ); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; public slots: @@ -56,18 +56,18 @@ protected slots: private: void updateButton(); - QListBox *mListBox; - QLineEdit *mString; - QCheckBox *mEnableCheck; - QCheckBox *mKillCheck; - QPushButton *mInsertButton; - QPushButton *mUpdateButton; - QPushButton *mRemoveButton; - QPushButton *mImportButton; - QPushButton *mExportButton; + TQListBox *mListBox; + TQLineEdit *mString; + TQCheckBox *mEnableCheck; + TQCheckBox *mKillCheck; + TQPushButton *mInsertButton; + TQPushButton *mUpdateButton; + TQPushButton *mRemoveButton; + TQPushButton *mImportButton; + TQPushButton *mExportButton; KConfig *mConfig; - QString mGroupname; + TQString mGroupname; int mSelCount; }; diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 44738e293..3cca58732 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -5,11 +5,11 @@ // (c) David Faure 1998 // (c) 2001 Waldo Bastian <bastian@kde.org> -#include <qlayout.h>//CT - 12Nov1998 -#include <qwhatsthis.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqlayout.h>//CT - 12Nov1998 +#include <tqwhatsthis.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include "htmlopts.h" #include "advancedTabDialog.h" @@ -31,11 +31,11 @@ enum UnderlineLinkType { UnderlineAlways=0, UnderlineNever=1, UnderlineHover=2 } enum AnimationsType { AnimationsAlways=0, AnimationsNever=1, AnimationsLoopOnce=2 }; //----------------------------------------------------------------------------- -KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *parent, const char *) +KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent, const char *) : KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group) { int row = 0; - QGridLayout *lay = new QGridLayout(this, 10, 2, 0, KDialog::spacingHint()); + TQGridLayout *lay = new TQGridLayout(this, 10, 2, 0, KDialog::spacingHint()); // Bookmarks setQuickHelp( i18n("<h1>Konqueror Browser</h1> Here you can configure Konqueror's browser " @@ -46,105 +46,105 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *pare "the web pages it loads. It is usually not necessary to " "change anything here.")); - QVGroupBox *bgBookmarks = new QVGroupBox( i18n("Boo&kmarks"), this ); - m_pAdvancedAddBookmarkCheckBox = new QCheckBox(i18n( "Ask for name and folder when adding bookmarks" ), bgBookmarks); - QWhatsThis::add( m_pAdvancedAddBookmarkCheckBox, i18n( "If this box is checked, Konqueror will allow you to" + TQVGroupBox *bgBookmarks = new TQVGroupBox( i18n("Boo&kmarks"), this ); + m_pAdvancedAddBookmarkCheckBox = new TQCheckBox(i18n( "Ask for name and folder when adding bookmarks" ), bgBookmarks); + TQWhatsThis::add( m_pAdvancedAddBookmarkCheckBox, i18n( "If this box is checked, Konqueror will allow you to" " change the title of the bookmark and choose a folder in which to store it when you add a new bookmark." ) ); - connect(m_pAdvancedAddBookmarkCheckBox, SIGNAL(clicked()), SLOT(slotChanged())); + connect(m_pAdvancedAddBookmarkCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - m_pOnlyMarkedBookmarksCheckBox = new QCheckBox(i18n( "Show only marked bookmarks in bookmark toolbar" ), bgBookmarks); - QWhatsThis::add( m_pOnlyMarkedBookmarksCheckBox, i18n( "If this box is checked, Konqueror will show only those" + m_pOnlyMarkedBookmarksCheckBox = new TQCheckBox(i18n( "Show only marked bookmarks in bookmark toolbar" ), bgBookmarks); + TQWhatsThis::add( m_pOnlyMarkedBookmarksCheckBox, i18n( "If this box is checked, Konqueror will show only those" " bookmarks in the bookmark toolbar which you have marked to do so in the bookmark editor." ) ); - connect(m_pOnlyMarkedBookmarksCheckBox, SIGNAL(clicked()), SLOT(slotChanged())); + connect(m_pOnlyMarkedBookmarksCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); lay->addMultiCellWidget( bgBookmarks, row, row, 0, 1 ); row++; // Form completion - QVGroupBox *bgForm = new QVGroupBox( i18n("Form Com&pletion"), this ); - m_pFormCompletionCheckBox = new QCheckBox(i18n( "Enable completion of &forms" ), bgForm); - QWhatsThis::add( m_pFormCompletionCheckBox, i18n( "If this box is checked, Konqueror will remember" + TQVGroupBox *bgForm = new TQVGroupBox( i18n("Form Com&pletion"), this ); + m_pFormCompletionCheckBox = new TQCheckBox(i18n( "Enable completion of &forms" ), bgForm); + TQWhatsThis::add( m_pFormCompletionCheckBox, i18n( "If this box is checked, Konqueror will remember" " the data you enter in web forms and suggest it in similar fields for all forms." ) ); - connect(m_pFormCompletionCheckBox, SIGNAL(clicked()), SLOT(slotChanged())); + connect(m_pFormCompletionCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); m_pMaxFormCompletionItems = new KIntNumInput( bgForm ); m_pMaxFormCompletionItems->setLabel( i18n( "&Maximum completions:" ) ); m_pMaxFormCompletionItems->setRange( 0, 100 ); - QWhatsThis::add( m_pMaxFormCompletionItems, + TQWhatsThis::add( m_pMaxFormCompletionItems, i18n( "Here you can select how many values Konqueror will remember for a form field." ) ); - connect(m_pMaxFormCompletionItems, SIGNAL(valueChanged(int)), SLOT(slotChanged())); + connect(m_pMaxFormCompletionItems, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); lay->addMultiCellWidget( bgForm, row, row, 0, 1 ); row++; // Tabbed Browsing - QGroupBox *bgTabbedBrowsing = new QGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this ); - QVBoxLayout *laygroup = new QVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() ); + TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this ); + TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() ); - m_pShowMMBInTabs = new QCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing ); - QWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, " + m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing ); + TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, " "such as choosing a link or a folder with the middle mouse button.") ); - connect(m_pShowMMBInTabs, SIGNAL(clicked()), SLOT(slotChanged())); + connect(m_pShowMMBInTabs, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); laygroup->addWidget(m_pShowMMBInTabs); - m_pDynamicTabbarHide = new QCheckBox( i18n( "Hide the tab bar when only one tab is open" ), bgTabbedBrowsing ); - QWhatsThis::add( m_pDynamicTabbarHide, i18n("This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.") ); - connect(m_pDynamicTabbarHide, SIGNAL(clicked()), SLOT(slotChanged())); + m_pDynamicTabbarHide = new TQCheckBox( i18n( "Hide the tab bar when only one tab is open" ), bgTabbedBrowsing ); + TQWhatsThis::add( m_pDynamicTabbarHide, i18n("This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.") ); + connect(m_pDynamicTabbarHide, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); laygroup->addWidget(m_pDynamicTabbarHide); - QHBoxLayout *laytab = new QHBoxLayout(laygroup, KDialog::spacingHint()); - QPushButton *advancedTabButton = new QPushButton( i18n( "Advanced Options"), bgTabbedBrowsing ); + TQHBoxLayout *laytab = new TQHBoxLayout(laygroup, KDialog::spacingHint()); + TQPushButton *advancedTabButton = new TQPushButton( i18n( "Advanced Options"), bgTabbedBrowsing ); laytab->addWidget(advancedTabButton); laytab->addStretch(); - connect(advancedTabButton, SIGNAL(clicked()), this, SLOT(launchAdvancedTabDialog())); + connect(advancedTabButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchAdvancedTabDialog())); lay->addMultiCellWidget( bgTabbedBrowsing, row, row, 0, 1 ); row++; // Mouse behavior - QVGroupBox *bgMouse = new QVGroupBox( i18n("Mouse Beha&vior"), this ); + TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this ); - m_cbCursor = new QCheckBox(i18n("Chan&ge cursor over links"), bgMouse ); - QWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change " + m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse ); + TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change " "(usually to a hand) if it is moved over a hyperlink.") ); - connect(m_cbCursor, SIGNAL(clicked()), SLOT(slotChanged())); + connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - m_pOpenMiddleClick = new QCheckBox( i18n ("M&iddle click opens URL in selection" ), bgMouse ); - QWhatsThis::add( m_pOpenMiddleClick, i18n ( + m_pOpenMiddleClick = new TQCheckBox( i18n ("M&iddle click opens URL in selection" ), bgMouse ); + TQWhatsThis::add( m_pOpenMiddleClick, i18n ( "If this box is checked, you can open the URL in the selection by middle clicking on a " "Konqueror view." ) ); - connect(m_pOpenMiddleClick, SIGNAL(clicked()), SLOT(slotChanged())); + connect(m_pOpenMiddleClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - m_pBackRightClick = new QCheckBox( i18n( "Right click goes &back in history" ), bgMouse ); - QWhatsThis::add( m_pBackRightClick, i18n( + m_pBackRightClick = new TQCheckBox( i18n( "Right click goes &back in history" ), bgMouse ); + TQWhatsThis::add( m_pBackRightClick, i18n( "If this box is checked, you can go back in history by right clicking on a Konqueror view. " "To access the context menu, press the right mouse button and move." ) ); - connect(m_pBackRightClick, SIGNAL(clicked()), SLOT(slotChanged())); + connect(m_pBackRightClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); lay->addMultiCellWidget( bgMouse, row, row, 0, 1 ); row++; // Misc - m_pAutoLoadImagesCheckBox = new QCheckBox( i18n( "A&utomatically load images"), this ); - QWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, Konqueror will automatically load any images that are embedded in a web page. Otherwise, it will display placeholders for the images, and you can then manually load the images by clicking on the image button.<br>Unless you have a very slow network connection, you will probably want to check this box to enhance your browsing experience." ) ); - connect(m_pAutoLoadImagesCheckBox, SIGNAL(clicked()), SLOT(slotChanged())); + m_pAutoLoadImagesCheckBox = new TQCheckBox( i18n( "A&utomatically load images"), this ); + TQWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, Konqueror will automatically load any images that are embedded in a web page. Otherwise, it will display placeholders for the images, and you can then manually load the images by clicking on the image button.<br>Unless you have a very slow network connection, you will probably want to check this box to enhance your browsing experience." ) ); + connect(m_pAutoLoadImagesCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); lay->addMultiCellWidget( m_pAutoLoadImagesCheckBox, row, row, 0, 1 ); row++; - m_pUnfinishedImageFrameCheckBox = new QCheckBox( i18n( "Dra&w frame around not completely loaded images"), this ); - QWhatsThis::add( m_pUnfinishedImageFrameCheckBox, i18n( "If this box is checked, Konqueror will draw a frame as placeholder around not yet fully loaded images that are embedded in a web page.<br>Especially if you have a slow network connection, you will probably want to check this box to enhance your browsing experience." ) ); - connect(m_pUnfinishedImageFrameCheckBox, SIGNAL(clicked()), SLOT(slotChanged())); + m_pUnfinishedImageFrameCheckBox = new TQCheckBox( i18n( "Dra&w frame around not completely loaded images"), this ); + TQWhatsThis::add( m_pUnfinishedImageFrameCheckBox, i18n( "If this box is checked, Konqueror will draw a frame as placeholder around not yet fully loaded images that are embedded in a web page.<br>Especially if you have a slow network connection, you will probably want to check this box to enhance your browsing experience." ) ); + connect(m_pUnfinishedImageFrameCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); lay->addMultiCellWidget( m_pUnfinishedImageFrameCheckBox, row, row, 0, 1 ); row++; - m_pAutoRedirectCheckBox = new QCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this ); - QWhatsThis::add( m_pAutoRedirectCheckBox, + m_pAutoRedirectCheckBox = new TQCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this ); + TQWhatsThis::add( m_pAutoRedirectCheckBox, i18n( "Some web pages request an automatic reload or redirection after a certain period of time. By unchecking this box Konqueror will ignore these requests." ) ); - connect(m_pAutoRedirectCheckBox, SIGNAL(clicked()), SLOT(slotChanged())); + connect(m_pAutoRedirectCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); lay->addMultiCellWidget( m_pAutoRedirectCheckBox, row, row, 0, 1 ); row++; @@ -155,8 +155,8 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *pare lay->addMultiCellWidget(sep, row, row, 0, 1); row++; - QLabel *label = new QLabel( i18n("Und&erline links:"), this); - m_pUnderlineCombo = new QComboBox( false, this ); + TQLabel *label = new TQLabel( i18n("Und&erline links:"), this); + m_pUnderlineCombo = new TQComboBox( false, this ); label->setBuddy(m_pUnderlineCombo); m_pUnderlineCombo->insertItem(i18n("underline","Enabled"), UnderlineAlways); m_pUnderlineCombo->insertItem(i18n("underline","Disabled"), UnderlineNever); @@ -164,19 +164,19 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *pare lay->addWidget(label, row, 0); lay->addWidget(m_pUnderlineCombo, row, 1); row++; - QString whatsThis = i18n("Controls how Konqueror handles underlining hyperlinks:<br>" + TQString whatsThis = i18n("Controls how Konqueror handles underlining hyperlinks:<br>" "<ul><li><b>Enabled</b>: Always underline links</li>" "<li><b>Disabled</b>: Never underline links</li>" "<li><b>Only on Hover</b>: Underline when the mouse is moved over the link</li>" "</ul><br><i>Note: The site's CSS definitions can override this value</i>"); - QWhatsThis::add( label, whatsThis); - QWhatsThis::add( m_pUnderlineCombo, whatsThis); - connect(m_pUnderlineCombo, SIGNAL(activated(int)), SLOT(slotChanged())); + TQWhatsThis::add( label, whatsThis); + TQWhatsThis::add( m_pUnderlineCombo, whatsThis); + connect(m_pUnderlineCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - label = new QLabel( i18n("A&nimations:"), this); - m_pAnimationsCombo = new QComboBox( false, this ); + label = new TQLabel( i18n("A&nimations:"), this); + m_pAnimationsCombo = new TQComboBox( false, this ); label->setBuddy(m_pAnimationsCombo); m_pAnimationsCombo->insertItem(i18n("animations","Enabled"), AnimationsAlways); m_pAnimationsCombo->insertItem(i18n("animations","Disabled"), AnimationsNever); @@ -188,9 +188,9 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *pare "<ul><li><b>Enabled</b>: Show all animations completely.</li>" "<li><b>Disabled</b>: Never show animations, show the start image only.</li>" "<li><b>Show only once</b>: Show all animations completely but do not repeat them.</li>"); - QWhatsThis::add( label, whatsThis); - QWhatsThis::add( m_pAnimationsCombo, whatsThis); - connect(m_pAnimationsCombo, SIGNAL(activated(int)), SLOT(slotChanged())); + TQWhatsThis::add( label, whatsThis); + TQWhatsThis::add( m_pAnimationsCombo, whatsThis); + connect(m_pAnimationsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); lay->setRowStretch(row, 1); @@ -229,7 +229,7 @@ void KMiscHTMLOptions::load( bool useDefaults ) bool hoverLinks = READ_BOOL("HoverLinks", true); bool bAutoLoadImages = READ_BOOL( "AutoLoadImages", true ); bool bUnfinishedImageFrame = READ_BOOL( "UnfinishedImageFrame", true ); - QString strAnimations = READ_ENTRY( "ShowAnimations" ).lower(); + TQString strAnimations = READ_ENTRY( "ShowAnimations" ).lower(); bool bAutoRedirect = m_pConfig->readBoolEntry( "AutoDelayedActions", true ); @@ -340,7 +340,7 @@ void KMiscHTMLOptions::save() config.writeEntry("FilteredToolbar", m_pOnlyMarkedBookmarksCheckBox->isChecked()); config.sync(); - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h index 15f5a2511..823e245c9 100644 --- a/kcontrol/konqhtml/htmlopts.h +++ b/kcontrol/konqhtml/htmlopts.h @@ -8,10 +8,10 @@ #ifndef __KMISCHTML_OPTIONS_H #define __KMISCHTML_OPTIONS_H -#include <qstrlist.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qcombobox.h> +#include <tqstrlist.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqcombobox.h> //----------------------------------------------------------------------------- @@ -23,7 +23,7 @@ // ... there is room for others :)) -#include <qstring.h> +#include <tqstring.h> #include <kconfig.h> #include <kcmodule.h> class QRadioButton; @@ -34,7 +34,7 @@ class KMiscHTMLOptions : public KCModule Q_OBJECT public: - KMiscHTMLOptions(KConfig *config, QString group, QWidget *parent = 0L, const char *name = 0L ); + KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L ); ~KMiscHTMLOptions(); virtual void load(); virtual void load( bool useDefaults ); @@ -47,21 +47,21 @@ private slots: private: KConfig* m_pConfig; - QString m_groupname; + TQString m_groupname; - QComboBox* m_pUnderlineCombo; - QComboBox* m_pAnimationsCombo; - QCheckBox* m_cbCursor; - QCheckBox* m_pAutoLoadImagesCheckBox; - QCheckBox* m_pUnfinishedImageFrameCheckBox; - QCheckBox* m_pAutoRedirectCheckBox; - QCheckBox* m_pOpenMiddleClick; - QCheckBox* m_pBackRightClick; - QCheckBox* m_pShowMMBInTabs; - QCheckBox* m_pFormCompletionCheckBox; - QCheckBox* m_pDynamicTabbarHide; - QCheckBox* m_pAdvancedAddBookmarkCheckBox; - QCheckBox* m_pOnlyMarkedBookmarksCheckBox; + TQComboBox* m_pUnderlineCombo; + TQComboBox* m_pAnimationsCombo; + TQCheckBox* m_cbCursor; + TQCheckBox* m_pAutoLoadImagesCheckBox; + TQCheckBox* m_pUnfinishedImageFrameCheckBox; + TQCheckBox* m_pAutoRedirectCheckBox; + TQCheckBox* m_pOpenMiddleClick; + TQCheckBox* m_pBackRightClick; + TQCheckBox* m_pShowMMBInTabs; + TQCheckBox* m_pFormCompletionCheckBox; + TQCheckBox* m_pDynamicTabbarHide; + TQCheckBox* m_pAdvancedAddBookmarkCheckBox; + TQCheckBox* m_pOnlyMarkedBookmarksCheckBox; KIntNumInput* m_pMaxFormCompletionItems; }; diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index 3cb538a9f..af168ed1f 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -20,10 +20,10 @@ #include <khtml_settings.h> #include <knuminput.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qvgroupbox.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> #include "htmlopts.h" #include "policydlg.h" @@ -31,13 +31,13 @@ // == class JavaPolicies ===== -JavaPolicies::JavaPolicies(KConfig* config, const QString &group, bool global, - const QString &domain) : +JavaPolicies::JavaPolicies(KConfig* config, const TQString &group, bool global, + const TQString &domain) : Policies(config,group,global,domain,"java.","EnableJava") { } -JavaPolicies::JavaPolicies() : Policies(0,QString::null,false, - QString::null,QString::null,QString::null) { +JavaPolicies::JavaPolicies() : Policies(0,TQString::null,false, + TQString::null,TQString::null,TQString::null) { } JavaPolicies::~JavaPolicies() { @@ -45,8 +45,8 @@ JavaPolicies::~JavaPolicies() { // == class KJavaOptions ===== -KJavaOptions::KJavaOptions( KConfig* config, QString group, - QWidget *parent, const char *name ) +KJavaOptions::KJavaOptions( KConfig* config, TQString group, + TQWidget *parent, const char *name ) : KCModule( parent, name ), _removeJavaScriptDomainAdvice(false), m_pConfig( config ), @@ -54,90 +54,90 @@ KJavaOptions::KJavaOptions( KConfig* config, QString group, java_global_policies(config,group,true), _removeJavaDomainSettings(false) { - QVBoxLayout* toplevel = new QVBoxLayout( this, 10, 5 ); + TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 ); /*************************************************************************** ********************* Global Settings ************************************* **************************************************************************/ - QVGroupBox* globalGB = new QVGroupBox( i18n( "Global Settings" ), this ); + TQVGroupBox* globalGB = new TQVGroupBox( i18n( "Global Settings" ), this ); toplevel->addWidget( globalGB ); - enableJavaGloballyCB = new QCheckBox( i18n( "Enable Ja&va globally" ), globalGB ); - connect( enableJavaGloballyCB, SIGNAL( clicked() ), this, SLOT( slotChanged() ) ); - connect( enableJavaGloballyCB, SIGNAL( clicked() ), this, SLOT( toggleJavaControls() ) ); + enableJavaGloballyCB = new TQCheckBox( i18n( "Enable Ja&va globally" ), globalGB ); + connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( toggleJavaControls() ) ); /*************************************************************************** ***************** Domain Specific Settings ******************************** **************************************************************************/ domainSpecific = new JavaDomainListView(m_pConfig,m_groupname,this,this); - connect(domainSpecific,SIGNAL(changed(bool)),SLOT(slotChanged())); + connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged())); toplevel->addWidget( domainSpecific, 2 ); /*************************************************************************** ***************** Java Runtime Settings *********************************** **************************************************************************/ - QVGroupBox* javartGB = new QVGroupBox( i18n( "Java Runtime Settings" ), this ); + TQVGroupBox* javartGB = new TQVGroupBox( i18n( "Java Runtime Settings" ), this ); toplevel->addWidget( javartGB ); - QWidget* checkboxes = new QWidget( javartGB ); - QGridLayout* grid = new QGridLayout( checkboxes, 2, 2 ); + TQWidget* checkboxes = new TQWidget( javartGB ); + TQGridLayout* grid = new TQGridLayout( checkboxes, 2, 2 ); - javaSecurityManagerCB = new QCheckBox( i18n("&Use security manager" ), checkboxes ); + javaSecurityManagerCB = new TQCheckBox( i18n("&Use security manager" ), checkboxes ); grid->addWidget( javaSecurityManagerCB, 0, 0 ); - connect( javaSecurityManagerCB, SIGNAL(toggled( bool )), this, SLOT(slotChanged()) ); + connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); - useKioCB = new QCheckBox( i18n("Use &KIO"), checkboxes ); + useKioCB = new TQCheckBox( i18n("Use &KIO"), checkboxes ); grid->addWidget( useKioCB, 0, 1 ); - connect( useKioCB, SIGNAL(toggled( bool )), this, SLOT(slotChanged()) ); + connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); - enableShutdownCB = new QCheckBox( i18n("Shu&tdown applet server when inactive"), checkboxes ); + enableShutdownCB = new TQCheckBox( i18n("Shu&tdown applet server when inactive"), checkboxes ); grid->addWidget( enableShutdownCB, 1, 0 ); - connect( enableShutdownCB, SIGNAL(toggled( bool )), this, SLOT(slotChanged()) ); - connect( enableShutdownCB, SIGNAL(clicked()), this, SLOT(toggleJavaControls()) ); + connect( enableShutdownCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); + connect( enableShutdownCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleJavaControls()) ); - QHBox* secondsHB = new QHBox( javartGB ); + TQHBox* secondsHB = new TQHBox( javartGB ); serverTimeoutSB = new KIntNumInput( secondsHB ); serverTimeoutSB->setRange( 0, 1000, 5 ); serverTimeoutSB->setLabel( i18n("App&let server timeout:"), AlignLeft ); serverTimeoutSB->setSuffix(i18n(" sec")); - connect(serverTimeoutSB, SIGNAL(valueChanged(int)),this,SLOT(slotChanged())); + connect(serverTimeoutSB, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged())); - QHBox* pathHB = new QHBox( javartGB ); + TQHBox* pathHB = new TQHBox( javartGB ); pathHB->setSpacing( 10 ); - QLabel* pathLA = new QLabel( i18n( "&Path to Java executable, or 'java':" ), + TQLabel* pathLA = new TQLabel( i18n( "&Path to Java executable, or 'java':" ), pathHB ); pathED = new KURLRequester( pathHB ); - connect( pathED, SIGNAL(textChanged( const QString& )), this, SLOT(slotChanged()) ); + connect( pathED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) ); pathLA->setBuddy( pathED ); - QHBox* addArgHB = new QHBox( javartGB ); + TQHBox* addArgHB = new TQHBox( javartGB ); addArgHB->setSpacing( 10 ); - QLabel* addArgLA = new QLabel( i18n( "Additional Java a&rguments:" ), addArgHB ); - addArgED = new QLineEdit( addArgHB ); - connect( addArgED, SIGNAL(textChanged( const QString& )), this, SLOT(slotChanged()) ); + TQLabel* addArgLA = new TQLabel( i18n( "Additional Java a&rguments:" ), addArgHB ); + addArgED = new TQLineEdit( addArgHB ); + connect( addArgED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) ); addArgLA->setBuddy( addArgED ); /*************************************************************************** ********************** WhatsThis? items *********************************** **************************************************************************/ - QWhatsThis::add( enableJavaGloballyCB, i18n("Enables the execution of scripts written in Java " + TQWhatsThis::add( enableJavaGloballyCB, i18n("Enables the execution of scripts written in Java " "that can be contained in HTML pages. " "Note that, as with any browser, enabling active contents can be a security problem.") ); - QString wtstr = i18n("This box contains the domains and hosts you have set " + TQString wtstr = i18n("This box contains the domains and hosts you have set " "a specific Java policy for. This policy will be used " "instead of the default policy for enabling or disabling Java applets on pages sent by these " "domains or hosts. <p>Select a policy and use the controls on " "the right to modify it."); - QWhatsThis::add( domainSpecific->listView(), wtstr ); + TQWhatsThis::add( domainSpecific->listView(), wtstr ); #if 0 - QWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " + TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " "the Java policies. These policies will be merged " "with the existing ones. Duplicate entries are ignored.") ); - QWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the Java policy to a zipped " + TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the Java policy to a zipped " "file. The file, named <b>java_policy.tgz</b>, will be " "saved to a location of your choice." ) ); #endif - QWhatsThis::add( domainSpecific, i18n("Here you can set specific Java policies for any particular " + TQWhatsThis::add( domainSpecific, i18n("Here you can set specific Java policies for any particular " "host or domain. To add a new policy, simply click the <i>New...</i> " "button and supply the necessary information requested by the " "dialog box. To change an existing policy, click on the <i>Change...</i> " @@ -150,7 +150,7 @@ KJavaOptions::KJavaOptions( KConfig* config, QString group, "you to save and retrieve them from a zipped file.") ); #endif - QWhatsThis::add( javaSecurityManagerCB, i18n( "Enabling the security manager will cause the jvm to run with a Security " + TQWhatsThis::add( javaSecurityManagerCB, i18n( "Enabling the security manager will cause the jvm to run with a Security " "Manager in place. This will keep applets from being able to read and " "write to your file system, creating arbitrary sockets, and other actions " "which could be used to compromise your system. Disable this option at your " @@ -158,23 +158,23 @@ KJavaOptions::KJavaOptions( KConfig* config, QString group, "policytool utility to give code downloaded from certain sites more " "permissions." ) ); - QWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use KIO for network transport ") ); + TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use KIO for network transport ") ); - QWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in " + TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in " "your path, simply leave it as 'java'. If you need to use a different jre, " "enter the path to the java executable (e.g. /usr/lib/jdk/bin/java), " "or the path to the directory that contains 'bin/java' (e.g. /opt/IBMJava2-13).") ); - QWhatsThis::add( addArgED, i18n("If you want special arguments to be passed to the virtual machine, enter them here.") ); + TQWhatsThis::add( addArgED, i18n("If you want special arguments to be passed to the virtual machine, enter them here.") ); - QString shutdown = i18n("When all the applets have been destroyed, the applet server should shut down. " + TQString shutdown = i18n("When all the applets have been destroyed, the applet server should shut down. " "However, starting the jvm takes a lot of time. If you would like to " "keep the java process running while you are " "browsing, you can set the timeout value to whatever you like. To keep " "the java process running for the whole time that the konqueror process is, " "leave the Shutdown Applet Server checkbox unchecked."); - QWhatsThis::add( serverTimeoutSB, shutdown); - QWhatsThis::add( enableShutdownCB, shutdown); + TQWhatsThis::add( serverTimeoutSB, shutdown); + TQWhatsThis::add( enableShutdownCB, shutdown); // Finally do the loading load(); } @@ -196,9 +196,9 @@ void KJavaOptions::load(bool useDefaults) bool bServerShutdown = m_pConfig->readBoolEntry( "ShutdownAppletServer", true ); int serverTimeout = m_pConfig->readNumEntry( "AppletServerTimeout", 60 ); #if defined(PATH_JAVA) - QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", PATH_JAVA ); + TQString sJavaPath = m_pConfig->readPathEntry( "JavaPath", PATH_JAVA ); #else - QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", "/usr/bin/java" ); + TQString sJavaPath = m_pConfig->readPathEntry( "JavaPath", "/usr/bin/java" ); #endif if( sJavaPath == "/usr/lib/jdk" ) @@ -278,8 +278,8 @@ void KJavaOptions::toggleJavaControls() // == class JavaDomainListView ===== -JavaDomainListView::JavaDomainListView(KConfig *config,const QString &group, - KJavaOptions *options,QWidget *parent,const char *name) +JavaDomainListView::JavaDomainListView(KConfig *config,const TQString &group, + KJavaOptions *options,TQWidget *parent,const char *name) : DomainListView(config,i18n( "Doma&in-Specific" ), parent, name), group(group), options(options) { } @@ -287,20 +287,20 @@ JavaDomainListView::JavaDomainListView(KConfig *config,const QString &group, JavaDomainListView::~JavaDomainListView() { } -void JavaDomainListView::updateDomainListLegacy(const QStringList &domainConfig) +void JavaDomainListView::updateDomainListLegacy(const TQStringList &domainConfig) { domainSpecificLV->clear(); JavaPolicies pol(config,group,false); pol.defaults(); - for ( QStringList::ConstIterator it = domainConfig.begin(); + for ( TQStringList::ConstIterator it = domainConfig.begin(); it != domainConfig.end(); ++it) { - QString domain; + TQString domain; KHTMLSettings::KJavaScriptAdvice javaAdvice; KHTMLSettings::KJavaScriptAdvice javaScriptAdvice; KHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice); if (javaAdvice != KHTMLSettings::KJavaScriptDunno) { - QListViewItem* index = new QListViewItem( domainSpecificLV, domain, + TQListViewItem* index = new TQListViewItem( domainSpecificLV, domain, i18n(KHTMLSettings::adviceToStr(javaAdvice)) ); pol.setDomain(domain); pol.setFeatureEnabled(javaAdvice != KHTMLSettings::KJavaScriptReject); @@ -311,7 +311,7 @@ void JavaDomainListView::updateDomainListLegacy(const QStringList &domainConfig) void JavaDomainListView::setupPolicyDlg(PushButton trigger,PolicyDialog &pDlg, Policies *pol) { - QString caption; + TQString caption; switch (trigger) { case AddButton: caption = i18n( "New Java Policy" ); pol->setFeatureEnabled(!options->enableJavaGloballyCB->isChecked()); diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h index 638b3a921..7e1fd0899 100644 --- a/kcontrol/konqhtml/javaopts.h +++ b/kcontrol/konqhtml/javaopts.h @@ -48,10 +48,10 @@ public: * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ - JavaPolicies(KConfig* config, const QString &group, bool global, - const QString &domain = QString::null); + JavaPolicies(KConfig* config, const TQString &group, bool global, + const TQString &domain = TQString::null); - /** empty constructur to make QMap happy + /** empty constructur to make TQMap happy * don't use for constructing a policies instance. * @internal */ @@ -65,13 +65,13 @@ public: class JavaDomainListView : public DomainListView { Q_OBJECT public: - JavaDomainListView(KConfig *config,const QString &group,KJavaOptions *opt, - QWidget *parent,const char *name = 0); + JavaDomainListView(KConfig *config,const TQString &group,KJavaOptions *opt, + TQWidget *parent,const char *name = 0); virtual ~JavaDomainListView(); /** remnant for importing pre KDE 3.2 settings */ - void updateDomainListLegacy(const QStringList &domainConfig); + void updateDomainListLegacy(const TQStringList &domainConfig); protected: virtual JavaPolicies *createPolicies(); @@ -80,7 +80,7 @@ protected: Policies *copy); private: - QString group; + TQString group; KJavaOptions *options; }; @@ -89,7 +89,7 @@ class KJavaOptions : public KCModule Q_OBJECT public: - KJavaOptions( KConfig* config, QString group, QWidget* parent = 0, const char* name = 0 ); + KJavaOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); virtual void load(); virtual void load( bool useDefaults ); @@ -105,15 +105,15 @@ private slots: private: KConfig* m_pConfig; - QString m_groupname; + TQString m_groupname; JavaPolicies java_global_policies; - QCheckBox* enableJavaGloballyCB; - QCheckBox* javaSecurityManagerCB; - QCheckBox* useKioCB; - QCheckBox* enableShutdownCB; + TQCheckBox* enableJavaGloballyCB; + TQCheckBox* javaSecurityManagerCB; + TQCheckBox* useKioCB; + TQCheckBox* enableShutdownCB; KIntNumInput* serverTimeoutSB; - QLineEdit* addArgED; + TQLineEdit* addArgED; KURLRequester* pathED; bool _removeJavaDomainSettings; diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index b6522f767..ae73fc686 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -11,9 +11,9 @@ // Big changes to accommodate per-domain settings // (c) Leo Savernik 2002-2003 -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qvgroupbox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqvgroupbox.h> #include <kconfig.h> #include <klistview.h> #include <kdebug.h> @@ -34,42 +34,42 @@ // == class KJavaScriptOptions ===== -KJavaScriptOptions::KJavaScriptOptions( KConfig* config, QString group, QWidget *parent, +KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidget *parent, const char *name ) : KCModule( parent, name ), _removeJavaScriptDomainAdvice(false), m_pConfig( config ), m_groupname( group ), - js_global_policies(config,group,true,QString::null), + js_global_policies(config,group,true,TQString::null), _removeECMADomainSettings(false) { - QVBoxLayout* toplevel = new QVBoxLayout( this, 10, 5 ); + TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 ); // the global checkbox - QGroupBox* globalGB = new QGroupBox( 2, Vertical, i18n( "Global Settings" ), this ); + TQGroupBox* globalGB = new TQGroupBox( 2, Vertical, i18n( "Global Settings" ), this ); toplevel->addWidget( globalGB ); - enableJavaScriptGloballyCB = new QCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB ); - QWhatsThis::add( enableJavaScriptGloballyCB, i18n("Enables the execution of scripts written in ECMA-Script " + enableJavaScriptGloballyCB = new TQCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB ); + TQWhatsThis::add( enableJavaScriptGloballyCB, i18n("Enables the execution of scripts written in ECMA-Script " "(also known as JavaScript) that can be contained in HTML pages. " "Note that, as with any browser, enabling scripting languages can be a security problem.") ); - connect( enableJavaScriptGloballyCB, SIGNAL( clicked() ), SLOT( changed() ) ); - connect( enableJavaScriptGloballyCB, SIGNAL( clicked() ), this, SLOT( slotChangeJSEnabled() ) ); + connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) ); + connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeJSEnabled() ) ); - reportErrorsCB = new QCheckBox( i18n( "Report &errors" ), globalGB ); - QWhatsThis::add( reportErrorsCB, i18n("Enables the reporting of errors that occur when JavaScript " + reportErrorsCB = new TQCheckBox( i18n( "Report &errors" ), globalGB ); + TQWhatsThis::add( reportErrorsCB, i18n("Enables the reporting of errors that occur when JavaScript " "code is executed.") ); - connect( reportErrorsCB, SIGNAL( clicked() ), SLOT( changed() ) ); + connect( reportErrorsCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) ); - jsDebugWindow = new QCheckBox( i18n( "Enable debu&gger" ), globalGB ); - QWhatsThis::add( jsDebugWindow, i18n( "Enables builtin JavaScript debugger." ) ); - connect( jsDebugWindow, SIGNAL( clicked() ), SLOT( changed() ) ); + jsDebugWindow = new TQCheckBox( i18n( "Enable debu&gger" ), globalGB ); + TQWhatsThis::add( jsDebugWindow, i18n( "Enables builtin JavaScript debugger." ) ); + connect( jsDebugWindow, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) ); // the domain-specific listview domainSpecific = new JSDomainListView(m_pConfig,m_groupname,this,this); - connect(domainSpecific,SIGNAL(changed(bool)),SLOT(changed())); + connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(changed())); toplevel->addWidget( domainSpecific, 2 ); - QWhatsThis::add( domainSpecific, i18n("Here you can set specific JavaScript policies for any particular " + TQWhatsThis::add( domainSpecific, i18n("Here you can set specific JavaScript policies for any particular " "host or domain. To add a new policy, simply click the <i>New...</i> " "button and supply the necessary information requested by the " "dialog box. To change an existing policy, click on the <i>Change...</i> " @@ -79,17 +79,17 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, QString group, QWidget "button allows you to easily share your policies with other people by allowing " "you to save and retrieve them from a zipped file.") ); - QString wtstr = i18n("This box contains the domains and hosts you have set " + TQString wtstr = i18n("This box contains the domains and hosts you have set " "a specific JavaScript policy for. This policy will be used " "instead of the default policy for enabling or disabling JavaScript on pages sent by these " "domains or hosts. <p>Select a policy and use the controls on " "the right to modify it."); - QWhatsThis::add( domainSpecific->listView(), wtstr ); + TQWhatsThis::add( domainSpecific->listView(), wtstr ); - QWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " + TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " "the JavaScript policies. These policies will be merged " "with the existing ones. Duplicate entries are ignored.") ); - QWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the JavaScript policy to a zipped " + TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the JavaScript policy to a zipped " "file. The file, named <b>javascript_policy.tgz</b>, will be " "saved to a location of your choice." ) ); @@ -97,7 +97,7 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, QString group, QWidget js_policies_frame = new JSPoliciesFrame(&js_global_policies, i18n("Global JavaScript Policies"),this); toplevel->addWidget(js_policies_frame); - connect(js_policies_frame, SIGNAL(changed()), SLOT(changed())); + connect(js_policies_frame, TQT_SIGNAL(changed()), TQT_SLOT(changed())); // Finally do the loading load(); @@ -165,8 +165,8 @@ void KJavaScriptOptions::slotChangeJSEnabled() { // == class JSDomainListView ===== -JSDomainListView::JSDomainListView(KConfig *config,const QString &group, - KJavaScriptOptions *options, QWidget *parent,const char *name) +JSDomainListView::JSDomainListView(KConfig *config,const TQString &group, + KJavaScriptOptions *options, TQWidget *parent,const char *name) : DomainListView(config,i18n( "Do&main-Specific" ), parent, name), group(group), options(options) { } @@ -174,20 +174,20 @@ JSDomainListView::JSDomainListView(KConfig *config,const QString &group, JSDomainListView::~JSDomainListView() { } -void JSDomainListView::updateDomainListLegacy(const QStringList &domainConfig) +void JSDomainListView::updateDomainListLegacy(const TQStringList &domainConfig) { domainSpecificLV->clear(); JSPolicies pol(config,group,false); pol.defaults(); - for (QStringList::ConstIterator it = domainConfig.begin(); + for (TQStringList::ConstIterator it = domainConfig.begin(); it != domainConfig.end(); ++it) { - QString domain; + TQString domain; KHTMLSettings::KJavaScriptAdvice javaAdvice; KHTMLSettings::KJavaScriptAdvice javaScriptAdvice; KHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice); if (javaScriptAdvice != KHTMLSettings::KJavaScriptDunno) { - QListViewItem *index = - new QListViewItem( domainSpecificLV, domain, + TQListViewItem *index = + new TQListViewItem( domainSpecificLV, domain, i18n(KHTMLSettings::adviceToStr(javaScriptAdvice)) ); pol.setDomain(domain); @@ -200,7 +200,7 @@ void JSDomainListView::updateDomainListLegacy(const QStringList &domainConfig) void JSDomainListView::setupPolicyDlg(PushButton trigger,PolicyDialog &pDlg, Policies *pol) { JSPolicies *jspol = static_cast<JSPolicies *>(pol); - QString caption; + TQString caption; switch (trigger) { case AddButton: caption = i18n( "New JavaScript Policy" ); diff --git a/kcontrol/konqhtml/jsopts.h b/kcontrol/konqhtml/jsopts.h index 41f5c87fd..01db6508f 100644 --- a/kcontrol/konqhtml/jsopts.h +++ b/kcontrol/konqhtml/jsopts.h @@ -35,13 +35,13 @@ class KJavaScriptOptions; class JSDomainListView : public DomainListView { Q_OBJECT public: - JSDomainListView(KConfig *config,const QString &group,KJavaScriptOptions *opt, - QWidget *parent,const char *name = 0); + JSDomainListView(KConfig *config,const TQString &group,KJavaScriptOptions *opt, + TQWidget *parent,const char *name = 0); virtual ~JSDomainListView(); /** remnant for importing pre KDE 3.2 settings */ - void updateDomainListLegacy(const QStringList &domainConfig); + void updateDomainListLegacy(const TQStringList &domainConfig); protected: virtual JSPolicies *createPolicies(); @@ -50,7 +50,7 @@ protected: Policies *copy); private: - QString group; + TQString group; KJavaScriptOptions *options; }; @@ -58,7 +58,7 @@ class KJavaScriptOptions : public KCModule { Q_OBJECT public: - KJavaScriptOptions( KConfig* config, QString group, QWidget* parent = 0, const char* name = 0 ); + KJavaScriptOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); virtual void load(); virtual void load( bool useDefaults ); @@ -73,11 +73,11 @@ private slots: private: KConfig *m_pConfig; - QString m_groupname; + TQString m_groupname; JSPolicies js_global_policies; - QCheckBox *enableJavaScriptGloballyCB; - QCheckBox *reportErrorsCB; - QCheckBox *jsDebugWindow; + TQCheckBox *enableJavaScriptGloballyCB; + TQCheckBox *reportErrorsCB; + TQCheckBox *jsDebugWindow; JSPoliciesFrame *js_policies_frame; bool _removeECMADomainSettings; diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index d4afbbd1d..5196af8dd 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -19,11 +19,11 @@ */ -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqwhatsthis.h> #include <kconfig.h> #include <kdebug.h> @@ -33,13 +33,13 @@ // == class JSPolicies == -JSPolicies::JSPolicies(KConfig* config,const QString &group, - bool global,const QString &domain) : +JSPolicies::JSPolicies(KConfig* config,const TQString &group, + bool global,const TQString &domain) : Policies(config,group,global,domain,"javascript.","EnableJavaScript") { } -JSPolicies::JSPolicies() : Policies(0,QString::null,false, - QString::null,QString::null,QString::null) { +JSPolicies::JSPolicies() : Policies(0,TQString::null,false, + TQString::null,TQString::null,TQString::null) { } JSPolicies::~JSPolicies() { @@ -48,7 +48,7 @@ JSPolicies::~JSPolicies() { void JSPolicies::load() { Policies::load(); - QString key; + TQString key; // enableJavaScriptDebugCB->setChecked( m_pConfig->readBoolEntry("EnableJavaScriptDebug",false)); // enableDebugOutputCB->setChecked( m_pConfig->readBoolEntry("EnableJSDebugOutput") ); @@ -89,7 +89,7 @@ void JSPolicies::defaults() { void JSPolicies::save() { Policies::save(); - QString key; + TQString key; key = prefix + "WindowOpenPolicy"; if (window_open != INHERIT_POLICY) config->writeEntry(key, window_open); @@ -125,9 +125,9 @@ void JSPolicies::save() { // == class JSPoliciesFrame == -JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const QString &title, - QWidget* parent) : - QGroupBox(title, parent, "jspoliciesframe"), +JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, + TQWidget* parent) : + TQGroupBox(title, parent, "jspoliciesframe"), policies(policies) { bool is_per_domain = !policies->isGlobal(); @@ -135,57 +135,57 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const QString &title, setColumnLayout(0, Qt::Vertical); layout()->setSpacing(0); layout()->setMargin(0); - QGridLayout *this_layout = new QGridLayout(layout(),5,10+is_per_domain*2); + TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2); this_layout->setAlignment(Qt::AlignTop); this_layout->setSpacing(3); this_layout->setMargin(11); - QString wtstr; // what's this description + TQString wtstr; // what's this description int colIdx; // column index // === window.open ================================ colIdx = 0; - QLabel *label = new QLabel(i18n("Open new windows:"),this); + TQLabel *label = new TQLabel(i18n("Open new windows:"),this); this_layout->addWidget(label,0,colIdx++); - js_popup = new QButtonGroup(this); + js_popup = new TQButtonGroup(this); js_popup->setExclusive(true); js_popup->setHidden(true); - QRadioButton* policy_btn; + TQRadioButton* policy_btn; if (is_per_domain) { - policy_btn = new QRadioButton(i18n("Use global"), this); - QWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); + policy_btn = new TQRadioButton(i18n("Use global"), this); + TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_popup->insert(policy_btn,INHERIT_POLICY); this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ - policy_btn = new QRadioButton(i18n("Allow"), this); - QWhatsThis::add(policy_btn,i18n("Accept all popup window requests.")); + policy_btn = new TQRadioButton(i18n("Allow"), this); + TQWhatsThis::add(policy_btn,i18n("Accept all popup window requests.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAllow); this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); - policy_btn = new QRadioButton(i18n("Ask"), this); - QWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested.")); + policy_btn = new TQRadioButton(i18n("Ask"), this); + TQWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAsk); this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); - policy_btn = new QRadioButton(i18n("Deny"), this); - QWhatsThis::add(policy_btn,i18n("Reject all popup window requests.")); + policy_btn = new TQRadioButton(i18n("Deny"), this); + TQWhatsThis::add(policy_btn,i18n("Reject all popup window requests.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenDeny); this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); - policy_btn = new QRadioButton(i18n("Smart"), this); - QWhatsThis::add(policy_btn, i18n("Accept popup window requests only when " + policy_btn = new TQRadioButton(i18n("Smart"), this); + TQWhatsThis::add(policy_btn, i18n("Accept popup window requests only when " "links are activated through an explicit " "mouse click or keyboard operation.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenSmart); this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("If you disable this, Konqueror will stop " "interpreting the <i>window.open()</i> " @@ -196,116 +196,116 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const QString &title, "also break certain sites that require <i>" "window.open()</i> for proper operation. Use " "this feature carefully."); - QWhatsThis::add(label, wtstr); - connect(js_popup, SIGNAL(clicked(int)), SLOT(setWindowOpenPolicy(int))); + TQWhatsThis::add(label, wtstr); + connect(js_popup, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowOpenPolicy(int))); // === window.resizeBy/resizeTo ================================ colIdx = 0; - label = new QLabel(i18n("Resize window:"),this); + label = new TQLabel(i18n("Resize window:"),this); this_layout->addWidget(label,1,colIdx++); - js_resize = new QButtonGroup(this); + js_resize = new TQButtonGroup(this); js_resize->setExclusive(true); js_resize->setHidden(true); if (is_per_domain) { - policy_btn = new QRadioButton(i18n("Use global"), this); - QWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); + policy_btn = new TQRadioButton(i18n("Use global"), this); + TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_resize->insert(policy_btn,INHERIT_POLICY); this_layout->addWidget(policy_btn,1,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ - policy_btn = new QRadioButton(i18n("Allow"), this); - QWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size.")); + policy_btn = new TQRadioButton(i18n("Allow"), this); + TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size.")); js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeAllow); this_layout->addWidget(policy_btn,1,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); - policy_btn = new QRadioButton(i18n("Ignore"), this); - QWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. " + policy_btn = new TQRadioButton(i18n("Ignore"), this); + TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. " "The web page will <i>think</i> it changed the " "size but the actual window is not affected.")); js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeIgnore); this_layout->addWidget(policy_btn,1,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites change the window size on their own by using " "<i>window.resizeBy()</i> or <i>window.resizeTo()</i>. " "This option specifies the treatment of such " "attempts."); - QWhatsThis::add(label, wtstr); - connect(js_resize, SIGNAL(clicked(int)), SLOT(setWindowResizePolicy(int))); + TQWhatsThis::add(label, wtstr); + connect(js_resize, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowResizePolicy(int))); // === window.moveBy/moveTo ================================ colIdx = 0; - label = new QLabel(i18n("Move window:"),this); + label = new TQLabel(i18n("Move window:"),this); this_layout->addWidget(label,2,colIdx++); - js_move = new QButtonGroup(this); + js_move = new TQButtonGroup(this); js_move->setExclusive(true); js_move->setHidden(true); if (is_per_domain) { - policy_btn = new QRadioButton(i18n("Use global"), this); - QWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); + policy_btn = new TQRadioButton(i18n("Use global"), this); + TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_move->insert(policy_btn,INHERIT_POLICY); this_layout->addWidget(policy_btn,2,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ - policy_btn = new QRadioButton(i18n("Allow"), this); - QWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position.")); + policy_btn = new TQRadioButton(i18n("Allow"), this); + TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position.")); js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveAllow); this_layout->addWidget(policy_btn,2,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); - policy_btn = new QRadioButton(i18n("Ignore"), this); - QWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. " + policy_btn = new TQRadioButton(i18n("Ignore"), this); + TQWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. " "The web page will <i>think</i> it moved the " "window but the actual position is not affected.")); js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveIgnore); this_layout->addWidget(policy_btn,2,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites change the window position on their own by using " "<i>window.moveBy()</i> or <i>window.moveTo()</i>. " "This option specifies the treatment of such " "attempts."); - QWhatsThis::add(label, wtstr); - connect(js_move, SIGNAL(clicked(int)), SLOT(setWindowMovePolicy(int))); + TQWhatsThis::add(label, wtstr); + connect(js_move, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowMovePolicy(int))); // === window.focus ================================ colIdx = 0; - label = new QLabel(i18n("Focus window:"),this); + label = new TQLabel(i18n("Focus window:"),this); this_layout->addWidget(label,3,colIdx++); - js_focus = new QButtonGroup(this); + js_focus = new TQButtonGroup(this); js_focus->setExclusive(true); js_focus->setHidden(true); if (is_per_domain) { - policy_btn = new QRadioButton(i18n("Use global"), this); - QWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); + policy_btn = new TQRadioButton(i18n("Use global"), this); + TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_focus->insert(policy_btn,INHERIT_POLICY); this_layout->addWidget(policy_btn,3,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ - policy_btn = new QRadioButton(i18n("Allow"), this); - QWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") ); + policy_btn = new TQRadioButton(i18n("Allow"), this); + TQWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") ); js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusAllow); this_layout->addWidget(policy_btn,3,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); - policy_btn = new QRadioButton(i18n("Ignore"), this); - QWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to focus the window. " + policy_btn = new TQRadioButton(i18n("Ignore"), this); + TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to focus the window. " "The web page will <i>think</i> it brought " "the focus to the window but the actual " "focus will remain unchanged.") ); js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusIgnore); this_layout->addWidget(policy_btn,3,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites set the focus to their browser window on their " "own by using <i>window.focus()</i>. This usually leads to " @@ -313,68 +313,68 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const QString &title, "action the user was dedicated to at that time. " "This option specifies the treatment of such " "attempts."); - QWhatsThis::add(label, wtstr); - connect(js_focus, SIGNAL(clicked(int)), SLOT(setWindowFocusPolicy(int))); + TQWhatsThis::add(label, wtstr); + connect(js_focus, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowFocusPolicy(int))); // === window.status ================================ colIdx = 0; - label = new QLabel(i18n("Modify status bar text:"),this); + label = new TQLabel(i18n("Modify status bar text:"),this); this_layout->addWidget(label,4,colIdx++); - js_statusbar = new QButtonGroup(this); + js_statusbar = new TQButtonGroup(this); js_statusbar->setExclusive(true); js_statusbar->setHidden(true); if (is_per_domain) { - policy_btn = new QRadioButton(i18n("Use global"), this); - QWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); + policy_btn = new TQRadioButton(i18n("Use global"), this); + TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_statusbar->insert(policy_btn,INHERIT_POLICY); this_layout->addWidget(policy_btn,4,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ - policy_btn = new QRadioButton(i18n("Allow"), this); - QWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar.")); + policy_btn = new TQRadioButton(i18n("Allow"), this); + TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar.")); js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusAllow); this_layout->addWidget(policy_btn,4,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); - policy_btn = new QRadioButton(i18n("Ignore"), this); - QWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the status bar text. " + policy_btn = new TQRadioButton(i18n("Ignore"), this); + TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the status bar text. " "The web page will <i>think</i> it changed " "the text but the actual text will remain " "unchanged.") ); js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusIgnore); this_layout->addWidget(policy_btn,4,colIdx++); - this_layout->addItem(new QSpacerItem(10,0),0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites change the status bar text by setting " "<i>window.status</i> or <i>window.defaultStatus</i>, " "thus sometimes preventing displaying the real URLs of hyperlinks. " "This option specifies the treatment of such " "attempts."); - QWhatsThis::add(label, wtstr); - connect(js_statusbar, SIGNAL(clicked(int)), SLOT(setWindowStatusPolicy(int))); + TQWhatsThis::add(label, wtstr); + connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int))); } JSPoliciesFrame::~JSPoliciesFrame() { } void JSPoliciesFrame::refresh() { - QRadioButton *button; - button = static_cast<QRadioButton *>(js_popup->find( + TQRadioButton *button; + button = static_cast<TQRadioButton *>(js_popup->find( policies->window_open)); if (button != 0) button->setChecked(true); - button = static_cast<QRadioButton *>(js_resize->find( + button = static_cast<TQRadioButton *>(js_resize->find( policies->window_resize)); if (button != 0) button->setChecked(true); - button = static_cast<QRadioButton *>(js_move->find( + button = static_cast<TQRadioButton *>(js_move->find( policies->window_move)); if (button != 0) button->setChecked(true); - button = static_cast<QRadioButton *>(js_focus->find( + button = static_cast<TQRadioButton *>(js_focus->find( policies->window_focus)); if (button != 0) button->setChecked(true); - button = static_cast<QRadioButton *>(js_statusbar->find( + button = static_cast<TQRadioButton *>(js_statusbar->find( policies->window_status)); if (button != 0) button->setChecked(true); } diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h index a955abc96..29f73c090 100644 --- a/kcontrol/konqhtml/jspolicies.h +++ b/kcontrol/konqhtml/jspolicies.h @@ -22,8 +22,8 @@ #ifndef __JSPOLICIES_H__ #define __JSPOLICIES_H__ -#include <qgroupbox.h> -#include <qstring.h> +#include <tqgroupbox.h> +#include <tqstring.h> #include <khtml_settings.h> @@ -63,11 +63,11 @@ public: * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ - JSPolicies(KConfig* config, const QString &group, bool global, - const QString &domain = QString::null); + JSPolicies(KConfig* config, const TQString &group, bool global, + const TQString &domain = TQString::null); /** - * dummy constructor to make QMap happy. + * dummy constructor to make TQMap happy. * * Never construct an object by using this. * @internal @@ -201,7 +201,7 @@ private: * * @author Leo Savernik */ -class JSPoliciesFrame : public QGroupBox { +class JSPoliciesFrame : public TQGroupBox { Q_OBJECT public: /** @@ -211,8 +211,8 @@ public: * @param title title for group box * @param parent parent widget */ - JSPoliciesFrame(JSPolicies *policies, const QString &title, - QWidget* parent = 0); + JSPoliciesFrame(JSPolicies *policies, const TQString &title, + TQWidget* parent = 0); virtual ~JSPoliciesFrame(); @@ -258,11 +258,11 @@ private slots: private: JSPolicies *policies; - QButtonGroup *js_popup; - QButtonGroup *js_resize; - QButtonGroup *js_move; - QButtonGroup *js_focus; - QButtonGroup *js_statusbar; + TQButtonGroup *js_popup; + TQButtonGroup *js_resize; + TQButtonGroup *js_move; + TQButtonGroup *js_focus; + TQButtonGroup *js_statusbar; }; diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp index e6c9a95ba..ca175e8e9 100644 --- a/kcontrol/konqhtml/khttpoptdlg.cpp +++ b/kcontrol/konqhtml/khttpoptdlg.cpp @@ -1,37 +1,37 @@ // File khttpoptdlg.cpp by Jacek Konieczny <jajcus@zeus.posl.gliwice.pl> // Port to KControl by David Faure <faure@kde.org> -#include <qlayout.h> //CT +#include <tqlayout.h> //CT #include <klocale.h> #include <kglobal.h> #include "khttpoptdlg.h" -KHTTPOptions::KHTTPOptions(KConfig *config, QString group, QWidget *parent, const char *name) +KHTTPOptions::KHTTPOptions(KConfig *config, TQString group, TQWidget *parent, const char *name) : KCModule( parent, name ), m_pConfig(config), m_groupname(group) { - QVBoxLayout *lay = new QVBoxLayout(this, 10, 5); + TQVBoxLayout *lay = new TQVBoxLayout(this, 10, 5); - lay->addWidget( new QLabel(i18n("Accept languages:"), this) ); + lay->addWidget( new TQLabel(i18n("Accept languages:"), this) ); - le_languages = new QLineEdit(this); + le_languages = new TQLineEdit(this); lay->addWidget( le_languages ); - connect(le_languages, SIGNAL(textChanged(const QString&)), - this, SLOT(slotChanged())); + connect(le_languages, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotChanged())); lay->addSpacing(10); - lay->addWidget( new QLabel(i18n("Accept character sets:"), this) ); + lay->addWidget( new TQLabel(i18n("Accept character sets:"), this) ); - le_charsets = new QLineEdit(this); + le_charsets = new TQLineEdit(this); lay->addWidget( le_charsets ); - connect(le_charsets, SIGNAL(textChanged(const QString&)), - this, SLOT(slotChanged())); + connect(le_charsets, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotChanged())); lay->addStretch(10); - // defaultCharsets = QString("utf-8 ")+klocale->charset()+" iso-8859-1"; - defaultCharsets = QString("utf-8 ")+" iso-8859-1"; // TODO + // defaultCharsets = TQString("utf-8 ")+klocale->charset()+" iso-8859-1"; + defaultCharsets = TQString("utf-8 ")+" iso-8859-1"; // TODO // finaly read the options load(); @@ -44,7 +44,7 @@ void KHTTPOptions::load() void KHTTPOptions::load( bool useDefaults ) { - QString tmp; + TQString tmp; m_pConfig->setReadDefaults( useDefaults ); diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h index 36e3650b4..f758be15c 100644 --- a/kcontrol/konqhtml/khttpoptdlg.h +++ b/kcontrol/konqhtml/khttpoptdlg.h @@ -2,10 +2,10 @@ #ifndef __KHTTPOPTDLG_H #define __KHTTPOPTDLG_H -#include <qlabel.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qstring.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqstring.h> #include <kcmodule.h> #include <kconfig.h> @@ -19,7 +19,7 @@ class KHTTPOptions : public KCModule { Q_OBJECT public: - KHTTPOptions(KConfig *config, QString group, QWidget *parent = 0L, const char *name = 0L); + KHTTPOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L); virtual void load(); virtual void load( bool useDefaults ); @@ -29,17 +29,17 @@ Q_OBJECT private: KConfig *m_pConfig; - QString m_groupname; + TQString m_groupname; // Acceptable languages "LANG" - locale selected languages - QLabel *lb_languages; - QLineEdit *le_languages; + TQLabel *lb_languages; + TQLineEdit *le_languages; // Acceptable charsets "CHARSET" - locale selected charset - QLabel *lb_charsets; - QLineEdit *le_charsets; + TQLabel *lb_charsets; + TQLineEdit *le_charsets; - QString defaultCharsets; + TQString defaultCharsets; private slots: void slotChanged(); diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index b1d459b00..28654869e 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -27,8 +27,8 @@ #include <kapplication.h> #include <dcopclient.h> -#include <qtabwidget.h> -#include <qlayout.h> +#include <tqtabwidget.h> +#include <tqlayout.h> #include "jsopts.h" #include "javaopts.h" @@ -43,31 +43,31 @@ extern "C" { - KDE_EXPORT KCModule *create_khtml_behavior(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_khtml_behavior(TQWidget *parent, const char *name) { KConfig *c = new KConfig( "konquerorrc", false, false ); return new KMiscHTMLOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT KCModule *create_khtml_fonts(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_khtml_fonts(TQWidget *parent, const char *name) { KConfig *c = new KConfig( "konquerorrc", false, false ); return new KAppearanceOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT KCModule *create_khtml_java_js(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/) { KConfig *c = new KConfig( "konquerorrc", false, false ); return new KJSParts(c, parent, "kcmkonqhtml"); } - KDE_EXPORT KCModule *create_khtml_plugins(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_khtml_plugins(TQWidget *parent, const char *name) { KConfig *c = new KConfig( "konquerorrc", false, false ); return new KPluginOptions(c, "Java/JavaScript Settings", parent, name); } - KDE_EXPORT KCModule *create_khtml_filter(QWidget *parent, const char *name ) + KDE_EXPORT KCModule *create_khtml_filter(TQWidget *parent, const char *name ) { KConfig *c = new KConfig( "khtmlrc", false, false ); return new KCMFilter(c, "Filter Settings", parent, name); @@ -75,7 +75,7 @@ extern "C" } -KJSParts::KJSParts(KConfig *config, QWidget *parent, const char *name) +KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name) : KCModule(parent, name), mConfig(config) { KAboutData *about = @@ -97,18 +97,18 @@ KJSParts::KJSParts(KConfig *config, QWidget *parent, const char *name) setAboutData( about ); - QVBoxLayout *layout = new QVBoxLayout(this); - tab = new QTabWidget(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); + tab = new TQTabWidget(this); layout->addWidget(tab); // ### the groupname is duplicated in KJSParts::save java = new KJavaOptions( config, "Java/JavaScript Settings", this, name ); tab->addTab( java, i18n( "&Java" ) ); - connect( java, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) ); + connect( java, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); javascript = new KJavaScriptOptions( config, "Java/JavaScript Settings", this, name ); tab->addTab( javascript, i18n( "Java&Script" ) ); - connect( javascript, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) ); + connect( javascript, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); } KJSParts::~KJSParts() @@ -141,7 +141,7 @@ void KJSParts::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); @@ -154,7 +154,7 @@ void KJSParts::defaults() java->defaults(); } -QString KJSParts::quickHelp() const +TQString KJSParts::quickHelp() const { return i18n("<h2>JavaScript</h2>On this page, you can configure " "whether JavaScript programs embedded in web pages should " diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h index 20f461fa2..db89be8ab 100644 --- a/kcontrol/konqhtml/main.h +++ b/kcontrol/konqhtml/main.h @@ -39,17 +39,17 @@ class KJSParts : public KCModule public: - KJSParts(KConfig *config,QWidget *parent, const char *name); + KJSParts(KConfig *config,TQWidget *parent, const char *name); virtual ~KJSParts(); void load(); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; private: - QTabWidget *tab; + TQTabWidget *tab; KJavaScriptOptions *javascript; KJavaOptions *java; diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index f31af3c40..d5cd4cc2b 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -7,12 +7,12 @@ #include <stdlib.h> #include <unistd.h> -#include <qlayout.h> -#include <qprogressdialog.h> -#include <qregexp.h> -#include <qslider.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqprogressdialog.h> +#include <tqregexp.h> +#include <tqslider.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> #include <dcopclient.h> #include <kapplication.h> @@ -33,8 +33,8 @@ // == class PluginPolicies ===== -PluginPolicies::PluginPolicies(KConfig* config, const QString &group, bool global, - const QString &domain) : +PluginPolicies::PluginPolicies(KConfig* config, const TQString &group, bool global, + const TQString &domain) : Policies(config,group,global,domain,"plugins.","EnablePlugins") { } @@ -43,7 +43,7 @@ PluginPolicies::~PluginPolicies() { // == class KPluginOptions ===== -KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent, +KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *parent, const char *) : KCModule( parent, "kcmkonqhtml" ), m_pConfig( config ), @@ -51,36 +51,36 @@ KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent, m_nspluginscan (0), global_policies(config,group,true) { - QVBoxLayout* toplevel = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout* toplevel = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); /************************************************************************** ******************** Global Settings ************************************* *************************************************************************/ - QVGroupBox* globalGB = new QVGroupBox( i18n( "Global Settings" ), this ); + TQVGroupBox* globalGB = new TQVGroupBox( i18n( "Global Settings" ), this ); toplevel->addWidget( globalGB ); - enablePluginsGloballyCB = new QCheckBox( i18n( "&Enable plugins globally" ), globalGB ); - enableHTTPOnly = new QCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB ); - enableUserDemand = new QCheckBox( i18n( "&Load plugins on demand only" ), globalGB ); - priorityLabel = new QLabel(i18n("CPU priority for plugins: %1").arg(QString::null), globalGB); - priority = new QSlider(5, 100, 5, 100, Horizontal, globalGB); - connect( enablePluginsGloballyCB, SIGNAL( clicked() ), this, SLOT( slotChanged() ) ); - connect( enablePluginsGloballyCB, SIGNAL( clicked() ), this, SLOT( slotTogglePluginsEnabled() ) ); - connect( enableHTTPOnly, SIGNAL( clicked() ), this, SLOT( slotChanged() ) ); - connect( enableUserDemand, SIGNAL( clicked() ), this, SLOT( slotChanged() ) ); - connect( priority, SIGNAL( valueChanged(int) ), this, SLOT( slotChanged() ) ); - connect( priority, SIGNAL( valueChanged(int) ), this, SLOT( updatePLabel(int) ) ); - - QFrame *hrule = new QFrame(globalGB); - hrule->setFrameStyle(QFrame::HLine | QFrame::Sunken); - hrule->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed); + enablePluginsGloballyCB = new TQCheckBox( i18n( "&Enable plugins globally" ), globalGB ); + enableHTTPOnly = new TQCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB ); + enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB ); + priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString::null), globalGB); + priority = new TQSlider(5, 100, 5, 100, Horizontal, globalGB); + connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) ); + connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect( enableUserDemand, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); + connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( updatePLabel(int) ) ); + + TQFrame *hrule = new TQFrame(globalGB); + hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); + hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); /************************************************************************** ********************* Domain-specific Settings *************************** *************************************************************************/ - QPushButton *domainSpecPB = new QPushButton(i18n("Domain-Specific Settin&gs"), + TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), globalGB); - domainSpecPB->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); - connect(domainSpecPB,SIGNAL(clicked()),SLOT(slotShowDomainDlg())); + domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, i18n("Domain-Specific Policies"),KDialogBase::Close, @@ -88,30 +88,30 @@ KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent, domainSpecific = new PluginDomainListView(config,group,this,domainSpecificDlg); domainSpecific->setMinimumSize(320,200); - connect(domainSpecific,SIGNAL(changed(bool)),SLOT(slotChanged())); + connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged())); domainSpecificDlg->setMainWidget(domainSpecific); /************************************************************************** ********************** WhatsThis? items ********************************** *************************************************************************/ - QWhatsThis::add( enablePluginsGloballyCB, i18n("Enables the execution of plugins " + TQWhatsThis::add( enablePluginsGloballyCB, i18n("Enables the execution of plugins " "that can be contained in HTML pages, e.g. Macromedia Flash. " "Note that, as with any browser, enabling active contents can be a security problem.") ); - QString wtstr = i18n("This box contains the domains and hosts you have set " + TQString wtstr = i18n("This box contains the domains and hosts you have set " "a specific plugin policy for. This policy will be used " "instead of the default policy for enabling or disabling plugins on pages sent by these " "domains or hosts. <p>Select a policy and use the controls on " "the right to modify it."); - QWhatsThis::add( domainSpecific->listView(), wtstr ); - QWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " + TQWhatsThis::add( domainSpecific->listView(), wtstr ); + TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " "the plugin policies. These policies will be merged " "with the existing ones. Duplicate entries are ignored.") ); - QWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the plugin policy to a zipped " + TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the plugin policy to a zipped " "file. The file, named <b>plugin_policy.tgz</b>, will be " "saved to a location of your choice." ) ); - QWhatsThis::add( domainSpecific, i18n("Here you can set specific plugin policies for any particular " + TQWhatsThis::add( domainSpecific, i18n("Here you can set specific plugin policies for any particular " "host or domain. To add a new policy, simply click the <i>New...</i> " "button and supply the necessary information requested by the " "dialog box. To change an existing policy, click on the <i>Change...</i> " @@ -126,7 +126,7 @@ KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent, /*****************************************************************************/ - QVGroupBox* netscapeGB = new QVGroupBox( i18n( "Netscape Plugins" ), this ); + TQVGroupBox* netscapeGB = new TQVGroupBox( i18n( "Netscape Plugins" ), this ); toplevel->addWidget( netscapeGB ); // create Designer made widget @@ -134,8 +134,8 @@ KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent, m_widget->dirEdit->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory); // setup widgets - connect( m_widget->scanAtStartup, SIGNAL(clicked()), SLOT(change()) ); - connect( m_widget->scanButton, SIGNAL(clicked()), SLOT(scan()) ); + connect( m_widget->scanAtStartup, TQT_SIGNAL(clicked()), TQT_SLOT(change()) ); + connect( m_widget->scanButton, TQT_SIGNAL(clicked()), TQT_SLOT(scan()) ); m_changed = false; @@ -153,7 +153,7 @@ KPluginOptions::~KPluginOptions() void KPluginOptions::updatePLabel(int p) { - QString level; + TQString level; p = (100 - p)/5; if (p > 15) { level = i18n("lowest priority", "lowest"); @@ -229,7 +229,7 @@ void KPluginOptions::save() m_pConfig->sync(); // I need a sync here, otherwise "apply" won't work // instantly - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); @@ -252,7 +252,7 @@ void KPluginOptions::save() change( false ); } -QString KPluginOptions::quickHelp() const +TQString KPluginOptions::quickHelp() const { return i18n("<h1>Konqueror Plugins</h1> The Konqueror web browser can use Netscape" " plugins to show special content, just like the Navigator does. Please note that" @@ -282,7 +282,7 @@ void KPluginOptions::scan() int ret = KMessageBox::warningYesNoCancel( this, i18n("Do you want to apply your changes " "before the scan? Otherwise the " - "changes will be lost."), QString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); + "changes will be lost."), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); if ( ret==KMessageBox::Cancel ) { m_widget->scanButton->setEnabled(true); return; @@ -292,7 +292,7 @@ void KPluginOptions::scan() } m_nspluginscan = new KProcIO; - QString scanExe = KGlobal::dirs()->findExe("nspluginscan"); + TQString scanExe = KGlobal::dirs()->findExe("nspluginscan"); if (!scanExe) { kdDebug() << "can't find nspluginviewer" << endl; delete m_nspluginscan; @@ -306,24 +306,24 @@ void KPluginOptions::scan() } // find nspluginscan executable - m_progress = new QProgressDialog( i18n("Scanning for plugins"), i18n("Cancel"), 100, this ); + m_progress = new TQProgressDialog( i18n("Scanning for plugins"), i18n("Cancel"), 100, this ); m_progress->setProgress( 5 ); // start nspluginscan *m_nspluginscan << scanExe << "--verbose"; kdDebug() << "Running nspluginscan" << endl; - connect(m_nspluginscan, SIGNAL(readReady(KProcIO*)), - this, SLOT(progress(KProcIO*))); - connect(m_nspluginscan, SIGNAL(processExited(KProcess *)), - this, SLOT(scanDone())); - connect(m_progress, SIGNAL(cancelled()), this, SLOT(scanDone())); + connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)), + this, TQT_SLOT(progress(KProcIO*))); + connect(m_nspluginscan, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(scanDone())); + connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone())); m_nspluginscan->start(); } void KPluginOptions::progress(KProcIO *proc) { - QString line; + TQString line; while(proc->readln(line) > 0) ; m_progress->setProgress(line.stripWhiteSpace().toInt()); @@ -345,28 +345,28 @@ void KPluginOptions::scanDone() void KPluginOptions::dirInit() { m_widget->dirEdit->setCaption(i18n("Select Plugin Scan Folder")); - connect( m_widget->dirNew, SIGNAL(clicked()), SLOT(dirNew())); - connect( m_widget->dirRemove, SIGNAL(clicked()), SLOT(dirRemove())); - connect( m_widget->dirUp, SIGNAL(clicked()), SLOT(dirUp())); - connect( m_widget->dirDown, SIGNAL(clicked()), SLOT(dirDown()) ); - connect( m_widget->useArtsdsp, SIGNAL(clicked()),SLOT(change())); + connect( m_widget->dirNew, TQT_SIGNAL(clicked()), TQT_SLOT(dirNew())); + connect( m_widget->dirRemove, TQT_SIGNAL(clicked()), TQT_SLOT(dirRemove())); + connect( m_widget->dirUp, TQT_SIGNAL(clicked()), TQT_SLOT(dirUp())); + connect( m_widget->dirDown, TQT_SIGNAL(clicked()), TQT_SLOT(dirDown()) ); + connect( m_widget->useArtsdsp, TQT_SIGNAL(clicked()),TQT_SLOT(change())); connect( m_widget->dirEdit, - SIGNAL(textChanged(const QString&)), - SLOT(dirEdited(const QString &)) ); + TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(dirEdited(const TQString &)) ); connect( m_widget->dirList, - SIGNAL(executed(QListBoxItem*)), - SLOT(dirSelect(QListBoxItem*)) ); + TQT_SIGNAL(executed(TQListBoxItem*)), + TQT_SLOT(dirSelect(TQListBoxItem*)) ); connect( m_widget->dirList, - SIGNAL(selectionChanged(QListBoxItem*)), - SLOT(dirSelect(QListBoxItem*)) ); + TQT_SIGNAL(selectionChanged(TQListBoxItem*)), + TQT_SLOT(dirSelect(TQListBoxItem*)) ); } void KPluginOptions::dirLoad( KConfig *config, bool useDefault ) { - QStringList paths; + TQStringList paths; // read search paths @@ -409,8 +409,8 @@ void KPluginOptions::dirLoad( KConfig *config, bool useDefault ) void KPluginOptions::dirSave( KConfig *config ) { // create stringlist - QStringList paths; - QListBoxItem *item = m_widget->dirList->firstItem(); + TQStringList paths; + TQListBoxItem *item = m_widget->dirList->firstItem(); for ( ; item!=0; item=item->next() ) if ( !item->text().isEmpty() ) paths << item->text(); @@ -422,7 +422,7 @@ void KPluginOptions::dirSave( KConfig *config ) } -void KPluginOptions::dirSelect( QListBoxItem *item ) +void KPluginOptions::dirSelect( TQListBoxItem *item ) { m_widget->dirEdit->setEnabled( item!=0 ); m_widget->dirRemove->setEnabled( item!=0 ); @@ -430,16 +430,16 @@ void KPluginOptions::dirSelect( QListBoxItem *item ) unsigned cur = m_widget->dirList->index(m_widget->dirList->selectedItem()); m_widget->dirDown->setEnabled( item!=0 && cur<m_widget->dirList->count()-1 ); m_widget->dirUp->setEnabled( item!=0 && cur>0 ); - m_widget->dirEdit->setURL( item!=0 ? item->text() : QString::null ); + m_widget->dirEdit->setURL( item!=0 ? item->text() : TQString::null ); } void KPluginOptions::dirNew() { - m_widget->dirList->insertItem( QString::null, 0 ); + m_widget->dirList->insertItem( TQString::null, 0 ); m_widget->dirList->setCurrentItem( 0 ); dirSelect( m_widget->dirList->selectedItem() ); - m_widget->dirEdit->setURL(QString::null); + m_widget->dirEdit->setURL(TQString::null); m_widget->dirEdit->setFocus(); change(); } @@ -447,7 +447,7 @@ void KPluginOptions::dirNew() void KPluginOptions::dirRemove() { - m_widget->dirEdit->setURL(QString::null); + m_widget->dirEdit->setURL(TQString::null); delete m_widget->dirList->selectedItem(); m_widget->dirRemove->setEnabled( false ); m_widget->dirUp->setEnabled( false ); @@ -461,7 +461,7 @@ void KPluginOptions::dirUp() { unsigned cur = m_widget->dirList->index(m_widget->dirList->selectedItem()); if ( cur>0 ) { - QString txt = m_widget->dirList->text(cur-1); + TQString txt = m_widget->dirList->text(cur-1); m_widget->dirList->removeItem( cur-1 ); m_widget->dirList->insertItem( txt, cur ); @@ -476,7 +476,7 @@ void KPluginOptions::dirDown() { unsigned cur = m_widget->dirList->index(m_widget->dirList->selectedItem()); if ( cur < m_widget->dirList->count()-1 ) { - QString txt = m_widget->dirList->text(cur+1); + TQString txt = m_widget->dirList->text(cur+1); m_widget->dirList->removeItem( cur+1 ); m_widget->dirList->insertItem( txt, cur ); @@ -487,7 +487,7 @@ void KPluginOptions::dirDown() } -void KPluginOptions::dirEdited(const QString &txt ) +void KPluginOptions::dirEdited(const TQString &txt ) { if ( m_widget->dirList->currentText() != txt ) { m_widget->dirList->blockSignals(true); @@ -510,28 +510,28 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ ) { kdDebug() << "-> KPluginOptions::fillPluginList" << endl; m_widget->pluginList->clear(); - QRegExp version(";version=[^:]*:"); + TQRegExp version(";version=[^:]*:"); // open the cache file - QFile cachef( locate("data", "nsplugins/cache") ); + TQFile cachef( locate("data", "nsplugins/cache") ); if ( !cachef.exists() || !cachef.open(IO_ReadOnly) ) { kdDebug() << "Could not load plugin cache file!" << endl; return; } - QTextStream cache(&cachef); + TQTextStream cache(&cachef); // root object - QListViewItem *root = new QListViewItem( m_widget->pluginList, i18n("Netscape Plugins") ); + TQListViewItem *root = new TQListViewItem( m_widget->pluginList, i18n("Netscape Plugins") ); root->setOpen( true ); root->setSelectable( false ); root->setExpandable( true ); root->setPixmap(0, SmallIcon("netscape")); // read in cache - QString line, plugin; - QListViewItem *next = 0; - QListViewItem *lastMIME = 0; + TQString line, plugin; + TQListViewItem *next = 0; + TQListViewItem *lastMIME = 0; while ( !cache.atEnd() ) { line = cache.readLine(); @@ -545,7 +545,7 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ ) //kdDebug() << "plugin=" << plugin << endl; // add plugin root item - next = new QListViewItem( root, i18n("Plugin"), plugin ); + next = new TQListViewItem( root, i18n("Plugin"), plugin ); next->setOpen( false ); next->setSelectable( false ); next->setExpandable( true ); @@ -555,24 +555,24 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ ) continue; } - QStringList desc = QStringList::split(':', line, TRUE); - QString mime = desc[0].stripWhiteSpace(); - QString name = desc[2]; - QString suffixes = desc[1]; + TQStringList desc = TQStringList::split(':', line, TRUE); + TQString mime = desc[0].stripWhiteSpace(); + TQString name = desc[2]; + TQString suffixes = desc[1]; if (!mime.isEmpty()) { //kdDebug() << "mime=" << mime << " desc=" << name << " suffix=" << suffixes << endl; - lastMIME = new QListViewItem( next, lastMIME, i18n("MIME type"), mime ); + lastMIME = new TQListViewItem( next, lastMIME, i18n("MIME type"), mime ); lastMIME->setOpen( false ); lastMIME->setSelectable( false ); lastMIME->setExpandable( true ); - QListViewItem *last = new QListViewItem( lastMIME, 0, i18n("Description"), name ); + TQListViewItem *last = new TQListViewItem( lastMIME, 0, i18n("Description"), name ); last->setOpen( false ); last->setSelectable( false ); last->setExpandable( false ); - last = new QListViewItem( lastMIME, last, i18n("Suffixes"), suffixes ); + last = new TQListViewItem( lastMIME, last, i18n("Suffixes"), suffixes ); last->setOpen( false ); last->setSelectable( false ); last->setExpandable( false ); @@ -590,22 +590,22 @@ void KPluginOptions::pluginSave( KConfig* /*config*/ ) // == class PluginDomainDialog ===== -PluginDomainDialog::PluginDomainDialog(QWidget *parent) : - QWidget(parent,"PluginDomainDialog") { +PluginDomainDialog::PluginDomainDialog(TQWidget *parent) : + TQWidget(parent,"PluginDomainDialog") { setCaption(i18n("Domain-Specific Policies")); - thisLayout = new QVBoxLayout(this); + thisLayout = new TQVBoxLayout(this); thisLayout->addSpacing(6); - QFrame *hrule = new QFrame(this); - hrule->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *hrule = new TQFrame(this); + hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); thisLayout->addWidget(hrule); thisLayout->addSpacing(6); - QBoxLayout *hl = new QHBoxLayout(this,0,6); + TQBoxLayout *hl = new TQHBoxLayout(this,0,6); hl->addStretch(10); - QPushButton *closePB = new KPushButton(KStdGuiItem::close(),this); - connect(closePB,SIGNAL(clicked()),SLOT(slotClose())); + TQPushButton *closePB = new KPushButton(KStdGuiItem::close(),this); + connect(closePB,TQT_SIGNAL(clicked()),TQT_SLOT(slotClose())); hl->addWidget(closePB); thisLayout->addLayout(hl); } @@ -613,7 +613,7 @@ PluginDomainDialog::PluginDomainDialog(QWidget *parent) : PluginDomainDialog::~PluginDomainDialog() { } -void PluginDomainDialog::setMainWidget(QWidget *widget) { +void PluginDomainDialog::setMainWidget(TQWidget *widget) { thisLayout->insertWidget(0,widget); } @@ -623,8 +623,8 @@ void PluginDomainDialog::slotClose() { // == class PluginDomainListView ===== -PluginDomainListView::PluginDomainListView(KConfig *config,const QString &group, - KPluginOptions *options,QWidget *parent,const char *name) +PluginDomainListView::PluginDomainListView(KConfig *config,const TQString &group, + KPluginOptions *options,TQWidget *parent,const char *name) : DomainListView(config,i18n( "Doma&in-Specific" ), parent, name), group(group), options(options) { } @@ -634,7 +634,7 @@ PluginDomainListView::~PluginDomainListView() { void PluginDomainListView::setupPolicyDlg(PushButton trigger,PolicyDialog &pDlg, Policies *pol) { - QString caption; + TQString caption; switch (trigger) { case AddButton: caption = i18n( "New Plugin Policy" ); diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h index 46142dcf7..60c89b57e 100644 --- a/kcontrol/konqhtml/pluginopts.h +++ b/kcontrol/konqhtml/pluginopts.h @@ -11,7 +11,7 @@ #ifndef __PLUGINOPTS_H__ #define __PLUGINOPTS_H__ -#include <qwidget.h> +#include <tqwidget.h> #include "domainlistview.h" #include "policies.h" @@ -44,8 +44,8 @@ public: * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ - PluginPolicies(KConfig* config, const QString &group, bool global, - const QString &domain = QString::null); + PluginPolicies(KConfig* config, const TQString &group, bool global, + const TQString &domain = TQString::null); virtual ~PluginPolicies(); }; @@ -55,8 +55,8 @@ public: class PluginDomainListView : public DomainListView { Q_OBJECT public: - PluginDomainListView(KConfig *config,const QString &group,KPluginOptions *opt, - QWidget *parent,const char *name = 0); + PluginDomainListView(KConfig *config,const TQString &group,KPluginOptions *opt, + TQWidget *parent,const char *name = 0); virtual ~PluginDomainListView(); protected: @@ -66,28 +66,28 @@ protected: Policies *copy); private: - QString group; + TQString group; KPluginOptions *options; }; /** * dialog for embedding a PluginDomainListView widget */ -class PluginDomainDialog : public QWidget { +class PluginDomainDialog : public TQWidget { Q_OBJECT public: - PluginDomainDialog(QWidget *parent); + PluginDomainDialog(TQWidget *parent); virtual ~PluginDomainDialog(); - void setMainWidget(QWidget *widget); + void setMainWidget(TQWidget *widget); private slots: virtual void slotClose(); private: PluginDomainListView *domainSpecific; - QBoxLayout *thisLayout; + TQBoxLayout *thisLayout; }; class KPluginOptions : public KCModule @@ -95,14 +95,14 @@ class KPluginOptions : public KCModule Q_OBJECT public: - KPluginOptions( KConfig* config, QString group, QWidget* parent = 0, const char* name = 0 ); + KPluginOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); ~KPluginOptions(); virtual void load(); virtual void load( bool useDefaults ); virtual void save(); virtual void defaults(); - QString quickHelp() const; + TQString quickHelp() const; private slots: void slotChanged(); @@ -112,9 +112,9 @@ private slots: private: KConfig* m_pConfig; - QString m_groupname; + TQString m_groupname; - QCheckBox *enablePluginsGloballyCB, *enableHTTPOnly, *enableUserDemand; + TQCheckBox *enablePluginsGloballyCB, *enableHTTPOnly, *enableUserDemand; protected slots: @@ -129,10 +129,10 @@ private: private: NSConfigWidget *m_widget; bool m_changed; - QProgressDialog *m_progress; + TQProgressDialog *m_progress; KProcIO* m_nspluginscan; - QSlider *priority; - QLabel *priorityLabel; + TQSlider *priority; + TQLabel *priorityLabel; PluginPolicies global_policies; PluginDomainListView *domainSpecific; KDialogBase *domainSpecificDlg; @@ -148,8 +148,8 @@ private: void dirRemove(); void dirUp(); void dirDown(); - void dirEdited(const QString &); - void dirSelect( QListBoxItem * ); + void dirEdited(const TQString &); + void dirSelect( TQListBoxItem * ); /******************************************************************************/ protected: diff --git a/kcontrol/konqhtml/policies.cpp b/kcontrol/konqhtml/policies.cpp index 153c80888..524bd4d15 100644 --- a/kcontrol/konqhtml/policies.cpp +++ b/kcontrol/konqhtml/policies.cpp @@ -26,14 +26,14 @@ // == class Policies == -Policies::Policies(KConfig* config,const QString &group, - bool global,const QString &domain, const QString &prefix, - const QString &feature_key) : +Policies::Policies(KConfig* config,const TQString &group, + bool global,const TQString &domain, const TQString &prefix, + const TQString &feature_key) : is_global(global), config(config), groupname(group), prefix(prefix), feature_key(feature_key) { if (is_global) { - this->prefix = QString::null; // global keys have no prefix + this->prefix = TQString::null; // global keys have no prefix }/*end if*/ setDomain(domain); } @@ -41,7 +41,7 @@ Policies::Policies(KConfig* config,const QString &group, Policies::~Policies() { } -void Policies::setDomain(const QString &domain) { +void Policies::setDomain(const TQString &domain) { if (is_global) return; this->domain = domain.lower(); groupname = this->domain; // group is domain in this case @@ -50,7 +50,7 @@ void Policies::setDomain(const QString &domain) { void Policies::load() { config->setGroup(groupname); - QString key = prefix + feature_key; + TQString key = prefix + feature_key; if (config->hasKey(key)) feature_enabled = config->readBoolEntry(key); else @@ -64,7 +64,7 @@ void Policies::defaults() { void Policies::save() { config->setGroup(groupname); - QString key = prefix + feature_key; + TQString key = prefix + feature_key; if (feature_enabled != INHERIT_POLICY) config->writeEntry(key, (bool)feature_enabled); else diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h index b5643c0bd..a9814396a 100644 --- a/kcontrol/konqhtml/policies.h +++ b/kcontrol/konqhtml/policies.h @@ -22,7 +22,7 @@ #ifndef __POLICIES_H__ #define __POLICIES_H__ -#include <qstring.h> +#include <tqstring.h> class KConfig; @@ -54,9 +54,9 @@ public: * @param feature_key key of the "feature enabled" policy. The final * key the policy is stored under will be prefix + featureKey. */ - Policies(KConfig* config, const QString &group, bool global, - const QString &domain, const QString &prefix, - const QString &feature_key); + Policies(KConfig* config, const TQString &group, bool global, + const TQString &domain, const TQString &prefix, + const TQString &feature_key); virtual ~Policies(); @@ -70,7 +70,7 @@ public: /** sets a new domain for this policy * @param domain domain name, will be converted to lowercase */ - void setDomain(const QString &domain); + void setDomain(const TQString &domain); /** * Returns whether the "feature enabled" policy is inherited. @@ -124,10 +124,10 @@ protected: bool is_global; KConfig *config; - QString groupname; - QString domain; - QString prefix; - QString feature_key; + TQString groupname; + TQString domain; + TQString prefix; + TQString feature_key; }; #endif // __POLICIES_H__ diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp index 801068d3a..4f1529ed8 100644 --- a/kcontrol/konqhtml/policydlg.cpp +++ b/kcontrol/konqhtml/policydlg.cpp @@ -2,48 +2,48 @@ // (C) 2002 Leo Savernik <l.savernik@aon.at> // Generalizing the policy dialog -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> #include <klocale.h> #include <kbuttonbox.h> #include <kmessagebox.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include "policydlg.h" #include "policies.h" -PolicyDialog::PolicyDialog( Policies *policies, QWidget *parent, const char *name ) - : KDialogBase(parent, name, true, QString::null, Ok|Cancel, Ok, true), +PolicyDialog::PolicyDialog( Policies *policies, TQWidget *parent, const char *name ) + : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true), policies(policies) { - QFrame *main = makeMainWidget(); + TQFrame *main = makeMainWidget(); insertIdx = 1; // index where to insert additional panels - topl = new QVBoxLayout(main, 0, spacingHint()); + topl = new TQVBoxLayout(main, 0, spacingHint()); - QGridLayout *grid = new QGridLayout(topl, 2, 2); + TQGridLayout *grid = new TQGridLayout(topl, 2, 2); grid->setColStretch(1, 1); - QLabel *l = new QLabel(i18n("&Host or domain name:"), main); + TQLabel *l = new TQLabel(i18n("&Host or domain name:"), main); grid->addWidget(l, 0, 0); - le_domain = new QLineEdit(main); + le_domain = new TQLineEdit(main); l->setBuddy( le_domain ); grid->addWidget(le_domain, 0, 1); - connect( le_domain,SIGNAL(textChanged( const QString & )), - SLOT(slotTextChanged( const QString &))); + connect( le_domain,TQT_SIGNAL(textChanged( const TQString & )), + TQT_SLOT(slotTextChanged( const TQString &))); - QWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.kde.org) " + TQWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.kde.org) " "or a domain, starting with a dot (like .kde.org or .org)") ); - l_feature_policy = new QLabel(main); + l_feature_policy = new TQLabel(main); grid->addWidget(l_feature_policy, 1, 0); - cb_feature_policy = new QComboBox(main); + cb_feature_policy = new TQComboBox(main); l_feature_policy->setBuddy( cb_feature_policy ); policy_values << i18n("Use Global") << i18n("Accept") << i18n("Reject"); cb_feature_policy->insertStringList(policy_values); @@ -58,12 +58,12 @@ PolicyDialog::FeatureEnabledPolicy PolicyDialog::featureEnabledPolicy() const { return (FeatureEnabledPolicy)cb_feature_policy->currentItem(); } -void PolicyDialog::slotTextChanged( const QString &text) +void PolicyDialog::slotTextChanged( const TQString &text) { enableButtonOK(!text.isEmpty()); } -void PolicyDialog::setDisableEdit( bool state, const QString& text ) +void PolicyDialog::setDisableEdit( bool state, const TQString& text ) { le_domain->setText( text ); @@ -85,24 +85,24 @@ void PolicyDialog::refresh() { cb_feature_policy->setCurrentItem(pol); } -void PolicyDialog::setFeatureEnabledLabel(const QString &text) { +void PolicyDialog::setFeatureEnabledLabel(const TQString &text) { l_feature_policy->setText(text); } -void PolicyDialog::setFeatureEnabledWhatsThis(const QString &text) { - QWhatsThis::add(cb_feature_policy, text); +void PolicyDialog::setFeatureEnabledWhatsThis(const TQString &text) { + TQWhatsThis::add(cb_feature_policy, text); } -void PolicyDialog::addPolicyPanel(QWidget *panel) { +void PolicyDialog::addPolicyPanel(TQWidget *panel) { topl->insertWidget(insertIdx++,panel); } -QString PolicyDialog::featureEnabledPolicyText() const { +TQString PolicyDialog::featureEnabledPolicyText() const { int pol = cb_feature_policy->currentItem(); if (pol >= 0 && pol < 3) // Keep in sync with FeatureEnabledPolicy return policy_values[pol]; else - return QString::null; + return TQString::null; } void PolicyDialog::accept() @@ -122,7 +122,7 @@ void PolicyDialog::accept() } else { policies->setFeatureEnabled(true); } - QDialog::accept(); + TQDialog::accept(); } #include "policydlg.moc" diff --git a/kcontrol/konqhtml/policydlg.h b/kcontrol/konqhtml/policydlg.h index 6922aa736..bfb63e4f2 100644 --- a/kcontrol/konqhtml/policydlg.h +++ b/kcontrol/konqhtml/policydlg.h @@ -7,8 +7,8 @@ #include <kdialogbase.h> -#include <qlineedit.h> -#include <qstringlist.h> +#include <tqlineedit.h> +#include <tqstringlist.h> class QLabel; class QComboBox; @@ -47,7 +47,7 @@ public: * @param parent parent widget this belongs to * @param name internal name */ - PolicyDialog(Policies *policies, QWidget *parent = 0, const char *name = 0 ); + PolicyDialog(Policies *policies, TQWidget *parent = 0, const char *name = 0 ); virtual ~PolicyDialog() {}; @@ -61,12 +61,12 @@ public: * @return the textual representation of the current "feature enabled" * policy */ - QString featureEnabledPolicyText() const; + TQString featureEnabledPolicyText() const; /* * @return the hostname for which the policy is being set */ - QString domain() const { return le_domain->text(); } + TQString domain() const { return le_domain->text(); } /* * Sets the line-edit to be enabled/disabled. @@ -77,20 +77,20 @@ public: * @param state @p true to enable the line-edit, otherwise disabled. * @param text the text to be set in the line-edit. Default is NULL. */ - void setDisableEdit( bool /*state*/, const QString& text = QString::null ); + void setDisableEdit( bool /*state*/, const TQString& text = TQString::null ); /** * Sets the label for the "feature enabled" policy * @param text label text */ - void setFeatureEnabledLabel(const QString &text); + void setFeatureEnabledLabel(const TQString &text); /** * Sets the "What's This" text for the "feature enabled" policy * combo box. * @param text what's-this text */ - void setFeatureEnabledWhatsThis(const QString &text); + void setFeatureEnabledWhatsThis(const TQString &text); /** * Syncs the controls with the current content of the @@ -108,23 +108,23 @@ public: * @param panel pointer to widget to insert. The dialog takes ownership * of it, but does not reparent it. */ - void addPolicyPanel(QWidget *panel); + void addPolicyPanel(TQWidget *panel); protected slots: virtual void accept(); - void slotTextChanged( const QString &text); + void slotTextChanged( const TQString &text); private: Policies *policies; - QVBoxLayout *topl; + TQVBoxLayout *topl; int insertIdx; - QLineEdit *le_domain; - QLabel *l_feature_policy; - QComboBox *cb_feature_policy; - QWidget *panel; - QStringList policy_values; - QPushButton *okButton; + TQLineEdit *le_domain; + TQLabel *l_feature_policy; + TQComboBox *cb_feature_policy; + TQWidget *panel; + TQStringList policy_values; + TQPushButton *okButton; }; #endif diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 19b547366..64ecc45d9 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include <qcheckbox.h> -#include <qlayout.h> -#include <qstringlist.h> -#include <qtabwidget.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqstringlist.h> +#include <tqtabwidget.h> #include <dcopclient.h> @@ -33,10 +33,10 @@ #include "sessioneditor.h" #include "kcmkonsole.h" -typedef KGenericFactory<KCMKonsole, QWidget> ModuleFactory; +typedef KGenericFactory<KCMKonsole, TQWidget> ModuleFactory; K_EXPORT_COMPONENT_FACTORY( kcm_konsole, ModuleFactory("kcmkonsole") ) -KCMKonsole::KCMKonsole(QWidget * parent, const char *name, const QStringList&) +KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&) :KCModule(ModuleFactory::instance(), parent, name) { @@ -45,7 +45,7 @@ KCMKonsole::KCMKonsole(QWidget * parent, const char *name, const QStringList&) "configured using the RMB) and you can edit the schemas and sessions " "available to Konsole.")); - QVBoxLayout *topLayout = new QVBoxLayout(this); + TQVBoxLayout *topLayout = new TQVBoxLayout(this); dialog = new KCMKonsoleDialog(this); dialog->line_spacingSB->setRange(0, 8, 1, false); dialog->line_spacingSB->setSpecialValueText(i18n("normal line spacing", "Normal")); @@ -60,24 +60,24 @@ KCMKonsole::KCMKonsole(QWidget * parent, const char *name, const QStringList&) ab->addAuthor("Andrea Rizzi",0, "rizzi@kde.org"); setAboutData( ab ); - connect(dialog->terminalSizeHintCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->warnCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->ctrldragCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->cutToBeginningOfLineCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->allowResizeCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->bidiCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->xonXoffCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->blinkingCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->frameCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->line_spacingSB,SIGNAL(valueChanged(int)), SLOT( changed() )); - connect(dialog->matchTabWinTitleCB,SIGNAL(toggled(bool)), SLOT( changed() )); - connect(dialog->silence_secondsSB,SIGNAL(valueChanged(int)), SLOT( changed() )); - connect(dialog->word_connectorLE,SIGNAL(textChanged(const QString &)), SLOT( changed() )); - connect(dialog->SchemaEditor1, SIGNAL(changed()), SLOT( changed() )); - connect(dialog->SessionEditor1, SIGNAL(changed()), SLOT( changed() )); - connect(dialog->SchemaEditor1, SIGNAL(schemaListChanged(const QStringList &,const QStringList &)), - dialog->SessionEditor1, SLOT(schemaListChanged(const QStringList &,const QStringList &))); - connect(dialog->SessionEditor1, SIGNAL(getList()), dialog->SchemaEditor1, SLOT(getList())); + connect(dialog->terminalSizeHintCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->warnCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->ctrldragCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->cutToBeginningOfLineCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->allowResizeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->bidiCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->xonXoffCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->blinkingCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->frameCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); + connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); + connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() )); + connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() )); + connect(dialog->SessionEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() )); + connect(dialog->SchemaEditor1, TQT_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)), + dialog->SessionEditor1, TQT_SLOT(schemaListChanged(const TQStringList &,const TQStringList &))); + connect(dialog->SessionEditor1, TQT_SIGNAL(getList()), dialog->SchemaEditor1, TQT_SLOT(getList())); } void KCMKonsole::load() @@ -152,9 +152,9 @@ void KCMKonsole::save() emit changed(false); DCOPClient *dcc = kapp->dcopClient(); - dcc->send("konsole-*", "konsole", "reparseConfiguration()", QByteArray()); - dcc->send("kdesktop", "default", "configure()", QByteArray()); - dcc->send("klauncher", "klauncher", "reparseConfiguration()", QByteArray()); + dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray()); + dcc->send("kdesktop", "default", "configure()", TQByteArray()); + dcc->send("klauncher", "klauncher", "reparseConfiguration()", TQByteArray()); if (xonXoffOrig != xonXoffNew) { diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h index ae6ee069b..bf93d1cfb 100644 --- a/kcontrol/konsole/kcmkonsole.h +++ b/kcontrol/konsole/kcmkonsole.h @@ -31,7 +31,7 @@ class KCMKonsole Q_OBJECT public: - KCMKonsole (QWidget *parent = 0, const char *name = 0, const QStringList& = 0); + KCMKonsole (TQWidget *parent = 0, const char *name = 0, const TQStringList& = 0); void load(); void load(bool useDefaults); diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index f7591bee8..17eaadc3c 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -23,43 +23,43 @@ #include <dcopclient.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qwmatrix.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqwmatrix.h> +#include <tqcombobox.h> #include <kdebug.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kstandarddirs.h> //#include <errno.h> -#include <qslider.h> +#include <tqslider.h> #include <klocale.h> #include <kfiledialog.h> #include <kinputdialog.h> -#include <qtoolbutton.h> +#include <tqtoolbutton.h> #include <kmessagebox.h> #include <ksharedpixmap.h> #include <kimageeffect.h> -#include <qimage.h> +#include <tqimage.h> // SchemaListBoxText is a list box text item with schema filename class SchemaListBoxText : public QListBoxText { public: - SchemaListBoxText(const QString &title, const QString &filename): QListBoxText(title) + SchemaListBoxText(const TQString &title, const TQString &filename): TQListBoxText(title) { m_filename = filename; }; - const QString filename() { return m_filename; }; + const TQString filename() { return m_filename; }; private: - QString m_filename; + TQString m_filename; }; -SchemaEditor::SchemaEditor(QWidget * parent, const char *name) +SchemaEditor::SchemaEditor(TQWidget * parent, const char *name) :SchemaDialog(parent, name) { schMod= false; @@ -75,14 +75,14 @@ SchemaEditor::SchemaEditor(QWidget * parent, const char *name) defaultSchema = ""; spix = new KSharedPixmap; - connect(spix, SIGNAL(done(bool)), SLOT(previewLoaded(bool))); + connect(spix, TQT_SIGNAL(done(bool)), TQT_SLOT(previewLoaded(bool))); DCOPClient *client = kapp->dcopClient(); if (!client->isAttached()) client->attach(); - QByteArray data; + TQByteArray data; - QDataStream args(data, IO_WriteOnly); + TQDataStream args(data, IO_WriteOnly); args << 1; client->send("kdesktop", "KBackgroundIface", "setExport(int)", data); @@ -94,36 +94,36 @@ SchemaEditor::SchemaEditor(QWidget * parent, const char *name) KGlobal::locale()->insertCatalogue("konsole"); // For schema translations - connect(imageBrowse, SIGNAL(clicked()), this, SLOT(imageSelect())); - connect(saveButton, SIGNAL(clicked()), this, SLOT(saveCurrent())); - connect(removeButton, SIGNAL(clicked()), this, SLOT(removeCurrent())); - connect(colorCombo, SIGNAL(activated(int)), this, SLOT(slotColorChanged(int))); - connect(typeCombo, SIGNAL(activated(int)), this, SLOT(slotTypeChanged(int))); - connect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int))); - connect(shadeColor, SIGNAL(changed(const QColor&)), this, SLOT(updatePreview())); - connect(shadeSlide, SIGNAL(valueChanged(int)), this, SLOT(updatePreview())); - connect(transparencyCheck, SIGNAL(toggled(bool)), this, SLOT(updatePreview())); - connect(backgndLine, SIGNAL(returnPressed()), this, SLOT(updatePreview())); - - connect(titleLine, SIGNAL(textChanged(const QString&)), this, SLOT(schemaModified())); - connect(shadeColor, SIGNAL(changed(const QColor&)), this, SLOT(schemaModified())); - connect(shadeSlide, SIGNAL(valueChanged(int)), this, SLOT(schemaModified())); - connect(transparencyCheck, SIGNAL(toggled(bool)), this, SLOT(schemaModified())); - connect(modeCombo, SIGNAL(activated(int)), this, SLOT(schemaModified())); - connect(backgndLine, SIGNAL(returnPressed()), this, SLOT(schemaModified())); - connect(transparentCheck, SIGNAL(toggled(bool)), this, SLOT(schemaModified())); - connect(boldCheck, SIGNAL(toggled(bool)), this, SLOT(schemaModified())); - connect(colorButton, SIGNAL(changed(const QColor&)), this, SLOT(schemaModified())); - connect(backgndLine, SIGNAL(textChanged(const QString&)), this, SLOT(schemaModified())); - - connect(defaultSchemaCB, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect())); + connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent())); + connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent())); + connect(colorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotColorChanged(int))); + connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTypeChanged(int))); + connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); + connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updatePreview())); + connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updatePreview())); + connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updatePreview())); + connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updatePreview())); + + connect(titleLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified())); + connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified())); + connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(schemaModified())); + connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified())); + connect(modeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(schemaModified())); + connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(schemaModified())); + connect(transparentCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified())); + connect(boldCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified())); + connect(colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified())); + connect(backgndLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified())); + + connect(defaultSchemaCB, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); removeButton->setEnabled( schemaList->currentItem() ); } -QString SchemaEditor::schema() +TQString SchemaEditor::schema() { - QString filename = defaultSchema; + TQString filename = defaultSchema; int i = schemaList->currentItem(); if (defaultSchemaCB->isChecked() && i>=0) @@ -133,7 +133,7 @@ QString SchemaEditor::schema() } -void SchemaEditor::setSchema(QString sch) +void SchemaEditor::setSchema(TQString sch) { defaultSchema = sch; sch = locate("data", "konsole/"+sch); @@ -163,21 +163,21 @@ void SchemaEditor::updatePreview() if (transparencyCheck->isChecked()) { if (loaded) { float rx = (100.0 - shadeSlide->value()) / 100; - QImage ima(pix.convertToImage()); + TQImage ima(pix.convertToImage()); ima = KImageEffect::fade(ima, rx, shadeColor->color()); - QPixmap pm; + TQPixmap pm; pm.convertFromImage(ima); previewPixmap->setPixmap(pm); previewPixmap->setScaledContents(true); } else //try to reload { - if(!spix->loadFromShared(QString("DESKTOP1"))) + if(!spix->loadFromShared(TQString("DESKTOP1"))) kdDebug(0) << "cannot load" << endl; } } else { - QPixmap pm; + TQPixmap pm; pm.load(backgndLine->text()); if ( pm.isNull() ) { previewPixmap->clear(); @@ -192,11 +192,11 @@ void SchemaEditor::updatePreview() void SchemaEditor::previewLoaded(bool l) { if (l) { - QWMatrix mat; + TQWMatrix mat; pix = spix->xForm(mat. - scale(180.0 / spix->QPixmap::width(), - 100.0 / spix->QPixmap::height())); + scale(180.0 / spix->TQPixmap::width(), + 100.0 / spix->TQPixmap::height())); kdDebug(0) << "Loaded" << endl; loaded = true; if (transparencyCheck->isChecked()) { @@ -226,19 +226,19 @@ void SchemaEditor::show() } -void SchemaEditor::loadAllSchema(QString currentFile) +void SchemaEditor::loadAllSchema(TQString currentFile) { - QStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.schema"); - QStringList::ConstIterator it; - disconnect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int))); + TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.schema"); + TQStringList::ConstIterator it; + disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); schemaList->clear(); - QListBoxItem* currentItem = 0; + TQListBoxItem* currentItem = 0; for (it = list.begin(); it != list.end(); ++it) { - QString name = (*it); + TQString name = (*it); - QString title = readSchemaTitle(name); + TQString title = readSchemaTitle(name); // Only insert new items so that local items override global if (schemaList->findItem(title, ExactMatch) == 0) { @@ -253,17 +253,17 @@ void SchemaEditor::loadAllSchema(QString currentFile) schemaList->sort(); schemaList->setCurrentItem(0); // select the first added item correctly too schemaList->setCurrentItem(currentItem); - connect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int))); + connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); schemaListChanged(); } void SchemaEditor::imageSelect() { - QString start; + TQString start; start = backgndLine->text(); if (start.isEmpty()) { - QStringList list=KGlobal::dirs()->resourceDirs("wallpaper"); + TQStringList list=KGlobal::dirs()->resourceDirs("wallpaper"); if(list.count()>0) start= list.last(); } @@ -310,7 +310,7 @@ void SchemaEditor::removeCurrent() int i = schemaList->currentItem(); if(i==-1) return; - QString base = ((SchemaListBoxText *) schemaList->item(i))->filename(); + TQString base = ((SchemaListBoxText *) schemaList->item(i))->filename(); // Query if system schemas should be removed if (locateLocal("data", "konsole/" + base.section('/', -1)) != base) { @@ -322,12 +322,12 @@ void SchemaEditor::removeCurrent() return; } - QString base_filename = base.section('/',-1); + TQString base_filename = base.section('/',-1); if(base_filename==schema()) setSchema(""); - if (!QFile::remove(base)) + if (!TQFile::remove(base)) KMessageBox::error(this, i18n("Cannot remove the schema.\nMaybe it is a system schema.\n"), i18n("Error Removing Schema")); @@ -345,7 +345,7 @@ void SchemaEditor::saveCurrent() colorCombo->setCurrentItem(0); slotColorChanged(0); - QString fullpath; + TQString fullpath; if (schemaList->currentText() == titleLine->text()) { int i = schemaList->currentItem(); fullpath = ((SchemaListBoxText *) schemaList->item(i))->filename().section('/',-1); @@ -363,25 +363,25 @@ void SchemaEditor::saveCurrent() if (fullpath[0] != '/') fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath; - QFile f(fullpath); + TQFile f(fullpath); if (f.open(IO_WriteOnly)) { - QTextStream t(&f); - t.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream t(&f); + t.setEncoding( TQTextStream::UnicodeUTF8 ); t << "# schema for konsole autogenerated with the schema editor" << endl; t << endl; t << "title " << titleLine->text() << endl; // Use title line as schema title t << endl; if (transparencyCheck->isChecked()) { - QColor c = shadeColor->color(); - QString tra; + TQColor c = shadeColor->color(); + TQString tra; tra.sprintf("transparency %1.2f %3d %3d %3d", 1.0 * (100 - shadeSlide->value()) / 100, c.red(), c.green(), c.blue()); t << tra << endl; } if (!backgndLine->text().isEmpty()) { - QString smode; + TQString smode; int mode; mode = modeCombo->currentItem(); if (mode == 0) @@ -391,7 +391,7 @@ void SchemaEditor::saveCurrent() if (mode == 2) smode = "full"; - QString image; + TQString image; image.sprintf("image %s %s", (const char *) smode.latin1(), (const char *) backgndLine->text().utf8()); @@ -408,7 +408,7 @@ void SchemaEditor::saveCurrent() t << "# V V--color--V V V" << endl; for (int i = 0; i < 20; i++) { - QString scol; + TQString scol; if (type[i] == 0) scol.sprintf("color %2d %3d %3d %3d %2d %1d # %s", i, color[i].red(), color[i].green(), color[i].blue(), @@ -451,7 +451,7 @@ void SchemaEditor::schemaModified() } } -QString SchemaEditor::readSchemaTitle(const QString & file) +TQString SchemaEditor::readSchemaTitle(const TQString & file) { /* Code taken from konsole/konsole/schema.cpp @@ -459,7 +459,7 @@ QString SchemaEditor::readSchemaTitle(const QString & file) */ - QString fPath = locate("data", "konsole/" + file); + TQString fPath = locate("data", "konsole/" + file); if (fPath.isNull()) fPath = locate("data", file); @@ -467,7 +467,7 @@ QString SchemaEditor::readSchemaTitle(const QString & file) if (fPath.isNull()) return 0; - FILE *sysin = fopen(QFile::encodeName(fPath), "r"); + FILE *sysin = fopen(TQFile::encodeName(fPath), "r"); if (!sysin) return 0; @@ -485,7 +485,7 @@ QString SchemaEditor::readSchemaTitle(const QString & file) void SchemaEditor::schemaListChanged() { - QStringList titles, filenames; + TQStringList titles, filenames; SchemaListBoxText *item; for (int index = 0; index < (int) schemaList->count(); index++) { @@ -528,17 +528,17 @@ void SchemaEditor::readSchema(int num) } if(schMod) { - disconnect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int))); + disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); schemaList->setCurrentItem(oldSchema); querySave(); schemaList->setCurrentItem(num); - connect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int))); + connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); schMod=false; } } - QString fPath = locate("data", "konsole/" + + TQString fPath = locate("data", "konsole/" + ((SchemaListBoxText *) schemaList->item(num))->filename()); if (fPath.isNull()) @@ -552,10 +552,10 @@ void SchemaEditor::readSchema(int num) return; } - removeButton->setEnabled( QFileInfo (fPath).isWritable () ); + removeButton->setEnabled( TQFileInfo (fPath).isWritable () ); defaultSchemaCB->setChecked(fPath.section('/',-1) == defaultSchema.section('/',-1)); - FILE *sysin = fopen(QFile::encodeName(fPath), "r"); + FILE *sysin = fopen(TQFile::encodeName(fPath), "r"); if (!sysin) { KMessageBox::error(this, i18n("Cannot load the schema."), i18n("Error Loading Schema")); @@ -593,7 +593,7 @@ void SchemaEditor::readSchema(int num) else continue; - QString qline(line); + TQString qline(line); backgndLine->setText(locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) )); modeCombo->setCurrentItem(attr - 2); @@ -610,7 +610,7 @@ void SchemaEditor::readSchema(int num) transparencyCheck->setChecked(true); shadeSlide->setValue((int)(100 - rx * 100)); - shadeColor->setColor(QColor(rr, rg, rb)); + shadeColor->setColor(TQColor(rr, rg, rb)); } if (!strncmp(line,"rcolor",6)) { @@ -628,7 +628,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1 )) continue; - color[fi] = QColor(); + color[fi] = TQColor(); color[fi].setHsv(ch,cs,cv); transparent[fi] = tr; bold[fi] = bo; @@ -650,7 +650,7 @@ void SchemaEditor::readSchema(int num) continue; if (!(0 <= bo && bo <= 1)) continue; - color[fi] = QColor(cr, cg, cb); + color[fi] = TQColor(cr, cg, cb); transparent[fi] = tr; bold[fi] = bo; type[fi] = 0; diff --git a/kcontrol/konsole/schemaeditor.h b/kcontrol/konsole/schemaeditor.h index 550f51762..9b17f169d 100644 --- a/kcontrol/konsole/schemaeditor.h +++ b/kcontrol/konsole/schemaeditor.h @@ -23,7 +23,7 @@ #endif #include <kapplication.h> -#include <qwidget.h> +#include <tqwidget.h> class QPixmap; class KSharedPixmap; @@ -35,18 +35,18 @@ class SchemaEditor : public SchemaDialog Q_OBJECT public: /** constructor */ - SchemaEditor(QWidget* parent=0, const char *name=0); + SchemaEditor(TQWidget* parent=0, const char *name=0); /** destructor */ ~SchemaEditor(); - QString schema(); - void setSchema(QString); + TQString schema(); + void setSchema(TQString); bool isModified() const { return schMod; } void querySave(); signals: void changed(); - void schemaListChanged(const QStringList &titles, const QStringList &filenames); + void schemaListChanged(const TQStringList &titles, const TQStringList &filenames); public slots: void slotColorChanged(int); @@ -60,23 +60,23 @@ class SchemaEditor : public SchemaDialog private slots: void show(); void schemaModified(); - void loadAllSchema(QString currentFile=""); + void loadAllSchema(TQString currentFile=""); void updatePreview(); private: bool schMod; - QMemArray<QColor> color; - QMemArray<int> type; // 0= custom, 1= sysfg, 2=sysbg, 3=rcolor - QMemArray<bool> transparent; - QMemArray<bool> bold; - QPixmap pix; + TQMemArray<TQColor> color; + TQMemArray<int> type; // 0= custom, 1= sysfg, 2=sysbg, 3=rcolor + TQMemArray<bool> transparent; + TQMemArray<bool> bold; + TQPixmap pix; KSharedPixmap *spix; - QString defaultSchema; + TQString defaultSchema; bool loaded; bool schemaLoaded; bool change; int oldSchema; int oldSlot; - QString readSchemaTitle(const QString& filename); + TQString readSchemaTitle(const TQString& filename); void schemaListChanged(); }; diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index 8542adfcb..5cb1c9746 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -18,8 +18,8 @@ #include "sessioneditor.h" #include "sessioneditor.moc" -#include <qlineedit.h> -#include <qcombobox.h> +#include <tqlineedit.h> +#include <tqcombobox.h> #include <kdebug.h> #include <kstandarddirs.h> @@ -38,18 +38,18 @@ class SessionListBoxText : public QListBoxText { public: - SessionListBoxText(const QString &title, const QString &filename): QListBoxText(title) + SessionListBoxText(const TQString &title, const TQString &filename): TQListBoxText(title) { m_filename = filename; }; - const QString filename() { return m_filename; }; + const TQString filename() { return m_filename; }; private: - QString m_filename; + TQString m_filename; }; -SessionEditor::SessionEditor(QWidget * parent, const char *name) +SessionEditor::SessionEditor(TQWidget * parent, const char *name) :SessionDialog(parent, name) { sesMod=false; @@ -60,20 +60,20 @@ SessionEditor::SessionEditor(QWidget * parent, const char *name) KGlobal::iconLoader()->addAppDir( "konsole" ); directoryLine->setMode(KFile::Directory); - connect(sessionList, SIGNAL(highlighted(int)), this, SLOT(readSession(int))); - connect(saveButton, SIGNAL(clicked()), this, SLOT(saveCurrent())); - connect(removeButton, SIGNAL(clicked()), this, SLOT(removeCurrent())); + connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); + connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent())); + connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent())); - connect(nameLine, SIGNAL(textChanged(const QString&)), this, SLOT(sessionModified())); - connect(directoryLine, SIGNAL(textChanged(const QString&)), this, SLOT(sessionModified())); - connect(executeLine, SIGNAL(textChanged(const QString&)), this, SLOT(sessionModified())); - connect(termLine, SIGNAL(textChanged(const QString&)), this, SLOT(sessionModified())); + connect(nameLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); + connect(directoryLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); + connect(executeLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); + connect(termLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); - connect(previewIcon, SIGNAL(iconChanged(QString)), this, SLOT(sessionModified())); + connect(previewIcon, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(sessionModified())); - connect(fontCombo, SIGNAL(activated(int)), this, SLOT(sessionModified())); - connect(keytabCombo, SIGNAL(activated(int)), this, SLOT(sessionModified())); - connect(schemaCombo, SIGNAL(activated(int)), this, SLOT(sessionModified())); + connect(fontCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified())); + connect(keytabCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified())); + connect(schemaCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified())); } SessionEditor::~SessionEditor() @@ -97,22 +97,22 @@ void SessionEditor::show() void SessionEditor::loadAllKeytab() { - QStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab"); + TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab"); keytabCombo->clear(); keytabFilename.clear(); keytabCombo->insertItem(i18n("XTerm (XFree 4.x.x)"),0); - keytabFilename.append(new QString("")); + keytabFilename.append(new TQString("")); int i=1; - for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { - QString name = (*it); - QString title = readKeymapTitle(name); + TQString name = (*it); + TQString title = readKeymapTitle(name); name = name.section('/',-1); name = name.section('.',0); - keytabFilename.append(new QString(name)); + keytabFilename.append(new TQString(name)); if (title.isNull() || title.isEmpty()) title=i18n("untitled"); @@ -123,18 +123,18 @@ void SessionEditor::loadAllKeytab() } } -QString SessionEditor::readKeymapTitle(const QString & file) +TQString SessionEditor::readKeymapTitle(const TQString & file) { - QString fPath = locate("data", "konsole/" + file); + TQString fPath = locate("data", "konsole/" + file); if (fPath.isNull()) fPath = locate("data", file); - removeButton->setEnabled( QFileInfo (fPath).isWritable () ); + removeButton->setEnabled( TQFileInfo (fPath).isWritable () ); if (fPath.isNull()) return 0; - FILE *sysin = fopen(QFile::encodeName(fPath), "r"); + FILE *sysin = fopen(TQFile::encodeName(fPath), "r"); if (!sysin) return 0; @@ -146,7 +146,7 @@ QString SessionEditor::readKeymapTitle(const QString & file) fclose(sysin); if(line[len-1] == '"') line[len-1] = '\000'; - QString temp; + TQString temp; if(line[9] == '"') temp=i18n(line+10); else @@ -157,19 +157,19 @@ QString SessionEditor::readKeymapTitle(const QString & file) return 0; } -void SessionEditor::loadAllSession(QString currentFile) +void SessionEditor::loadAllSession(TQString currentFile) { - QStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true); + TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true); sessionList->clear(); - QListBoxItem* currentItem = 0; - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { + TQListBoxItem* currentItem = 0; + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - QString name = (*it); + TQString name = (*it); KSimpleConfig* co = new KSimpleConfig(name,true); co->setDesktopGroup(); - QString sesname = co->readEntry("Name",i18n("Unnamed")); + TQString sesname = co->readEntry("Name",i18n("Unnamed")); delete co; sessionList->insertItem(new SessionListBoxText(sesname, name)); @@ -186,21 +186,21 @@ void SessionEditor::loadAllSession(QString currentFile) void SessionEditor::readSession(int num) { int i,counter; - QString str; + TQString str; KSimpleConfig* co; if(sesMod) { - disconnect(sessionList, SIGNAL(highlighted(int)), this, SLOT(readSession(int))); + disconnect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); sessionList->setCurrentItem(oldSession); querySave(); sessionList->setCurrentItem(num); - connect(sessionList, SIGNAL(highlighted(int)), this, SLOT(readSession(int))); + connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); sesMod=false; } if( sessionList->item(num) ) { - removeButton->setEnabled( QFileInfo ( ((SessionListBoxText *)sessionList->item(num))->filename() ).isWritable () ); + removeButton->setEnabled( TQFileInfo ( ((SessionListBoxText *)sessionList->item(num))->filename() ).isWritable () ); co = new KSimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true); co->setDesktopGroup(); @@ -225,7 +225,7 @@ void SessionEditor::readSession(int num) str = co->readEntry("KeyTab",""); i=0; counter=0; - for (QString *it = keytabFilename.first(); it != 0; it = keytabFilename.next()) { + for (TQString *it = keytabFilename.first(); it != 0; it = keytabFilename.next()) { if (str == (*it)) i = counter; counter++; @@ -235,7 +235,7 @@ void SessionEditor::readSession(int num) str = co->readEntry("Schema",""); i=0; counter=0; - for (QString *it = schemaFilename.first(); it != 0; it = schemaFilename.next()) { + for (TQString *it = schemaFilename.first(); it != 0; it = schemaFilename.next()) { if (str == (*it)) i = counter; counter++; @@ -261,19 +261,19 @@ void SessionEditor::querySave() } } -void SessionEditor::schemaListChanged(const QStringList &titles, const QStringList &filenames) +void SessionEditor::schemaListChanged(const TQStringList &titles, const TQStringList &filenames) { - const QString text = schemaCombo->currentText(); + const TQString text = schemaCombo->currentText(); schemaCombo->clear(); schemaFilename.clear(); schemaCombo->insertItem(i18n("Konsole Default"),0); - schemaFilename.append(new QString("")); + schemaFilename.append(new TQString("")); schemaCombo->insertStringList(titles, 1); - for (QStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it) - schemaFilename.append(new QString(*it)); + for (TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it) + schemaFilename.append(new TQString(*it)); // Restore current item int item = 0; @@ -289,14 +289,14 @@ void SessionEditor::saveCurrent() { // Verify Execute entry is valid; otherwise Konsole will ignore it. // This code is take from konsole.cpp; if you change one, change both. - QString exec = executeLine->text(); + TQString exec = executeLine->text(); if ( !exec.isEmpty() ) // If Execute field is empty, default shell is used. { if ( exec.startsWith( "su -c \'" ) ) exec = exec.mid( 7, exec.length() - 8 ); exec = KRun::binaryName( exec, false ); exec = KShell::tildeExpand( exec ); - QString pexec = KGlobal::dirs()->findExe( exec ); + TQString pexec = KGlobal::dirs()->findExe( exec ); if ( pexec.isEmpty() ) { @@ -311,7 +311,7 @@ void SessionEditor::saveCurrent() } - QString fullpath; + TQString fullpath; if (sessionList->currentText() == nameLine->text()) { fullpath = ( ((SessionListBoxText *)sessionList->item( sessionList->currentItem() ))->filename() ).section('/',-1); } @@ -351,7 +351,7 @@ void SessionEditor::saveCurrent() void SessionEditor::removeCurrent() { - QString base = ((SessionListBoxText *)sessionList->item( sessionList->currentItem() ))->filename(); + TQString base = ((SessionListBoxText *)sessionList->item( sessionList->currentItem() ))->filename(); // Query if system sessions should be removed if (locateLocal("data", "konsole/" + base.section('/', -1)) != base) { @@ -363,7 +363,7 @@ void SessionEditor::removeCurrent() return; } - if (!QFile::remove(base)) { + if (!TQFile::remove(base)) { KMessageBox::error(this, i18n("Cannot remove the session.\nMaybe it is a system session.\n"), i18n("Error Removing Session")); diff --git a/kcontrol/konsole/sessioneditor.h b/kcontrol/konsole/sessioneditor.h index 15d1aee2b..638b6b0e6 100644 --- a/kcontrol/konsole/sessioneditor.h +++ b/kcontrol/konsole/sessioneditor.h @@ -22,10 +22,10 @@ #include <config.h> #endif -#include <qptrlist.h> -#include <qstringlist.h> +#include <tqptrlist.h> +#include <tqstringlist.h> #include <kapplication.h> -#include <qwidget.h> +#include <tqwidget.h> #include "sessiondialog.h" @@ -33,7 +33,7 @@ class SessionEditor : public SessionDialog { Q_OBJECT public: - SessionEditor(QWidget* parent=0, const char *name=0); + SessionEditor(TQWidget* parent=0, const char *name=0); ~SessionEditor(); bool isModified() const { return sesMod; } @@ -44,7 +44,7 @@ class SessionEditor : public SessionDialog void getList(); public slots: - void schemaListChanged(const QStringList &titles, const QStringList &filenames); + void schemaListChanged(const TQStringList &titles, const TQStringList &filenames); private slots: void readSession(int); @@ -55,14 +55,14 @@ class SessionEditor : public SessionDialog private: void show(); void loadAllKeytab(); - void loadAllSession(QString currentFile=""); - QString readKeymapTitle(const QString& filename); + void loadAllSession(TQString currentFile=""); + TQString readKeymapTitle(const TQString& filename); bool sesMod; int oldSession; bool loaded; - QPtrList<QString> keytabFilename; - QPtrList<QString> schemaFilename; + TQPtrList<TQString> keytabFilename; + TQPtrList<TQString> schemaFilename; }; #endif diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index cd8f08905..73c98df04 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -22,10 +22,10 @@ #include <unistd.h> #undef Unsorted -#include <qbuffer.h> -#include <qdir.h> -#include <qsettings.h> -#include <qtooltip.h> +#include <tqbuffer.h> +#include <tqdir.h> +#include <tqsettings.h> +#include <tqtooltip.h> #include <dcopclient.h> @@ -75,45 +75,45 @@ inline const char * userGtkrc(int version) // ----------------------------------------------------------------------------- static void applyGtkStyles(bool active, int version) { - QString gtkkde = locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc"); - QCString gtkrc = getenv(gtkEnvVar(version)); - QStringList list = QStringList::split(':', QFile::decodeName(gtkrc)); + TQString gtkkde = locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc"); + TQCString gtkrc = getenv(gtkEnvVar(version)); + TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc)); if (list.count() == 0) { - list.append(QString::fromLatin1(sysGtkrc(version))); - list.append(QDir::homeDirPath()+userGtkrc(version)); + list.append(TQString::fromLatin1(sysGtkrc(version))); + list.append(TQDir::homeDirPath()+userGtkrc(version)); } list.remove(gtkkde); list.append(gtkkde); if (!active) - ::unlink(QFile::encodeName(gtkkde)); + ::unlink(TQFile::encodeName(gtkkde)); // Pass env. var to kdeinit. - QCString name = gtkEnvVar(version); - QCString value = QFile::encodeName(list.join(":")); - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQCString name = gtkEnvVar(version); + TQCString value = TQFile::encodeName(list.join(":")); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << name << value; - kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(QCString,QCString)", params); + kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(TQCString,TQCString)", params); } // ----------------------------------------------------------------------------- -static void applyQtColors( KConfig& kglobals, QSettings& settings, QPalette& newPal ) +static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& newPal ) { - QStringList actcg, inactcg, discg; + TQStringList actcg, inactcg, discg; /* export kde color settings */ int i; - for (i = 0; i < QColorGroup::NColorRoles; i++) - actcg << newPal.color(QPalette::Active, - (QColorGroup::ColorRole) i).name(); - for (i = 0; i < QColorGroup::NColorRoles; i++) - inactcg << newPal.color(QPalette::Inactive, - (QColorGroup::ColorRole) i).name(); - for (i = 0; i < QColorGroup::NColorRoles; i++) - discg << newPal.color(QPalette::Disabled, - (QColorGroup::ColorRole) i).name(); + for (i = 0; i < TQColorGroup::NColorRoles; i++) + actcg << newPal.color(TQPalette::Active, + (TQColorGroup::ColorRole) i).name(); + for (i = 0; i < TQColorGroup::NColorRoles; i++) + inactcg << newPal.color(TQPalette::Inactive, + (TQColorGroup::ColorRole) i).name(); + for (i = 0; i < TQColorGroup::NColorRoles; i++) + discg << newPal.color(TQPalette::Disabled, + (TQColorGroup::ColorRole) i).name(); while (!settings.writeEntry("/qt/Palette/active", actcg)) ; settings.writeEntry("/qt/Palette/inactive", inactcg); @@ -123,10 +123,10 @@ static void applyQtColors( KConfig& kglobals, QSettings& settings, QPalette& new kglobals.setGroup("WM"); // active colors - QColor clr = newPal.active().background(); + TQColor clr = newPal.active().background(); clr = kglobals.readColorEntry("activeBackground", &clr); settings.writeEntry("/qt/KWinPalette/activeBackground", clr.name()); - if (QPixmap::defaultDepth() > 8) + if (TQPixmap::defaultDepth() > 8) clr = clr.dark(110); clr = kglobals.readColorEntry("activeBlend", &clr); settings.writeEntry("/qt/KWinPalette/activeBlend", clr.name()); @@ -143,7 +143,7 @@ static void applyQtColors( KConfig& kglobals, QSettings& settings, QPalette& new clr = newPal.inactive().background(); clr = kglobals.readColorEntry("inactiveBackground", &clr); settings.writeEntry("/qt/KWinPalette/inactiveBackground", clr.name()); - if (QPixmap::defaultDepth() > 8) + if (TQPixmap::defaultDepth() > 8) clr = clr.dark(110); clr = kglobals.readColorEntry("inactiveBlend", &clr); settings.writeEntry("/qt/KWinPalette/inactiveBlend", clr.name()); @@ -162,33 +162,33 @@ static void applyQtColors( KConfig& kglobals, QSettings& settings, QPalette& new // ----------------------------------------------------------------------------- -static void applyQtSettings( KConfig& kglobals, QSettings& settings ) +static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) { /* export kde's plugin library path to qtrc */ - QMap <QString, bool> pathDb; + TQMap <TQString, bool> pathDb; // OK, this isn't fun at all. // KApp adds paths ending with /, QApp those without slash, and if // one gives it something that is other way around, it will complain and scare // users. So we need to know whether a path being added is from KApp, and in this case - // end it with.. So keep a QMap to bool, specifying whether the path is KDE-specified.. + // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified.. - QString qversion = qVersion(); + TQString qversion = qVersion(); if ( qversion.contains( '.' ) > 1 ) qversion.truncate( qversion.findRev( '.' ) ); if ( qversion.contains( '-' ) ) qversion.truncate( qversion.findRev( '-' ) ); - QStringList kdeAdded = + TQStringList kdeAdded = settings.readListEntry("/qt/KDE/kdeAddedLibraryPaths"); - QString libPathKey = - QString("/qt/%1/libraryPath").arg( qversion ); + TQString libPathKey = + TQString("/qt/%1/libraryPath").arg( qversion ); //Read qt library path.. - QStringList plugins = settings.readListEntry(libPathKey, ':'); - for (QStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) + TQStringList plugins = settings.readListEntry(libPathKey, ':'); + for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) { - QString path = *it; + TQString path = *it; if (path.endsWith("/")) path.truncate(path.length()-1); @@ -196,10 +196,10 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings ) } //Get rid of old KDE-added ones... - for (QStringList::ConstIterator it = kdeAdded.begin(); it != kdeAdded.end(); ++it) + for (TQStringList::ConstIterator it = kdeAdded.begin(); it != kdeAdded.end(); ++it) { //Normalize.. - QString path = *it; + TQString path = *it; if (path.endsWith("/")) path.truncate(path.length()-1); @@ -212,9 +212,9 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings ) //Merge in KDE ones.. plugins = KGlobal::dirs()->resourceDirs( "qtplugins" ); - for (QStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) + for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) { - QString path = *it; + TQString path = *it; if (path.endsWith("/")) path.truncate(path.length()-1); @@ -225,16 +225,16 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings ) pathDb[path]=true; } - QStringList paths; - for (QMap <QString, bool>::ConstIterator it = pathDb.begin(); + TQStringList paths; + for (TQMap <TQString, bool>::ConstIterator it = pathDb.begin(); it != pathDb.end(); ++it) { - QString path = it.key(); + TQString path = it.key(); bool fromKDE = it.data(); char new_path[PATH_MAX+1]; - if (realpath(QFile::encodeName(path), new_path)) - path = QFile::decodeName(new_path); + if (realpath(TQFile::encodeName(path), new_path)) + path = TQFile::decodeName(new_path); if (fromKDE) { @@ -252,7 +252,7 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings ) /* export widget style */ kglobals.setGroup("General"); - QString style = kglobals.readEntry("widgetStyle", KStyle::defaultStyle() ); + TQString style = kglobals.readEntry("widgetStyle", KStyle::defaultStyle() ); if (!style.isEmpty()) settings.writeEntry("/qt/style", style); @@ -272,27 +272,27 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings ) bool fadeTooltips = kglobals.readBoolEntry("EffectFadeTooltip", false); bool animateCombobox = kglobals.readBoolEntry("EffectAnimateCombo", false); - QStringList guieffects; + TQStringList guieffects; if (effectsEnabled) { - guieffects << QString("general"); + guieffects << TQString("general"); if (fadeMenus) - guieffects << QString("fademenu"); + guieffects << TQString("fademenu"); if (animateCombobox) - guieffects << QString("animatecombo"); + guieffects << TQString("animatecombo"); if (fadeTooltips) - guieffects << QString("fadetooltip"); + guieffects << TQString("fadetooltip"); } else - guieffects << QString("none"); + guieffects << TQString("none"); settings.writeEntry("/qt/GUIEffects", guieffects); } // ----------------------------------------------------------------------------- -static void addColorDef(QString& s, const char* n, const QColor& col) +static void addColorDef(TQString& s, const char* n, const TQColor& col) { - QString tmp; + TQString tmp; tmp.sprintf("#define %s #%02x%02x%02x\n", n, col.red(), col.green(), col.blue()); @@ -303,11 +303,11 @@ static void addColorDef(QString& s, const char* n, const QColor& col) // ----------------------------------------------------------------------------- -static void copyFile(QFile& tmp, QString const& filename, bool ) +static void copyFile(TQFile& tmp, TQString const& filename, bool ) { - QFile f( filename ); + TQFile f( filename ); if ( f.open(IO_ReadOnly) ) { - QCString buf( 8192 ); + TQCString buf( 8192 ); while ( !f.atEnd() ) { int read = f.readBlock( buf.data(), buf.size() ); if ( read > 0 ) @@ -319,16 +319,16 @@ static void copyFile(QFile& tmp, QString const& filename, bool ) // ----------------------------------------------------------------------------- -static QString item( int i ) { - return QString::number( i / 255.0, 'f', 3 ); +static TQString item( int i ) { + return TQString::number( i / 255.0, 'f', 3 ); } -static QString color( const QColor& col ) +static TQString color( const TQColor& col ) { - return QString( "{ %1, %2, %3 }" ).arg( item( col.red() ) ).arg( item( col.green() ) ).arg( item( col.blue() ) ); + return TQString( "{ %1, %2, %3 }" ).arg( item( col.red() ) ).arg( item( col.green() ) ).arg( item( col.blue() ) ); } -static void createGtkrc( bool exportColors, const QColorGroup& cg, int version ) +static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version ) { // lukas: why does it create in ~/.kde/share/config ??? // pfeiffer: so that we don't overwrite the user's gtkrc. @@ -337,8 +337,8 @@ static void createGtkrc( bool exportColors, const QColorGroup& cg, int version ) if ( saveFile.status() != 0 || saveFile.textStream() == 0L ) return; - QTextStream& t = *saveFile.textStream(); - t.setEncoding( QTextStream::Locale ); + TQTextStream& t = *saveFile.textStream(); + t.setEncoding( TQTextStream::Locale ); t << i18n( "# created by KDE, %1\n" @@ -347,7 +347,7 @@ static void createGtkrc( bool exportColors, const QColorGroup& cg, int version ) "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n" "# \"Apply colors to non-KDE applications\"\n" "#\n" - "#\n").arg(QDateTime::currentDateTime().toString()); + "#\n").arg(TQDateTime::currentDateTime().toString()); t << "style \"default\"" << endl; t << "{" << endl; @@ -392,7 +392,7 @@ static void createGtkrc( bool exportColors, const QColorGroup& cg, int version ) // tooltips don't have the standard background color t << "style \"ToolTip\"" << endl; t << "{" << endl; - QColorGroup group = QToolTip::palette().active(); + TQColorGroup group = TQToolTip::palette().active(); t << " bg[NORMAL] = " << color( group.background() ) << endl; t << " base[NORMAL] = " << color( group.base() ) << endl; t << " text[NORMAL] = " << color( group.text() ) << endl; @@ -422,7 +422,7 @@ static void createGtkrc( bool exportColors, const QColorGroup& cg, int version ) void runRdb( uint flags ) { // Obtain the application palette that is about to be set. - QPalette newPal = KApplication::createApplicationPalette(); + TQPalette newPal = KApplication::createApplicationPalette(); bool exportColors = flags & KRdbExportColors; bool exportQtColors = flags & KRdbExportQtColors; bool exportQtSettings = flags & KRdbExportQtSettings; @@ -439,19 +439,19 @@ void runRdb( uint flags ) exit(0); } - QFile &tmp = *(tmpFile.file()); + TQFile &tmp = *(tmpFile.file()); // Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps) if (exportColors) { KGlobal::dirs()->addResourceType("appdefaults", KStandardDirs::kde_default("data") + "kdisplay/app-defaults/"); - QColorGroup cg = newPal.active(); + TQColorGroup cg = newPal.active(); KGlobal::locale()->insertCatalogue("krdb"); createGtkrc( true, cg, 1 ); createGtkrc( true, cg, 2 ); - QString preproc; - QColor backCol = cg.background(); + TQString preproc; + TQColor backCol = cg.background(); addColorDef(preproc, "FOREGROUND" , cg.foreground()); addColorDef(preproc, "BACKGROUND" , backCol); addColorDef(preproc, "HIGHLIGHT" , backCol.light(100+(2*KGlobalSettings::contrast()+4)*16/1)); @@ -468,30 +468,30 @@ void runRdb( uint flags ) tmp.writeBlock( preproc.latin1(), preproc.length() ); - QStringList list; + TQStringList list; - QStringList adPaths = KGlobal::dirs()->findDirs("appdefaults", ""); - for (QStringList::ConstIterator it = adPaths.begin(); it != adPaths.end(); ++it) { - QDir dSys( *it ); + TQStringList adPaths = KGlobal::dirs()->findDirs("appdefaults", ""); + for (TQStringList::ConstIterator it = adPaths.begin(); it != adPaths.end(); ++it) { + TQDir dSys( *it ); if ( dSys.exists() ) { - dSys.setFilter( QDir::Files ); - dSys.setSorting( QDir::Name ); + dSys.setFilter( TQDir::Files ); + dSys.setSorting( TQDir::Name ); dSys.setNameFilter("*.ad"); list += dSys.entryList(); } } - for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++) + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) copyFile(tmp, locate("appdefaults", *it ), true); } // Merge ~/.Xresources or fallback to ~/.Xdefaults - QString homeDir = QDir::homeDirPath(); - QString xResources = homeDir + "/.Xresources"; + TQString homeDir = TQDir::homeDirPath(); + TQString xResources = homeDir + "/.Xresources"; // very primitive support for ~/.Xresources by appending it - if ( QFile::exists( xResources ) ) + if ( TQFile::exists( xResources ) ) copyFile(tmp, xResources, true); else copyFile(tmp, homeDir + "/.Xdefaults", true); @@ -499,9 +499,9 @@ void runRdb( uint flags ) // Export the Xcursor theme & size settings KConfig mousecfg( "kcminputrc" ); mousecfg.setGroup( "Mouse" ); - QString theme = mousecfg.readEntry("cursorTheme", QString()); - QString size = mousecfg.readEntry("cursorSize", QString()); - QString contents; + TQString theme = mousecfg.readEntry("cursorTheme", TQString()); + TQString size = mousecfg.readEntry("cursorSize", TQString()); + TQString contents; if (!theme.isNull()) contents = "Xcursor.theme: " + theme + '\n'; @@ -524,7 +524,7 @@ void runRdb( uint flags ) if (kglobals.hasKey("XftHintStyle")) { - QString hintStyle = kglobals.readEntry("XftHintStyle", "hintfull"); + TQString hintStyle = kglobals.readEntry("XftHintStyle", "hintfull"); contents += "Xft.hinting: "; if(hintStyle.isEmpty()) contents += "-1\n"; @@ -540,7 +540,7 @@ void runRdb( uint flags ) if (kglobals.hasKey("XftSubPixel")) { - QString subPixel = kglobals.readEntry("XftSubPixel", "none"); + TQString subPixel = kglobals.readEntry("XftSubPixel", "none"); if(!subPixel.isEmpty()) contents += "Xft.rgba: " + subPixel + '\n'; } @@ -572,7 +572,7 @@ void runRdb( uint flags ) /* Qt exports */ if ( exportQtColors || exportQtSettings ) { - QSettings* settings = new QSettings; + TQSettings* settings = new QSettings; if ( exportQtColors ) applyQtColors( kglobals, *settings, newPal ); // For kcmcolors @@ -581,7 +581,7 @@ void runRdb( uint flags ) applyQtSettings( kglobals, *settings ); // For kcmstyle delete settings; - QApplication::flushX(); + TQApplication::flushX(); // We let KIPC take care of ourselves, as we are in a KDE app with // QApp::setDesktopSettingsAware(false); @@ -590,23 +590,23 @@ void runRdb( uint flags ) // Qt-only apps without adversely affecting ourselves. // Cheat and use the current timestamp, since we just saved to qtrc. - QDateTime settingsstamp = QDateTime::currentDateTime(); + TQDateTime settingsstamp = TQDateTime::currentDateTime(); static Atom qt_settings_timestamp = 0; if (!qt_settings_timestamp) { - QString atomname("_QT_SETTINGS_TIMESTAMP_"); + TQString atomname("_QT_SETTINGS_TIMESTAMP_"); atomname += XDisplayName( 0 ); // Use the $DISPLAY envvar. qt_settings_timestamp = XInternAtom( qt_xdisplay(), atomname.latin1(), False); } - QBuffer stamp; - QDataStream s(stamp.buffer(), IO_WriteOnly); + TQBuffer stamp; + TQDataStream s(stamp.buffer(), IO_WriteOnly); s << settingsstamp; XChangeProperty( qt_xdisplay(), qt_xrootwin(), qt_settings_timestamp, qt_settings_timestamp, 8, PropModeReplace, (unsigned char*) stamp.buffer().data(), stamp.buffer().size() ); - QApplication::flushX(); + TQApplication::flushX(); } } diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp index 1514ed453..8ba59b680 100644 --- a/kcontrol/kthememanager/knewthemedlg.cpp +++ b/kcontrol/kthememanager/knewthemedlg.cpp @@ -19,17 +19,17 @@ #include "knewthemedlg.h" #include "newthemewidget.h" -#include <qlineedit.h> -#include <qtextedit.h> +#include <tqlineedit.h> +#include <tqtextedit.h> #include <klocale.h> -KNewThemeDlg::KNewThemeDlg( QWidget * parent, const char * name ) +KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name ) : KDialogBase(parent, name, true, i18n("New Theme"), Ok|Cancel, Ok) { m_base = new NewThemeWidget( this, "new_theme_base" ); setMainWidget( m_base ); - connect( m_base->leName, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotThemeNameChanged( const QString & ) ) ); + connect( m_base->leName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotThemeNameChanged( const TQString & ) ) ); slotThemeNameChanged( m_base->leName->text() ); } @@ -38,57 +38,57 @@ KNewThemeDlg::~KNewThemeDlg() delete m_base; } -void KNewThemeDlg::slotThemeNameChanged( const QString &_text ) +void KNewThemeDlg::slotThemeNameChanged( const TQString &_text ) { enableButtonOK( !_text.isEmpty() ); } -QString KNewThemeDlg::getName() const +TQString KNewThemeDlg::getName() const { return m_base->leName->text(); } -QString KNewThemeDlg::getAuthor() const +TQString KNewThemeDlg::getAuthor() const { return m_base->leAuthor->text(); } -QString KNewThemeDlg::getEmail() const +TQString KNewThemeDlg::getEmail() const { return m_base->leEmail->text(); } -QString KNewThemeDlg::getHomepage() const +TQString KNewThemeDlg::getHomepage() const { return m_base->leHomepage->text(); } -QString KNewThemeDlg::getComment() const +TQString KNewThemeDlg::getComment() const { return m_base->teComment->text(); } -QString KNewThemeDlg::getVersion() const +TQString KNewThemeDlg::getVersion() const { return m_base->leVersion->text(); } -void KNewThemeDlg::setAuthor( const QString & author ) +void KNewThemeDlg::setAuthor( const TQString & author ) { m_base->leAuthor->setText( author ); } -void KNewThemeDlg::setEmail( const QString & email ) +void KNewThemeDlg::setEmail( const TQString & email ) { m_base->leEmail->setText( email ); } -void KNewThemeDlg::setVersion( const QString & version ) +void KNewThemeDlg::setVersion( const TQString & version ) { m_base->leVersion->setText( version ); } -void KNewThemeDlg::setName( const QString & name ) +void KNewThemeDlg::setName( const TQString & name ) { m_base->leName->setText( name ); } diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h index 52fd0816f..5a0df045a 100644 --- a/kcontrol/kthememanager/knewthemedlg.h +++ b/kcontrol/kthememanager/knewthemedlg.h @@ -19,7 +19,7 @@ #ifndef KNEWTHEMEDLG_H #define KNEWTHEMEDLG_H -#include <qstring.h> +#include <tqstring.h> #include <kdialogbase.h> @@ -34,25 +34,25 @@ class KNewThemeDlg: public KDialogBase { Q_OBJECT public: - KNewThemeDlg( QWidget * parent = 0, const char * name = 0); + KNewThemeDlg( TQWidget * parent = 0, const char * name = 0); ~KNewThemeDlg(); - QString getName() const; - QString getAuthor() const; - QString getEmail() const; - QString getHomepage() const; - QString getComment() const; - QString getVersion() const; - - void setName( const QString & name ); - void setAuthor( const QString & author ); - void setEmail( const QString & email ); - void setVersion( const QString & version ); + TQString getName() const; + TQString getAuthor() const; + TQString getEmail() const; + TQString getHomepage() const; + TQString getComment() const; + TQString getVersion() const; + + void setName( const TQString & name ); + void setAuthor( const TQString & author ); + void setEmail( const TQString & email ); + void setVersion( const TQString & version ); private: NewThemeWidget * m_base; private slots: - void slotThemeNameChanged( const QString &_text ); + void slotThemeNameChanged( const TQString &_text ); }; #endif diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 241aac132..b78a354be 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -18,13 +18,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "ktheme.h" -#include <qfile.h> -#include <qfileinfo.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qregexp.h> -#include <qtextstream.h> -#include <qdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqregexp.h> +#include <tqtextstream.h> +#include <tqdir.h> #include <dcopclient.h> #include <kapplication.h> @@ -43,26 +43,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <ktar.h> #include <kstyle.h> -KTheme::KTheme( QWidget *parent, const QString & xmlFile ) +KTheme::KTheme( TQWidget *parent, const TQString & xmlFile ) : m_parent(parent) { - QFile file( xmlFile ); + TQFile file( xmlFile ); file.open( IO_ReadOnly ); m_dom.setContent( file.readAll() ); file.close(); //kdDebug() << m_dom.toString( 2 ) << endl; - setName( QFileInfo( file ).baseName() ); + setName( TQFileInfo( file ).baseName() ); m_kgd = KGlobal::dirs(); } -KTheme::KTheme( QWidget *parent, bool create ) +KTheme::KTheme( TQWidget *parent, bool create ) : m_parent(parent) { if ( create ) { - m_dom = QDomDocument( "ktheme" ); + m_dom = TQDomDocument( "ktheme" ); m_root = m_dom.createElement( "ktheme" ); m_root.setAttribute( "version", SYNTAX_VERSION ); @@ -79,7 +79,7 @@ KTheme::~KTheme() { } -void KTheme::setName( const QString & name ) +void KTheme::setName( const TQString & name ) { m_name = name; } @@ -88,24 +88,24 @@ bool KTheme::load( const KURL & url ) { kdDebug() << "Loading theme from URL: " << url << endl; - QString tmpFile; + TQString tmpFile; if ( !KIO::NetAccess::download( url, tmpFile, 0L ) ) return false; kdDebug() << "Theme is in temp file: " << tmpFile << endl; // set theme's name - setName( QFileInfo( url.fileName() ).baseName() ); + setName( TQFileInfo( url.fileName() ).baseName() ); // unpack the tarball - QString location = m_kgd->saveLocation( "themes", m_name + "/" ); + TQString location = m_kgd->saveLocation( "themes", m_name + "/" ); KTar tar( tmpFile ); tar.open( IO_ReadOnly ); tar.directory()->copyTo( location ); tar.close(); // create the DOM - QFile file( location + m_name + ".xml" ); + TQFile file( location + m_name + ".xml" ); file.open( IO_ReadOnly ); m_dom.setContent( file.readAll() ); file.close(); @@ -116,7 +116,7 @@ bool KTheme::load( const KURL & url ) return true; } -QString KTheme::createYourself( bool pack ) +TQString KTheme::createYourself( bool pack ) { // start with empty dir for orig theme if ( !pack ) @@ -137,35 +137,35 @@ QString KTheme::createYourself( bool pack ) for ( uint i=0; i < numDesktops-1; i++ ) { - QDomElement desktopElem = m_dom.createElement( "desktop" ); + TQDomElement desktopElem = m_dom.createElement( "desktop" ); desktopElem.setAttribute( "number", i ); desktopElem.setAttribute( "common", common ); - desktopConf.setGroup( "Desktop" + QString::number( i ) ); + desktopConf.setGroup( "Desktop" + TQString::number( i ) ); - QDomElement modeElem = m_dom.createElement( "mode" ); + TQDomElement modeElem = m_dom.createElement( "mode" ); modeElem.setAttribute( "id", desktopConf.readEntry( "BackgroundMode", "Flat" ) ); desktopElem.appendChild( modeElem ); - QDomElement c1Elem = m_dom.createElement( "color1" ); + TQDomElement c1Elem = m_dom.createElement( "color1" ); c1Elem.setAttribute( "rgb", desktopConf.readColorEntry( "Color1" ).name() ); desktopElem.appendChild( c1Elem ); - QDomElement c2Elem = m_dom.createElement( "color2" ); + TQDomElement c2Elem = m_dom.createElement( "color2" ); c2Elem.setAttribute( "rgb", desktopConf.readColorEntry( "Color2" ).name() ); desktopElem.appendChild( c2Elem ); - QDomElement blendElem = m_dom.createElement( "blending" ); - blendElem.setAttribute( "mode", desktopConf.readEntry( "BlendMode", QString( "NoBlending" ) ) ); - blendElem.setAttribute( "balance", desktopConf.readEntry( "BlendBalance", QString::number( 100 ) ) ); + TQDomElement blendElem = m_dom.createElement( "blending" ); + blendElem.setAttribute( "mode", desktopConf.readEntry( "BlendMode", TQString( "NoBlending" ) ) ); + blendElem.setAttribute( "balance", desktopConf.readEntry( "BlendBalance", TQString::number( 100 ) ) ); blendElem.setAttribute( "reverse", desktopConf.readBoolEntry( "ReverseBlending", false ) ); desktopElem.appendChild( blendElem ); - QDomElement patElem = m_dom.createElement( "pattern" ); + TQDomElement patElem = m_dom.createElement( "pattern" ); patElem.setAttribute( "name", desktopConf.readEntry( "Pattern" ) ); desktopElem.appendChild( patElem ); - QDomElement wallElem = m_dom.createElement( "wallpaper" ); + TQDomElement wallElem = m_dom.createElement( "wallpaper" ); wallElem.setAttribute( "url", processFilePath( "desktop", desktopConf.readPathEntry( "Wallpaper" ) ) ); wallElem.setAttribute( "mode", desktopConf.readEntry( "WallpaperMode" ) ); desktopElem.appendChild( wallElem ); @@ -180,13 +180,13 @@ QString KTheme::createYourself( bool pack ) // 11. Screensaver desktopConf.setGroup( "ScreenSaver" ); - QDomElement saverElem = m_dom.createElement( "screensaver" ); + TQDomElement saverElem = m_dom.createElement( "screensaver" ); saverElem.setAttribute( "name", desktopConf.readEntry( "Saver" ) ); m_root.appendChild( saverElem ); // 3. Icons globalConf->setGroup( "Icons" ); - QDomElement iconElem = m_dom.createElement( "icons" ); + TQDomElement iconElem = m_dom.createElement( "icons" ); iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) ); createIconElems( "DesktopIcons", "desktop", iconElem, globalConf ); createIconElems( "MainToolbarIcons", "mainToolbar", iconElem, globalConf ); @@ -198,7 +198,7 @@ QString KTheme::createYourself( bool pack ) // 4. Sounds // 4.1 Global sounds KConfig * soundConf = new KConfig( "knotify.eventsrc", true ); - QStringList stdEvents; + TQStringList stdEvents; stdEvents << "cannotopenfile" << "catastrophe" << "exitkde" << "fatalerror" << "notification" << "printerror" << "startkde" << "warning" << "messageCritical" << "messageInformation" << "messageWarning" @@ -206,7 +206,7 @@ QString KTheme::createYourself( bool pack ) // 4.2 KWin sounds KConfig * kwinSoundConf = new KConfig( "kwin.eventsrc", true ); - QStringList kwinEvents; + TQStringList kwinEvents; kwinEvents << "activate" << "close" << "delete" << "desktop1" << "desktop2" << "desktop3" << "desktop4" << "desktop5" << "desktop6" << "desktop7" << "desktop8" << @@ -215,7 +215,7 @@ QString KTheme::createYourself( bool pack ) "resizeend" << "resizestart" << "shadedown" << "shadeup" << "transdelete" << "transnew" << "unmaximize" << "unminimize"; - QDomElement soundsElem = m_dom.createElement( "sounds" ); + TQDomElement soundsElem = m_dom.createElement( "sounds" ); createSoundList( stdEvents, "global", soundsElem, soundConf ); createSoundList( kwinEvents, "kwin", soundsElem, kwinSoundConf ); m_root.appendChild( soundsElem ); @@ -224,24 +224,24 @@ QString KTheme::createYourself( bool pack ) // 5. Colors - QDomElement colorsElem = m_dom.createElement( "colors" ); + TQDomElement colorsElem = m_dom.createElement( "colors" ); globalConf->setGroup( "KDE" ); colorsElem.setAttribute( "contrast", globalConf->readNumEntry( "contrast", 7 ) ); - QStringList stdColors; + TQStringList stdColors; stdColors << "background" << "selectBackground" << "foreground" << "windowForeground" << "windowBackground" << "selectForeground" << "buttonBackground" << "buttonForeground" << "linkColor" << "visitedLinkColor" << "alternateBackground"; globalConf->setGroup( "General" ); - for ( QStringList::Iterator it = stdColors.begin(); it != stdColors.end(); ++it ) + for ( TQStringList::Iterator it = stdColors.begin(); it != stdColors.end(); ++it ) createColorElem( ( *it ), "global", colorsElem, globalConf ); - QStringList kwinColors; + TQStringList kwinColors; kwinColors << "activeForeground" << "inactiveBackground" << "inactiveBlend" << "activeBackground" << "activeBlend" << "inactiveForeground" << "activeTitleBtnBg" << "inactiveTitleBtnBg" << "frame" << "inactiveFrame" << "handle" << "inactiveHandle"; globalConf->setGroup( "WM" ); - for ( QStringList::Iterator it = kwinColors.begin(); it != kwinColors.end(); ++it ) + for ( TQStringList::Iterator it = kwinColors.begin(); it != kwinColors.end(); ++it ) createColorElem( ( *it ), "kwin", colorsElem, globalConf ); m_root.appendChild( colorsElem ); @@ -249,7 +249,7 @@ QString KTheme::createYourself( bool pack ) // 6. Cursors KConfig* mouseConf = new KConfig( "kcminputrc", true ); mouseConf->setGroup( "Mouse" ); - QDomElement cursorsElem = m_dom.createElement( "cursors" ); + TQDomElement cursorsElem = m_dom.createElement( "cursors" ); cursorsElem.setAttribute( "name", mouseConf->readEntry( "cursorTheme" ) ); m_root.appendChild( cursorsElem ); delete mouseConf; @@ -257,17 +257,17 @@ QString KTheme::createYourself( bool pack ) // 7. KWin kwinConf.setGroup( "Style" ); - QDomElement wmElem = m_dom.createElement( "wm" ); + TQDomElement wmElem = m_dom.createElement( "wm" ); wmElem.setAttribute( "name", kwinConf.readEntry( "PluginLib" ) ); wmElem.setAttribute( "type", "builtin" ); // TODO support pixmap themes when the kwin client gets ported if ( kwinConf.readBoolEntry( "CustomButtonPositions" ) ) { - QDomElement buttonsElem = m_dom.createElement( "buttons" ); + TQDomElement buttonsElem = m_dom.createElement( "buttons" ); buttonsElem.setAttribute( "left", kwinConf.readEntry( "ButtonsOnLeft" ) ); buttonsElem.setAttribute( "right", kwinConf.readEntry( "ButtonsOnRight" ) ); wmElem.appendChild( buttonsElem ); } - QDomElement borderElem = m_dom.createElement( "border" ); + TQDomElement borderElem = m_dom.createElement( "border" ); borderElem.setAttribute( "size", kwinConf.readNumEntry( "BorderSize", 1 ) ); wmElem.appendChild( borderElem ); m_root.appendChild( wmElem ); @@ -275,12 +275,12 @@ QString KTheme::createYourself( bool pack ) // 8. Konqueror KConfig konqConf( "konquerorrc", true ); konqConf.setGroup( "Settings" ); - QDomElement konqElem = m_dom.createElement( "konqueror" ); - QDomElement konqWallElem = m_dom.createElement( "wallpaper" ); - QString bgImagePath = konqConf.readPathEntry( "BgImage" ); + TQDomElement konqElem = m_dom.createElement( "konqueror" ); + TQDomElement konqWallElem = m_dom.createElement( "wallpaper" ); + TQString bgImagePath = konqConf.readPathEntry( "BgImage" ); konqWallElem.setAttribute( "url", processFilePath( "konqueror", bgImagePath ) ); konqElem.appendChild( konqWallElem ); - QDomElement konqBgColorElem = m_dom.createElement( "bgcolor" ); + TQDomElement konqBgColorElem = m_dom.createElement( "bgcolor" ); konqBgColorElem.setAttribute( "rgb", konqConf.readColorEntry( "BgColor" ).name() ); konqElem.appendChild( konqBgColorElem ); m_root.appendChild( konqElem ); @@ -289,31 +289,31 @@ QString KTheme::createYourself( bool pack ) KConfig kickerConf( "kickerrc", true ); kickerConf.setGroup( "General" ); - QDomElement panelElem = m_dom.createElement( "panel" ); + TQDomElement panelElem = m_dom.createElement( "panel" ); if ( kickerConf.readBoolEntry( "UseBackgroundTheme" ) ) { - QDomElement backElem = m_dom.createElement( "background" ); - QString kbgPath = kickerConf.readPathEntry( "BackgroundTheme" ); + TQDomElement backElem = m_dom.createElement( "background" ); + TQString kbgPath = kickerConf.readPathEntry( "BackgroundTheme" ); backElem.setAttribute( "url", processFilePath( "panel", kbgPath ) ); backElem.setAttribute( "colorize", kickerConf.readBoolEntry( "ColorizeBackground" ) ); panelElem.appendChild( backElem ); } - QDomElement transElem = m_dom.createElement( "transparent" ); + TQDomElement transElem = m_dom.createElement( "transparent" ); transElem.setAttribute( "value", kickerConf.readBoolEntry( "Transparent" ) ); panelElem.appendChild( transElem ); - QDomElement posElem = m_dom.createElement( "position" ); + TQDomElement posElem = m_dom.createElement( "position" ); posElem.setAttribute( "value", kickerConf.readEntry( "Position" ) ); panelElem.appendChild( posElem ); - QDomElement showLeftHideButtonElem = m_dom.createElement( "showlefthidebutton" ); + TQDomElement showLeftHideButtonElem = m_dom.createElement( "showlefthidebutton" ); showLeftHideButtonElem.setAttribute( "value", kickerConf.readBoolEntry( "ShowLeftHideButton" ) ); panelElem.appendChild( showLeftHideButtonElem ); - QDomElement showRightHideButtonElem = m_dom.createElement( "showrighthidebutton" ); + TQDomElement showRightHideButtonElem = m_dom.createElement( "showrighthidebutton" ); showRightHideButtonElem.setAttribute( "value", kickerConf.readBoolEntry( "ShowRightHideButton" ) ); panelElem.appendChild( showRightHideButtonElem ); @@ -323,13 +323,13 @@ QString KTheme::createYourself( bool pack ) // 10. Widget style globalConf->setGroup( "General" ); - QDomElement widgetsElem = m_dom.createElement( "widgets" ); + TQDomElement widgetsElem = m_dom.createElement( "widgets" ); widgetsElem.setAttribute( "name", globalConf->readEntry( "widgetStyle",KStyle::defaultStyle() ) ); m_root.appendChild( widgetsElem ); // 12. - QDomElement fontsElem = m_dom.createElement( "fonts" ); - QStringList fonts; + TQDomElement fontsElem = m_dom.createElement( "fonts" ); + TQStringList fonts; fonts << "General" << "font" << "General" << "fixed" << "General" << "toolBarFont" @@ -338,10 +338,10 @@ QString KTheme::createYourself( bool pack ) << "General" << "taskbarFont" << "FMSettings" << "StandardFont"; - for ( QStringList::Iterator it = fonts.begin(); it != fonts.end(); ++it ) { - QString group = *it; ++it; - QString key = *it; - QString value; + for ( TQStringList::Iterator it = fonts.begin(); it != fonts.end(); ++it ) { + TQString group = *it; ++it; + TQString key = *it; + TQString value; if ( group == "FMSettings" ) { desktopConf.setGroup( group ); @@ -351,7 +351,7 @@ QString KTheme::createYourself( bool pack ) globalConf->setGroup( group ); value = globalConf->readEntry( key ); } - QDomElement fontElem = m_dom.createElement( key ); + TQDomElement fontElem = m_dom.createElement( key ); fontElem.setAttribute( "object", group ); fontElem.setAttribute( "value", value ); fontsElem.appendChild( fontElem ); @@ -359,14 +359,14 @@ QString KTheme::createYourself( bool pack ) m_root.appendChild( fontsElem ); // Save the XML - QFile file( m_kgd->saveLocation( "themes", m_name + "/" ) + m_name + ".xml" ); + TQFile file( m_kgd->saveLocation( "themes", m_name + "/" ) + m_name + ".xml" ); if ( file.open( IO_WriteOnly ) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); m_dom.save( stream, 2 ); file.close(); } - QString result; + TQString result; if ( pack ) { // Pack the whole theme @@ -375,7 +375,7 @@ QString KTheme::createYourself( bool pack ) kdDebug() << "Packing everything under: " << m_kgd->saveLocation( "themes", m_name + "/" ) << endl; - if ( tar.addLocalDirectory( m_kgd->saveLocation( "themes", m_name + "/" ), QString::null ) ) + if ( tar.addLocalDirectory( m_kgd->saveLocation( "themes", m_name + "/" ), TQString::null ) ) result = tar.fileName(); tar.close(); @@ -390,18 +390,18 @@ void KTheme::apply() { kdDebug() << "Going to apply theme: " << m_name << endl; - QString themeDir = m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/"; + TQString themeDir = m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/"; kdDebug() << "Theme dir: " << themeDir << endl; // 2. Background theme - QDomNodeList desktopList = m_dom.elementsByTagName( "desktop" ); + TQDomNodeList desktopList = m_dom.elementsByTagName( "desktop" ); KConfig desktopConf( "kdesktoprc" ); desktopConf.setGroup( "Background Common" ); for ( uint i = 0; i <= desktopList.count(); i++ ) { - QDomElement desktopElem = desktopList.item( i ).toElement(); + TQDomElement desktopElem = desktopList.item( i ).toElement(); if ( !desktopElem.isNull() ) { // TODO optimize, don't write several times the common section @@ -409,10 +409,10 @@ void KTheme::apply() desktopConf.writeEntry( "CommonDesktop", common ); desktopConf.writeEntry( "DeskNum", desktopElem.attribute( "number", "0" ).toUInt() ); - desktopConf.setGroup( QString( "Desktop%1" ).arg( i ) ); + desktopConf.setGroup( TQString( "Desktop%1" ).arg( i ) ); desktopConf.writeEntry( "BackgroundMode", getProperty( desktopElem, "mode", "id" ) ); - desktopConf.writeEntry( "Color1", QColor( getProperty( desktopElem, "color1", "rgb" ) ) ); - desktopConf.writeEntry( "Color2", QColor( getProperty( desktopElem, "color2", "rgb" ) ) ); + desktopConf.writeEntry( "Color1", TQColor( getProperty( desktopElem, "color1", "rgb" ) ) ); + desktopConf.writeEntry( "Color2", TQColor( getProperty( desktopElem, "color2", "rgb" ) ) ); desktopConf.writeEntry( "BlendMode", getProperty( desktopElem, "blending", "mode" ) ); desktopConf.writeEntry( "BlendBalance", getProperty( desktopElem, "blending", "balance" ) ); desktopConf.writeEntry( "ReverseBlending", @@ -428,7 +428,7 @@ void KTheme::apply() } // 11. Screensaver - QDomElement saverElem = m_dom.elementsByTagName( "screensaver" ).item( 0 ).toElement(); + TQDomElement saverElem = m_dom.elementsByTagName( "screensaver" ).item( 0 ).toElement(); if ( !saverElem.isNull() ) { @@ -445,18 +445,18 @@ void KTheme::apply() // FIXME Xinerama // 3. Icons - QDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement(); + TQDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement(); if ( !iconElem.isNull() ) { KConfig * iconConf = KGlobal::config(); iconConf->setGroup( "Icons" ); iconConf->writeEntry( "Theme", iconElem.attribute( "name", "crystalsvg" ), true, true ); - QDomNodeList iconList = iconElem.childNodes(); + TQDomNodeList iconList = iconElem.childNodes(); for ( uint i = 0; i < iconList.count(); i++ ) { - QDomElement iconSubElem = iconList.item( i ).toElement(); - QString object = iconSubElem.attribute( "object" ); + TQDomElement iconSubElem = iconList.item( i ).toElement(); + TQString object = iconSubElem.attribute( "object" ); if ( object == "desktop" ) iconConf->setGroup( "DesktopIcons" ); else if ( object == "mainToolbar" ) @@ -468,10 +468,10 @@ void KTheme::apply() else if ( object == "toolbar" ) iconConf->setGroup( "ToolbarIcons" ); - QString iconName = iconSubElem.tagName(); + TQString iconName = iconSubElem.tagName(); if ( iconName.contains( "Color" ) ) { - QColor iconColor = QColor( iconSubElem.attribute( "rgb" ) ); + TQColor iconColor = TQColor( iconSubElem.attribute( "rgb" ) ); iconConf->writeEntry( iconName, iconColor, true, true ); } else if ( iconName.contains( "Value" ) || iconName == "Size" ) @@ -489,16 +489,16 @@ void KTheme::apply() } // 4. Sounds - QDomElement soundsElem = m_dom.elementsByTagName( "sounds" ).item( 0 ).toElement(); + TQDomElement soundsElem = m_dom.elementsByTagName( "sounds" ).item( 0 ).toElement(); if ( !soundsElem.isNull() ) { KConfig soundConf( "knotify.eventsrc" ); KConfig kwinSoundConf( "kwin.eventsrc" ); - QDomNodeList eventList = soundsElem.elementsByTagName( "event" ); + TQDomNodeList eventList = soundsElem.elementsByTagName( "event" ); for ( uint i = 0; i < eventList.count(); i++ ) { - QDomElement eventElem = eventList.item( i ).toElement(); - QString object = eventElem.attribute( "object" ); + TQDomElement eventElem = eventList.item( i ).toElement(); + TQString object = eventElem.attribute( "object" ); if ( object == "global" ) { @@ -521,28 +521,28 @@ void KTheme::apply() } // 5. Colors - QDomElement colorsElem = m_dom.elementsByTagName( "colors" ).item( 0 ).toElement(); + TQDomElement colorsElem = m_dom.elementsByTagName( "colors" ).item( 0 ).toElement(); if ( !colorsElem.isNull() ) { - QDomNodeList colorList = colorsElem.childNodes(); + TQDomNodeList colorList = colorsElem.childNodes(); KConfig * colorConf = KGlobal::config(); - QString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc"); + TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc"); KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme ); colorScheme->setGroup("Color Scheme" ); for ( uint i = 0; i < colorList.count(); i++ ) { - QDomElement colorElem = colorList.item( i ).toElement(); - QString object = colorElem.attribute( "object" ); + TQDomElement colorElem = colorList.item( i ).toElement(); + TQString object = colorElem.attribute( "object" ); if ( object == "global" ) colorConf->setGroup( "General" ); else if ( object == "kwin" ) colorConf->setGroup( "WM" ); - QString colName = colorElem.tagName(); - QColor curColor = QColor( colorElem.attribute( "rgb" ) ); + TQString colName = colorElem.tagName(); + TQColor curColor = TQColor( colorElem.attribute( "rgb" ) ); colorConf->writeEntry( colName, curColor, true, true ); // kdeglobals colorScheme->writeEntry( colName, curColor ); // thememgr.kcsrc } @@ -558,7 +558,7 @@ void KTheme::apply() } // 6.Cursors - QDomElement cursorsElem = m_dom.elementsByTagName( "cursors" ).item( 0 ).toElement(); + TQDomElement cursorsElem = m_dom.elementsByTagName( "cursors" ).item( 0 ).toElement(); if ( !cursorsElem.isNull() ) { @@ -569,17 +569,17 @@ void KTheme::apply() } // 7. KWin - QDomElement wmElem = m_dom.elementsByTagName( "wm" ).item( 0 ).toElement(); + TQDomElement wmElem = m_dom.elementsByTagName( "wm" ).item( 0 ).toElement(); if ( !wmElem.isNull() ) { KConfig kwinConf( "kwinrc" ); kwinConf.setGroup( "Style" ); - QString type = wmElem.attribute( "type" ); + TQString type = wmElem.attribute( "type" ); if ( type == "builtin" ) kwinConf.writeEntry( "PluginLib", wmElem.attribute( "name" ) ); //else // TODO support custom themes - QDomNodeList buttons = wmElem.elementsByTagName ("buttons"); + TQDomNodeList buttons = wmElem.elementsByTagName ("buttons"); if ( buttons.count() > 0 ) { kwinConf.writeEntry( "CustomButtonPositions", true ); @@ -597,27 +597,27 @@ void KTheme::apply() } // 8. Konqueror - QDomElement konqElem = m_dom.elementsByTagName( "konqueror" ).item( 0 ).toElement(); + TQDomElement konqElem = m_dom.elementsByTagName( "konqueror" ).item( 0 ).toElement(); if ( !konqElem.isNull() ) { KConfig konqConf( "konquerorrc" ); konqConf.setGroup( "Settings" ); konqConf.writeEntry( "BgImage", unprocessFilePath( "konqueror", getProperty( konqElem, "wallpaper", "url" ) ) ); - konqConf.writeEntry( "BgColor", QColor( getProperty( konqElem, "bgcolor", "rgb" ) ) ); + konqConf.writeEntry( "BgColor", TQColor( getProperty( konqElem, "bgcolor", "rgb" ) ) ); konqConf.sync(); client->send("konqueror*", "KonquerorIface", "reparseConfiguration()", ""); // FIXME seems not to work :( } // 9. Kicker - QDomElement panelElem = m_dom.elementsByTagName( "panel" ).item( 0 ).toElement(); + TQDomElement panelElem = m_dom.elementsByTagName( "panel" ).item( 0 ).toElement(); if ( !panelElem.isNull() ) { KConfig kickerConf( "kickerrc" ); kickerConf.setGroup( "General" ); - QString kickerBgUrl = getProperty( panelElem, "background", "url" ); + TQString kickerBgUrl = getProperty( panelElem, "background", "url" ); if ( !kickerBgUrl.isEmpty() ) { kickerConf.writeEntry( "UseBackgroundTheme", true ); @@ -639,7 +639,7 @@ void KTheme::apply() } // 10. Widget style - QDomElement widgetsElem = m_dom.elementsByTagName( "widgets" ).item( 0 ).toElement(); + TQDomElement widgetsElem = m_dom.elementsByTagName( "widgets" ).item( 0 ).toElement(); if ( !widgetsElem.isNull() ) { @@ -651,20 +651,20 @@ void KTheme::apply() } // 12. Fonts - QDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement(); + TQDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement(); if ( !fontsElem.isNull() ) { KConfig * fontsConf = KGlobal::config(); - KConfig * kde1xConf = new KSimpleConfig( QDir::homeDirPath() + "/.kderc" ); + KConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); kde1xConf->setGroup( "General" ); - QDomNodeList fontList = fontsElem.childNodes(); + TQDomNodeList fontList = fontsElem.childNodes(); for ( uint i = 0; i < fontList.count(); i++ ) { - QDomElement fontElem = fontList.item( i ).toElement(); - QString fontName = fontElem.tagName(); - QString fontValue = fontElem.attribute( "value" ); - QString fontObject = fontElem.attribute( "object" ); + TQDomElement fontElem = fontList.item( i ).toElement(); + TQString fontName = fontElem.tagName(); + TQString fontValue = fontElem.attribute( "value" ); + TQString fontObject = fontElem.attribute( "object" ); if ( fontObject == "FMSettings" ) { desktopConf.setGroup( fontObject ); @@ -685,51 +685,51 @@ void KTheme::apply() } -bool KTheme::remove( const QString & name ) +bool KTheme::remove( const TQString & name ) { kdDebug() << "Going to remove theme: " << name << endl; return KIO::NetAccess::del( KGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L ); } -void KTheme::setProperty( const QString & name, const QString & value, QDomElement parent ) +void KTheme::setProperty( const TQString & name, const TQString & value, TQDomElement parent ) { - QDomElement tmp = m_dom.createElement( name ); + TQDomElement tmp = m_dom.createElement( name ); tmp.setAttribute( "value", value ); parent.appendChild( tmp ); } -QString KTheme::getProperty( const QString & name ) const +TQString KTheme::getProperty( const TQString & name ) const { - QDomNodeList _list = m_dom.elementsByTagName( name ); + TQDomNodeList _list = m_dom.elementsByTagName( name ); if ( _list.count() != 0 ) return _list.item( 0 ).toElement().attribute( "value" ); else { kdWarning() << "Found no such property: " << name << endl; - return QString::null; + return TQString::null; } } -QString KTheme::getProperty( QDomElement parent, const QString & tag, - const QString & attr ) const +TQString KTheme::getProperty( TQDomElement parent, const TQString & tag, + const TQString & attr ) const { - QDomNodeList _list = parent.elementsByTagName( tag ); + TQDomNodeList _list = parent.elementsByTagName( tag ); if ( _list.count() != 0 ) return _list.item( 0 ).toElement().attribute( attr ); else { - kdWarning() << QString( "No such property found: %1->%2->%3" ) + kdWarning() << TQString( "No such property found: %1->%2->%3" ) .arg( parent.tagName() ).arg( tag ).arg( attr ) << endl; - return QString::null; + return TQString::null; } } -void KTheme::createIconElems( const QString & group, const QString & object, - QDomElement parent, KConfig * cfg ) +void KTheme::createIconElems( const TQString & group, const TQString & object, + TQDomElement parent, KConfig * cfg ) { cfg->setGroup( group ); - QStringList elemNames; + TQStringList elemNames; elemNames << "Animated" << "DoublePixels" << "Size" << "ActiveColor" << "ActiveColor2" << "ActiveEffect" << "ActiveSemiTransparent" << "ActiveValue" @@ -737,12 +737,12 @@ void KTheme::createIconElems( const QString & group, const QString & object, << "DefaultSemiTransparent" << "DefaultValue" << "DisabledColor" << "DisabledColor2" << "DisabledEffect" << "DisabledSemiTransparent" << "DisabledValue"; - for ( QStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) { + for ( TQStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) { if ( (*it).contains( "Color" ) ) createColorElem( *it, object, parent, cfg ); else { - QDomElement tmpCol = m_dom.createElement( *it ); + TQDomElement tmpCol = m_dom.createElement( *it ); tmpCol.setAttribute( "object", object ); if ( (*it).contains( "Value" ) || *it == "Size" ) @@ -758,33 +758,33 @@ void KTheme::createIconElems( const QString & group, const QString & object, } } -void KTheme::createColorElem( const QString & name, const QString & object, - QDomElement parent, KConfig * cfg ) +void KTheme::createColorElem( const TQString & name, const TQString & object, + TQDomElement parent, KConfig * cfg ) { - QColor color = cfg->readColorEntry( name ); + TQColor color = cfg->readColorEntry( name ); if ( color.isValid() ) { - QDomElement tmpCol = m_dom.createElement( name ); + TQDomElement tmpCol = m_dom.createElement( name ); tmpCol.setAttribute( "rgb", color.name() ); tmpCol.setAttribute( "object", object ); parent.appendChild( tmpCol ); } } -void KTheme::createSoundList( const QStringList & events, const QString & object, - QDomElement parent, KConfig * cfg ) +void KTheme::createSoundList( const TQStringList & events, const TQString & object, + TQDomElement parent, KConfig * cfg ) { - for ( QStringList::ConstIterator it = events.begin(); it != events.end(); ++it ) + for ( TQStringList::ConstIterator it = events.begin(); it != events.end(); ++it ) { - QString group = ( *it ); + TQString group = ( *it ); if ( cfg->hasGroup( group ) ) { cfg->setGroup( group ); - QString soundURL = cfg->readPathEntry( "soundfile" ); + TQString soundURL = cfg->readPathEntry( "soundfile" ); int pres = cfg->readNumEntry( "presentation", 0 ); if ( !soundURL.isEmpty() && ( ( pres & 1 ) == 1 ) ) { - QDomElement eventElem = m_dom.createElement( "event" ); + TQDomElement eventElem = m_dom.createElement( "event" ); eventElem.setAttribute( "object", object ); eventElem.setAttribute( "name", group ); eventElem.setAttribute( "url", processFilePath( "sounds", soundURL ) ); @@ -794,9 +794,9 @@ void KTheme::createSoundList( const QStringList & events, const QString & object } } -QString KTheme::processFilePath( const QString & section, const QString & path ) +TQString KTheme::processFilePath( const TQString & section, const TQString & path ) { - QFileInfo fi( path ); + TQFileInfo fi( path ); if ( fi.isRelative() ) fi.setFile( findResource( section, path ) ); @@ -826,60 +826,60 @@ QString KTheme::processFilePath( const QString & section, const QString & path ) else kdWarning() << "Unsupported theme resource type" << endl; - return QString::null; // an error occured or the resource doesn't exist + return TQString::null; // an error occured or the resource doesn't exist } -QString KTheme::unprocessFilePath( const QString & section, QString path ) +TQString KTheme::unprocessFilePath( const TQString & section, TQString path ) { if ( path.startsWith( "theme:/" ) ) - return path.replace( QRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); + return path.replace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); - if ( QFile::exists( path ) ) + if ( TQFile::exists( path ) ) return path; else // try to find it in the system return findResource( section, path ); } -void KTheme::setAuthor( const QString & author ) +void KTheme::setAuthor( const TQString & author ) { setProperty( "author", author, m_general ); } -void KTheme::setEmail( const QString & email ) +void KTheme::setEmail( const TQString & email ) { setProperty( "email", email, m_general ); } -void KTheme::setHomepage( const QString & homepage ) +void KTheme::setHomepage( const TQString & homepage ) { setProperty( "homepage", homepage, m_general ); } -void KTheme::setComment( const QString & comment ) +void KTheme::setComment( const TQString & comment ) { setProperty( "comment", comment, m_general ); } -void KTheme::setVersion( const QString & version ) +void KTheme::setVersion( const TQString & version ) { setProperty( "version", version, m_general ); } void KTheme::addPreview() { - QString file = m_kgd->saveLocation( "themes", m_name + "/" ) + m_name + ".preview.png"; + TQString file = m_kgd->saveLocation( "themes", m_name + "/" ) + m_name + ".preview.png"; kdDebug() << "Adding preview: " << file << endl; - QPixmap snapshot = QPixmap::grabWindow( qt_xrootwin() ); + TQPixmap snapshot = TQPixmap::grabWindow( qt_xrootwin() ); snapshot.save( file, "PNG" ); } -bool KTheme::copyFile( const QString & from, const QString & to ) +bool KTheme::copyFile( const TQString & from, const TQString & to ) { // we overwrite b/c of restoring the "original" theme return KIO::NetAccess::file_copy( from, to, -1, true /*overwrite*/ ); } -QString KTheme::findResource( const QString & section, const QString & path ) +TQString KTheme::findResource( const TQString & section, const TQString & path ) { if ( section == "desktop" ) return m_kgd->findResource( "wallpaper", path ); @@ -892,6 +892,6 @@ QString KTheme::findResource( const QString & section, const QString & path ) else { kdWarning() << "Requested unknown resource: " << section << endl; - return QString::null; + return TQString::null; } } diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h index 1401b49e7..0ec3c94cf 100644 --- a/kcontrol/kthememanager/ktheme.h +++ b/kcontrol/kthememanager/ktheme.h @@ -19,11 +19,11 @@ #ifndef KTHEME_H #define KTHEME_H -#include <qdom.h> -#include <qguardedptr.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qwidget.h> +#include <tqdom.h> +#include <tqguardedptr.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqwidget.h> #include <kurl.h> @@ -47,14 +47,14 @@ public: * Constructs KTheme using an installed theme * @param xmlFile The theme's XML file */ - KTheme( QWidget *parent, const QString & xmlFile ); + KTheme( TQWidget *parent, const TQString & xmlFile ); /** * Constructs an empty theme, to be used with * #createYourself() * @param create Whether to start the DOM tree */ - KTheme( QWidget *parent, bool create = false ); + KTheme( TQWidget *parent, bool create = false ); /** * Destructor @@ -74,7 +74,7 @@ public: * @param pack Whether to also pack the theme in tar.gz format * @return The path to the newly created tarball with theme (if @p pack == true) */ - QString createYourself( bool pack = false ); + TQString createYourself( bool pack = false ); /** * Apply the theme to the system, ie. set the config variables and @@ -87,41 +87,41 @@ public: * @param name The name of the theme * @return true on success */ - static bool remove( const QString & name ); + static bool remove( const TQString & name ); /** * @return the theme name */ - QString name() const { return m_name; } + TQString name() const { return m_name; } /** * Set the theme name */ - void setName( const QString & name ); + void setName( const TQString & name ); - QString author() const { + TQString author() const { return getProperty( "author" ); } - void setAuthor( const QString & author ); + void setAuthor( const TQString & author ); - QString email() const { + TQString email() const { return getProperty( "email" ); } - void setEmail( const QString & email ); + void setEmail( const TQString & email ); - QString homepage() const { + TQString homepage() const { return getProperty( "homepage" ); } - void setHomepage( const QString & homepage ); + void setHomepage( const TQString & homepage ); - QString comment() const { + TQString comment() const { return getProperty( "comment" ); } - void setComment ( const QString & comment ); + void setComment ( const TQString & comment ); - QString version() const { + TQString version() const { return getProperty( "version" ); } - void setVersion ( const QString & version ); + void setVersion ( const TQString & version ); /** * Creates a preview file called theme_name.preview.png @@ -134,13 +134,13 @@ private: * Create a property with @p name, value @p value * and append it to @p parent element */ - void setProperty( const QString & name, - const QString & value, - QDomElement parent ); + void setProperty( const TQString & name, + const TQString & value, + TQDomElement parent ); /** * Get a simple property from the "general" section of the DOM tree */ - QString getProperty( const QString & name ) const; + TQString getProperty( const TQString & name ) const; /** * Get a property from the DOM tree, based on: @@ -148,8 +148,8 @@ private: * @param tag From the this tag * @param attr From this attribute */ - QString getProperty( QDomElement parent, const QString & tag, - const QString & attr ) const; + TQString getProperty( TQDomElement parent, const TQString & tag, + const TQString & attr ) const; /** * Creates a list of "icon" elements based on: @@ -158,16 +158,16 @@ private: * @param parent Parent element to append to * @param cfg The KConfig object to work with */ - void createIconElems( const QString & group, const QString & object, - QDomElement parent, KConfig * cfg ); + void createIconElems( const TQString & group, const TQString & object, + TQDomElement parent, KConfig * cfg ); /** * Creates a color DOM element @p name, with a specifier @p object, * appends it to @p parent; used when creating themes * @param cfg The KConfig object to work with */ - void createColorElem( const QString & name, const QString & object, - QDomElement parent, KConfig * cfg ); + void createColorElem( const TQString & name, const TQString & object, + TQDomElement parent, KConfig * cfg ); /** * Creates a list of "event" elements based on: * @param events The list of events to work on @@ -175,50 +175,50 @@ private: * @param parent Parent element to append to * @param cfg The KConfig object to work with */ - void createSoundList( const QStringList & events, const QString & object, - QDomElement parent, KConfig * cfg ); + void createSoundList( const TQStringList & events, const TQString & object, + TQDomElement parent, KConfig * cfg ); /** * Tries to find out absolute path to a resource and copy it to the theme's temp dir; * used when creating themes * @param section The theme section to work on, corresponds to toplevel XML tags * @param path The original path, relative or absolute - * @return an internal path suitable for writing into the XML file or QString::null + * @return an internal path suitable for writing into the XML file or TQString::null * in case the resource couldn't be found */ - QString processFilePath( const QString & section, const QString & path ); + TQString processFilePath( const TQString & section, const TQString & path ); /** * Converts an internal theme:/ representation of a resource * to a real path */ - QString unprocessFilePath( const QString & section, QString path ); + TQString unprocessFilePath( const TQString & section, TQString path ); /** * Wrapper around KIO::NetAccess::file_copy */ - bool copyFile( const QString & from, const QString & to ); + bool copyFile( const TQString & from, const TQString & to ); /** * Wrapper around KGlobal::dirs()->findResource() * @param section Section to work on (desktop, sounds, panel etc) * @param path The file to find */ - QString findResource( const QString & section, const QString & path ); + TQString findResource( const TQString & section, const TQString & path ); /// name of the theme - QString m_name; + TQString m_name; /// DOM holding the theme - QDomDocument m_dom; + TQDomDocument m_dom; /// the DOM root element - QDomElement m_root; + TQDomElement m_root; /// "general" section - QDomElement m_general; + TQDomElement m_general; KStandardDirs * m_kgd; - QGuardedPtr<QWidget> m_parent; + TQGuardedPtr<TQWidget> m_parent; }; #endif diff --git a/kcontrol/kthememanager/kthemedlg.ui.h b/kcontrol/kthememanager/kthemedlg.ui.h index 53f296a1c..85d22cb9d 100644 --- a/kcontrol/kthememanager/kthemedlg.ui.h +++ b/kcontrol/kthememanager/kthemedlg.ui.h @@ -8,7 +8,7 @@ *****************************************************************************/ #include <krun.h> -void KThemeDlg::startKonqui( const QString & url ) +void KThemeDlg::startKonqui( const TQString & url ) { (void) new KRun(url); } diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index d5efc65cd..2668bd87c 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -16,12 +16,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qtooltip.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> #include <kaboutdata.h> #include <kapplication.h> @@ -42,7 +42,7 @@ #include "knewthemedlg.h" #include "config.h" -kthememanager::kthememanager( QWidget *parent, const char *name ) +kthememanager::kthememanager( TQWidget *parent, const char *name ) : KCModule( parent, name ), m_theme( 0 ), m_origTheme( 0 ) { @@ -61,33 +61,33 @@ kthememanager::kthememanager( QWidget *parent, const char *name ) setAcceptDrops( true ); init(); - QBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint()); dlg = new KThemeDlg(this); top->addWidget( dlg ); - dlg->lvThemes->setColumnWidthMode( 0, QListView::Maximum ); + dlg->lvThemes->setColumnWidthMode( 0, TQListView::Maximum ); - connect( ( QObject * )dlg->btnInstall, SIGNAL( clicked() ), - this, SLOT( slotInstallTheme() ) ); + connect( ( TQObject * )dlg->btnInstall, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotInstallTheme() ) ); - connect( ( QObject * )dlg->btnRemove, SIGNAL( clicked() ), - this, SLOT( slotRemoveTheme() ) ); + connect( ( TQObject * )dlg->btnRemove, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotRemoveTheme() ) ); - connect( ( QObject * )dlg->btnCreate, SIGNAL( clicked() ), - this, SLOT( slotCreateTheme() ) ); + connect( ( TQObject * )dlg->btnCreate, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotCreateTheme() ) ); - connect( ( QObject * )dlg->lvThemes, SIGNAL( clicked( QListViewItem * ) ), - this, SLOT( slotThemeChanged( QListViewItem * ) ) ); + connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ), + this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) ); - connect( ( QObject * )dlg->lvThemes, SIGNAL( currentChanged( QListViewItem * ) ), - this, SLOT( slotThemeChanged( QListViewItem * ) ) ); + connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) ); - connect( this, SIGNAL( filesDropped( const KURL::List& ) ), - this, SLOT( updateButton() ) ); + connect( this, TQT_SIGNAL( filesDropped( const KURL::List& ) ), + this, TQT_SLOT( updateButton() ) ); - connect( ( QObject * )dlg->lvThemes, SIGNAL( clicked( QListViewItem * ) ), - this, SLOT( updateButton() ) ); + connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ), + this, TQT_SLOT( updateButton() ) ); m_origTheme = new KTheme( this, true ); // stores the defaults to get back to m_origTheme->setName( ORIGINAL_THEME ); @@ -112,10 +112,10 @@ void kthememanager::init() void kthememanager::updateButton() { - QListViewItem * cur = dlg->lvThemes->currentItem(); + TQListViewItem * cur = dlg->lvThemes->currentItem(); bool enable = (cur != 0); if (enable) { - enable = QFile(KGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ; + enable = TQFile(KGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ; } dlg->btnRemove->setEnabled(enable); } @@ -135,8 +135,8 @@ void kthememanager::load(bool useDefaults) conf.setReadDefaults( useDefaults ); conf.setGroup( "General" ); - QString themeName = conf.readEntry( "CurrentTheme" ); - QListViewItem * cur = dlg->lvThemes->findItem( themeName, 0 ); + TQString themeName = conf.readEntry( "CurrentTheme" ); + TQListViewItem * cur = dlg->lvThemes->findItem( themeName, 0 ); if ( cur ) { dlg->lvThemes->setSelected( cur, true ); @@ -154,11 +154,11 @@ void kthememanager::defaults() void kthememanager::save() { - QListViewItem * cur = dlg->lvThemes->currentItem(); + TQListViewItem * cur = dlg->lvThemes->currentItem(); if ( cur ) { - QString themeName = cur->text( 0 ); + TQString themeName = cur->text( 0 ); m_theme = new KTheme( this, KGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") ); m_theme->apply(); @@ -178,33 +178,33 @@ void kthememanager::save() void kthememanager::listThemes() { dlg->lvThemes->clear(); - dlg->lbPreview->setPixmap( QPixmap() ); + dlg->lbPreview->setPixmap( TQPixmap() ); - QStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); + TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); - QStringList::const_iterator it; + TQStringList::const_iterator it; for ( it = themes.begin(); it != themes.end(); ++it ) { KTheme theme( this, ( *it ) ); - QString name = theme.name(); + TQString name = theme.name(); if ( name != ORIGINAL_THEME ) // skip the "original" theme - ( void ) new QListViewItem( dlg->lvThemes, name, theme.comment() ); + ( void ) new TQListViewItem( dlg->lvThemes, name, theme.comment() ); } kdDebug() << "Available themes: " << themes << endl; } -float kthememanager::getThemeVersion( const QString & themeName ) +float kthememanager::getThemeVersion( const TQString & themeName ) { - QStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); + TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); - QStringList::const_iterator it; + TQStringList::const_iterator it; for ( it = themes.begin(); it != themes.end(); ++it ) { KTheme theme( 0L, ( *it ) ); - QString name = theme.name(); + TQString name = theme.name(); bool ok = false; float version = theme.version().toFloat( &ok ); if ( name == themeName && ok ) @@ -224,7 +224,7 @@ void kthememanager::addNewTheme( const KURL & url ) { if ( url.isValid() ) { - QString themeName = QFileInfo( url.fileName() ).baseName(); + TQString themeName = TQFileInfo( url.fileName() ).baseName(); if ( getThemeVersion( themeName ) != -1 ) // theme exists already { KTheme::remove( themeName ); // remove first @@ -246,11 +246,11 @@ void kthememanager::addNewTheme( const KURL & url ) void kthememanager::slotRemoveTheme() { // get the selected item from the listview - QListViewItem * cur = dlg->lvThemes->currentItem(); + TQListViewItem * cur = dlg->lvThemes->currentItem(); // ask and remove it if ( cur ) { - QString themeName = cur->text( 0 ); + TQString themeName = cur->text( 0 ); if ( KMessageBox::warningContinueCancel( this, "<qt>" + i18n( "Do you really want to remove the theme <b>%1</b>?" ).arg( themeName ), i18n( "Remove Theme" ), KGuiItem( i18n( "&Remove" ), "editdelete" ) ) == KMessageBox::Continue ) @@ -262,7 +262,7 @@ void kthememanager::slotRemoveTheme() } } -bool kthememanager::themeExist(const QString &_themeName) +bool kthememanager::themeExist(const TQString &_themeName) { return ( dlg->lvThemes->findItem( _themeName, 0 )!=0 ); } @@ -279,10 +279,10 @@ void kthememanager::slotCreateTheme() dlg.setEmail( es.getSetting( KEMailSettings::EmailAddress ) ); dlg.setVersion( "0.1" ); - if ( dlg.exec() == QDialog::Accepted ) + if ( dlg.exec() == TQDialog::Accepted ) { - QString themeName = dlg.getName(); + TQString themeName = dlg.getName(); if ( themeExist(themeName) ) { KMessageBox::information( this, i18n( "Theme %1 already exists." ).arg( themeName ) ); @@ -301,7 +301,7 @@ void kthememanager::slotCreateTheme() m_theme->setComment( dlg.getComment().replace( "\n", "" ) ); m_theme->setVersion( dlg.getVersion() ); - QString result = m_theme->createYourself( true ); + TQString result = m_theme->createYourself( true ); m_theme->addPreview(); if ( !result.isEmpty() ) @@ -318,30 +318,30 @@ void kthememanager::slotCreateTheme() } } -void kthememanager::slotThemeChanged( QListViewItem * item ) +void kthememanager::slotThemeChanged( TQListViewItem * item ) { if ( item ) { - QString themeName = item->text(0); + TQString themeName = item->text(0); kdDebug() << "Activated theme: " << themeName << endl; - QString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/"; + TQString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/"; - QString pixFile = themeDir + themeName + ".preview.png"; + TQString pixFile = themeDir + themeName + ".preview.png"; - if ( QFile::exists( pixFile ) ) + if ( TQFile::exists( pixFile ) ) { updatePreview( pixFile ); } else { - dlg->lbPreview->setPixmap( QPixmap() ); + dlg->lbPreview->setPixmap( TQPixmap() ); dlg->lbPreview->setText( i18n( "This theme does not contain a preview." ) ); } KTheme theme( this, themeDir + themeName + ".xml" ); - QToolTip::remove( dlg->lbPreview ); - QToolTip::add( dlg->lbPreview, "<qt>" + i18n( "Author: %1<br>Email: %2<br>Version: %3<br>Homepage: %4" ) + TQToolTip::remove( dlg->lbPreview ); + TQToolTip::add( dlg->lbPreview, "<qt>" + i18n( "Author: %1<br>Email: %2<br>Version: %3<br>Homepage: %4" ) .arg( theme.author() ).arg( theme.email() ) .arg( theme.version() ).arg( theme.homepage() ) + "</qt>"); @@ -349,12 +349,12 @@ void kthememanager::slotThemeChanged( QListViewItem * item ) } } -void kthememanager::dragEnterEvent( QDragEnterEvent * ev ) +void kthememanager::dragEnterEvent( TQDragEnterEvent * ev ) { ev->accept( KURLDrag::canDecode( ev ) ); } -void kthememanager::dropEvent( QDropEvent * ev ) +void kthememanager::dropEvent( TQDropEvent * ev ) { KURL::List urls; if ( KURLDrag::decode( ev, urls ) ) @@ -401,21 +401,21 @@ void kthememanager::queryLNFModules() dlg->btnSaver->setIconSet( il->loadIconSet( "kscreensaver", KIcon::Desktop, 32 ) ); } -void kthememanager::updatePreview( const QString & pixFile ) +void kthememanager::updatePreview( const TQString & pixFile ) { kdDebug() << "Preview is in file: " << pixFile << endl; - QImage preview( pixFile, "PNG" ); + TQImage preview( pixFile, "PNG" ); if (preview.width()>dlg->lbPreview->contentsRect().width() || preview.height()>dlg->lbPreview->contentsRect().height() ) - preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), QImage::ScaleMin ); - QPixmap pix; + preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin ); + TQPixmap pix; pix.convertFromImage( preview ); dlg->lbPreview->setPixmap( pix ); } extern "C" { - KDE_EXPORT KCModule *create_kthememanager(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_kthememanager(TQWidget *parent, const char *) { KGlobal::locale()->insertCatalogue( "kthememanager" ); return new kthememanager( parent, "kthememanager" ); diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h index 972251f6a..cbb0a1db5 100644 --- a/kcontrol/kthememanager/kthememanager.h +++ b/kcontrol/kthememanager/kthememanager.h @@ -39,7 +39,7 @@ class KIconViewItem; class KThemeDetailsItem: public KIconViewItem { public: - KThemeDetailsItem( KIconView * parent, const QString & text, const QPixmap & icon, const QString & execString ) + KThemeDetailsItem( KIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString ) : KIconViewItem( parent, text, icon ) { m_exec = execString; } virtual ~KThemeDetailsItem() { }; @@ -47,7 +47,7 @@ public: ( void ) new KRun( m_exec ); } private: - QString m_exec; + TQString m_exec; }; */ @@ -63,7 +63,7 @@ class kthememanager: public KCModule { Q_OBJECT public: - kthememanager( QWidget *parent=0, const char *name=0 ); + kthememanager( TQWidget *parent=0, const char *name=0 ); virtual ~kthememanager(); /** @@ -81,8 +81,8 @@ public: virtual void defaults(); protected: - void dragEnterEvent ( QDragEnterEvent * ev ); - void dropEvent ( QDropEvent * ev ); + void dragEnterEvent ( TQDragEnterEvent * ev ); + void dropEvent ( TQDropEvent * ev ); signals: /** @@ -109,7 +109,7 @@ private slots: /** * Update the theme's info and preview */ - void slotThemeChanged( QListViewItem * item ); + void slotThemeChanged( TQListViewItem * item ); /** * Invoked when one drag and drops @p urls onto the kcm @@ -139,15 +139,15 @@ private: * @param themeName The theme name * @return The theme's version number or -1 if not installed */ - static float getThemeVersion( const QString & themeName ); + static float getThemeVersion( const TQString & themeName ); void queryLNFModules(); /** * Updates the preview widget */ - void updatePreview( const QString & pixFile ); - bool themeExist(const QString &_themeName); + void updatePreview( const TQString & pixFile ); + bool themeExist(const TQString &_themeName); KThemeDlg * dlg; KTheme * m_theme; diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index 24623a7ea..ba6193107 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -15,12 +15,12 @@ * along with this program; if not, write to the Free Software */ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <dcopclient.h> @@ -32,22 +32,22 @@ #include "kcmlaunch.h" -typedef KGenericFactory<LaunchConfig, QWidget> LaunchFactory; +typedef KGenericFactory<LaunchConfig, TQWidget> LaunchFactory; K_EXPORT_COMPONENT_FACTORY( kcm_launch, LaunchFactory("kcmlaunch") ) -LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringList &) +LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringList &) : KCModule(LaunchFactory::instance(), parent, name) { - QVBoxLayout* Form1Layout = new QVBoxLayout( this, 0, + TQVBoxLayout* Form1Layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); setQuickHelp( i18n ( "<h1>Launch Feedback</h1>" " You can configure the application-launch feedback here.")); - QGroupBox* GroupBox1 = new QGroupBox( this, "GroupBox1" ); + TQGroupBox* GroupBox1 = new TQGroupBox( this, "GroupBox1" ); GroupBox1->setTitle( i18n( "Bus&y Cursor" ) ); - QWhatsThis::add(GroupBox1, i18n( + TQWhatsThis::add(GroupBox1, i18n( "<h1>Busy Cursor</h1>\n" "KDE offers a busy cursor for application startup notification.\n" "To enable the busy cursor, select one kind of visual feedback\n" @@ -60,22 +60,22 @@ LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringLis GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox1 ); - QGridLayout* GroupBox1Layout = new QGridLayout( GroupBox1->layout(), 3, 2 ); + TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); GroupBox1Layout->setColStretch( 1, 1 ); - cb_busyCursor = new QComboBox( GroupBox1, "cb_busyCursor" ); + cb_busyCursor = new TQComboBox( GroupBox1, "cb_busyCursor" ); cb_busyCursor->insertItem( i18n( "No Busy Cursor" ), 0 ); cb_busyCursor->insertItem( i18n( "Passive Busy Cursor" ), 1 ); cb_busyCursor->insertItem( i18n( "Blinking Cursor" ), 2 ); cb_busyCursor->insertItem( i18n( "Bouncing Cursor" ), 3 ); GroupBox1Layout->addWidget( cb_busyCursor, 0, 0 ); - connect( cb_busyCursor, SIGNAL( activated(int) ), - SLOT ( slotBusyCursor(int))); - connect( cb_busyCursor, SIGNAL( activated(int) ), SLOT( checkChanged() ) ); + connect( cb_busyCursor, TQT_SIGNAL( activated(int) ), + TQT_SLOT ( slotBusyCursor(int))); + connect( cb_busyCursor, TQT_SIGNAL( activated(int) ), TQT_SLOT( checkChanged() ) ); - lbl_cursorTimeout = new QLabel( GroupBox1, "TextLabel1" ); + lbl_cursorTimeout = new TQLabel( GroupBox1, "TextLabel1" ); lbl_cursorTimeout->setText( i18n( "&Startup indication timeout:" ) ); GroupBox1Layout->addWidget( lbl_cursorTimeout, 2, 0 ); sb_cursorTimeout = new KIntNumInput( GroupBox1, "sb_cursorTimeout" ); @@ -83,12 +83,12 @@ LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringLis sb_cursorTimeout->setSuffix( i18n(" sec") ); GroupBox1Layout->addWidget( sb_cursorTimeout, 2, 1 ); lbl_cursorTimeout->setBuddy( sb_cursorTimeout ); - connect( sb_cursorTimeout, SIGNAL( valueChanged(int) ), - SLOT( checkChanged() ) ); + connect( sb_cursorTimeout, TQT_SIGNAL( valueChanged(int) ), + TQT_SLOT( checkChanged() ) ); - QGroupBox* GroupBox2 = new QGroupBox( this, "GroupBox2" ); + TQGroupBox* GroupBox2 = new TQGroupBox( this, "GroupBox2" ); GroupBox2->setTitle( i18n( "Taskbar &Notification" ) ); - QWhatsThis::add(GroupBox2, i18n("<H1>Taskbar Notification</H1>\n" + TQWhatsThis::add(GroupBox2, i18n("<H1>Taskbar Notification</H1>\n" "You can enable a second method of startup notification which is\n" "used by the taskbar where a button with a rotating hourglass appears,\n" "symbolizing that your started application is loading.\n" @@ -100,19 +100,19 @@ LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringLis GroupBox2->layout()->setSpacing( 0 ); GroupBox2->layout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox2 ); - QGridLayout* GroupBox2Layout = new QGridLayout( GroupBox2->layout(), 2, 2 ); + TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 ); GroupBox2Layout->setSpacing( 6 ); GroupBox2Layout->setMargin( 11 ); GroupBox2Layout->setColStretch( 1, 1 ); - cb_taskbarButton = new QCheckBox( GroupBox2, "cb_taskbarButton" ); + cb_taskbarButton = new TQCheckBox( GroupBox2, "cb_taskbarButton" ); cb_taskbarButton->setText( i18n( "Enable &taskbar notification" ) ); GroupBox2Layout->addMultiCellWidget( cb_taskbarButton, 0, 0, 0, 1 ); - connect( cb_taskbarButton, SIGNAL( toggled(bool) ), - SLOT( slotTaskbarButton(bool))); - connect( cb_taskbarButton, SIGNAL( toggled(bool) ), SLOT( checkChanged())); + connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( slotTaskbarButton(bool))); + connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( checkChanged())); - lbl_taskbarTimeout = new QLabel( GroupBox2, "TextLabel2" ); + lbl_taskbarTimeout = new TQLabel( GroupBox2, "TextLabel2" ); lbl_taskbarTimeout->setText( i18n( "Start&up indication timeout:" ) ); GroupBox2Layout->addWidget( lbl_taskbarTimeout, 1, 0 ); sb_taskbarTimeout = new KIntNumInput( GroupBox2, "sb_taskbarTimeout" ); @@ -120,8 +120,8 @@ LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringLis sb_taskbarTimeout->setSuffix( i18n(" sec") ); GroupBox2Layout->addWidget( sb_taskbarTimeout, 1, 1 ); lbl_taskbarTimeout->setBuddy( sb_taskbarTimeout ); - connect( sb_taskbarTimeout, SIGNAL( valueChanged(int) ), - SLOT( checkChanged() ) ); + connect( sb_taskbarTimeout, TQT_SIGNAL( valueChanged(int) ), + TQT_SLOT( checkChanged() ) ); Form1Layout->addStretch(); @@ -214,7 +214,7 @@ LaunchConfig::save() if (!kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( "kicker", "Panel", "restart()", data ); kapp->dcopClient()->send( "kdesktop", "", "configure()", data ); } diff --git a/kcontrol/launch/kcmlaunch.h b/kcontrol/launch/kcmlaunch.h index c69bef943..6c89c0974 100644 --- a/kcontrol/launch/kcmlaunch.h +++ b/kcontrol/launch/kcmlaunch.h @@ -32,7 +32,7 @@ class LaunchConfig : public KCModule public: - LaunchConfig(QWidget * parent = 0, const char * name = 0, const QStringList &list = QStringList() ); + LaunchConfig(TQWidget * parent = 0, const char * name = 0, const TQStringList &list = TQStringList() ); virtual ~LaunchConfig(); @@ -60,10 +60,10 @@ class LaunchConfig : public KCModule private: - QLabel * lbl_cursorTimeout; - QLabel * lbl_taskbarTimeout; - QComboBox * cb_busyCursor; - QCheckBox * cb_taskbarButton; + TQLabel * lbl_cursorTimeout; + TQLabel * lbl_taskbarTimeout; + TQComboBox * cb_busyCursor; + TQCheckBox * cb_taskbarButton; KIntNumInput * sb_cursorTimeout; KIntNumInput * sb_taskbarTimeout; diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 0a24b4a59..39210741f 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -23,13 +23,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qhbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <kdebug.h> #include <kdialog.h> @@ -43,50 +43,50 @@ #include "toplevel.h" KLocaleConfig::KLocaleConfig(KLocale *locale, - QWidget *parent, const char *name) - : QWidget (parent, name), + TQWidget *parent, const char *name) + : TQWidget (parent, name), m_locale(locale) { - QGridLayout *lay = new QGridLayout(this, 4, 3, + TQGridLayout *lay = new TQGridLayout(this, 4, 3, KDialog::marginHint(), KDialog::spacingHint()); - m_labCountry = new QLabel(this, I18N_NOOP("Country or region:")); + m_labCountry = new TQLabel(this, I18N_NOOP("Country or region:")); m_comboCountry = new KLanguageButton( this ); m_labCountry->setBuddy(m_comboCountry); - connect( m_comboCountry, SIGNAL(activated(const QString &)), - this, SLOT(changedCountry(const QString &)) ); + connect( m_comboCountry, TQT_SIGNAL(activated(const TQString &)), + this, TQT_SLOT(changedCountry(const TQString &)) ); - m_labLang = new QLabel(this, I18N_NOOP("Languages:")); + m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); m_labLang->setAlignment( AlignTop ); - m_languages = new QListBox(this); - connect(m_languages, SIGNAL(selectionChanged()), - SLOT(slotCheckButtons())); + m_languages = new TQListBox(this); + connect(m_languages, TQT_SIGNAL(selectionChanged()), + TQT_SLOT(slotCheckButtons())); - QWidget * vb = new QWidget(this); - QVBoxLayout * boxlay = new QVBoxLayout(vb, 0, KDialog::spacingHint()); - m_addLanguage = new KLanguageButton(QString::null, vb, I18N_NOOP("Add Language")); + TQWidget * vb = new TQWidget(this); + TQVBoxLayout * boxlay = new TQVBoxLayout(vb, 0, KDialog::spacingHint()); + m_addLanguage = new KLanguageButton(TQString::null, vb, I18N_NOOP("Add Language")); boxlay->add(m_addLanguage); - connect(m_addLanguage, SIGNAL(activated(const QString &)), - SLOT(slotAddLanguage(const QString &))); - m_removeLanguage = new QPushButton(vb, I18N_NOOP("Remove Language")); - m_upButton = new QPushButton(vb, I18N_NOOP("Move Up")); - m_downButton = new QPushButton(vb, I18N_NOOP("Move Down")); + connect(m_addLanguage, TQT_SIGNAL(activated(const TQString &)), + TQT_SLOT(slotAddLanguage(const TQString &))); + m_removeLanguage = new TQPushButton(vb, I18N_NOOP("Remove Language")); + m_upButton = new TQPushButton(vb, I18N_NOOP("Move Up")); + m_downButton = new TQPushButton(vb, I18N_NOOP("Move Down")); boxlay->add(m_removeLanguage); boxlay->add(m_upButton); boxlay->add(m_downButton); - connect(m_removeLanguage, SIGNAL(clicked()), - SLOT(slotRemoveLanguage())); - connect(m_upButton, SIGNAL(clicked()), - SLOT(slotLanguageUp())); - connect(m_downButton, SIGNAL(clicked()), - SLOT(slotLanguageDown())); + connect(m_removeLanguage, TQT_SIGNAL(clicked()), + TQT_SLOT(slotRemoveLanguage())); + connect(m_upButton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotLanguageUp())); + connect(m_downButton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotLanguageDown())); boxlay->insertStretch(-1); // #### HPB: This should be implemented for KDE 3 - // new QLabel(this, I18N_NOOP("Encoding:")); - //QComboBox * cb = new QComboBox( this ); + // new TQLabel(this, I18N_NOOP("Encoding:")); + //TQComboBox * cb = new TQComboBox( this ); //cb->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() ); lay->addMultiCellWidget(m_labCountry, 0, 0, 0, 1); @@ -101,19 +101,19 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, lay->setColStretch(2, 1); // Added jriddell 2007-01-08, for Kubuntu Language Selector spec - QHBoxLayout* languageSelectorLayout = new QHBoxLayout(); - installLanguage = new QPushButton(i18n("Install New Language"), this); + TQHBoxLayout* languageSelectorLayout = new TQHBoxLayout(); + installLanguage = new TQPushButton(i18n("Install New Language"), this); languageSelectorLayout->addWidget(installLanguage); - uninstallLanguage = new QPushButton(i18n("Uninstall Language"), this); + uninstallLanguage = new TQPushButton(i18n("Uninstall Language"), this); languageSelectorLayout->addWidget(uninstallLanguage); - selectLanguage = new QPushButton(i18n("Select System Language"), this); + selectLanguage = new TQPushButton(i18n("Select System Language"), this); languageSelectorLayout->addWidget(selectLanguage); languageSelectorLayout->addStretch(); lay->addMultiCellLayout(languageSelectorLayout, 3, 3, 0, 2); - connect( installLanguage, SIGNAL(clicked()), this, SLOT(slotInstallLanguage()) ); - connect( uninstallLanguage, SIGNAL(clicked()), this, SLOT(slotUninstallLanguage()) ); - connect( selectLanguage, SIGNAL(clicked()), this, SLOT(slotSelectLanguage()) ); + connect( installLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallLanguage()) ); + connect( uninstallLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallLanguage()) ); + connect( selectLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectLanguage()) ); } @@ -123,8 +123,8 @@ void KLocaleConfig::slotInstallLanguage() *proc << "kdesu"; *proc << "qt-language-selector --mode install"; - QApplication::connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotLanguageSelectorExited(KProcess *))); + TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); setEnabled(false); proc->start(); } @@ -135,8 +135,8 @@ void KLocaleConfig::slotUninstallLanguage() *proc << "kdesu"; *proc << "qt-language-selector --mode uninstall"; - QApplication::connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotLanguageSelectorExited(KProcess *))); + TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); setEnabled(false); proc->start(); } @@ -147,8 +147,8 @@ void KLocaleConfig::slotSelectLanguage() *proc << "kdesu"; *proc << "qt-language-selector --mode select"; - QApplication::connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotLanguageSelectorExited(KProcess *))); + TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); setEnabled(false); proc->start(); } @@ -160,9 +160,9 @@ void KLocaleConfig::slotLanguageSelectorExited(KProcess *) setEnabled(true); } -void KLocaleConfig::slotAddLanguage(const QString & code) +void KLocaleConfig::slotAddLanguage(const TQString & code) { - QStringList languageList = m_locale->languageList(); + TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); if ( pos < 0 ) @@ -176,7 +176,7 @@ void KLocaleConfig::slotAddLanguage(const QString & code) if ( oldPos != -1 && oldPos < pos ) --pos; - QStringList::Iterator it = languageList.at( pos ); + TQStringList::Iterator it = languageList.at( pos ); languageList.insert( it, code ); @@ -189,10 +189,10 @@ void KLocaleConfig::slotAddLanguage(const QString & code) void KLocaleConfig::slotRemoveLanguage() { - QStringList languageList = m_locale->languageList(); + TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - QStringList::Iterator it = languageList.at( pos ); + TQStringList::Iterator it = languageList.at( pos ); if ( it != languageList.end() ) { @@ -208,15 +208,15 @@ void KLocaleConfig::slotRemoveLanguage() void KLocaleConfig::slotLanguageUp() { - QStringList languageList = m_locale->languageList(); + TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - QStringList::Iterator it1 = languageList.at( pos - 1 ); - QStringList::Iterator it2 = languageList.at( pos ); + TQStringList::Iterator it1 = languageList.at( pos - 1 ); + TQStringList::Iterator it2 = languageList.at( pos ); if ( it1 != languageList.end() && it2 != languageList.end() ) { - QString str = *it1; + TQString str = *it1; *it1 = *it2; *it2 = str; @@ -230,15 +230,15 @@ void KLocaleConfig::slotLanguageUp() void KLocaleConfig::slotLanguageDown() { - QStringList languageList = m_locale->languageList(); + TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - QStringList::Iterator it1 = languageList.at( pos ); - QStringList::Iterator it2 = languageList.at( pos + 1 ); + TQStringList::Iterator it1 = languageList.at( pos ); + TQStringList::Iterator it2 = languageList.at( pos + 1 ); if ( it1 != languageList.end() && it2 != languageList.end() ) { - QString str = *it1; + TQString str = *it1; *it1 = *it2; *it2 = str; @@ -259,49 +259,49 @@ void KLocaleConfig::loadLanguageList() // clear the list m_addLanguage->clear(); - QStringList first = languageList(); + TQStringList first = languageList(); - QStringList prilang; + TQStringList prilang; // add the primary languages for the country to the list - for ( QStringList::ConstIterator it = first.begin(); + for ( TQStringList::ConstIterator it = first.begin(); it != first.end(); ++it ) { - QString str = locate("locale", QString::fromLatin1("%1/entry.desktop") + TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop") .arg(*it)); if (!str.isNull()) prilang << str; } // add all languages to the list - QStringList alllang = KGlobal::dirs()->findAllResources("locale", - QString::fromLatin1("*/entry.desktop"), + TQStringList alllang = KGlobal::dirs()->findAllResources("locale", + TQString::fromLatin1("*/entry.desktop"), false, true); - QStringList langlist = prilang; + TQStringList langlist = prilang; if (langlist.count() > 0) - langlist << QString::null; // separator + langlist << TQString::null; // separator langlist += alllang; int menu_index = -2; - QString submenu; // we are working on this menu - for ( QStringList::ConstIterator it = langlist.begin(); + TQString submenu; // we are working on this menu + for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) { if ((*it).isNull()) { m_addLanguage->insertSeparator(); - submenu = QString::fromLatin1("other"); + submenu = TQString::fromLatin1("other"); m_addLanguage->insertSubmenu(m_locale->translate("Other"), - submenu, QString::null, -1); + submenu, TQString::null, -1); menu_index = -2; // first entries should _not_ be sorted continue; } KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); - QString name = entry.readEntry("Name", + TQString name = entry.readEntry("Name", m_locale->translate("without name")); - QString tag = *it; + TQString tag = *it; int index = tag.findRev('/'); tag = tag.left(index); index = tag.findRev('/'); @@ -319,20 +319,20 @@ void KLocaleConfig::loadCountryList() KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; - QString sub = QString::fromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list m_comboCountry->clear(); - QStringList regionlist = KGlobal::dirs()->findAllResources("locale", - sub + QString::fromLatin1("*.desktop"), + TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", + sub + TQString::fromLatin1("*.desktop"), false, true ); - for ( QStringList::ConstIterator it = regionlist.begin(); + for ( TQStringList::ConstIterator it = regionlist.begin(); it != regionlist.end(); ++it ) { - QString tag = *it; + TQString tag = *it; int index; index = tag.findRev('/'); @@ -345,42 +345,42 @@ void KLocaleConfig::loadCountryList() KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); - QString name = entry.readEntry("Name", + TQString name = entry.readEntry("Name", m_locale->translate("without name")); - QString map( locate( "locale", - QString::fromLatin1( "l10n/%1.png" ) + TQString map( locate( "locale", + TQString::fromLatin1( "l10n/%1.png" ) .arg(tag) ) ); - QIconSet icon; + TQIconSet icon; if ( !map.isNull() ) icon = KGlobal::iconLoader()->loadIconSet(map, KIcon::Small); m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 ); } // add all languages to the list - QStringList countrylist = KGlobal::dirs()->findAllResources - ("locale", sub + QString::fromLatin1("*/entry.desktop"), false, true); + TQStringList countrylist = KGlobal::dirs()->findAllResources + ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true); - for ( QStringList::ConstIterator it = countrylist.begin(); + for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); - QString name = entry.readEntry("Name", + TQString name = entry.readEntry("Name", m_locale->translate("without name")); - QString submenu = entry.readEntry("Region"); + TQString submenu = entry.readEntry("Region"); - QString tag = *it; + TQString tag = *it; int index = tag.findRev('/'); tag.truncate(index); index = tag.findRev('/'); tag = tag.mid(index + 1); int menu_index = submenu.isEmpty() ? -1 : -2; - QString flag( locate( "locale", - QString::fromLatin1( "l10n/%1/flag.png" ) + TQString flag( locate( "locale", + TQString::fromLatin1( "l10n/%1/flag.png" ) .arg(tag) ) ); - QIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); + TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); } @@ -388,15 +388,15 @@ void KLocaleConfig::loadCountryList() KGlobal::_locale = lsave; } -void KLocaleConfig::readLocale(const QString &path, QString &name, - const QString &sub) const +void KLocaleConfig::readLocale(const TQString &path, TQString &name, + const TQString &sub) const { // temperary use of our locale as the global locale KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; // read the name - QString filepath = QString::fromLatin1("%1%2/entry.desktop") + TQString filepath = TQString::fromLatin1("%1%2/entry.desktop") .arg(sub) .arg(path); @@ -416,7 +416,7 @@ void KLocaleConfig::save() config->writeEntry("Country", m_locale->country(), true, true); if ( m_locale->languageList().isEmpty() ) - config->writeEntry("Language", QString::fromLatin1(""), true, true); + config->writeEntry("Language", TQString::fromLatin1(""), true, true); else config->writeEntry("Language", m_locale->languageList(), ':', true, true); @@ -439,13 +439,13 @@ void KLocaleConfig::slotLocaleChanged() // update language widget m_languages->clear(); - QStringList languageList = m_locale->languageList(); - for ( QStringList::Iterator it = languageList.begin(); + TQStringList languageList = m_locale->languageList(); + for ( TQStringList::Iterator it = languageList.begin(); it != languageList.end(); ++it ) { - QString name; - readLocale(*it, name, QString::null); + TQString name; + readLocale(*it, name, TQString::null); m_languages->insertItem(name); } @@ -458,29 +458,29 @@ void KLocaleConfig::slotTranslate() { kdDebug() << "slotTranslate()" << endl; - QToolTip::add(m_comboCountry, m_locale->translate + TQToolTip::add(m_comboCountry, m_locale->translate ( "This is where you live. KDE will use the defaults for " "this country or region.") ); - QToolTip::add(m_addLanguage, m_locale->translate + TQToolTip::add(m_addLanguage, m_locale->translate ( "This will add a language to the list. If the language is already " "in the list, the old one will be moved instead." ) ); - QToolTip::add(m_removeLanguage, m_locale->translate + TQToolTip::add(m_removeLanguage, m_locale->translate ( "This will remove the highlighted language from the list." ) ); - QToolTip::add(m_languages, m_locale->translate + TQToolTip::add(m_languages, m_locale->translate ( "KDE programs will be displayed in the first available language in " "this list.\nIf none of the languages are available, US English " "will be used.") ); - QString str; + TQString str; str = m_locale->translate ( "Here you can choose your country or region. The settings " "for languages, numbers etc. will automatically switch to the " "corresponding values." ); - QWhatsThis::add( m_labCountry, str ); - QWhatsThis::add( m_comboCountry, str ); + TQWhatsThis::add( m_labCountry, str ); + TQWhatsThis::add( m_comboCountry, str ); str = m_locale->translate ( "Here you can choose the languages that will be used by KDE. If the " @@ -490,16 +490,16 @@ void KLocaleConfig::slotTranslate() "languages from the place you got KDE from.<p>" "Note that some applications may not be translated to your languages; " "in this case, they will automatically fall back to US English." ); - QWhatsThis::add( m_labLang, str ); - QWhatsThis::add( m_languages, str ); - QWhatsThis::add( m_addLanguage, str ); - QWhatsThis::add( m_removeLanguage, str ); + TQWhatsThis::add( m_labLang, str ); + TQWhatsThis::add( m_languages, str ); + TQWhatsThis::add( m_addLanguage, str ); + TQWhatsThis::add( m_removeLanguage, str ); } -QStringList KLocaleConfig::languageList() const +TQStringList KLocaleConfig::languageList() const { - QString fileName = locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString fileName = locate("locale", + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); KSimpleConfig entry(fileName); @@ -508,19 +508,19 @@ QStringList KLocaleConfig::languageList() const return entry.readListEntry("Languages"); } -void KLocaleConfig::changedCountry(const QString & code) +void KLocaleConfig::changedCountry(const TQString & code) { m_locale->setCountry(code); // change to the preferred languages in that country, installed only - QStringList languages = languageList(); - QStringList newLanguageList; - for ( QStringList::Iterator it = languages.begin(); + TQStringList languages = languageList(); + TQStringList newLanguageList; + for ( TQStringList::Iterator it = languages.begin(); it != languages.end(); ++it ) { - QString name; - readLocale(*it, name, QString::null); + TQString name; + readLocale(*it, name, TQString::null); if (!name.isEmpty()) newLanguageList += *it; diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h index 46f954730..b5b191ccf 100644 --- a/kcontrol/locale/kcmlocale.h +++ b/kcontrol/locale/kcmlocale.h @@ -25,8 +25,8 @@ #ifndef KCMLOCALE_H #define KCMLOCALE_H -#include <qwidget.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqstringlist.h> class KAddButton; class KLanguageButton; @@ -43,7 +43,7 @@ class KLocaleConfig : public QWidget public: KLocaleConfig( KLocale *_locale, - QWidget *parent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); void save(); @@ -65,11 +65,11 @@ private slots: void loadLanguageList(); void loadCountryList(); - void changedCountry(const QString & code); - void readLocale(const QString &path, QString &name, - const QString &sub) const; + void changedCountry(const TQString & code); + void readLocale(const TQString &path, TQString &name, + const TQString &sub) const; - void slotAddLanguage(const QString & id); + void slotAddLanguage(const TQString & id); void slotRemoveLanguage(); void slotLanguageUp(); void slotLanguageDown(); @@ -81,24 +81,24 @@ private slots: void slotLanguageSelectorExited(KProcess *); private: - QStringList languageList() const; + TQStringList languageList() const; KLocale *m_locale; KLanguageButton *m_comboCountry; - QLabel *m_labCountry; - QLabel *m_labLang; + TQLabel *m_labCountry; + TQLabel *m_labLang; - QListBox * m_languages; + TQListBox * m_languages; KLanguageButton * m_addLanguage; - QPushButton * m_removeLanguage; - QPushButton * m_upButton; - QPushButton * m_downButton; + TQPushButton * m_removeLanguage; + TQPushButton * m_upButton; + TQPushButton * m_downButton; - QPushButton* installLanguage; - QPushButton* uninstallLanguage; - QPushButton* selectLanguage; + TQPushButton* installLanguage; + TQPushButton* uninstallLanguage; + TQPushButton* selectLanguage; }; #endif diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index e78ae966c..bf4cc8b32 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -23,11 +23,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qdatetime.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qtimer.h> +#include <tqdatetime.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqtimer.h> #include <stdio.h> @@ -37,48 +37,48 @@ #include "klocalesample.moc" KLocaleSample::KLocaleSample(KLocale *locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(locale) { - QGridLayout *lay = new QGridLayout(this, 5, 2); + TQGridLayout *lay = new TQGridLayout(this, 5, 2); lay->setAutoAdd(TRUE); // Whatever the color scheme is, we want black text - QColorGroup a = palette().active(); - a.setColor(QColorGroup::Foreground, Qt::black); - QPalette pal(a, a, a); + TQColorGroup a = palette().active(); + a.setColor(TQColorGroup::Foreground, Qt::black); + TQPalette pal(a, a, a); - m_labNumber = new QLabel(this, I18N_NOOP("Numbers:")); + m_labNumber = new TQLabel(this, I18N_NOOP("Numbers:")); m_labNumber->setPalette(pal); - m_numberSample = new QLabel(this); + m_numberSample = new TQLabel(this); m_numberSample->setPalette(pal); - m_labMoney = new QLabel(this, I18N_NOOP("Money:")); + m_labMoney = new TQLabel(this, I18N_NOOP("Money:")); m_labMoney->setPalette(pal); - m_moneySample = new QLabel(this); + m_moneySample = new TQLabel(this); m_moneySample->setPalette(pal); - m_labDate = new QLabel(this, I18N_NOOP("Date:")); + m_labDate = new TQLabel(this, I18N_NOOP("Date:")); m_labDate->setPalette(pal); - m_dateSample = new QLabel(this); + m_dateSample = new TQLabel(this); m_dateSample->setPalette(pal); - m_labDateShort = new QLabel(this, I18N_NOOP("Short date:")); + m_labDateShort = new TQLabel(this, I18N_NOOP("Short date:")); m_labDateShort->setPalette(pal); - m_dateShortSample = new QLabel(this); + m_dateShortSample = new TQLabel(this); m_dateShortSample->setPalette(pal); - m_labTime = new QLabel(this, I18N_NOOP("Time:")); + m_labTime = new TQLabel(this, I18N_NOOP("Time:")); m_labTime->setPalette(pal); - m_timeSample = new QLabel(this); + m_timeSample = new TQLabel(this); m_timeSample->setPalette(pal); lay->setColStretch(0, 1); lay->setColStretch(1, 3); - QTimer *timer = new QTimer(this, "clock_timer"); - connect(timer, SIGNAL(timeout()), this, SLOT(slotUpdateTime())); + TQTimer *timer = new TQTimer(this, "clock_timer"); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateTime())); timer->start(1000); } @@ -88,7 +88,7 @@ KLocaleSample::~KLocaleSample() void KLocaleSample::slotUpdateTime() { - QDateTime dt = QDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); m_dateSample->setText(m_locale->formatDate(dt.date(), false)); m_dateShortSample->setText(m_locale->formatDate(dt.date(), true)); @@ -98,35 +98,35 @@ void KLocaleSample::slotUpdateTime() void KLocaleSample::slotLocaleChanged() { m_numberSample->setText(m_locale->formatNumber(1234567.89) + - QString::fromLatin1(" / ") + + TQString::fromLatin1(" / ") + m_locale->formatNumber(-1234567.89)); m_moneySample->setText(m_locale->formatMoney(123456789.00) + - QString::fromLatin1(" / ") + + TQString::fromLatin1(" / ") + m_locale->formatMoney(-123456789.00)); slotUpdateTime(); - QString str; + TQString str; str = m_locale->translate("This is how numbers will be displayed."); - QWhatsThis::add( m_labNumber, str ); - QWhatsThis::add( m_numberSample, str ); + TQWhatsThis::add( m_labNumber, str ); + TQWhatsThis::add( m_numberSample, str ); str = m_locale->translate("This is how monetary values will be displayed."); - QWhatsThis::add( m_labMoney, str ); - QWhatsThis::add( m_moneySample, str ); + TQWhatsThis::add( m_labMoney, str ); + TQWhatsThis::add( m_moneySample, str ); str = m_locale->translate("This is how date values will be displayed."); - QWhatsThis::add( m_labDate, str ); - QWhatsThis::add( m_dateSample, str ); + TQWhatsThis::add( m_labDate, str ); + TQWhatsThis::add( m_dateSample, str ); str = m_locale->translate("This is how date values will be displayed using " "a short notation."); - QWhatsThis::add( m_labDateShort, str ); - QWhatsThis::add( m_dateShortSample, str ); + TQWhatsThis::add( m_labDateShort, str ); + TQWhatsThis::add( m_dateShortSample, str ); str = m_locale->translate("This is how the time will be displayed."); - QWhatsThis::add( m_labTime, str ); - QWhatsThis::add( m_timeSample, str ); + TQWhatsThis::add( m_labTime, str ); + TQWhatsThis::add( m_timeSample, str ); } diff --git a/kcontrol/locale/klocalesample.h b/kcontrol/locale/klocalesample.h index bf1cd7462..dbdce0b5c 100644 --- a/kcontrol/locale/klocalesample.h +++ b/kcontrol/locale/klocalesample.h @@ -25,7 +25,7 @@ #ifndef __KLOCALESAMPLE_H__ #define __KLOCALESAMPLE_H__ -#include <qwidget.h> +#include <tqwidget.h> class QLabel; class QResizeEvent; @@ -37,7 +37,7 @@ class KLocaleSample : public QWidget Q_OBJECT public: KLocaleSample(KLocale *_locale, - QWidget *parent = 0, const char*name = 0); + TQWidget *parent = 0, const char*name = 0); virtual ~KLocaleSample(); public slots: @@ -48,11 +48,11 @@ protected slots: private: KLocale *m_locale; - QLabel *m_numberSample, *m_labNumber; - QLabel *m_moneySample, *m_labMoney; - QLabel *m_timeSample, *m_labTime; - QLabel *m_dateSample, *m_labDate; - QLabel *m_dateShortSample, *m_labDateShort; + TQLabel *m_numberSample, *m_labNumber; + TQLabel *m_moneySample, *m_labMoney; + TQLabel *m_timeSample, *m_labTime; + TQLabel *m_dateSample, *m_labDate; + TQLabel *m_dateShortSample, *m_labDateShort; }; #endif diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 504ce393c..9fa1ad708 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -21,16 +21,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qobjectlist.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qvgroupbox.h> -#include <qvbox.h> -#include <qregexp.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqobjectlist.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> +#include <tqvbox.h> +#include <tqregexp.h> #include <knuminput.h> #include <kdialog.h> @@ -42,77 +42,77 @@ #include "localemon.moc" KLocaleConfigMoney::KLocaleConfigMoney(KLocale *locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(locale) { // Money - QGridLayout *lay = new QGridLayout(this, 6, 2, + TQGridLayout *lay = new TQGridLayout(this, 6, 2, KDialog::marginHint(), KDialog::spacingHint()); - m_labMonCurSym = new QLabel(this, I18N_NOOP("Currency symbol:")); + m_labMonCurSym = new TQLabel(this, I18N_NOOP("Currency symbol:")); lay->addWidget(m_labMonCurSym, 0, 0); - m_edMonCurSym = new QLineEdit(this); + m_edMonCurSym = new TQLineEdit(this); lay->addWidget(m_edMonCurSym, 0, 1); - connect( m_edMonCurSym, SIGNAL( textChanged(const QString &) ), - SLOT( slotMonCurSymChanged(const QString &) ) ); + connect( m_edMonCurSym, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( slotMonCurSymChanged(const TQString &) ) ); - m_labMonDecSym = new QLabel(this, I18N_NOOP("Decimal symbol:")); + m_labMonDecSym = new TQLabel(this, I18N_NOOP("Decimal symbol:")); lay->addWidget(m_labMonDecSym, 1, 0); - m_edMonDecSym = new QLineEdit(this); + m_edMonDecSym = new TQLineEdit(this); lay->addWidget(m_edMonDecSym, 1, 1); - connect( m_edMonDecSym, SIGNAL( textChanged(const QString &) ), - SLOT( slotMonDecSymChanged(const QString &) ) ); + connect( m_edMonDecSym, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( slotMonDecSymChanged(const TQString &) ) ); - m_labMonThoSep = new QLabel(this, I18N_NOOP("Thousands separator:")); + m_labMonThoSep = new TQLabel(this, I18N_NOOP("Thousands separator:")); lay->addWidget(m_labMonThoSep, 2, 0); - m_edMonThoSep = new QLineEdit(this); + m_edMonThoSep = new TQLineEdit(this); lay->addWidget(m_edMonThoSep, 2, 1); - connect( m_edMonThoSep, SIGNAL( textChanged(const QString &) ), - SLOT( slotMonThoSepChanged(const QString &) ) ); + connect( m_edMonThoSep, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( slotMonThoSepChanged(const TQString &) ) ); - m_labMonFraDig = new QLabel(this, I18N_NOOP("Fract digits:")); + m_labMonFraDig = new TQLabel(this, I18N_NOOP("Fract digits:")); lay->addWidget(m_labMonFraDig, 3, 0); m_inMonFraDig = new KIntNumInput(this); m_inMonFraDig->setRange(0, 10, 1, false); lay->addWidget(m_inMonFraDig, 3, 1); - connect( m_inMonFraDig, SIGNAL( valueChanged(int) ), - SLOT( slotMonFraDigChanged(int) ) ); + connect( m_inMonFraDig, TQT_SIGNAL( valueChanged(int) ), + TQT_SLOT( slotMonFraDigChanged(int) ) ); - QWidget *vbox = new QVBox(this); + TQWidget *vbox = new TQVBox(this); lay->addMultiCellWidget(vbox, 4, 4, 0, 1); - QVGroupBox *vgrp; - vgrp = new QVGroupBox( vbox, I18N_NOOP("Positive") ); - m_chMonPosPreCurSym = new QCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); - connect( m_chMonPosPreCurSym, SIGNAL( clicked() ), - SLOT( slotMonPosPreCurSymChanged() ) ); - - QHBox *hbox; - hbox = new QHBox( vgrp ); - m_labMonPosMonSignPos = new QLabel(hbox, I18N_NOOP("Sign position:")); - m_cmbMonPosMonSignPos = new QComboBox(hbox, "signpos"); - connect( m_cmbMonPosMonSignPos, SIGNAL( activated(int) ), - SLOT( slotMonPosMonSignPosChanged(int) ) ); - - vgrp = new QVGroupBox( vbox, I18N_NOOP("Negative") ); - m_chMonNegPreCurSym = new QCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); - connect( m_chMonNegPreCurSym, SIGNAL( clicked() ), - SLOT( slotMonNegPreCurSymChanged() ) ); - - hbox = new QHBox( vgrp ); - m_labMonNegMonSignPos = new QLabel(hbox, I18N_NOOP("Sign position:")); - m_cmbMonNegMonSignPos = new QComboBox(hbox, "signpos"); - connect( m_cmbMonNegMonSignPos, SIGNAL( activated(int) ), - SLOT( slotMonNegMonSignPosChanged(int) ) ); + TQVGroupBox *vgrp; + vgrp = new TQVGroupBox( vbox, I18N_NOOP("Positive") ); + m_chMonPosPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); + connect( m_chMonPosPreCurSym, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotMonPosPreCurSymChanged() ) ); + + TQHBox *hbox; + hbox = new TQHBox( vgrp ); + m_labMonPosMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:")); + m_cmbMonPosMonSignPos = new TQComboBox(hbox, "signpos"); + connect( m_cmbMonPosMonSignPos, TQT_SIGNAL( activated(int) ), + TQT_SLOT( slotMonPosMonSignPosChanged(int) ) ); + + vgrp = new TQVGroupBox( vbox, I18N_NOOP("Negative") ); + m_chMonNegPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); + connect( m_chMonNegPreCurSym, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotMonNegPreCurSymChanged() ) ); + + hbox = new TQHBox( vgrp ); + m_labMonNegMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:")); + m_cmbMonNegMonSignPos = new TQComboBox(hbox, "signpos"); + connect( m_cmbMonNegMonSignPos, TQT_SIGNAL( activated(int) ), + TQT_SLOT( slotMonNegMonSignPosChanged(int) ) ); // insert some items int i = 5; while (i--) { - m_cmbMonPosMonSignPos->insertItem(QString::null); - m_cmbMonNegMonSignPos->insertItem(QString::null); + m_cmbMonPosMonSignPos->insertItem(TQString::null); + m_cmbMonNegMonSignPos->insertItem(TQString::null); } lay->setColStretch(1, 1); @@ -131,32 +131,32 @@ void KLocaleConfigMoney::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); - QString str; + TQString str; int i; bool b; - str = ent.readEntry("CurrencySymbol", QString::fromLatin1("$")); + str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$")); config->deleteEntry("CurrencySymbol", false, true); if (str != m_locale->currencySymbol()) config->writeEntry("CurrencySymbol", m_locale->currencySymbol(), true, true); - str = ent.readEntry("MonetaryDecimalSymbol", QString::fromLatin1(".")); + str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1(".")); config->deleteEntry("MonetaryDecimalSymbol", false, true); if (str != m_locale->monetaryDecimalSymbol()) config->writeEntry("MonetaryDecimalSymbol", m_locale->monetaryDecimalSymbol(), true, true); - str = ent.readEntry("MonetaryThousandsSeparator", QString::fromLatin1(",")); - str.replace(QString::fromLatin1("$0"), QString::null); + str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(",")); + str.replace(TQString::fromLatin1("$0"), TQString::null); config->deleteEntry("MonetaryThousandsSeparator", false, true); if (str != m_locale->monetaryThousandsSeparator()) config->writeEntry("MonetaryThousandsSeparator", - QString::fromLatin1("$0%1$0") + TQString::fromLatin1("$0%1$0") .arg(m_locale->monetaryThousandsSeparator()), true, true); @@ -209,19 +209,19 @@ void KLocaleConfigMoney::slotLocaleChanged() m_cmbMonNegMonSignPos->setCurrentItem( m_locale->negativeMonetarySignPosition() ); } -void KLocaleConfigMoney::slotMonCurSymChanged(const QString &t) +void KLocaleConfigMoney::slotMonCurSymChanged(const TQString &t) { m_locale->setCurrencySymbol(t); emit localeChanged(); } -void KLocaleConfigMoney::slotMonDecSymChanged(const QString &t) +void KLocaleConfigMoney::slotMonDecSymChanged(const TQString &t) { m_locale->setMonetaryDecimalSymbol(t); emit localeChanged(); } -void KLocaleConfigMoney::slotMonThoSepChanged(const QString &t) +void KLocaleConfigMoney::slotMonThoSepChanged(const TQString &t) { m_locale->setMonetaryThousandsSeparator(t); emit localeChanged(); @@ -259,12 +259,12 @@ void KLocaleConfigMoney::slotMonNegMonSignPosChanged(int i) void KLocaleConfigMoney::slotTranslate() { - QObjectList list; + TQObjectList list; list.append(m_cmbMonPosMonSignPos); list.append(m_cmbMonNegMonSignPos); - QComboBox *wc; - for (QObjectListIt li(list) ; (wc = (QComboBox *)li.current()) != 0; ++li) + TQComboBox *wc; + for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li) { wc->changeItem(m_locale->translate("Parentheses Around"), 0); wc->changeItem(m_locale->translate("Before Quantity Money"), 1); @@ -273,58 +273,58 @@ void KLocaleConfigMoney::slotTranslate() wc->changeItem(m_locale->translate("After Money"), 4); } - QString str; + TQString str; str = m_locale->translate( "Here you can enter your usual currency " "symbol, e.g. $ or DM." "<p>Please note that the Euro symbol may not be " "available on your system, depending on the " "distribution you use." ); - QWhatsThis::add( m_labMonCurSym, str ); - QWhatsThis::add( m_edMonCurSym, str ); + TQWhatsThis::add( m_labMonCurSym, str ); + TQWhatsThis::add( m_edMonCurSym, str ); str = m_locale->translate( "Here you can define the decimal separator used " "to display monetary values." "<p>Note that the decimal separator used to " "display other numbers has to be defined " "separately (see the 'Numbers' tab)." ); - QWhatsThis::add( m_labMonDecSym, str ); - QWhatsThis::add( m_edMonDecSym, str ); + TQWhatsThis::add( m_labMonDecSym, str ); + TQWhatsThis::add( m_edMonDecSym, str ); str = m_locale->translate( "Here you can define the thousands separator " "used to display monetary values." "<p>Note that the thousands separator used to " "display other numbers has to be defined " "separately (see the 'Numbers' tab)." ); - QWhatsThis::add( m_labMonThoSep, str ); - QWhatsThis::add( m_edMonThoSep, str ); + TQWhatsThis::add( m_labMonThoSep, str ); + TQWhatsThis::add( m_edMonThoSep, str ); str = m_locale->translate( "This determines the number of fract digits for " "monetary values, i.e. the number of digits you " "find <em>behind</em> the decimal separator. " "Correct value is 2 for almost all people." ); - QWhatsThis::add( m_labMonFraDig, str ); - QWhatsThis::add( m_inMonFraDig, str ); + TQWhatsThis::add( m_labMonFraDig, str ); + TQWhatsThis::add( m_inMonFraDig, str ); str = m_locale->translate( "If this option is checked, the currency sign " "will be prefixed (i.e. to the left of the " "value) for all positive monetary values. If " "not, it will be postfixed (i.e. to the right)." ); - QWhatsThis::add( m_chMonPosPreCurSym, str ); + TQWhatsThis::add( m_chMonPosPreCurSym, str ); str = m_locale->translate( "If this option is checked, the currency sign " "will be prefixed (i.e. to the left of the " "value) for all negative monetary values. If " "not, it will be postfixed (i.e. to the right)." ); - QWhatsThis::add( m_chMonNegPreCurSym, str ); + TQWhatsThis::add( m_chMonNegPreCurSym, str ); str = m_locale->translate( "Here you can select how a positive sign will be " "positioned. This only affects monetary values." ); - QWhatsThis::add( m_labMonPosMonSignPos, str ); - QWhatsThis::add( m_cmbMonPosMonSignPos, str ); + TQWhatsThis::add( m_labMonPosMonSignPos, str ); + TQWhatsThis::add( m_cmbMonPosMonSignPos, str ); str = m_locale->translate( "Here you can select how a negative sign will " "be positioned. This only affects monetary " "values." ); - QWhatsThis::add( m_labMonNegMonSignPos, str ); - QWhatsThis::add( m_cmbMonNegMonSignPos, str ); + TQWhatsThis::add( m_labMonNegMonSignPos, str ); + TQWhatsThis::add( m_cmbMonNegMonSignPos, str ); } diff --git a/kcontrol/locale/localemon.h b/kcontrol/locale/localemon.h index e772af4d3..0ec90f392 100644 --- a/kcontrol/locale/localemon.h +++ b/kcontrol/locale/localemon.h @@ -25,7 +25,7 @@ #ifndef __KLOCALECONFIGMON_H__ #define __KLOCALECONFIGMON_H__ -#include <qwidget.h> +#include <tqwidget.h> class QCheckBox; class QComboBox; @@ -40,7 +40,7 @@ class KLocaleConfigMoney : public QWidget Q_OBJECT public: - KLocaleConfigMoney(KLocale *locale, QWidget *parent = 0, const char *name = 0); + KLocaleConfigMoney(KLocale *locale, TQWidget *parent = 0, const char *name = 0); virtual ~KLocaleConfigMoney(); void save(); @@ -60,9 +60,9 @@ signals: private slots: // Money - void slotMonCurSymChanged(const QString &t); - void slotMonDecSymChanged(const QString &t); - void slotMonThoSepChanged(const QString &t); + void slotMonCurSymChanged(const TQString &t); + void slotMonDecSymChanged(const TQString &t); + void slotMonThoSepChanged(const TQString &t); void slotMonFraDigChanged(int value); void slotMonPosPreCurSymChanged(); void slotMonNegPreCurSymChanged(); @@ -73,21 +73,21 @@ private: KLocale *m_locale; // Money - QLabel *m_labMonCurSym; - QLineEdit *m_edMonCurSym; - QLabel *m_labMonDecSym; - QLineEdit *m_edMonDecSym; - QLabel *m_labMonThoSep; - QLineEdit *m_edMonThoSep; - QLabel *m_labMonFraDig; + TQLabel *m_labMonCurSym; + TQLineEdit *m_edMonCurSym; + TQLabel *m_labMonDecSym; + TQLineEdit *m_edMonDecSym; + TQLabel *m_labMonThoSep; + TQLineEdit *m_edMonThoSep; + TQLabel *m_labMonFraDig; KIntNumInput * m_inMonFraDig; - QCheckBox *m_chMonPosPreCurSym; - QCheckBox *m_chMonNegPreCurSym; - QLabel *m_labMonPosMonSignPos; - QComboBox *m_cmbMonPosMonSignPos; - QLabel *m_labMonNegMonSignPos; - QComboBox *m_cmbMonNegMonSignPos; + TQCheckBox *m_chMonPosPreCurSym; + TQCheckBox *m_chMonNegPreCurSym; + TQLabel *m_labMonPosMonSignPos; + TQComboBox *m_cmbMonPosMonSignPos; + TQLabel *m_labMonNegMonSignPos; + TQComboBox *m_cmbMonNegMonSignPos; }; #endif diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index 9e5445ded..537cc99ab 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -21,11 +21,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlineedit.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qregexp.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqregexp.h> #include <kdialog.h> #include <ksimpleconfig.h> @@ -36,43 +36,43 @@ #include "localenum.moc" KLocaleConfigNumber::KLocaleConfigNumber(KLocale *locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(locale) { - QGridLayout *lay = new QGridLayout(this, 5, 2, + TQGridLayout *lay = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint()); lay->setAutoAdd(TRUE); - m_labDecSym = new QLabel(this, I18N_NOOP("&Decimal symbol:")); - m_edDecSym = new QLineEdit(this); - connect( m_edDecSym, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotDecSymChanged(const QString &) ) ); + m_labDecSym = new TQLabel(this, I18N_NOOP("&Decimal symbol:")); + m_edDecSym = new TQLineEdit(this); + connect( m_edDecSym, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotDecSymChanged(const TQString &) ) ); m_labDecSym->setBuddy(m_edDecSym); - m_labThoSep = new QLabel(this, I18N_NOOP("Tho&usands separator:")); - m_edThoSep = new QLineEdit(this); - connect( m_edThoSep, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotThoSepChanged(const QString &) ) ); + m_labThoSep = new TQLabel(this, I18N_NOOP("Tho&usands separator:")); + m_edThoSep = new TQLineEdit(this); + connect( m_edThoSep, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotThoSepChanged(const TQString &) ) ); m_labThoSep->setBuddy(m_edThoSep); - m_labMonPosSign = new QLabel(this, I18N_NOOP("Positive si&gn:")); - m_edMonPosSign = new QLineEdit(this); - connect( m_edMonPosSign, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotMonPosSignChanged(const QString &) ) ); + m_labMonPosSign = new TQLabel(this, I18N_NOOP("Positive si&gn:")); + m_edMonPosSign = new TQLineEdit(this); + connect( m_edMonPosSign, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotMonPosSignChanged(const TQString &) ) ); m_labMonPosSign->setBuddy(m_edMonPosSign); - m_labMonNegSign = new QLabel(this, I18N_NOOP("&Negative sign:")); - m_edMonNegSign = new QLineEdit(this); - connect( m_edMonNegSign, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotMonNegSignChanged(const QString &) ) ); + m_labMonNegSign = new TQLabel(this, I18N_NOOP("&Negative sign:")); + m_edMonNegSign = new TQLineEdit(this); + connect( m_edMonNegSign, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotMonNegSignChanged(const TQString &) ) ); m_labMonNegSign->setBuddy(m_edMonNegSign); lay->setColStretch(1, 1); - connect(this, SIGNAL(localeChanged()), - SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotLocaleChanged())); } KLocaleConfigNumber::~KLocaleConfigNumber() @@ -89,26 +89,26 @@ void KLocaleConfigNumber::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); - QString str; + TQString str; str = ent.readEntry("DecimalSymbol", - QString::fromLatin1(".")); + TQString::fromLatin1(".")); config->deleteEntry("DecimalSymbol", false, true); if (str != m_locale->decimalSymbol()) config->writeEntry("DecimalSymbol", m_locale->decimalSymbol(), true, true); str = ent.readEntry("ThousandsSeparator", - QString::fromLatin1(",")); + TQString::fromLatin1(",")); config->deleteEntry("ThousandsSeparator", false, true); - str.replace(QString::fromLatin1("$0"), QString::null); + str.replace(TQString::fromLatin1("$0"), TQString::null); if (str != m_locale->thousandsSeparator()) config->writeEntry("ThousandsSeparator", - QString::fromLatin1("$0%1$0") + TQString::fromLatin1("$0%1$0") .arg(m_locale->thousandsSeparator()), true, true); str = ent.readEntry("PositiveSign"); @@ -116,7 +116,7 @@ void KLocaleConfigNumber::save() if (str != m_locale->positiveSign()) config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true); - str = ent.readEntry("NegativeSign", QString::fromLatin1("-")); + str = ent.readEntry("NegativeSign", TQString::fromLatin1("-")); config->deleteEntry("NegativeSign", false, true); if (str != m_locale->negativeSign()) config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); @@ -134,25 +134,25 @@ void KLocaleConfigNumber::slotLocaleChanged() m_edMonNegSign->setText( m_locale->negativeSign() ); } -void KLocaleConfigNumber::slotDecSymChanged(const QString &t) +void KLocaleConfigNumber::slotDecSymChanged(const TQString &t) { m_locale->setDecimalSymbol(t); emit localeChanged(); } -void KLocaleConfigNumber::slotThoSepChanged(const QString &t) +void KLocaleConfigNumber::slotThoSepChanged(const TQString &t) { m_locale->setThousandsSeparator(t); emit localeChanged(); } -void KLocaleConfigNumber::slotMonPosSignChanged(const QString &t) +void KLocaleConfigNumber::slotMonPosSignChanged(const TQString &t) { m_locale->setPositiveSign(t); emit localeChanged(); } -void KLocaleConfigNumber::slotMonNegSignChanged(const QString &t) +void KLocaleConfigNumber::slotMonNegSignChanged(const TQString &t) { m_locale->setNegativeSign(t); emit localeChanged(); @@ -160,7 +160,7 @@ void KLocaleConfigNumber::slotMonNegSignChanged(const QString &t) void KLocaleConfigNumber::slotTranslate() { - QString str; + TQString str; str = m_locale->translate( "Here you can define the decimal separator used " "to display numbers (i.e. a dot or a comma in " @@ -168,27 +168,27 @@ void KLocaleConfigNumber::slotTranslate() "Note that the decimal separator used to " "display monetary values has to be set " "separately (see the 'Money' tab)." ); - QWhatsThis::add( m_labDecSym, str ); - QWhatsThis::add( m_edDecSym, str ); + TQWhatsThis::add( m_labDecSym, str ); + TQWhatsThis::add( m_edDecSym, str ); str = m_locale->translate( "Here you can define the thousands separator " "used to display numbers.<p>" "Note that the thousands separator used to " "display monetary values has to be set " "separately (see the 'Money' tab)." ); - QWhatsThis::add( m_labThoSep, str ); - QWhatsThis::add( m_edThoSep, str ); + TQWhatsThis::add( m_labThoSep, str ); + TQWhatsThis::add( m_edThoSep, str ); str = m_locale->translate( "Here you can specify text used to prefix " "positive numbers. Most people leave this " "blank." ); - QWhatsThis::add( m_labMonPosSign, str ); - QWhatsThis::add( m_edMonPosSign, str ); + TQWhatsThis::add( m_labMonPosSign, str ); + TQWhatsThis::add( m_edMonPosSign, str ); str = m_locale->translate( "Here you can specify text used to prefix " "negative numbers. This should not be empty, so " "you can distinguish positive and negative " "numbers. It is normally set to minus (-)." ); - QWhatsThis::add( m_labMonNegSign, str ); - QWhatsThis::add( m_edMonNegSign, str ); + TQWhatsThis::add( m_labMonNegSign, str ); + TQWhatsThis::add( m_edMonNegSign, str ); } diff --git a/kcontrol/locale/localenum.h b/kcontrol/locale/localenum.h index da75dc708..c0e8ef511 100644 --- a/kcontrol/locale/localenum.h +++ b/kcontrol/locale/localenum.h @@ -25,7 +25,7 @@ #ifndef __KLOCALECONFIGNUM_H__ #define __KLOCALECONFIGNUM_H__ -#include <qwidget.h> +#include <tqwidget.h> class QCheckBox; class QComboBox; @@ -40,7 +40,7 @@ class KLocaleConfigNumber : public QWidget public: KLocaleConfigNumber( KLocale *_locale, - QWidget *parent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); virtual ~KLocaleConfigNumber( ); void save(); @@ -60,23 +60,23 @@ signals: private slots: // Numbers - void slotMonPosSignChanged(const QString &t); - void slotMonNegSignChanged(const QString &t); - void slotDecSymChanged(const QString &t); - void slotThoSepChanged(const QString &t); + void slotMonPosSignChanged(const TQString &t); + void slotMonNegSignChanged(const TQString &t); + void slotDecSymChanged(const TQString &t); + void slotThoSepChanged(const TQString &t); private: KLocale *m_locale; // Numbers - QLabel *m_labDecSym; - QLineEdit *m_edDecSym; - QLabel *m_labThoSep; - QLineEdit *m_edThoSep; - QLabel *m_labMonPosSign; - QLineEdit *m_edMonPosSign; - QLabel *m_labMonNegSign; - QLineEdit *m_edMonNegSign; + TQLabel *m_labDecSym; + TQLineEdit *m_edDecSym; + TQLabel *m_labThoSep; + TQLineEdit *m_edThoSep; + TQLabel *m_labMonPosSign; + TQLineEdit *m_edMonPosSign; + TQLabel *m_labMonNegSign; + TQLineEdit *m_edMonNegSign; }; #endif diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 97f97ba2f..1cf6b949b 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -21,10 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcombobox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qprinter.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqprinter.h> #include <kdialog.h> #include <klocale.h> @@ -36,33 +36,33 @@ KLocaleConfigOther::KLocaleConfigOther(KLocale *locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(locale) { // Other - QGridLayout *lay = new QGridLayout(this, 3, 2, + TQGridLayout *lay = new TQGridLayout(this, 3, 2, KDialog::marginHint(), KDialog::spacingHint()); - m_labPageSize = new QLabel(this, I18N_NOOP("Paper format:")); + m_labPageSize = new TQLabel(this, I18N_NOOP("Paper format:")); lay->addWidget(m_labPageSize, 0, 0); - m_combPageSize = new QComboBox(this); + m_combPageSize = new TQComboBox(this); lay->addWidget(m_combPageSize, 0, 1); - connect( m_combPageSize, SIGNAL( activated(int) ), - SLOT( slotPageSizeChanged(int) ) ); + connect( m_combPageSize, TQT_SIGNAL( activated(int) ), + TQT_SLOT( slotPageSizeChanged(int) ) ); - m_labMeasureSystem = new QLabel(this, I18N_NOOP("Measure system:")); + m_labMeasureSystem = new TQLabel(this, I18N_NOOP("Measure system:")); lay->addWidget(m_labMeasureSystem, 1, 0); - m_combMeasureSystem = new QComboBox(this); + m_combMeasureSystem = new TQComboBox(this); lay->addWidget(m_combMeasureSystem, 1, 1); - connect( m_combMeasureSystem, SIGNAL( activated(int) ), - SLOT( slotMeasureSystemChanged(int) ) ); + connect( m_combMeasureSystem, TQT_SIGNAL( activated(int) ), + TQT_SLOT( slotMeasureSystemChanged(int) ) ); - m_combPageSize->insertItem(QString::null); - m_combPageSize->insertItem(QString::null); - m_combMeasureSystem->insertItem(QString::null); - m_combMeasureSystem->insertItem(QString::null); + m_combPageSize->insertItem(TQString::null); + m_combPageSize->insertItem(TQString::null); + m_combMeasureSystem->insertItem(TQString::null); + m_combMeasureSystem->insertItem(TQString::null); lay->setColStretch(1, 1); lay->addRowSpacing(2, 0); @@ -80,13 +80,13 @@ void KLocaleConfigOther::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); // ### HPB: Add code here int i; - i = ent.readNumEntry("PageSize", (int)QPrinter::A4); + i = ent.readNumEntry("PageSize", (int)TQPrinter::A4); config->deleteEntry("PageSize", false, true); if (i != m_locale->pageSize()) config->writeEntry("PageSize", @@ -108,7 +108,7 @@ void KLocaleConfigOther::slotLocaleChanged() int pageSize = m_locale->pageSize(); int i = 0; // default to A4 - if ( pageSize == (int)QPrinter::Letter ) + if ( pageSize == (int)TQPrinter::Letter ) i = 1; m_combPageSize->setCurrentItem(i); } @@ -126,10 +126,10 @@ void KLocaleConfigOther::slotTranslate() void KLocaleConfigOther::slotPageSizeChanged(int i) { - QPrinter::PageSize pageSize = QPrinter::A4; + TQPrinter::PageSize pageSize = TQPrinter::A4; if ( i == 1 ) - pageSize = QPrinter::Letter; + pageSize = TQPrinter::Letter; m_locale->setPageSize((int)pageSize); emit localeChanged(); diff --git a/kcontrol/locale/localeother.h b/kcontrol/locale/localeother.h index 1c6ec0b48..a4d2dc1ba 100644 --- a/kcontrol/locale/localeother.h +++ b/kcontrol/locale/localeother.h @@ -24,7 +24,7 @@ #ifndef __KLOCALECONFIGOTHER_H__ #define __KLOCALECONFIGOTHER_H__ -#include <qwidget.h> +#include <tqwidget.h> class QLabel; class QComboBox; @@ -36,7 +36,7 @@ class KLocaleConfigOther : public QWidget Q_OBJECT public: - KLocaleConfigOther(KLocale *locale, QWidget *parent = 0, const char *name = 0); + KLocaleConfigOther(KLocale *locale, TQWidget *parent = 0, const char *name = 0); virtual ~KLocaleConfigOther(); void save(); @@ -61,10 +61,10 @@ private slots: private: KLocale *m_locale; - QLabel *m_labMeasureSystem; - QComboBox *m_combMeasureSystem; - QLabel *m_labPageSize; - QComboBox *m_combPageSize; + TQLabel *m_labMeasureSystem; + TQComboBox *m_combMeasureSystem; + TQLabel *m_labPageSize; + TQComboBox *m_combPageSize; }; #endif diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index ea077ac89..2519ea794 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -21,12 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qcombobox.h> -#include <qvaluevector.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> +#include <tqvaluevector.h> #include <kdialog.h> #include <ksimpleconfig.h> @@ -41,12 +41,12 @@ class StringPair { public: - QChar storeName; - QString userName; + TQChar storeName; + TQString userName; - static StringPair find( const QValueList <StringPair> &list, const QChar &c) + static StringPair find( const TQValueList <StringPair> &list, const TQChar &c) { - for ( QValueList<StringPair>::ConstIterator it = list.begin(); + for ( TQValueList<StringPair>::ConstIterator it = list.begin(); it != list.end(); ++it ) if ((*it).storeName==c) return (*it); @@ -80,7 +80,7 @@ bool operator>= (const StringPair &p1, const StringPair &p2) return ! (p1.userName>=p2.userName); } -StringPair KLocaleConfigTime::buildStringPair(const QChar &c, const QString &s) const +StringPair KLocaleConfigTime::buildStringPair(const TQChar &c, const TQString &s) const { StringPair pair; pair.storeName=c; @@ -88,9 +88,9 @@ StringPair KLocaleConfigTime::buildStringPair(const QChar &c, const QString &s) return pair; } -QValueList<StringPair> KLocaleConfigTime::timeMap() const +TQValueList<StringPair> KLocaleConfigTime::timeMap() const { - QValueList < StringPair > list; + TQValueList < StringPair > list; list+=buildStringPair('H',m_locale->translate("HH")); list+=buildStringPair('k',m_locale->translate("hH")); list+=buildStringPair('I',m_locale->translate("PH")); @@ -104,9 +104,9 @@ QValueList<StringPair> KLocaleConfigTime::timeMap() const return list; } -QValueList <StringPair> KLocaleConfigTime::dateMap() const +TQValueList <StringPair> KLocaleConfigTime::dateMap() const { - QValueList < StringPair > list; + TQValueList < StringPair > list; list+=buildStringPair('Y',m_locale->translate("YYYY")); list+=buildStringPair('y',m_locale->translate("YY")); list+=buildStringPair('n',m_locale->translate("mM")); @@ -123,19 +123,19 @@ QValueList <StringPair> KLocaleConfigTime::dateMap() const return list; } -QString KLocaleConfigTime::userToStore(const QValueList<StringPair> & list, - const QString & userFormat) const +TQString KLocaleConfigTime::userToStore(const TQValueList<StringPair> & list, + const TQString & userFormat) const { - QString result; + TQString result; for ( uint pos = 0; pos < userFormat.length(); ++pos ) { bool bFound = false; - for ( QValueList<StringPair>::ConstIterator it = list.begin(); + for ( TQValueList<StringPair>::ConstIterator it = list.begin(); it != list.end() && !bFound; ++it ) { - QString s = (*it).userName; + TQString s = (*it).userName; if ( userFormat.mid( pos, s.length() ) == s ) { @@ -150,7 +150,7 @@ QString KLocaleConfigTime::userToStore(const QValueList<StringPair> & list, if ( !bFound ) { - QChar c = userFormat.at( pos ); + TQChar c = userFormat.at( pos ); if ( c == '%' ) result += c; @@ -161,15 +161,15 @@ QString KLocaleConfigTime::userToStore(const QValueList<StringPair> & list, return result; } -QString KLocaleConfigTime::storeToUser(const QValueList<StringPair> & list, - const QString & storeFormat) const +TQString KLocaleConfigTime::storeToUser(const TQValueList<StringPair> & list, + const TQString & storeFormat) const { - QString result; + TQString result; bool escaped = false; for ( uint pos = 0; pos < storeFormat.length(); ++pos ) { - QChar c = storeFormat.at(pos); + TQChar c = storeFormat.at(pos); if ( escaped ) { StringPair it = StringPair::find( list, c ); @@ -190,51 +190,51 @@ QString KLocaleConfigTime::storeToUser(const QValueList<StringPair> & list, } KLocaleConfigTime::KLocaleConfigTime(KLocale *_locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(_locale) { // Time - QGridLayout *lay = new QGridLayout(this, 7, 2, + TQGridLayout *lay = new TQGridLayout(this, 7, 2, KDialog::marginHint(), KDialog::spacingHint()); lay->setAutoAdd(TRUE); - m_labCalendarSystem = new QLabel(this, I18N_NOOP("Calendar system:")); - m_comboCalendarSystem = new QComboBox(false, this); - connect(m_comboCalendarSystem, SIGNAL(activated(int)), - this, SLOT(slotCalendarSystemChanged(int))); - QStringList tmpCalendars; - tmpCalendars << QString::null << QString::null; + m_labCalendarSystem = new TQLabel(this, I18N_NOOP("Calendar system:")); + m_comboCalendarSystem = new TQComboBox(false, this); + connect(m_comboCalendarSystem, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotCalendarSystemChanged(int))); + TQStringList tmpCalendars; + tmpCalendars << TQString::null << TQString::null; m_comboCalendarSystem->insertStringList(tmpCalendars); - m_labTimeFmt = new QLabel(this, I18N_NOOP("Time format:")); - m_comboTimeFmt = new QComboBox(true, this); + m_labTimeFmt = new TQLabel(this, I18N_NOOP("Time format:")); + m_comboTimeFmt = new TQComboBox(true, this); //m_edTimeFmt = m_comboTimeFmt->lineEdit(); - //m_edTimeFmt = new QLineEdit(this); - connect( m_comboTimeFmt, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotTimeFmtChanged(const QString &) ) ); + //m_edTimeFmt = new TQLineEdit(this); + connect( m_comboTimeFmt, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotTimeFmtChanged(const TQString &) ) ); - m_labDateFmt = new QLabel(this, I18N_NOOP("Date format:")); - m_comboDateFmt = new QComboBox(true, this); - connect( m_comboDateFmt, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotDateFmtChanged(const QString &) ) ); + m_labDateFmt = new TQLabel(this, I18N_NOOP("Date format:")); + m_comboDateFmt = new TQComboBox(true, this); + connect( m_comboDateFmt, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotDateFmtChanged(const TQString &) ) ); - m_labDateFmtShort = new QLabel(this, I18N_NOOP("Short date format:")); - m_comboDateFmtShort = new QComboBox(true, this); - connect( m_comboDateFmtShort, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotDateFmtShortChanged(const QString &) ) ); + m_labDateFmtShort = new TQLabel(this, I18N_NOOP("Short date format:")); + m_comboDateFmtShort = new TQComboBox(true, this); + connect( m_comboDateFmtShort, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotDateFmtShortChanged(const TQString &) ) ); - m_labWeekStartDay = new QLabel(this, I18N_NOOP("First day of the week:")); - m_comboWeekStartDay = new QComboBox(false, this); - connect (m_comboWeekStartDay, SIGNAL(activated(int)), - this, SLOT(slotWeekStartDayChanged(int))); + m_labWeekStartDay = new TQLabel(this, I18N_NOOP("First day of the week:")); + m_comboWeekStartDay = new TQComboBox(false, this); + connect (m_comboWeekStartDay, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotWeekStartDayChanged(int))); updateWeekDayNames(); - m_chDateMonthNamePossessive = new QCheckBox(this, I18N_NOOP("Use declined form of month name")); - connect( m_chDateMonthNamePossessive, SIGNAL( clicked() ), - SLOT( slotDateMonthNamePossChanged() ) ); + m_chDateMonthNamePossessive = new TQCheckBox(this, I18N_NOOP("Use declined form of month name")); + connect( m_chDateMonthNamePossessive, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotDateMonthNamePossChanged() ) ); lay->setColStretch(1, 1); } @@ -253,28 +253,28 @@ void KLocaleConfigTime::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); - QString str; + TQString str; - str = ent.readEntry("CalendarSystem", QString::fromLatin1("gregorian")); + str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian")); config->deleteEntry("CalendarSystem", false, true); if (str != m_locale->calendarType()) config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true); - str = ent.readEntry("TimeFormat", QString::fromLatin1("%H:%M:%S")); + str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S")); config->deleteEntry("TimeFormat", false, true); if (str != m_locale->timeFormat()) config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true); - str = ent.readEntry("DateFormat", QString::fromLatin1("%A %d %B %Y")); + str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y")); config->deleteEntry("DateFormat", false, true); if (str != m_locale->dateFormat()) config->writeEntry("DateFormat", m_locale->dateFormat(), true, true); - str = ent.readEntry("DateFormatShort", QString::fromLatin1("%Y-%m-%d")); + str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d")); config->deleteEntry("DateFormatShort", false, true); if (str != m_locale->dateFormatShort()) config->writeEntry("DateFormatShort", @@ -302,26 +302,26 @@ void KLocaleConfigTime::save() KGlobal::_locale = lsave; } -void KLocaleConfigTime::showEvent( QShowEvent *e ) +void KLocaleConfigTime::showEvent( TQShowEvent *e ) { // This option makes sense only for languages where nouns are declined if ( !m_locale->nounDeclension() ) m_chDateMonthNamePossessive->hide(); - QWidget::showEvent( e ); + TQWidget::showEvent( e ); } void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem) { kdDebug() << "CalendarSystem: " << calendarSystem << endl; - typedef QValueVector<QString> CalendarVector; + typedef TQValueVector<TQString> CalendarVector; CalendarVector calendars(4); calendars[0] = "gregorian"; calendars[1] = "hijri"; calendars[2] = "hebrew"; calendars[3] = "jalali"; - QString calendarType; + TQString calendarType; bool ok; calendarType = calendars.at(calendarSystem, &ok); if ( !ok ) @@ -335,14 +335,14 @@ void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem) void KLocaleConfigTime::slotLocaleChanged() { - typedef QValueVector<QString> CalendarVector; + typedef TQValueVector<TQString> CalendarVector; CalendarVector calendars(4); calendars[0] = "gregorian"; calendars[1] = "hijri"; calendars[2] = "hebrew"; calendars[3] = "jalali"; - QString calendarType = m_locale->calendarType(); + TQString calendarType = m_locale->calendarType(); int calendarSystem = 0; CalendarVector::iterator it = qFind(calendars.begin(), calendars.end(), @@ -371,11 +371,11 @@ calendarType); kdDebug(173) << storeToUser(timeMap(), m_locale->timeFormat()) << endl; kdDebug(173) << userToStore(timeMap(), - QString::fromLatin1("HH:MM:SS AMPM test")) << endl; + TQString::fromLatin1("HH:MM:SS AMPM test")) << endl; } -void KLocaleConfigTime::slotTimeFmtChanged(const QString &t) +void KLocaleConfigTime::slotTimeFmtChanged(const TQString &t) { // m_locale->setTimeFormat(t); m_locale->setTimeFormat( userToStore( timeMap(), t ) ); @@ -383,14 +383,14 @@ void KLocaleConfigTime::slotTimeFmtChanged(const QString &t) emit localeChanged(); } -void KLocaleConfigTime::slotDateFmtChanged(const QString &t) +void KLocaleConfigTime::slotDateFmtChanged(const TQString &t) { // m_locale->setDateFormat(t); m_locale->setDateFormat( userToStore( dateMap(), t ) ); emit localeChanged(); } -void KLocaleConfigTime::slotDateFmtShortChanged(const QString &t) +void KLocaleConfigTime::slotDateFmtShortChanged(const TQString &t) { //m_locale->setDateFormatShort(t); m_locale->setDateFormatShort( userToStore( dateMap(), t ) ); @@ -414,11 +414,11 @@ void KLocaleConfigTime::slotDateMonthNamePossChanged() void KLocaleConfigTime::slotTranslate() { - QString str; + TQString str; - QString sep = QString::fromLatin1("\n"); + TQString sep = TQString::fromLatin1("\n"); - QString old; + TQString old; // clear() and insertStringList also changes the current item, so // we better use save and restore here.. @@ -427,7 +427,7 @@ void KLocaleConfigTime::slotTranslate() str = i18n("some reasonable time formats for the language", "HH:MM:SS\n" "pH:MM:SS AMPM"); - m_comboTimeFmt->insertStringList(QStringList::split(sep, str)); + m_comboTimeFmt->insertStringList(TQStringList::split(sep, str)); m_comboTimeFmt->setEditText(old); old = m_comboDateFmt->currentText(); @@ -435,7 +435,7 @@ void KLocaleConfigTime::slotTranslate() str = i18n("some reasonable date formats for the language", "WEEKDAY MONTH dD YYYY\n" "SHORTWEEKDAY MONTH dD YYYY"); - m_comboDateFmt->insertStringList(QStringList::split(sep, str)); + m_comboDateFmt->insertStringList(TQStringList::split(sep, str)); m_comboDateFmt->setEditText(old); old = m_comboDateFmtShort->currentText(); @@ -444,13 +444,13 @@ void KLocaleConfigTime::slotTranslate() "YYYY-MM-DD\n" "dD.mM.YYYY\n" "DD.MM.YYYY"); - m_comboDateFmtShort->insertStringList(QStringList::split(sep, str)); + m_comboDateFmtShort->insertStringList(TQStringList::split(sep, str)); m_comboDateFmtShort->setEditText(old); updateWeekDayNames(); while ( m_comboCalendarSystem->count() < 4 ) - m_comboCalendarSystem->insertItem(QString::null); + m_comboCalendarSystem->insertItem(TQString::null); m_comboCalendarSystem->changeItem (m_locale->translate("Calendar System Gregorian", "Gregorian"), 0); m_comboCalendarSystem->changeItem @@ -480,10 +480,10 @@ void KLocaleConfigTime::slotTranslate() "given time value. Noon is treated as \"pm\" and midnight as \"am\"." "</td></tr>" "</table>"); - QWhatsThis::add( m_labTimeFmt, str ); - QWhatsThis::add( m_comboTimeFmt, str ); + TQWhatsThis::add( m_labTimeFmt, str ); + TQWhatsThis::add( m_comboTimeFmt, str ); - QString datecodes = m_locale->translate( + TQString datecodes = m_locale->translate( "<table>" "<tr><td><b>YYYY</b></td><td>The year with century as a decimal number." "</td></tr>" @@ -507,27 +507,27 @@ void KLocaleConfigTime::slotTranslate() str = m_locale->translate ( "<p>The text in this textbox will be used to format long " "dates. The sequences below will be replaced:</p>") + datecodes; - QWhatsThis::add( m_labDateFmt, str ); - QWhatsThis::add( m_comboDateFmt, str ); + TQWhatsThis::add( m_labDateFmt, str ); + TQWhatsThis::add( m_comboDateFmt, str ); str = m_locale->translate ( "<p>The text in this textbox will be used to format short " "dates. For instance, this is used when listing files. " "The sequences below will be replaced:</p>") + datecodes; - QWhatsThis::add( m_labDateFmtShort, str ); - QWhatsThis::add( m_comboDateFmtShort, str ); + TQWhatsThis::add( m_labDateFmtShort, str ); + TQWhatsThis::add( m_comboDateFmtShort, str ); str = m_locale->translate ("<p>This option determines which day will be considered as " "the first one of the week.</p>"); - QWhatsThis::add( m_comboWeekStartDay, str ); + TQWhatsThis::add( m_comboWeekStartDay, str ); if ( m_locale->nounDeclension() ) { str = m_locale->translate ("<p>This option determines whether possessive form of month " "names should be used in dates.</p>"); - QWhatsThis::add( m_chDateMonthNamePossessive, str ); + TQWhatsThis::add( m_chDateMonthNamePossessive, str ); } } @@ -537,7 +537,7 @@ void KLocaleConfigTime::updateWeekDayNames() for ( int i = 1; ; ++i ) { - QString str = calendar->weekDayName(i); + TQString str = calendar->weekDayName(i); bool outsideComboList = m_comboWeekStartDay->count() < i; if ( str.isNull() ) diff --git a/kcontrol/locale/localetime.h b/kcontrol/locale/localetime.h index c77f00cd3..26f65579c 100644 --- a/kcontrol/locale/localetime.h +++ b/kcontrol/locale/localetime.h @@ -24,9 +24,9 @@ #ifndef __KLOCALECONFIGTIME_H__ #define __KLOCALECONFIGTIME_H__ -#include <qwidget.h> +#include <tqwidget.h> -#include <qmap.h> +#include <tqmap.h> class QCheckBox; class QComboBox; @@ -41,13 +41,13 @@ class KLocaleConfigTime : public QWidget Q_OBJECT public: - KLocaleConfigTime( KLocale *_locale, QWidget *parent=0, const char *name=0); + KLocaleConfigTime( KLocale *_locale, TQWidget *parent=0, const char *name=0); virtual ~KLocaleConfigTime( ); void save(); protected: - void showEvent( QShowEvent *e ); + void showEvent( TQShowEvent *e ); public slots: /** @@ -64,9 +64,9 @@ signals: private slots: // Time & dates - void slotTimeFmtChanged(const QString &t); - void slotDateFmtChanged(const QString &t); - void slotDateFmtShortChanged(const QString &t); + void slotTimeFmtChanged(const TQString &t); + void slotDateFmtChanged(const TQString &t); + void slotDateFmtShortChanged(const TQString &t); void slotWeekStartDayChanged(int firstDay); void slotDateMonthNamePossChanged(); void slotCalendarSystemChanged(int calendarSystem); @@ -74,29 +74,29 @@ private slots: private: void updateWeekDayNames(); - QValueList<StringPair> timeMap() const; - QValueList<StringPair> dateMap() const; + TQValueList<StringPair> timeMap() const; + TQValueList<StringPair> dateMap() const; - QString storeToUser(const QValueList<StringPair> & map, - const QString & storeFormat) const; - QString userToStore(const QValueList<StringPair> & map, - const QString & userFormat) const; - StringPair buildStringPair(const QChar &storeName, const QString &userName) const; + TQString storeToUser(const TQValueList<StringPair> & map, + const TQString & storeFormat) const; + TQString userToStore(const TQValueList<StringPair> & map, + const TQString & userFormat) const; + StringPair buildStringPair(const TQChar &storeName, const TQString &userName) const; KLocale *m_locale; // Time & dates - QLabel *m_labTimeFmt; - QComboBox *m_comboTimeFmt; - QLabel *m_labDateFmt; - QComboBox * m_comboDateFmt; - QLabel *m_labDateFmtShort; - QComboBox * m_comboDateFmtShort; - QLabel * m_labWeekStartDay; - QComboBox * m_comboWeekStartDay; - QCheckBox *m_chDateMonthNamePossessive; - QLabel * m_labCalendarSystem; - QComboBox * m_comboCalendarSystem; + TQLabel *m_labTimeFmt; + TQComboBox *m_comboTimeFmt; + TQLabel *m_labDateFmt; + TQComboBox * m_comboDateFmt; + TQLabel *m_labDateFmtShort; + TQComboBox * m_comboDateFmtShort; + TQLabel * m_labWeekStartDay; + TQComboBox * m_comboWeekStartDay; + TQCheckBox *m_chDateMonthNamePossessive; + TQLabel * m_labCalendarSystem; + TQComboBox * m_comboCalendarSystem; }; #endif diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp index 7a861495b..74febe07e 100644 --- a/kcontrol/locale/main.cpp +++ b/kcontrol/locale/main.cpp @@ -30,7 +30,7 @@ extern "C" { /* extern "C" { - KCModule *create_locale(QWidget *parent, const char* name) { + KCModule *create_locale(TQWidget *parent, const char* name) { KLocale::setMainCatalogue("kcmlocale"); return new KLocaleApplication(parent, "kcmlocale"); } diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index 4ba70e1ed..de47ce661 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -20,13 +20,13 @@ */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qobjectlist.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qvgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqobjectlist.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqvgroupbox.h> #include <kaboutdata.h> #include <kconfig.h> @@ -45,8 +45,8 @@ #include "kcmlocale.h" #include "toplevel.moc" -KLocaleApplication::KLocaleApplication(QWidget *parent, const char* /*name*/, - const QStringList &args) +KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, + const TQStringList &args) : KCModule( KLocaleFactory::instance(), parent, args) { KAboutData* aboutData = new KAboutData("kcmlocale", @@ -59,89 +59,89 @@ KLocaleApplication::KLocaleApplication(QWidget *parent, const char* /*name*/, 0, 0, "bieker@kde.org"); setAboutData( aboutData ); - m_nullConfig = new KConfig(QString::null, false, false); - m_globalConfig = new KConfig(QString::null, false, true); + m_nullConfig = new KConfig(TQString::null, false, false); + m_globalConfig = new KConfig(TQString::null, false, true); - m_locale = new KLocale(QString::fromLatin1("kcmlocale"), m_nullConfig); - QVBoxLayout *l = new QVBoxLayout(this, 0, KDialog::spacingHint()); + m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l->setAutoAdd(TRUE); - m_tab = new QTabWidget(this); + m_tab = new TQTabWidget(this); m_localemain = new KLocaleConfig(m_locale, this); - m_tab->addTab( m_localemain, QString::null); + m_tab->addTab( m_localemain, TQString::null); m_localenum = new KLocaleConfigNumber(m_locale, this); - m_tab->addTab( m_localenum, QString::null ); + m_tab->addTab( m_localenum, TQString::null ); m_localemon = new KLocaleConfigMoney(m_locale, this); - m_tab->addTab( m_localemon, QString::null ); + m_tab->addTab( m_localemon, TQString::null ); m_localetime = new KLocaleConfigTime(m_locale, this); - m_tab->addTab( m_localetime, QString::null ); + m_tab->addTab( m_localetime, TQString::null ); m_localeother = new KLocaleConfigOther(m_locale, this); - m_tab->addTab( m_localeother, QString::null ); + m_tab->addTab( m_localeother, TQString::null ); // Examples - m_gbox = new QVGroupBox(this); + m_gbox = new TQVGroupBox(this); m_sample = new KLocaleSample(m_locale, m_gbox); // getting signals from childs - connect(m_localemain, SIGNAL(localeChanged()), - this, SIGNAL(localeChanged())); - connect(m_localemain, SIGNAL(languageChanged()), - this, SIGNAL(languageChanged())); + connect(m_localemain, TQT_SIGNAL(localeChanged()), + this, TQT_SIGNAL(localeChanged())); + connect(m_localemain, TQT_SIGNAL(languageChanged()), + this, TQT_SIGNAL(languageChanged())); // run the slots on the childs - connect(this, SIGNAL(localeChanged()), - m_localemain, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_localenum, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_localemon, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_localetime, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_localeother, SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localemain, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localenum, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localemon, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localetime, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localeother, TQT_SLOT(slotLocaleChanged())); // keep the example up to date // NOTE: this will make the sample be updated 6 times the first time // because combo boxes++ emits the change signal not only when the user changes // it, but also when it's changed by the program. - connect(m_localenum, SIGNAL(localeChanged()), - m_sample, SLOT(slotLocaleChanged())); - connect(m_localemon, SIGNAL(localeChanged()), - m_sample, SLOT(slotLocaleChanged())); - connect(m_localetime, SIGNAL(localeChanged()), - m_sample, SLOT(slotLocaleChanged())); + connect(m_localenum, TQT_SIGNAL(localeChanged()), + m_sample, TQT_SLOT(slotLocaleChanged())); + connect(m_localemon, TQT_SIGNAL(localeChanged()), + m_sample, TQT_SLOT(slotLocaleChanged())); + connect(m_localetime, TQT_SIGNAL(localeChanged()), + m_sample, TQT_SLOT(slotLocaleChanged())); // No examples for this yet - //connect(m_localeother, SIGNAL(slotLocaleChanged()), - //m_sample, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_sample, SLOT(slotLocaleChanged())); + //connect(m_localeother, TQT_SIGNAL(slotLocaleChanged()), + //m_sample, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_sample, TQT_SLOT(slotLocaleChanged())); // make sure we always have translated interface - connect(this, SIGNAL(languageChanged()), - this, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localemain, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localenum, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localemon, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localetime, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localeother, SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + this, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localemain, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localenum, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localemon, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localetime, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localeother, TQT_SLOT(slotTranslate())); // mark it as changed when we change it. - connect(m_localemain, SIGNAL(localeChanged()), - SLOT(slotChanged())); - connect(m_localenum, SIGNAL(localeChanged()), - SLOT(slotChanged())); - connect(m_localemon, SIGNAL(localeChanged()), - SLOT(slotChanged())); - connect(m_localetime, SIGNAL(localeChanged()), - SLOT(slotChanged())); - connect(m_localeother, SIGNAL(localeChanged()), - SLOT(slotChanged())); + connect(m_localemain, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); + connect(m_localenum, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); + connect(m_localemon, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); + connect(m_localetime, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); + connect(m_localeother, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); load(); } @@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults ) { m_globalConfig->setReadDefaults( useDefaults ); m_globalConfig->reparseConfiguration(); - *m_locale = KLocale(QString::fromLatin1("kcmlocale"), m_globalConfig); + *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig); emit localeChanged(); emit languageChanged(); @@ -180,7 +180,7 @@ void KLocaleApplication::save() "language of all programs, you will have to " "logout first."), m_locale->translate("Applying Language Settings"), - QString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); + TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); // restore the old global locale KGlobal::_locale = lsave; @@ -211,7 +211,7 @@ void KLocaleApplication::defaults() load( true ); } -QString KLocaleApplication::quickHelp() const +TQString KLocaleApplication::quickHelp() const { return m_locale->translate("<h1>Country/Region & Language</h1>\n" "<p>From here you can configure language, numeric, and time \n" @@ -224,11 +224,11 @@ QString KLocaleApplication::quickHelp() const void KLocaleApplication::slotTranslate() { - // The untranslated string for QLabel are stored in + // The untranslated string for TQLabel are stored in // the name() so we use that when retranslating - QObject *wc; - QObjectList *list = queryList("QWidget"); - QObjectListIt it(*list); + TQObject *wc; + TQObjectList *list = queryList("TQWidget"); + TQObjectListIt it(*list); while ( (wc = it.current()) != 0 ) { ++it; @@ -243,16 +243,16 @@ void KLocaleApplication::slotTranslate() if (::qstrcmp(wc->name(), "unnamed") == 0) continue; - if (::qstrcmp(wc->className(), "QLabel") == 0) - ((QLabel *)wc)->setText( m_locale->translate( wc->name() ) ); - else if (::qstrcmp(wc->className(), "QGroupBox") == 0 || - ::qstrcmp(wc->className(), "QVGroupBox") == 0) - ((QGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) ); - else if (::qstrcmp(wc->className(), "QPushButton") == 0 || + if (::qstrcmp(wc->className(), "TQLabel") == 0) + ((TQLabel *)wc)->setText( m_locale->translate( wc->name() ) ); + else if (::qstrcmp(wc->className(), "TQGroupBox") == 0 || + ::qstrcmp(wc->className(), "TQVGroupBox") == 0) + ((TQGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) ); + else if (::qstrcmp(wc->className(), "TQPushButton") == 0 || ::qstrcmp(wc->className(), "KMenuButton") == 0) - ((QPushButton *)wc)->setText( m_locale->translate( wc->name() ) ); - else if (::qstrcmp(wc->className(), "QCheckBox") == 0) - ((QCheckBox *)wc)->setText( m_locale->translate( wc->name() ) ); + ((TQPushButton *)wc)->setText( m_locale->translate( wc->name() ) ); + else if (::qstrcmp(wc->className(), "TQCheckBox") == 0) + ((TQCheckBox *)wc)->setText( m_locale->translate( wc->name() ) ); } delete list; diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h index 746f22a69..cd27cd441 100644 --- a/kcontrol/locale/toplevel.h +++ b/kcontrol/locale/toplevel.h @@ -45,14 +45,14 @@ class KLocaleApplication : public KCModule Q_OBJECT public: - KLocaleApplication(QWidget *parent, const char *name, const QStringList &); + KLocaleApplication(TQWidget *parent, const char *name, const TQStringList &); virtual ~KLocaleApplication(); virtual void load(); virtual void load(bool useDefault); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; signals: void languageChanged(); @@ -68,20 +68,20 @@ public slots: private: KLocale *m_locale; - QTabWidget *m_tab; + TQTabWidget *m_tab; KLocaleConfig *m_localemain; KLocaleConfigNumber *m_localenum; KLocaleConfigMoney *m_localemon; KLocaleConfigTime *m_localetime; KLocaleConfigOther *m_localeother; - QGroupBox *m_gbox; + TQGroupBox *m_gbox; KLocaleSample *m_sample; KConfig * m_globalConfig; KConfig * m_nullConfig; }; -typedef KGenericFactory<KLocaleApplication, QWidget > KLocaleFactory; +typedef KGenericFactory<KLocaleApplication, TQWidget > KLocaleFactory; #endif diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 97bb9f42b..5bc340f7b 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -35,11 +35,11 @@ #include <kgenericfactory.h> #include <kglobal.h> -#include <qlayout.h> -#include <qlistview.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqtimer.h> #include "nic.h" @@ -64,31 +64,31 @@ #include <ifaddrs.h> #include <netdb.h> - QString flags_tos (unsigned int flags); + TQString flags_tos (unsigned int flags); #endif -typedef KGenericFactory<KCMNic, QWidget> KCMNicFactory; +typedef KGenericFactory<KCMNic, TQWidget> KCMNicFactory; K_EXPORT_COMPONENT_FACTORY (kcm_nic, KCMNicFactory("kcmnic")) struct MyNIC { - QString name; - QString addr; - QString netmask; - QString state; - QString type; - QString HWaddr; + TQString name; + TQString addr; + TQString netmask; + TQString state; + TQString type; + TQString HWaddr; }; -typedef QPtrList<MyNIC> NICList; +typedef TQPtrList<MyNIC> NICList; NICList* findNICs(); -KCMNic::KCMNic(QWidget *parent, const char * name, const QStringList &) +KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &) :KCModule(KCMNicFactory::instance(), parent,name) { - QVBoxLayout *box=new QVBoxLayout(this, 0, KDialog::spacingHint()); - m_list=new QListView(this); + TQVBoxLayout *box=new TQVBoxLayout(this, 0, KDialog::spacingHint()); + m_list=new TQListView(this); box->addWidget(m_list); m_list->addColumn(i18n("Name")); m_list->addColumn(i18n("IP Address")); @@ -97,14 +97,14 @@ KCMNic::KCMNic(QWidget *parent, const char * name, const QStringList &) m_list->addColumn(i18n("State")); m_list->addColumn(i18n("HWaddr")); m_list->setAllColumnsShowFocus(true); - QHBoxLayout *hbox=new QHBoxLayout(box); - m_updateButton=new QPushButton(i18n("&Update"),this); + TQHBoxLayout *hbox=new TQHBoxLayout(box); + m_updateButton=new TQPushButton(i18n("&Update"),this); hbox->addWidget(m_updateButton); hbox->addStretch(1); - QTimer* timer=new QTimer(this); + TQTimer* timer=new TQTimer(this); timer->start(60000); - connect(m_updateButton,SIGNAL(clicked()),this,SLOT(update())); - connect(timer,SIGNAL(timeout()),this,SLOT(update())); + connect(m_updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(update())); + connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); update(); KAboutData *about = new KAboutData(I18N_NOOP("kcminfo"), @@ -123,17 +123,17 @@ void KCMNic::update() NICList *nics=findNICs(); nics->setAutoDelete(true); for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next()) - new QListViewItem(m_list,tmp->name, tmp->addr, tmp->netmask, tmp->type, tmp->state, tmp->HWaddr); + new TQListViewItem(m_list,tmp->name, tmp->addr, tmp->netmask, tmp->type, tmp->state, tmp->HWaddr); delete nics; } -static QString HWaddr2String( char *hwaddr ) +static TQString HWaddr2String( char *hwaddr ) { - QString ret; + TQString ret; int i; for (i=0; i<6; i++, hwaddr++) { int v = (*hwaddr & 0xff); - QString num = QString("%1").arg(v,0,16); + TQString num = TQString("%1").arg(v,0,16); if (num.length() < 2) num.prepend("0"); if (i>0) @@ -145,8 +145,8 @@ static QString HWaddr2String( char *hwaddr ) NICList* findNICs() { - QString upMessage( i18n("State of network card is connected", "Up") ); - QString downMessage( i18n("State of network card is disconnected", "Down") ); + TQString upMessage( i18n("State of network card is connected", "Up") ); + TQString downMessage( i18n("State of network card is disconnected", "Down") ); NICList* nl=new NICList; nl->setAutoDelete(true); @@ -289,30 +289,30 @@ NICList* findNICs() #if defined(HAVE_GETNAMEINFO) && defined(HAVE_GETIFADDRS) -QString flags_tos (unsigned int flags) +TQString flags_tos (unsigned int flags) { - QString tmp; + TQString tmp; if (flags & IFF_POINTOPOINT) { tmp += i18n("Point to Point"); } if (flags & IFF_BROADCAST) { if (tmp.length()) { - tmp += QString::fromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Broadcast"); } if (flags & IFF_MULTICAST) { if (tmp.length()) { - tmp += QString::fromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Multicast"); } if (flags & IFF_LOOPBACK) { if (tmp.length()) { - tmp += QString::fromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Loopback"); } diff --git a/kcontrol/nics/nic.h b/kcontrol/nics/nic.h index c7711701a..87938cf8f 100644 --- a/kcontrol/nics/nic.h +++ b/kcontrol/nics/nic.h @@ -31,14 +31,14 @@ class KCMNic:public KCModule { Q_OBJECT public: - KCMNic(QWidget *parent=0, const char * name=0, const QStringList &list = QStringList( )); + KCMNic(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList( )); protected slots: void update(); protected: - QListView *m_list; - QPushButton *m_updateButton; + TQListView *m_list; + TQPushButton *m_updateButton; }; #endif diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp index be4b57387..b85dca5d8 100644 --- a/kcontrol/performance/kcmperformance.cpp +++ b/kcontrol/performance/kcmperformance.cpp @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qtabwidget.h> +#include <tqlayout.h> +#include <tqtabwidget.h> #include <klocale.h> #include <kdialog.h> @@ -28,12 +28,12 @@ extern "C" { - KDE_EXPORT KCModule* create_performance( QWidget* parent_P, const char* name_P ) + KDE_EXPORT KCModule* create_performance( TQWidget* parent_P, const char* name_P ) { return new KCMPerformance::Config( parent_P, name_P ); } - KDE_EXPORT KCModule* create_konqueror( QWidget* parent_P, const char* name_P ) + KDE_EXPORT KCModule* create_konqueror( TQWidget* parent_P, const char* name_P ) { return new KCMPerformance::KonquerorConfig( parent_P, name_P ); } @@ -42,21 +42,21 @@ extern "C" namespace KCMPerformance { -Config::Config( QWidget* parent_P, const char* ) +Config::Config( TQWidget* parent_P, const char* ) : KCModule( parent_P, "kcmperformance" ) { setQuickHelp( i18n( "<h1>KDE Performance</h1>" " You can configure settings that improve KDE performance here." )); - QVBoxLayout *topLayout = new QVBoxLayout( this ); - QTabWidget* tabs = new QTabWidget( this ); + TQVBoxLayout *topLayout = new TQVBoxLayout( this ); + TQTabWidget* tabs = new TQTabWidget( this ); konqueror_widget = new Konqueror( tabs ); konqueror_widget->layout()->setMargin( KDialog::marginHint() ); - connect( konqueror_widget, SIGNAL( changed()), SLOT( changed())); + connect( konqueror_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); tabs->addTab( konqueror_widget, i18n( "Konqueror" )); system_widget = new SystemWidget( tabs ); system_widget->layout()->setMargin( KDialog::marginHint() ); - connect( system_widget, SIGNAL( changed()), SLOT( changed())); + connect( system_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); tabs->addTab( system_widget, i18n( "System" )); topLayout->add( tabs ); load(); @@ -85,7 +85,7 @@ void Config::defaults() load( true ); } -KonquerorConfig::KonquerorConfig( QWidget* parent_P, const char* ) +KonquerorConfig::KonquerorConfig( TQWidget* parent_P, const char* ) : KCModule( parent_P, "kcmperformance" ) { setQuickHelp( i18n( "<h1>Konqueror Performance</h1>" @@ -93,9 +93,9 @@ KonquerorConfig::KonquerorConfig( QWidget* parent_P, const char* ) " These include options for reusing already running instances" " and for keeping instances preloaded." )); - QVBoxLayout *topLayout = new QVBoxLayout( this ); + TQVBoxLayout *topLayout = new TQVBoxLayout( this ); widget = new Konqueror( this ); - connect( widget, SIGNAL( changed()), SLOT( changed())); + connect( widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); topLayout->add( widget ); load(); } diff --git a/kcontrol/performance/kcmperformance.h b/kcontrol/performance/kcmperformance.h index 13c3f9465..bb924b880 100644 --- a/kcontrol/performance/kcmperformance.h +++ b/kcontrol/performance/kcmperformance.h @@ -32,7 +32,7 @@ class Config { Q_OBJECT public: - Config( QWidget* parent_P, const char* name_P ); + Config( TQWidget* parent_P, const char* name_P ); virtual void load(); virtual void load( bool useDefaults ); virtual void save(); @@ -47,7 +47,7 @@ class KonquerorConfig { Q_OBJECT public: - KonquerorConfig( QWidget* parent_P, const char* name_P ); + KonquerorConfig( TQWidget* parent_P, const char* name_P ); virtual void load(); virtual void load( bool useDefaults ); virtual void save(); diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp index 02dde4cce..909f989bd 100644 --- a/kcontrol/performance/konqueror.cpp +++ b/kcontrol/performance/konqueror.cpp @@ -20,23 +20,23 @@ #include <dcopref.h> #include <kconfig.h> -#include <qwhatsthis.h> -#include <qradiobutton.h> -#include <qspinbox.h> -#include <qlabel.h> -#include <qcheckbox.h> +#include <tqwhatsthis.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqcheckbox.h> #include <klocale.h> namespace KCMPerformance { -Konqueror::Konqueror( QWidget* parent_P ) +Konqueror::Konqueror( TQWidget* parent_P ) : Konqueror_ui( parent_P ) { - QWhatsThis::add( rb_never_reuse, + TQWhatsThis::add( rb_never_reuse, i18n( "Disables the minimization of memory usage and allows you " "to make each browsing activity independent from the others" )); - QWhatsThis::add( rb_file_browsing_reuse, + TQWhatsThis::add( rb_file_browsing_reuse, i18n( "With this option activated, only one instance of Konqueror " "used for file browsing will exist in the memory of your computer " "at any moment, " @@ -44,43 +44,43 @@ Konqueror::Konqueror( QWidget* parent_P ) "thus reducing resource requirements." "<p>Be aware that this also means that, if something goes wrong, " "all your file browsing windows will be closed simultaneously" )); - QWhatsThis::add( rb_always_reuse, + TQWhatsThis::add( rb_always_reuse, i18n( "With this option activated, only one instance of Konqueror " "will exist in the memory of your computer at any moment, " "no matter how many browsing windows you open, " "thus reducing resource requirements." "<p>Be aware that this also means that, if something goes wrong, " "all your browsing windows will be closed simultaneously." )); - connect( rb_never_reuse, SIGNAL( clicked()), SIGNAL( changed())); - connect( rb_file_browsing_reuse, SIGNAL( clicked()), SIGNAL( changed())); - connect( rb_always_reuse, SIGNAL( clicked()), SIGNAL( changed())); + connect( rb_never_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + connect( rb_file_browsing_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + connect( rb_always_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); rb_file_browsing_reuse->setChecked( true ); - QString tmp = + TQString tmp = i18n( "If non-zero, this option allows keeping Konqueror instances " "in memory after all their windows have been closed, up to the " "number specified in this option." "<p>When a new Konqueror instance is needed, one of these preloaded " "instances will be reused instead, improving responsiveness at " "the expense of the memory required by the preloaded instances." ); - QWhatsThis::add( sb_preload_count, tmp ); - QWhatsThis::add( lb_preload_count, tmp ); - QWhatsThis::add( cb_preload_on_startup, + TQWhatsThis::add( sb_preload_count, tmp ); + TQWhatsThis::add( lb_preload_count, tmp ); + TQWhatsThis::add( cb_preload_on_startup, i18n( "If enabled, an instance of Konqueror will be preloaded after the ordinary KDE " "startup sequence." "<p>This will make the first Konqueror window open faster, but " "at the expense of longer KDE startup times (but you will be able to work " "while it is loading, so you may not even notice that it is taking longer)." )); - QWhatsThis::add( cb_always_have_preloaded, + TQWhatsThis::add( cb_always_have_preloaded, i18n( "If enabled, KDE will always try to have one preloaded Konqueror instance ready; " "preloading a new instance in the background whenever there is not one available, " "so that windows will always open quickly." "<p><b>Warning:</b> In some cases, it is actually possible that this will " "reduce perceived performance." )); - connect( sb_preload_count, SIGNAL( valueChanged( int )), SLOT( preload_count_changed( int ))); - connect( sb_preload_count, SIGNAL( valueChanged( int )), SIGNAL( changed())); - connect( cb_preload_on_startup, SIGNAL( clicked()), SIGNAL( changed())); - connect( cb_always_have_preloaded, SIGNAL( clicked()), SIGNAL( changed())); + connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( preload_count_changed( int ))); + connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SIGNAL( changed())); + connect( cb_preload_on_startup, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + connect( cb_always_have_preloaded, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); defaults(); } diff --git a/kcontrol/performance/konqueror.h b/kcontrol/performance/konqueror.h index bc17d2e4e..e948f6b7a 100644 --- a/kcontrol/performance/konqueror.h +++ b/kcontrol/performance/konqueror.h @@ -29,7 +29,7 @@ class Konqueror { Q_OBJECT public: - Konqueror( QWidget* parent_P = NULL ); + Konqueror( TQWidget* parent_P = NULL ); void load(bool useDefaults); void save(); void defaults(); @@ -38,7 +38,7 @@ class Konqueror private slots: void preload_count_changed( int ); private: - QString allowed_parts; + TQString allowed_parts; }; } // namespace diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp index 97b5c5709..4a9ee001a 100644 --- a/kcontrol/performance/system.cpp +++ b/kcontrol/performance/system.cpp @@ -19,18 +19,18 @@ #include "system.h" #include <kconfig.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <klocale.h> namespace KCMPerformance { -SystemWidget::SystemWidget( QWidget* parent_P ) +SystemWidget::SystemWidget( TQWidget* parent_P ) : System_ui( parent_P ) { - QString tmp = + TQString tmp = i18n( "<p>During startup KDE needs to perform a check of its system configuration" " (mimetypes, installed applications, etc.), and in case the configuration" " has changed since the last time, the system configuration cache (KSyCoCa)" @@ -49,9 +49,9 @@ SystemWidget::SystemWidget( QWidget* parent_P ) " handler will refuse to provide backtrace for the bugreport with this option" " turned on (you will need to reproduce it again with this option turned off," " or turn on the developer mode for the crash handler).</p>" ); - QWhatsThis::add( cb_disable_kbuildsycoca, tmp ); - QWhatsThis::add( label_kbuildsycoca, tmp ); - connect( cb_disable_kbuildsycoca, SIGNAL( clicked()), SIGNAL( changed())); + TQWhatsThis::add( cb_disable_kbuildsycoca, tmp ); + TQWhatsThis::add( label_kbuildsycoca, tmp ); + connect( cb_disable_kbuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); defaults(); } diff --git a/kcontrol/performance/system.h b/kcontrol/performance/system.h index d788b2073..1358c8e79 100644 --- a/kcontrol/performance/system.h +++ b/kcontrol/performance/system.h @@ -31,7 +31,7 @@ class SystemWidget { Q_OBJECT public: - SystemWidget( QWidget* parent_P = NULL ); + SystemWidget( TQWidget* parent_P = NULL ); void load( bool useDefaults ); void save(); void defaults(); diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index cad01a169..bbf5e088a 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -30,9 +30,9 @@ #include <krecentdocument.h> #include <kstandarddirs.h> -#include <qstringlist.h> -#include <qfile.h> -#include <qdir.h> +#include <tqstringlist.h> +#include <tqfile.h> +#include <tqdir.h> KPrivacyManager::KPrivacyManager() { @@ -52,22 +52,22 @@ bool KPrivacyManager::clearThumbnails() // http://freedesktop.org/Standards/Home // http://triq.net/~jens/thumbnail-spec/index.html - QDir thumbnailDir( QDir::homeDirPath() + "/.thumbnails/normal"); - thumbnailDir.setFilter( QDir::Files ); - QStringList entries = thumbnailDir.entryList(); - for( QStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it) + TQDir thumbnailDir( TQDir::homeDirPath() + "/.thumbnails/normal"); + thumbnailDir.setFilter( TQDir::Files ); + TQStringList entries = thumbnailDir.entryList(); + for( TQStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it) if(!thumbnailDir.remove(*it)) m_error = true; if(m_error) return m_error; - thumbnailDir.setPath(QDir::homeDirPath() + "/.thumbnails/large"); + thumbnailDir.setPath(TQDir::homeDirPath() + "/.thumbnails/large"); entries = thumbnailDir.entryList(); - for( QStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it) + for( TQStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it) if(!thumbnailDir.remove(*it)) m_error = true; if(m_error) return m_error; - thumbnailDir.setPath(QDir::homeDirPath() + "/.thumbnails/fail"); + thumbnailDir.setPath(TQDir::homeDirPath() + "/.thumbnails/fail"); entries = thumbnailDir.entryList(); - for( QStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it) + for( TQStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it) if(!thumbnailDir.remove(*it)) m_error = true; return m_error; @@ -103,7 +103,7 @@ bool KPrivacyManager::clearSavedClipboardContents() bool KPrivacyManager::clearFormCompletion() const { - QFile completionFile(locateLocal("data", "khtml/formcompletions")); + TQFile completionFile(locateLocal("data", "khtml/formcompletions")); return completionFile.remove(); } @@ -128,7 +128,7 @@ bool KPrivacyManager::clearQuickStartMenu() const bool KPrivacyManager::clearWebHistory() { - QStringList args("--preload"); + TQStringList args("--preload"); // preload Konqueror if it is not running if(!isApplicationRegistered("konqueror")) @@ -138,24 +138,24 @@ bool KPrivacyManager::clearWebHistory() } return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyClear(QCString)", "" ); + "notifyClear(TQCString)", "" ); } bool KPrivacyManager::clearFavIcons() { - QDir favIconDir(KGlobal::dirs()->saveLocation( "cache", "favicons/" )); - favIconDir.setFilter( QDir::Files ); + TQDir favIconDir(KGlobal::dirs()->saveLocation( "cache", "favicons/" )); + favIconDir.setFilter( TQDir::Files ); - QStringList entries = favIconDir.entryList(); + TQStringList entries = favIconDir.entryList(); // erase all files in favicon directory - for( QStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it) + for( TQStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it) if(!favIconDir.remove(*it)) m_error = true; return m_error; } -bool KPrivacyManager::isApplicationRegistered(const QString &appName) +bool KPrivacyManager::isApplicationRegistered(const TQString &appName) { QCStringList regApps = kapp->dcopClient()->registeredApplications(); diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h index 114618577..6d950c903 100644 --- a/kcontrol/privacy/kprivacymanager.h +++ b/kcontrol/privacy/kprivacymanager.h @@ -21,7 +21,7 @@ #ifndef KPRIVACYMANAGER_H #define KPRIVACYMANAGER_H -#include <qobject.h> +#include <tqobject.h> /** @author Ralf Hoelzer @@ -47,7 +47,7 @@ public: bool clearFavIcons(); private: - bool isApplicationRegistered(const QString &appName); + bool isApplicationRegistered(const TQString &appName); bool m_error; }; diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index c0287ceba..c5d24397c 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qlayout.h> -#include <qptrlist.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqptrlist.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <kaboutdata.h> #include <kconfig.h> @@ -37,7 +37,7 @@ #include "privacy.h" -Privacy::Privacy(QWidget *parent, const char *name) +Privacy::Privacy(TQWidget *parent, const char *name) : KCModule(parent, name) { setQuickHelp( i18n("The privacy module allows a user to erase traces which KDE leaves on " @@ -56,10 +56,10 @@ Privacy::Privacy(QWidget *parent, const char *name) m_privacymanager = new KPrivacyManager(); - QBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint()); // add this once the P3P stuff is finished - //QTabWidget *privacyTabs = new QTabWidget(this, "privacytabs"); + //TQTabWidget *privacyTabs = new TQTabWidget(this, "privacytabs"); cleaningDialog = new KCMPrivacyDialog(this); //p3pSettings = new KPrivacySettings(this); @@ -78,7 +78,7 @@ Privacy::Privacy(QWidget *parent, const char *name) sw->setRootIsDecorated(true); sw->setTooltipColumn(1); - sw->setColumnWidthMode(0, QListView::Maximum); + sw->setColumnWidthMode(0, TQListView::Maximum); @@ -88,29 +88,29 @@ Privacy::Privacy(QWidget *parent, const char *name) generalCLI->setOpen(true); webbrowsingCLI->setOpen(true); - clearThumbnails = new QCheckListItem(generalCLI, - i18n("Thumbnail Cache"),QCheckListItem::CheckBox); - clearRunCommandHistory = new QCheckListItem(generalCLI, - i18n("Run Command History"),QCheckListItem::CheckBox); - clearAllCookies = new QCheckListItem(webbrowsingCLI, - i18n("Cookies"),QCheckListItem::CheckBox); - clearSavedClipboardContents = new QCheckListItem(generalCLI, - i18n("Saved Clipboard Contents"),QCheckListItem::CheckBox); - clearWebHistory = new QCheckListItem(webbrowsingCLI, - i18n("Web History"),QCheckListItem::CheckBox); - clearWebCache = new QCheckListItem(webbrowsingCLI, - i18n("Web Cache"),QCheckListItem::CheckBox); - clearFormCompletion = new QCheckListItem(webbrowsingCLI, - i18n("Form Completion Entries"),QCheckListItem::CheckBox); - clearRecentDocuments = new QCheckListItem(generalCLI, - i18n("Recent Documents"),QCheckListItem::CheckBox); - clearQuickStartMenu = new QCheckListItem(generalCLI, - i18n("Quick Start Menu"),QCheckListItem::CheckBox); - clearFavIcons = new QCheckListItem(webbrowsingCLI, - i18n("Favorite Icons"),QCheckListItem::CheckBox); - - QWhatsThis::add(sw, i18n("Check all cleanup actions you would like to perform. These will be executed by pressing the button below")); - QWhatsThis::add(cleaningDialog->cleanupButton, i18n("Immediately performs the cleanup actions selected above")); + clearThumbnails = new TQCheckListItem(generalCLI, + i18n("Thumbnail Cache"),TQCheckListItem::CheckBox); + clearRunCommandHistory = new TQCheckListItem(generalCLI, + i18n("Run Command History"),TQCheckListItem::CheckBox); + clearAllCookies = new TQCheckListItem(webbrowsingCLI, + i18n("Cookies"),TQCheckListItem::CheckBox); + clearSavedClipboardContents = new TQCheckListItem(generalCLI, + i18n("Saved Clipboard Contents"),TQCheckListItem::CheckBox); + clearWebHistory = new TQCheckListItem(webbrowsingCLI, + i18n("Web History"),TQCheckListItem::CheckBox); + clearWebCache = new TQCheckListItem(webbrowsingCLI, + i18n("Web Cache"),TQCheckListItem::CheckBox); + clearFormCompletion = new TQCheckListItem(webbrowsingCLI, + i18n("Form Completion Entries"),TQCheckListItem::CheckBox); + clearRecentDocuments = new TQCheckListItem(generalCLI, + i18n("Recent Documents"),TQCheckListItem::CheckBox); + clearQuickStartMenu = new TQCheckListItem(generalCLI, + i18n("Quick Start Menu"),TQCheckListItem::CheckBox); + clearFavIcons = new TQCheckListItem(webbrowsingCLI, + i18n("Favorite Icons"),TQCheckListItem::CheckBox); + + TQWhatsThis::add(sw, i18n("Check all cleanup actions you would like to perform. These will be executed by pressing the button below")); + TQWhatsThis::add(cleaningDialog->cleanupButton, i18n("Immediately performs the cleanup actions selected above")); clearThumbnails->setText(1, i18n("Clears all cached thumbnails")); clearRunCommandHistory->setText(1, i18n("Clears the history of commands run through the Run Command tool on the desktop")); @@ -123,7 +123,7 @@ Privacy::Privacy(QWidget *parent, const char *name) clearQuickStartMenu->setText(1, i18n("Clears the entries from the list of recently started applications")); clearFavIcons->setText(1, i18n("Clears the FavIcons cached from visited websites")); - connect(sw, SIGNAL(selectionChanged()), SLOT(changed())); + connect(sw, TQT_SIGNAL(selectionChanged()), TQT_SLOT(changed())); // store all entries in a list for easy access later on checklist.append(clearThumbnails); @@ -137,9 +137,9 @@ Privacy::Privacy(QWidget *parent, const char *name) checklist.append(clearQuickStartMenu); checklist.append(clearFavIcons); - connect(cleaningDialog->cleanupButton, SIGNAL(clicked()), SLOT(cleanup())); - connect(cleaningDialog->selectAllButton, SIGNAL(clicked()), SLOT(selectAll())); - connect(cleaningDialog->selectNoneButton, SIGNAL(clicked()), SLOT(selectNone())); + connect(cleaningDialog->cleanupButton, TQT_SIGNAL(clicked()), TQT_SLOT(cleanup())); + connect(cleaningDialog->selectAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectAll())); + connect(cleaningDialog->selectNoneButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectNone())); load(); } @@ -227,7 +227,7 @@ void Privacy::save() void Privacy::selectAll() { - QCheckListItem *item; + TQCheckListItem *item; for ( item = checklist.first(); item; item = checklist.next() ) item->setOn(true); @@ -237,7 +237,7 @@ void Privacy::selectAll() void Privacy::selectNone() { - QCheckListItem *item; + TQCheckListItem *item; for ( item = checklist.first(); item; item = checklist.next() ) item->setOn(false); @@ -253,14 +253,14 @@ void Privacy::cleanup() cleaningDialog->statusTextEdit->clear(); cleaningDialog->statusTextEdit->setText(i18n("Starting cleanup...")); - QCheckListItem *item; + TQCheckListItem *item; bool error = false; for ( item = checklist.first(); item; item = checklist.next() ) { if(item->isOn()) { - QString statusText = i18n("Clearing %1...").arg(item->text()); + TQString statusText = i18n("Clearing %1...").arg(item->text()); cleaningDialog->statusTextEdit->append(statusText); if(item == clearThumbnails) @@ -295,7 +295,7 @@ void Privacy::cleanup() if(error) { - QString errorText = i18n("Clearing of %1 failed").arg(item->text()); + TQString errorText = i18n("Clearing of %1 failed").arg(item->text()); cleaningDialog->statusTextEdit->append(errorText); } } @@ -309,7 +309,7 @@ void Privacy::cleanup() extern "C" { - KDE_EXPORT KCModule *create_privacy(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_privacy(TQWidget *parent, const char * /*name*/) { KGlobal::locale()->insertCatalogue("privacy"); return new Privacy(parent, "Privacy"); diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h index fcec193c7..69b061f4c 100644 --- a/kcontrol/privacy/privacy.h +++ b/kcontrol/privacy/privacy.h @@ -33,7 +33,7 @@ class Privacy: public KCModule Q_OBJECT public: - Privacy( QWidget *parent=0, const char *name=0 ); + Privacy( TQWidget *parent=0, const char *name=0 ); ~Privacy(); virtual void load(); @@ -51,22 +51,22 @@ private: KPrivacySettings *p3pSettings; KPrivacyManager *m_privacymanager; - QPtrList<QCheckListItem> checklist; + TQPtrList<TQCheckListItem> checklist; KListViewItem *generalCLI; KListViewItem *webbrowsingCLI; - QCheckListItem *clearThumbnails; - QCheckListItem *clearRunCommandHistory; - QCheckListItem *clearAllCookies; - QCheckListItem *clearSavedClipboardContents; - QCheckListItem *clearWebHistory; - QCheckListItem *clearWebCache; - QCheckListItem *clearFormCompletion; - QCheckListItem *clearRecentDocuments; - QCheckListItem *clearQuickStartMenu; - QCheckListItem *clearFavIcons; - //QCheckListItem *clearFileDialogHistory; + TQCheckListItem *clearThumbnails; + TQCheckListItem *clearRunCommandHistory; + TQCheckListItem *clearAllCookies; + TQCheckListItem *clearSavedClipboardContents; + TQCheckListItem *clearWebHistory; + TQCheckListItem *clearWebCache; + TQCheckListItem *clearFormCompletion; + TQCheckListItem *clearRecentDocuments; + TQCheckListItem *clearQuickStartMenu; + TQCheckListItem *clearFavIcons; + //TQCheckListItem *clearFileDialogHistory; }; diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index 681610c66..e97cf4836 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -17,13 +17,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qlistview.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qvbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqvbuttongroup.h> #include <assert.h> #include <kiconloader.h> @@ -42,9 +42,9 @@ ConfigDialog::ConfigDialog(KGlobalAccel *accel, Ok, 0L, "config dialog" ) { if ( isApplet ) - setHelp( QString::null, "krandrtray" ); + setHelp( TQString::null, "krandrtray" ); - QFrame *w = 0L; // the parent for the widgets + TQFrame *w = 0L; // the parent for the widgets w = addVBoxPage( i18n("Global &Shortcuts") ); keysWidget = new KKeyChooser( accel, w ); @@ -60,8 +60,8 @@ void ConfigDialog::show() { if ( !isVisible() ) { KWinModule module(0, KWinModule::INFO_DESKTOP); - QSize s1 = sizeHint(); - QSize s2 = module.workArea().size(); + TQSize s1 = sizeHint(); + TQSize s2 = module.workArea().size(); int w = s1.width(); int h = s1.height(); diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index c307a8aaa..dab9a7bb8 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -20,12 +20,12 @@ #ifndef CONFIGDIALOG_H #define CONFIGDIALOG_H -#include <qcheckbox.h> -#include <qevent.h> -#include <qgroupbox.h> -#include <qheader.h> -#include <qradiobutton.h> -#include <qvbox.h> +#include <tqcheckbox.h> +#include <tqevent.h> +#include <tqgroupbox.h> +#include <tqheader.h> +#include <tqradiobutton.h> +#include <tqvbox.h> #include <kdialogbase.h> #include <keditlistbox.h> @@ -59,30 +59,30 @@ private: class ListView : public KListView { public: - ListView( ConfigDialog* configWidget, QWidget *parent, const char *name ) + ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) : KListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} - // QListView has a weird idea of a sizeHint... - virtual QSize sizeHint () const { + // TQListView has a weird idea of a sizeHint... + virtual TQSize sizeHint () const { int w = minimumSizeHint().width(); int h = header()->height(); h += viewport()->sizeHint().height(); h += horizontalScrollBar()->height(); - QListViewItem *item = firstChild(); + TQListViewItem *item = firstChild(); while ( item ) { h += item->totalHeight(); item = item->nextSibling(); } - return QSize( w, h ); + return TQSize( w, h ); } protected: - virtual void rename( QListViewItem* item, int c ); + virtual void rename( TQListViewItem* item, int c ); private: ConfigDialog* _configWidget; - QDialog* _regExpEditor; + TQDialog* _regExpEditor; }; #endif // CONFIGDIALOG_H diff --git a/kcontrol/randr/krandrbindings.cpp b/kcontrol/randr/krandrbindings.cpp index bb694a9bd..4857651a1 100644 --- a/kcontrol/randr/krandrbindings.cpp +++ b/kcontrol/randr/krandrbindings.cpp @@ -19,16 +19,16 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4, this, SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString::null, key3, key4 ) #endif #define WIN KKey::QtWIN keys->insert( "Program:krandrtray", i18n("Display Control") ); - DEF( I18N_NOOP("Switch Displays"), KShortcut::KShortcut(QString("XF86Display")), KShortcut::KShortcut(QString("XF86Display")), slotCycleDisplays() ); + DEF( I18N_NOOP("Switch Displays"), KShortcut::KShortcut(TQString("XF86Display")), KShortcut::KShortcut(TQString("XF86Display")), slotCycleDisplays() ); #undef DEF #undef WIN diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp index d1d7ec73f..087585d3f 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/krandrmodule.cpp @@ -16,16 +16,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qdesktopwidget.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qvbox.h> -#include <qvbuttongroup.h> -#include <qwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqdesktopwidget.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqvbox.h> +#include <tqvbuttongroup.h> +#include <tqwhatsthis.h> #include <kcmodule.h> #include <kcombobox.h> @@ -42,7 +42,7 @@ #include <X11/extensions/Xrandr.h> // DLL Interface for kcontrol -typedef KGenericFactory<KRandRModule, QWidget > KSSFactory; +typedef KGenericFactory<KRandRModule, TQWidget > KSSFactory; K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("krandr") ) extern "C" @@ -73,22 +73,22 @@ void KRandRModule::performApplyOnStartup() } } -KRandRModule::KRandRModule(QWidget *parent, const char *name, const QStringList&) +KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringList&) : KCModule(parent, name) , m_changed(false) { if (!isValid()) { - QVBoxLayout *topLayout = new QVBoxLayout(this); - topLayout->addWidget(new QLabel(i18n("<qt>Your X server does not support resizing and rotating the display. Please update to version 4.3 or greater. You need the X Resize And Rotate extension (RANDR) version 1.1 or greater to use this feature.</qt>"), this)); + TQVBoxLayout *topLayout = new TQVBoxLayout(this); + topLayout->addWidget(new TQLabel(i18n("<qt>Your X server does not support resizing and rotating the display. Please update to version 4.3 or greater. You need the X Resize And Rotate extension (RANDR) version 1.1 or greater to use this feature.</qt>"), this)); kdWarning() << "Error: " << errorCode() << endl; return; } - QVBoxLayout* topLayout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - QHBox* screenBox = new QHBox(this); + TQHBox* screenBox = new TQHBox(this); topLayout->addWidget(screenBox); - QLabel *screenLabel = new QLabel(i18n("Settings for screen:"), screenBox); + TQLabel *screenLabel = new TQLabel(i18n("Settings for screen:"), screenBox); m_screenSelector = new KComboBox(screenBox); for (int s = 0; s < numScreens(); s++) { @@ -97,45 +97,45 @@ KRandRModule::KRandRModule(QWidget *parent, const char *name, const QStringList& m_screenSelector->setCurrentItem(currentScreenIndex()); screenLabel->setBuddy( m_screenSelector ); - QWhatsThis::add(m_screenSelector, i18n("The screen whose settings you would like to change can be selected using this drop-down list.")); + TQWhatsThis::add(m_screenSelector, i18n("The screen whose settings you would like to change can be selected using this drop-down list.")); - connect(m_screenSelector, SIGNAL(activated(int)), SLOT(slotScreenChanged(int))); + connect(m_screenSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenChanged(int))); if (numScreens() <= 1) m_screenSelector->setEnabled(false); - QHBox* sizeBox = new QHBox(this); + TQHBox* sizeBox = new TQHBox(this); topLayout->addWidget(sizeBox); - QLabel *sizeLabel = new QLabel(i18n("Screen size:"), sizeBox); + TQLabel *sizeLabel = new TQLabel(i18n("Screen size:"), sizeBox); m_sizeCombo = new KComboBox(sizeBox); - QWhatsThis::add(m_sizeCombo, i18n("The size, otherwise known as the resolution, of your screen can be selected from this drop-down list.")); - connect(m_sizeCombo, SIGNAL(activated(int)), SLOT(slotSizeChanged(int))); + TQWhatsThis::add(m_sizeCombo, i18n("The size, otherwise known as the resolution, of your screen can be selected from this drop-down list.")); + connect(m_sizeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeChanged(int))); sizeLabel->setBuddy( m_sizeCombo ); - QHBox* refreshBox = new QHBox(this); + TQHBox* refreshBox = new TQHBox(this); topLayout->addWidget(refreshBox); - QLabel *rateLabel = new QLabel(i18n("Refresh rate:"), refreshBox); + TQLabel *rateLabel = new TQLabel(i18n("Refresh rate:"), refreshBox); m_refreshRates = new KComboBox(refreshBox); - QWhatsThis::add(m_refreshRates, i18n("The refresh rate of your screen can be selected from this drop-down list.")); - connect(m_refreshRates, SIGNAL(activated(int)), SLOT(slotRefreshChanged(int))); + TQWhatsThis::add(m_refreshRates, i18n("The refresh rate of your screen can be selected from this drop-down list.")); + connect(m_refreshRates, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRefreshChanged(int))); rateLabel->setBuddy( m_refreshRates ); - m_rotationGroup = new QButtonGroup(2, Qt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this); + m_rotationGroup = new TQButtonGroup(2, Qt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this); topLayout->addWidget(m_rotationGroup); m_rotationGroup->setRadioButtonExclusive(true); - QWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen.")); + TQWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen.")); - m_applyOnStartup = new QCheckBox(i18n("Apply settings on KDE startup"), this); + m_applyOnStartup = new TQCheckBox(i18n("Apply settings on KDE startup"), this); topLayout->addWidget(m_applyOnStartup); - QWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when KDE starts.")); - connect(m_applyOnStartup, SIGNAL(clicked()), SLOT(setChanged())); + TQWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when KDE starts.")); + connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); - QHBox* syncBox = new QHBox(this); - syncBox->layout()->addItem(new QSpacerItem(20, 1, QSizePolicy::Maximum)); - m_syncTrayApp = new QCheckBox(i18n("Allow tray application to change startup settings"), syncBox); + TQHBox* syncBox = new TQHBox(this); + syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum)); + m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox); topLayout->addWidget(syncBox); - QWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary.")); - connect(m_syncTrayApp, SIGNAL(clicked()), SLOT(setChanged())); + TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary.")); + connect(m_syncTrayApp, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); topLayout->addStretch(1); @@ -143,7 +143,7 @@ KRandRModule::KRandRModule(QWidget *parent, const char *name, const QStringList& load(); m_syncTrayApp->setEnabled(m_applyOnStartup->isChecked()); - slotScreenChanged(QApplication::desktop()->primaryScreen()); + slotScreenChanged(TQApplication::desktop()->primaryScreen()); setButtons(KCModule::Apply); } @@ -152,13 +152,13 @@ void KRandRModule::addRotationButton(int thisRotation, bool checkbox) { Q_ASSERT(m_rotationGroup); if (!checkbox) { - QRadioButton* thisButton = new QRadioButton(RandRScreen::rotationName(thisRotation), m_rotationGroup); + TQRadioButton* thisButton = new TQRadioButton(RandRScreen::rotationName(thisRotation), m_rotationGroup); thisButton->setEnabled(thisRotation & currentScreen()->rotations()); - connect(thisButton, SIGNAL(clicked()), SLOT(slotRotationChanged())); + connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged())); } else { - QCheckBox* thisButton = new QCheckBox(RandRScreen::rotationName(thisRotation), m_rotationGroup); + TQCheckBox* thisButton = new TQCheckBox(RandRScreen::rotationName(thisRotation), m_rotationGroup); thisButton->setEnabled(thisRotation & currentScreen()->rotations()); - connect(thisButton, SIGNAL(clicked()), SLOT(slotRotationChanged())); + connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged())); } } @@ -243,11 +243,11 @@ void KRandRModule::populateRefreshRates() { m_refreshRates->clear(); - QStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize()); + TQStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize()); m_refreshRates->setEnabled(rr.count()); - for (QStringList::Iterator it = rr.begin(); it != rr.end(); ++it) + for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it) m_refreshRates->insertItem(*it); } diff --git a/kcontrol/randr/krandrmodule.h b/kcontrol/randr/krandrmodule.h index b542299e8..a8a00a464 100644 --- a/kcontrol/randr/krandrmodule.h +++ b/kcontrol/randr/krandrmodule.h @@ -30,7 +30,7 @@ class KRandRModule : public KCModule, public KRandrSimpleAPI Q_OBJECT public: - KRandRModule(QWidget *parent, const char *name, const QStringList& _args); + KRandRModule(TQWidget *parent, const char *name, const TQStringList& _args); virtual void load(); virtual void load(bool useDefaults); @@ -55,10 +55,10 @@ protected: KComboBox* m_screenSelector; KComboBox* m_sizeCombo; - QButtonGroup* m_rotationGroup; + TQButtonGroup* m_rotationGroup; KComboBox* m_refreshRates; - QCheckBox* m_applyOnStartup; - QCheckBox* m_syncTrayApp; + TQCheckBox* m_applyOnStartup; + TQCheckBox* m_syncTrayApp; bool m_oldApply; bool m_oldSyncTrayApp; diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp index 858014014..5cf6fa6b2 100644 --- a/kcontrol/randr/krandrpassivepopup.cpp +++ b/kcontrol/randr/krandrpassivepopup.cpp @@ -25,14 +25,14 @@ // widgets moves (needed because after a resolution switch Kicker will // reposition itself, causing normal KPassivePopup to stay at weird places) -KRandrPassivePopup::KRandrPassivePopup( QWidget *parent, const char *name, WFlags f ) +KRandrPassivePopup::KRandrPassivePopup( TQWidget *parent, const char *name, WFlags f ) : KPassivePopup( parent, name, f ) { - connect( &update_timer, SIGNAL( timeout()), SLOT( slotPositionSelf())); + connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( slotPositionSelf())); } -KRandrPassivePopup* KRandrPassivePopup::message( const QString &caption, const QString &text, - const QPixmap &icon, QWidget *parent, const char *name, int timeout ) +KRandrPassivePopup* KRandrPassivePopup::message( const TQString &caption, const TQString &text, + const TQPixmap &icon, TQWidget *parent, const char *name, int timeout ) { KRandrPassivePopup *pop = new KRandrPassivePopup( parent, name ); pop->setAutoDelete( true ); @@ -43,7 +43,7 @@ KRandrPassivePopup* KRandrPassivePopup::message( const QString &caption, const Q return pop; } -void KRandrPassivePopup::startWatchingWidget( QWidget* widget_P ) +void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) { static Atom wm_state = XInternAtom( qt_xdisplay() , "WM_STATE", False ); Window win = widget_P->winId(); @@ -60,7 +60,7 @@ void KRandrPassivePopup::startWatchingWidget( QWidget* widget_P ) break; win = parent; - QWidget* widget = QWidget::find( win ); + TQWidget* widget = TQWidget::find( win ); if( widget != NULL ) { widget->installEventFilter( this ); @@ -91,11 +91,11 @@ void KRandrPassivePopup::startWatchingWidget( QWidget* widget_P ) kapp->installX11EventFilter( this ); } -bool KRandrPassivePopup::eventFilter( QObject* o, QEvent* e ) +bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) { - if( e->type() == QEvent::Move && o->isWidgetType() - && watched_widgets.contains( static_cast< QWidget* >( o ))) - QTimer::singleShot( 0, this, SLOT( slotPositionSelf())); + if( e->type() == TQEvent::Move && o->isWidgetType() + && watched_widgets.contains( static_cast< TQWidget* >( o ))) + TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf())); return false; } diff --git a/kcontrol/randr/krandrpassivepopup.h b/kcontrol/randr/krandrpassivepopup.h index 6e86c336c..3b1d4b4f6 100644 --- a/kcontrol/randr/krandrpassivepopup.h +++ b/kcontrol/randr/krandrpassivepopup.h @@ -20,8 +20,8 @@ #define __RANDRPASSIVEPOPUP_H__ #include <kpassivepopup.h> -#include <qvaluelist.h> -#include <qtimer.h> +#include <tqvaluelist.h> +#include <tqtimer.h> #include <X11/Xlib.h> class KRandrPassivePopup @@ -29,19 +29,19 @@ class KRandrPassivePopup { Q_OBJECT public: - static KRandrPassivePopup *message( const QString &caption, const QString &text, - const QPixmap &icon, QWidget *parent, const char *name=0, int timeout = -1 ); + static KRandrPassivePopup *message( const TQString &caption, const TQString &text, + const TQPixmap &icon, TQWidget *parent, const char *name=0, int timeout = -1 ); protected: - virtual bool eventFilter( QObject* o, QEvent* e ); + virtual bool eventFilter( TQObject* o, TQEvent* e ); virtual bool x11Event( XEvent* e ); private slots: void slotPositionSelf(); private: - KRandrPassivePopup( QWidget *parent=0, const char *name=0, WFlags f=0 ); - void startWatchingWidget( QWidget* w ); - QValueList< QWidget* > watched_widgets; - QValueList< Window > watched_windows; - QTimer update_timer; + KRandrPassivePopup( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + void startWatchingWidget( TQWidget* w ); + TQValueList< TQWidget* > watched_widgets; + TQValueList< Window > watched_windows; + TQTimer update_timer; }; #endif diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index bee4a5e10..4424e4036 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qtimer.h> -#include <qtooltip.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <kaction.h> #include <kapplication.h> @@ -46,15 +46,15 @@ #define OUTPUT_ON (1 << 3) #define OUTPUT_ALL (0xf) -KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name) +KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) : KSystemTray(parent, name) , m_popupUp(false) , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection())) { setPixmap(KSystemTray::loadSizedIcon("randr", width())); setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - connect(this, SIGNAL(quitSelected()), this, SLOT(_quit())); - QToolTip::add(this, i18n("Screen resize & rotate")); + connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); + TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; //printf("Reading configuration...\n\r"); @@ -66,10 +66,10 @@ KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name) globalKeys->setEnabled(true); globalKeys->updateConnections(); - connect(kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int))); + connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); #if (QT_VERSION-0 >= 0x030200) // XRANDR support -// connect(this, SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), SLOT( desktopResized())); +// connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized())); #endif randr_display = XOpenDisplay(NULL); @@ -81,7 +81,7 @@ KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name) t_config = new KSimpleConfig("kiccconfigrc"); - QString cur_profile; + TQString cur_profile; cur_profile = getCurrentProfile(); if (cur_profile != "") { applyIccConfiguration(cur_profile, NULL); @@ -89,14 +89,14 @@ KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name) } /*! - * \b SLOT which called if krandrtray is exited by the user. In this case the user + * \b TQT_SLOT which called if krandrtray is exited by the user. In this case the user * is asked through a yes/no box if "KRandRTray should start automatically on log in" and the * result is written to the KDE configfile. */ void KRandRSystemTray::_quit (){ r_config = new KSimpleConfig("krandrtrayrc"); - QString tmp1 = i18n ("Start KRandRTray automatically when you log in?"); + TQString tmp1 = i18n ("Start KRandRTray automatically when you log in?"); int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); r_config->setGroup("General"); r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes); @@ -105,12 +105,12 @@ void KRandRSystemTray::_quit (){ exit(0); } -void KRandRSystemTray::resizeEvent ( QResizeEvent * ) +void KRandRSystemTray::resizeEvent ( TQResizeEvent * ) { // Honor Free Desktop specifications that allow for arbitrary system tray icon sizes - QPixmap origpixmap; - QPixmap scaledpixmap; - QImage newIcon; + TQPixmap origpixmap; + TQPixmap scaledpixmap; + TQImage newIcon; origpixmap = KSystemTray::loadSizedIcon( "randr", width() ); newIcon = origpixmap; newIcon = newIcon.smoothScale(width(), height()); @@ -118,7 +118,7 @@ void KRandRSystemTray::resizeEvent ( QResizeEvent * ) setPixmap(scaledpixmap); } -void KRandRSystemTray::mousePressEvent(QMouseEvent* e) +void KRandRSystemTray::mousePressEvent(TQMouseEvent* e) { // Popup the context menu with left-click if (e->button() == LeftButton) { @@ -203,11 +203,11 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) /*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1)); menu->setItemEnabled(lastIndex, false);*/ } else { - KPopupMenu* subMenu = new KPopupMenu(menu, QString("screen%1").arg(s+1).latin1()); + KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); m_screenPopups.append(subMenu); populateMenu(subMenu); lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); - connect(subMenu, SIGNAL(activated(int)), SLOT(slotScreenActivated())); + connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenActivated())); } } @@ -218,34 +218,34 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) addOutputMenu(menu); // Find any user ICC profiles - QStringList cfgProfiles; + TQStringList cfgProfiles; cfgProfiles = t_config->groupList(); if (cfgProfiles.isEmpty() == false) { menu->insertTitle(SmallIcon("kcoloredit"), i18n("Color Profile")); } - for (QStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t) { + for (TQStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t) { lastIndex = menu->insertItem(*t); if (t_config->readEntry("CurrentProfile") == (*t)) { menu->setItemChecked(lastIndex, true); } menu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false)); - menu->connectItem(lastIndex, this, SLOT(slotColorProfileChanged(int))); + menu->connectItem(lastIndex, this, TQT_SLOT(slotColorProfileChanged(int))); } menu->insertTitle(SmallIcon("randr"), i18n("Global Configuation")); KAction *actColors = new KAction( i18n( "Configure Color Profiles..." ), - SmallIconSet( "configure" ), KShortcut(), this, SLOT( slotColorConfig() ), + SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotColorConfig() ), actionCollection() ); actColors->plug( menu ); // KAction *actPrefs = new KAction( i18n( "Configure Display..." ), -// SmallIconSet( "configure" ), KShortcut(), this, SLOT( slotPrefs() ), +// SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotPrefs() ), // actionCollection() ); // actPrefs->plug( menu ); KAction *actSKeys = new KAction( i18n( "Configure Shortcut Keys..." ), - SmallIconSet( "configure" ), KShortcut(), this, SLOT( slotSKeys() ), + SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotSKeys() ), actionCollection() ); actSKeys->plug( menu ); @@ -286,7 +286,7 @@ void KRandRSystemTray::configChanged() first = false; - QString cur_profile; + TQString cur_profile; cur_profile = getCurrentProfile(); if (cur_profile != "") { applyIccConfiguration(cur_profile, NULL); @@ -363,7 +363,7 @@ void KRandRSystemTray::populateMenu(KPopupMenu* menu) menu->setItemChecked(lastIndex, true); menu->setItemParameter(lastIndex, highestIndex); - menu->connectItem(lastIndex, this, SLOT(slotResolutionChanged(int))); + menu->connectItem(lastIndex, this, TQT_SLOT(slotResolutionChanged(int))); } delete [] sizeSort; sizeSort = 0L; @@ -381,25 +381,25 @@ void KRandRSystemTray::populateMenu(KPopupMenu* menu) menu->setItemChecked(lastIndex, true); menu->setItemParameter(lastIndex, 1 << i); - menu->connectItem(lastIndex, this, SLOT(slotOrientationChanged(int))); + menu->connectItem(lastIndex, this, TQT_SLOT(slotOrientationChanged(int))); } } } - QStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize()); + TQStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize()); if (rr.count()) menu->insertTitle(SmallIcon("clock"), i18n("Refresh Rate")); int i = 0; - for (QStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++) { + for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++) { lastIndex = menu->insertItem(*it); if (currentScreen()->proposedRefreshRate() == i) menu->setItemChecked(lastIndex, true); menu->setItemParameter(lastIndex, i); - menu->connectItem(lastIndex, this, SLOT(slotRefreshRateChanged(int))); + menu->connectItem(lastIndex, this, TQT_SLOT(slotRefreshRateChanged(int))); } } @@ -488,7 +488,7 @@ void KRandRSystemTray::slotSKeys() { ConfigDialog *dlg = new ConfigDialog(globalKeys, true); - if ( dlg->exec() == QDialog::Accepted ) { + if ( dlg->exec() == TQDialog::Accepted ) { dlg->commitShortcuts(); globalKeys->writeSettings(0, true); globalKeys->updateConnections(); @@ -709,7 +709,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu) lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name)); menu->setItemChecked(lastIndex, true); - menu->connectItem(lastIndex, this, SLOT(slotOutputChanged(int))); + menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); menu->setItemParameter(lastIndex, i); connected_displays++; @@ -732,7 +732,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu) lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name)); menu->setItemChecked(lastIndex, false); - menu->connectItem(lastIndex, this, SLOT(slotOutputChanged(int))); + menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); menu->setItemParameter(lastIndex, i); connected_displays++; @@ -756,7 +756,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu) lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name)); menu->setItemChecked(lastIndex, false); menu->setItemEnabled(lastIndex, false); - menu->connectItem(lastIndex, this, SLOT(slotOutputChanged(int))); + menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); menu->setItemParameter(lastIndex, i); } @@ -764,7 +764,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu) if (connected_displays < 2) { menu->setItemEnabled(lastIndex, false); } - menu->connectItem(lastIndex, this, SLOT(slotCycleDisplays())); + menu->connectItem(lastIndex, this, TQT_SLOT(slotCycleDisplays())); } } diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h index 640a38697..f0d8d7367 100644 --- a/kcontrol/randr/krandrtray.h +++ b/kcontrol/randr/krandrtray.h @@ -19,7 +19,7 @@ #ifndef KRANDRTRAY_H #define KRANDRTRAY_H -#include <qptrlist.h> +#include <tqptrlist.h> #include <ksystemtray.h> #include <kglobalaccel.h> @@ -34,7 +34,7 @@ class KRandRSystemTray : public KSystemTray, public KRandrSimpleAPI Q_OBJECT public: - KRandRSystemTray(QWidget* parent = 0, const char *name = 0); + KRandRSystemTray(TQWidget* parent = 0, const char *name = 0); KGlobalAccel *globalKeys; virtual void contextMenuAboutToShow(KPopupMenu* menu); @@ -58,8 +58,8 @@ protected slots: void slotColorProfileChanged(int parameter); protected: - void mousePressEvent( QMouseEvent *e ); - void resizeEvent ( QResizeEvent * ); + void mousePressEvent( TQMouseEvent *e ); + void resizeEvent ( TQResizeEvent * ); private: void populateMenu(KPopupMenu* menu); @@ -70,11 +70,11 @@ private: bool m_popupUp; KHelpMenu* m_help; - QPtrList<KPopupMenu> m_screenPopups; + TQPtrList<KPopupMenu> m_screenPopups; Display *randr_display; ScreenInfo *randr_screen_info; - QWidget* my_parent; + TQWidget* my_parent; int last_known_x; int last_known_y; diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index a88e2448f..fd31f7800 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -23,20 +23,20 @@ #include "kcmsambaimports.h" #include "kcmsambaimports.moc" -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kdialog.h> #include <stdio.h> -ImportsView::ImportsView(QWidget * parent, KConfig *config, const char * name ) - : QWidget (parent, name) +ImportsView::ImportsView(TQWidget * parent, KConfig *config, const char * name ) + : TQWidget (parent, name) ,configFile(config) ,list(this) { - QBoxLayout *topLayout = new QVBoxLayout(this, KDialog::marginHint(), + TQBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); topLayout->setAutoAdd(true); @@ -47,7 +47,7 @@ ImportsView::ImportsView(QWidget * parent, KConfig *config, const char * name ) list.addColumn(i18n("Resource"), 200); list.addColumn(i18n("Mounted Under"), 190); - QWhatsThis::add( this, i18n("This list shows the Samba and NFS shared" + TQWhatsThis::add( this, i18n("This list shows the Samba and NFS shared" " resources mounted on your system from other hosts. The \"Type\"" " column tells you whether the mounted resource is a Samba or an NFS" " type of resource. The \"Resource\" column shows the descriptive name" @@ -56,7 +56,7 @@ ImportsView::ImportsView(QWidget * parent, KConfig *config, const char * name ) " resource is mounted.") ); timer.start(10000); - QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(updateList())); + TQObject::connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList())); updateList(); } @@ -65,7 +65,7 @@ void ImportsView::updateList() list.clear(); char *e; char buf[250]; - QCString s(""),strSource, strMount, strType; + TQCString s(""),strSource, strMount, strType; FILE *f=popen("mount","r"); if (f==0) return; do @@ -85,7 +85,7 @@ void ImportsView::updateList() int pos(strMount.find(" type ")); if (pos==-1) pos=strMount.find(" read/"); strMount=strMount.left(pos); - new QListViewItem(&list,strType,strSource,strMount); + new TQListViewItem(&list,strType,strSource,strMount); }; }; } diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h index 5cd1c5e92..56ddb5f36 100644 --- a/kcontrol/samba/kcmsambaimports.h +++ b/kcontrol/samba/kcmsambaimports.h @@ -24,22 +24,22 @@ #ifndef kcmsambaimports_h_included #define kcmsambaimports_h_included -#include <qtimer.h> -#include <qlistview.h> +#include <tqtimer.h> +#include <tqlistview.h> #include <kconfig.h> class ImportsView: public QWidget { Q_OBJECT public: - ImportsView(QWidget *parent, KConfig *config=0, const char * name=0); + ImportsView(TQWidget *parent, KConfig *config=0, const char * name=0); virtual ~ImportsView() {}; void saveSettings() {}; void loadSettings() {}; private: KConfig *configFile; - QListView list; - QTimer timer; + TQListView list; + TQTimer timer; private slots: void updateList(); }; diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index c4f01b464..224bc6fa2 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -21,9 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qfile.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqfile.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> #include <kmessagebox.h> #include <kdialog.h> @@ -34,8 +34,8 @@ #define LOG_SCREEN_XY_OFFSET 10 -LogView::LogView(QWidget *parent,KConfig *config, const char *name) -: QWidget (parent, name) +LogView::LogView(TQWidget *parent,KConfig *config, const char *name) +: TQWidget (parent, name) ,configFile(config) ,filesCount(0) ,connectionsCount(0) @@ -48,50 +48,50 @@ LogView::LogView(QWidget *parent,KConfig *config, const char *name) ,showFileClose(i18n("Show closed files"),this) ,updateButton(i18n("&Update"),this) { - QVBoxLayout *mainLayout=new QVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *mainLayout=new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QHBoxLayout *leLayout=new QHBoxLayout(mainLayout); + TQHBoxLayout *leLayout=new TQHBoxLayout(mainLayout); leLayout->addWidget(&label); leLayout->addWidget(&logFileName,1); mainLayout->addWidget(&viewHistory,1); - QGridLayout *subLayout=new QGridLayout(mainLayout,2,2); + TQGridLayout *subLayout=new TQGridLayout(mainLayout,2,2); subLayout->addWidget(&showConnOpen,0,0); subLayout->addWidget(&showConnClose,1,0); subLayout->addWidget(&showFileOpen,0,1); subLayout->addWidget(&showFileClose,1,1); mainLayout->addWidget(&updateButton,0,Qt::AlignLeft); - QWhatsThis::add( &logFileName, i18n("This page presents the contents of" + TQWhatsThis::add( &logFileName, i18n("This page presents the contents of" " your samba log file in a friendly layout. Check that the correct log" " file for your computer is listed here. If you need to, correct the name" " or location of the log file, and then click the \"Update\" button.") ); - QWhatsThis::add( &showConnOpen, i18n("Check this option if you want to" + TQWhatsThis::add( &showConnOpen, i18n("Check this option if you want to" " view the details for connections opened to your computer.") ); - QWhatsThis::add( &showConnClose, i18n("Check this option if you want to" + TQWhatsThis::add( &showConnClose, i18n("Check this option if you want to" " view the events when connections to your computer were closed.") ); - QWhatsThis::add( &showFileOpen, i18n("Check this option if you want to" + TQWhatsThis::add( &showFileOpen, i18n("Check this option if you want to" " see the files which were opened on your computer by remote users." " Note that file open/close events are not logged unless the samba" " log level is set to at least 2 (you cannot set the log level" " using this module).") ); - QWhatsThis::add( &showFileClose, i18n("Check this option if you want to" + TQWhatsThis::add( &showFileClose, i18n("Check this option if you want to" " see the events when files opened by remote users were closed." " Note that file open/close events are not logged unless the samba" " log level is set to at least 2 (you cannot set the log level" " using this module).") ); - QWhatsThis::add( &updateButton, i18n("Click here to refresh the information" + TQWhatsThis::add( &updateButton, i18n("Click here to refresh the information" " on this page. The log file (shown above) will be read to obtain the" " events logged by samba.") ); logFileName.setURL("/var/log/samba.log"); viewHistory.setAllColumnsShowFocus(TRUE); - viewHistory.setFocusPolicy(QWidget::ClickFocus); + viewHistory.setFocusPolicy(TQWidget::ClickFocus); viewHistory.setShowSortIndicator(true); viewHistory.addColumn(i18n("Date & Time"),130); @@ -99,7 +99,7 @@ LogView::LogView(QWidget *parent,KConfig *config, const char *name) viewHistory.addColumn(i18n("Service/File"),210); viewHistory.addColumn(i18n("Host/User"),150); - QWhatsThis::add( &viewHistory, i18n("This list shows details of the events" + TQWhatsThis::add( &viewHistory, i18n("This list shows details of the events" " logged by samba. Note that events at the file level are not logged" " unless you have configured the log level for samba to 2 or greater.<p>" " As with many other lists in KDE, you can click on a column heading" @@ -113,7 +113,7 @@ LogView::LogView(QWidget *parent,KConfig *config, const char *name) showFileOpen.setChecked(FALSE); showFileClose.setChecked(FALSE); - connect(&updateButton,SIGNAL(clicked()),this,SLOT(updateList())); + connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList())); emit contentsChanged(&viewHistory,0,0); label.setMinimumSize(label.sizeHint()); @@ -158,10 +158,10 @@ void LogView::saveSettings() //caution ! high optimized code :-) void LogView::updateList() { - QFile logFile(logFileName.url()); + TQFile logFile(logFileName.url()); if (logFile.open(IO_ReadOnly)) { - QApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(waitCursor); viewHistory.clear(); filesCount=0; connectionsCount=0; @@ -242,11 +242,11 @@ void LogView::updateList() }; logFile.close(); emit contentsChanged(&viewHistory, filesCount, connectionsCount); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } else { - QString tmp = i18n("Could not open file %1").arg(logFileName.url()); + TQString tmp = i18n("Could not open file %1").arg(logFileName.url()); KMessageBox::error(this,tmp); }; } diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h index 03e22f872..d0b427d48 100644 --- a/kcontrol/samba/kcmsambalog.h +++ b/kcontrol/samba/kcmsambalog.h @@ -23,12 +23,12 @@ #ifndef kcmsambalog_h_included #define kcmsambalog_h_included -#include <qlabel.h> -#include <qcstring.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qlistview.h> -#include <qevent.h> +#include <tqlabel.h> +#include <tqcstring.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqlistview.h> +#include <tqevent.h> #include <kconfig.h> #include <kurlrequester.h> @@ -39,7 +39,7 @@ class LogView: public QWidget { Q_OBJECT public: - LogView(QWidget *parent=0, KConfig *config=0, const char *name=0); + LogView(TQWidget *parent=0, KConfig *config=0, const char *name=0); virtual ~LogView() {}; void saveSettings(); void loadSettings(); @@ -47,26 +47,26 @@ class LogView: public QWidget KConfig *configFile; int filesCount, connectionsCount; KURLRequester logFileName; - QLabel label; - QListView viewHistory; - QCheckBox showConnOpen, showConnClose, showFileOpen, showFileClose; - QPushButton updateButton; + TQLabel label; + TQListView viewHistory; + TQCheckBox showConnOpen, showConnClose, showFileOpen, showFileClose; + TQPushButton updateButton; private slots: void updateList(); signals: - void contentsChanged(QListView* list, int nrOfFiles, int nrOfConnections); + void contentsChanged(TQListView* list, int nrOfFiles, int nrOfConnections); }; class QListViewItemX:public QListViewItem { public: //a faster constructor saves a lot time - QListViewItemX( QListView * parent, + QListViewItemX( TQListView * parent, const char *c0, const char *c1 = 0, const char *c2 = 0, const char *c3 = 0, const char *c4 = 0, const char *c5 = 0, const char *c6 = 0, const char *c7 = 0 ) - :QListViewItem(parent) + :TQListViewItem(parent) { setText( 0, c0 ); setText( 1, c1 ); diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index ebdd1c092..4da2045cb 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -23,44 +23,44 @@ #include "kcmsambastatistics.h" #include "kcmsambastatistics.moc" -#include <qlayout.h> -#include <qlistview.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qpushbutton.h> -#include <qregexp.h> +#include <tqlayout.h> +#include <tqlistview.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqpushbutton.h> +#include <tqregexp.h> #include <kglobal.h> #include <klocale.h> #include <kdebug.h> #include <kdialog.h> -StatisticsView::StatisticsView(QWidget *parent,KConfig *config, const char *name) - :QWidget (parent, name) +StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *name) + :TQWidget (parent, name) ,configFile(config) ,dataList(0) ,connectionsCount(0) ,filesCount(0) ,calcCount(0) { - viewStatistics = new QListView( this ); - connectionsL = new QLabel( i18n( "Connections: 0" ), this ); - filesL = new QLabel( i18n( "File accesses: 0" ), this ); - eventCb = new QComboBox( false, this ); - eventL = new QLabel( eventCb, i18n( "Event: " ), this ); - serviceLe = new QLineEdit( this ); - serviceL = new QLabel( serviceLe, i18n( "Service/File:" ), this ); - hostLe = new QLineEdit( this ); - hostL = new QLabel( hostLe, i18n( "Host/User:" ), this ); - calcButton = new QPushButton( i18n( "&Search" ), this ); - clearButton = new QPushButton( i18n( "Clear Results" ), this ); - expandedInfoCb = new QCheckBox( i18n( "Show expanded service info" ), this ); - expandedUserCb = new QCheckBox( i18n( "Show expanded host info" ), this ); + viewStatistics = new TQListView( this ); + connectionsL = new TQLabel( i18n( "Connections: 0" ), this ); + filesL = new TQLabel( i18n( "File accesses: 0" ), this ); + eventCb = new TQComboBox( false, this ); + eventL = new TQLabel( eventCb, i18n( "Event: " ), this ); + serviceLe = new TQLineEdit( this ); + serviceL = new TQLabel( serviceLe, i18n( "Service/File:" ), this ); + hostLe = new TQLineEdit( this ); + hostL = new TQLabel( hostLe, i18n( "Host/User:" ), this ); + calcButton = new TQPushButton( i18n( "&Search" ), this ); + clearButton = new TQPushButton( i18n( "Clear Results" ), this ); + expandedInfoCb = new TQCheckBox( i18n( "Show expanded service info" ), this ); + expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this ); viewStatistics->setAllColumnsShowFocus(TRUE); - viewStatistics->setFocusPolicy(QWidget::ClickFocus); + viewStatistics->setFocusPolicy(TQWidget::ClickFocus); viewStatistics->setShowSortIndicator(true); viewStatistics->addColumn(i18n("Nr"),30); @@ -93,14 +93,14 @@ StatisticsView::StatisticsView(QWidget *parent,KConfig *config, const char *name expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint()); expandedUserCb->setMinimumSize(expandedUserCb->sizeHint()); - QVBoxLayout *topLayout=new QVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); topLayout->addWidget(viewStatistics,1); - QGridLayout *subLayout=new QGridLayout(topLayout,4,3); + TQGridLayout *subLayout=new TQGridLayout(topLayout,4,3); subLayout->setColStretch(1,1); subLayout->setColStretch(2,1); - QHBoxLayout *twoButtonsLayout=new QHBoxLayout; + TQHBoxLayout *twoButtonsLayout=new QHBoxLayout; twoButtonsLayout->addWidget(calcButton,1); twoButtonsLayout->addWidget(clearButton,1); @@ -116,12 +116,12 @@ StatisticsView::StatisticsView(QWidget *parent,KConfig *config, const char *name subLayout->addWidget(expandedInfoCb,3,1); subLayout->addWidget(expandedUserCb,3,2); - connect(clearButton,SIGNAL(clicked()),this,SLOT(clearStatistics())); - connect(calcButton,SIGNAL(clicked()),this,SLOT(calculate())); + connect(clearButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearStatistics())); + connect(calcButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(calculate())); setListInfo(0,0,0); } -void StatisticsView::setListInfo(QListView *list, int nrOfFiles, int nrOfConnections) +void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnections) { dataList=list; filesCount=nrOfFiles; @@ -134,7 +134,7 @@ void StatisticsView::setListInfo(QListView *list, int nrOfFiles, int nrOfConnect void StatisticsView::calculate() { if (dataList==0) return; - QApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(waitCursor); int connCount(0); if (eventCb->currentText()==i18n("Connection")) connCount=1; @@ -142,16 +142,16 @@ void StatisticsView::calculate() if ((expandedInfoCb->isChecked()) || (expandedUserCb->isChecked())) { SambaLog sLog; - QRegExp rService(serviceLe->text(),FALSE,TRUE); - QRegExp rHost(hostLe->text(),FALSE,TRUE); - QString item2, item3; - QListViewItem* item=dataList->firstChild(); + TQRegExp rService(serviceLe->text(),FALSE,TRUE); + TQRegExp rHost(hostLe->text(),FALSE,TRUE); + TQString item2, item3; + TQListViewItem* item=dataList->firstChild(); while (item!=0) { if (connCount) { - if ((QString(item->text(1)).contains(i18n("CONNECTION OPENED"))) - && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -163,8 +163,8 @@ void StatisticsView::calculate() } else { - if ((QString(item->text(1)).contains(i18n("FILE OPENED"))) - && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -181,11 +181,11 @@ void StatisticsView::calculate() for (SmallLogItem *tmpStr=tmpItem->accessed.first();tmpStr!=0;tmpStr=tmpItem->accessed.next()) { calcCount++; - QString number(""); + TQString number(""); number.sprintf("%6d",calcCount); - QString hits(""); + TQString hits(""); hits.sprintf("%7d",tmpStr->count); - new QListViewItem(viewStatistics,number,eventCb->currentText(),tmpItem->name,tmpStr->name,hits); + new TQListViewItem(viewStatistics,number,eventCb->currentText(),tmpItem->name,tmpStr->name,hits); }; }; } @@ -194,32 +194,32 @@ void StatisticsView::calculate() { calcCount++; int count(0); - QRegExp rService(serviceLe->text(),FALSE,TRUE); - QRegExp rHost(hostLe->text(),FALSE,TRUE); - QListViewItem* item=dataList->firstChild(); + TQRegExp rService(serviceLe->text(),FALSE,TRUE); + TQRegExp rHost(hostLe->text(),FALSE,TRUE); + TQListViewItem* item=dataList->firstChild(); while (item!=0) { if (connCount) { - if ((QString(item->text(1)).contains(i18n("CONNECTION OPENED"))) - && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) count++; } else { - if ((QString(item->text(1)).contains(i18n("FILE OPENED"))) - && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) count++; }; item=item->nextSibling(); }; - QString number(""); + TQString number(""); number.sprintf("%6d",calcCount); - QString hits(""); + TQString hits(""); hits.sprintf("%7d",count); - new QListViewItem(viewStatistics,number,eventCb->currentText(),serviceLe->text(),hostLe->text(),hits); + new TQListViewItem(viewStatistics,number,eventCb->currentText(),serviceLe->text(),hostLe->text(),hits); }; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } void StatisticsView::clearStatistics() @@ -240,7 +240,7 @@ void SambaLog::printItems() kdDebug() << "------ end of printing ------" << endl << endl; } -LogItem* SambaLog::itemInList(QString name) +LogItem* SambaLog::itemInList(TQString name) { LogItem* tmpItem(items.first()); LogItem* foundItem(0); @@ -252,7 +252,7 @@ LogItem* SambaLog::itemInList(QString name) return foundItem; } -void SambaLog::addItem(QString share, QString user) +void SambaLog::addItem(TQString share, TQString user) { //cout<<" adding connection: -"<<share<<"- -"<<user<<"-"<<endl; LogItem* tmp(itemInList(share)); @@ -267,7 +267,7 @@ void SambaLog::addItem(QString share, QString user) }; } -SmallLogItem* LogItem::itemInList(QString name) +SmallLogItem* LogItem::itemInList(TQString name) { SmallLogItem* tmpItem(accessed.first()); SmallLogItem* foundItem(0); @@ -279,7 +279,7 @@ SmallLogItem* LogItem::itemInList(QString name) return foundItem; } -void LogItem::addItem (QString host) +void LogItem::addItem (TQString host) { SmallLogItem* tmp(itemInList(host)); if (tmp!=0) diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h index 66a9474ab..958e45a55 100644 --- a/kcontrol/samba/kcmsambastatistics.h +++ b/kcontrol/samba/kcmsambastatistics.h @@ -23,8 +23,8 @@ #ifndef kcmsambastatistics_h_included #define kcmsambastatistics_h_included -#include <qwidget.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> class QListView; class QLabel; @@ -39,8 +39,8 @@ class SmallLogItem { public: SmallLogItem():name(""),count(0){}; - SmallLogItem(QString n):name(n),count(1){}; - QString name; + SmallLogItem(TQString n):name(n),count(1){}; + TQString name; int count; }; @@ -48,17 +48,17 @@ class LogItem { public: LogItem():name(""), accessed(),count(0) {}; - LogItem(QString n, QString a):name(n), accessed(), count(1) + LogItem(TQString n, TQString a):name(n), accessed(), count(1) { accessed.setAutoDelete(TRUE); accessed.append(new SmallLogItem(a)); }; - QString name; - //QStrList accessedBy; - QPtrList<SmallLogItem> accessed; + TQString name; + //TQStrList accessedBy; + TQPtrList<SmallLogItem> accessed; int count; - SmallLogItem* itemInList(QString name); - void addItem (QString host); + SmallLogItem* itemInList(TQString name); + void addItem (TQString host); }; class SambaLog @@ -68,36 +68,36 @@ class SambaLog { items.setAutoDelete(TRUE); }; - QPtrList<LogItem> items; - void addItem (QString share, QString host); + TQPtrList<LogItem> items; + void addItem (TQString share, TQString host); void printItems(); private: - LogItem* itemInList(QString name); + LogItem* itemInList(TQString name); }; class StatisticsView: public QWidget { Q_OBJECT public: - StatisticsView(QWidget *parent=0, KConfig *config=0, const char *name=0); + StatisticsView(TQWidget *parent=0, KConfig *config=0, const char *name=0); virtual ~StatisticsView() {}; void saveSettings() {}; void loadSettings() {}; public slots: - void setListInfo(QListView *list, int nrOfFiles, int nrOfConnections); + void setListInfo(TQListView *list, int nrOfFiles, int nrOfConnections); private: KConfig *configFile; - QListView *dataList; - QListView* viewStatistics; - QLabel* connectionsL, *filesL; - QComboBox* eventCb; - QLabel* eventL; - QLineEdit* serviceLe; - QLabel* serviceL; - QLineEdit* hostLe; - QLabel* hostL; - QPushButton* calcButton, *clearButton; - QCheckBox* expandedInfoCb, *expandedUserCb; + TQListView *dataList; + TQListView* viewStatistics; + TQLabel* connectionsL, *filesL; + TQComboBox* eventCb; + TQLabel* eventL; + TQLineEdit* serviceLe; + TQLabel* serviceL; + TQLineEdit* hostLe; + TQLabel* hostL; + TQPushButton* calcButton, *clearButton; + TQCheckBox* expandedInfoCb, *expandedUserCb; int connectionsCount, filesCount, calcCount; private slots: void clearStatistics(); diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index b5bc6599f..c94bc5129 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -22,7 +22,7 @@ #include <string.h> #include <time.h> -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include <kdialog.h> @@ -32,10 +32,10 @@ #define Before(ttf,in) in.left(in.find(ttf)) -#define After(ttf,in) (in.contains(ttf)?QString(in.mid(in.find(ttf)+QString(ttf).length())):QString("")) +#define After(ttf,in) (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString("")) -NetMon::NetMon( QWidget * parent, KConfig *config, const char * name ) - : QWidget(parent, name) +NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) + : TQWidget(parent, name) ,configFile(config) ,showmountProc(0) ,strShare("") @@ -49,12 +49,12 @@ NetMon::NetMon( QWidget * parent, KConfig *config, const char * name ) ,iMachine(0) ,iPid(0) { - QBoxLayout *topLayout = new QVBoxLayout(this, KDialog::marginHint(), + TQBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); topLayout->setAutoAdd(true); - list=new QListView(this,"Hello"); - version=new QLabel(this); + list=new TQListView(this,"Hello"); + version=new TQLabel(this); list->setAllColumnsShowFocus(true); list->setMinimumSize(425,200); @@ -68,22 +68,22 @@ NetMon::NetMon( QWidget * parent, KConfig *config, const char * name ) list->addColumn(i18n("PID")); list->addColumn(i18n("Open Files")); - timer = new QTimer(this); + timer = new TQTimer(this); timer->start(15000); - QObject::connect(timer, SIGNAL(timeout()), this, SLOT(update())); + TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update())); update(); } void NetMon::processNFSLine(char *bufline, int) { - QCString line(bufline); + TQCString line(bufline); if (line.contains(":/")) - new QListViewItem(list,"NFS",After(":",line),Before(":/",line)); + new TQListViewItem(list,"NFS",After(":",line),Before(":/",line)); } void NetMon::processSambaLine(char *bufline, int) { - QCString line(bufline); + TQCString line(bufline); rownumber++; if (rownumber == 2) version->setText(bufline); // second line = samba version @@ -107,7 +107,7 @@ void NetMon::processSambaLine(char *bufline, int) line=line.mid(iMachine,line.length()); strMachine=line; - new QListViewItem(list,"SMB",strShare,strMachine, strUser,strGroup,strPid/*,strSince*/); + new TQListViewItem(list,"SMB",strShare,strMachine, strUser,strGroup,strPid/*,strSince*/); } else if (readingpart==connexions) readingpart=locked_files; @@ -167,7 +167,7 @@ void NetMon::update() list->clear(); /* Re-read the Contents ... */ - QString path(::getenv("PATH")); + TQString path(::getenv("PATH")); path += "/bin:/sbin:/usr/bin:/usr/sbin"; rownumber=0; @@ -175,8 +175,8 @@ void NetMon::update() nrpid=0; process->setEnvironment("PATH", path); connect(process, - SIGNAL(receivedStdout(KProcess *, char *, int)), - SLOT(slotReceivedData(KProcess *, char *, int))); + TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + TQT_SLOT(slotReceivedData(KProcess *, char *, int))); *process << "smbstatus"; if (!process->start(KProcess::Block,KProcess::Stdout)) version->setText(i18n("Error: Unable to run smbstatus")); @@ -185,11 +185,11 @@ void NetMon::update() else { // ok -> count the number of locked files for each pid - for (QListViewItem *row=list->firstChild();row!=0;row=row->itemBelow()) + for (TQListViewItem *row=list->firstChild();row!=0;row=row->itemBelow()) { // cerr<<"NetMon::update: this should be the pid: "<<row->text(5)<<endl; int pid=row->text(5).toInt(); - row->setText(6,QString("%1").arg((lo)[pid])); + row->setText(6,TQString("%1").arg((lo)[pid])); } } delete process; @@ -200,12 +200,12 @@ void NetMon::update() showmountProc=new KProcess(); showmountProc->setEnvironment("PATH", path); *showmountProc<<"showmount"<<"-a"<<"localhost"; - connect(showmountProc,SIGNAL(receivedStdout(KProcess *, char *, int)),SLOT(slotReceivedData(KProcess *, char *, int))); + connect(showmountProc,TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),TQT_SLOT(slotReceivedData(KProcess *, char *, int))); //without this timer showmount hangs up to 5 minutes //if the portmapper daemon isn't running - QTimer::singleShot(5000,this,SLOT(killShowmount())); + TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount())); //kdDebug()<<"starting kill timer with 5 seconds"<<endl; - connect(showmountProc,SIGNAL(processExited(KProcess*)),this,SLOT(killShowmount())); + connect(showmountProc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(killShowmount())); if (!showmountProc->start(KProcess::NotifyOnExit,KProcess::Stdout)) // run showmount { delete showmountProc; diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h index 9d60e30c2..4f7185fa4 100644 --- a/kcontrol/samba/ksmbstatus.h +++ b/kcontrol/samba/ksmbstatus.h @@ -19,11 +19,11 @@ #ifndef ksmbstatus_h_included #define ksmbstatus_h_included -#include <qtimer.h> -#include <qlabel.h> +#include <tqtimer.h> +#include <tqlabel.h> #include <kprocess.h> -#include <qcstring.h> -#include <qlistview.h> +#include <tqcstring.h> +#include <tqlistview.h> #include <kconfig.h> #define SCREEN_XY_OFFSET 20 @@ -36,16 +36,16 @@ class NetMon : public QWidget { Q_OBJECT public: - NetMon(QWidget *parent, KConfig * config=0, const char * name=0); + NetMon(TQWidget *parent, KConfig * config=0, const char * name=0); void saveSettings() {}; void loadSettings() {}; private: KConfig *configFile; KProcess *showmountProc; - QListView *list; - QLabel *version; - QTimer *timer; - QListViewItem *killrow; + TQListView *list; + TQLabel *version; + TQTimer *timer; + TQListViewItem *killrow; int rownumber; enum {header, connexions, locked_files, finished, nfs} readingpart; int lo[65536]; @@ -53,7 +53,7 @@ private: void processNFSLine(char *bufline, int linelen); void processSambaLine(char *bufline, int linelen); - QCString strShare, strUser, strGroup, strMachine, strSince, strPid; + TQCString strShare, strUser, strGroup, strMachine, strSince, strPid; int iUser, iGroup, iMachine, iPid; private slots: diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index f6df8f91b..88d95680a 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qtabwidget.h> +#include <tqlayout.h> +#include <tqtabwidget.h> #include <kaboutdata.h> #include <kcmodule.h> @@ -32,24 +32,24 @@ class SambaContainer:public KCModule { public: - SambaContainer(QWidget *parent=0, const char * name=0, const QStringList &list = QStringList() ); + SambaContainer(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList() ); virtual ~SambaContainer(); virtual void load(); virtual void save(); private: KConfig config; - QTabWidget tabs; + TQTabWidget tabs; NetMon status; ImportsView imports; LogView logView; StatisticsView statisticsView; }; -typedef KGenericFactory<SambaContainer, QWidget > SambaFactory; +typedef KGenericFactory<SambaContainer, TQWidget > SambaFactory; K_EXPORT_COMPONENT_FACTORY (kcm_samba, SambaFactory("kcmsamba") ) -SambaContainer::SambaContainer(QWidget *parent, const char* name, const QStringList&) +SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStringList&) :KCModule(SambaFactory::instance(), parent,name) ,config("kcmsambarc",false,true) ,tabs(this) @@ -58,13 +58,13 @@ SambaContainer::SambaContainer(QWidget *parent, const char* name, const QStringL ,logView(&tabs,&config) ,statisticsView(&tabs,&config) { - QVBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); layout->addWidget(&tabs); tabs.addTab(&status,i18n("&Exports")); tabs.addTab(&imports,i18n("&Imports")); tabs.addTab(&logView,i18n("&Log")); tabs.addTab(&statisticsView,i18n("&Statistics")); - connect(&logView,SIGNAL(contentsChanged(QListView* , int, int)),&statisticsView,SLOT(setListInfo(QListView *, int, int))); + connect(&logView,TQT_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQT_SLOT(setListInfo(TQListView *, int, int))); setButtons(Help); load(); diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp index 273888960..4a48eedfe 100644 --- a/kcontrol/screensaver/advanceddialog.cpp +++ b/kcontrol/screensaver/advanceddialog.cpp @@ -1,10 +1,10 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <qcombobox.h> +#include <tqcombobox.h> #include <kdebug.h> -#include <qwhatsthis.h> -#include <qstring.h> +#include <tqwhatsthis.h> +#include <tqstring.h> #include <config.h> @@ -14,7 +14,7 @@ #include "advanceddialog.moc" -KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(QWidget *parent, const char* name) +KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const char* name) : KDialogBase( parent, name, true, i18n( "Advanced Options" ), Ok | Cancel, Ok, true ) { @@ -24,17 +24,17 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(QWidget *parent, const ch readSettings(); - connect(dialog->qcbPriority, SIGNAL(activated(int)), - this, SLOT(slotPriorityChanged(int))); + connect(dialog->qcbPriority, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotPriorityChanged(int))); - connect(dialog->qcbTopLeft, SIGNAL(activated(int)), - this, SLOT(slotChangeTopLeftCorner(int))); - connect(dialog->qcbTopRight, SIGNAL(activated(int)), - this, SLOT(slotChangeTopLeftCorner(int))); - connect(dialog->qcbBottomLeft, SIGNAL(activated(int)), - this, SLOT(slotChangeTopLeftCorner(int))); - connect(dialog->qcbBottomRight, SIGNAL(activated(int)), - this, SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbTopLeft, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbTopRight, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbBottomLeft, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbBottomRight, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChangeTopLeftCorner(int))); #ifndef HAVE_SETPRIORITY dialog->qgbPriority->setEnabled(false); @@ -140,22 +140,22 @@ void KScreenSaverAdvancedDialog::slotChangeTopLeftCorner(int) /* =================================================================================================== */ -AdvancedDialog::AdvancedDialog(QWidget *parent, const char *name) : AdvancedDialogImpl(parent, name) +AdvancedDialog::AdvancedDialog(TQWidget *parent, const char *name) : AdvancedDialogImpl(parent, name) { - monitorLabel->setPixmap(QPixmap(locate("data", "kcontrol/pics/monitor.png"))); - QWhatsThis::add(qcbPriority, "<qt>" + i18n("Specify the priority that the screensaver will run at. A higher priority may mean that the screensaver runs faster, though may reduce the speed that other programs run at while the screensaver is active.") + "</qt>"); - QString qsTopLeft("<qt>" + i18n("The action to take when the mouse cursor is located in the top left corner of the screen for 15 seconds.") + "</qt>"); - QString qsTopRight("<qt>" + i18n("The action to take when the mouse cursor is located in the top right corner of the screen for 15 seconds.") + "</qt>"); - QString qsBottomLeft("<qt>" + i18n("The action to take when the mouse cursor is located in the bottom left corner of the screen for 15 seconds.") + "</qt>"); - QString qsBottomRight("<qt>" + i18n("The action to take when the mouse cursor is located in the bottom right corner of the screen for 15 seconds.") + "</qt>"); - QWhatsThis::add(qlTopLeft, qsTopLeft); - QWhatsThis::add(qcbTopLeft, qsTopLeft); - QWhatsThis::add(qlTopRight, qsTopRight); - QWhatsThis::add(qcbTopRight, qsTopRight); - QWhatsThis::add(qlBottomLeft, qsBottomLeft); - QWhatsThis::add(qcbBottomLeft, qsBottomLeft); - QWhatsThis::add(qlBottomRight, qsBottomRight); - QWhatsThis::add(qcbBottomRight, qsBottomRight); + monitorLabel->setPixmap(TQPixmap(locate("data", "kcontrol/pics/monitor.png"))); + TQWhatsThis::add(qcbPriority, "<qt>" + i18n("Specify the priority that the screensaver will run at. A higher priority may mean that the screensaver runs faster, though may reduce the speed that other programs run at while the screensaver is active.") + "</qt>"); + TQString qsTopLeft("<qt>" + i18n("The action to take when the mouse cursor is located in the top left corner of the screen for 15 seconds.") + "</qt>"); + TQString qsTopRight("<qt>" + i18n("The action to take when the mouse cursor is located in the top right corner of the screen for 15 seconds.") + "</qt>"); + TQString qsBottomLeft("<qt>" + i18n("The action to take when the mouse cursor is located in the bottom left corner of the screen for 15 seconds.") + "</qt>"); + TQString qsBottomRight("<qt>" + i18n("The action to take when the mouse cursor is located in the bottom right corner of the screen for 15 seconds.") + "</qt>"); + TQWhatsThis::add(qlTopLeft, qsTopLeft); + TQWhatsThis::add(qcbTopLeft, qsTopLeft); + TQWhatsThis::add(qlTopRight, qsTopRight); + TQWhatsThis::add(qcbTopRight, qsTopRight); + TQWhatsThis::add(qlBottomLeft, qsBottomLeft); + TQWhatsThis::add(qcbBottomLeft, qsBottomLeft); + TQWhatsThis::add(qlBottomRight, qsBottomRight); + TQWhatsThis::add(qcbBottomRight, qsBottomRight); } AdvancedDialog::~AdvancedDialog() @@ -163,12 +163,12 @@ AdvancedDialog::~AdvancedDialog() } -void AdvancedDialog::setMode(QComboBox *box, int i) +void AdvancedDialog::setMode(TQComboBox *box, int i) { box->setCurrentItem(i); } -int AdvancedDialog::mode(QComboBox *box) +int AdvancedDialog::mode(TQComboBox *box) { return box->currentItem(); } diff --git a/kcontrol/screensaver/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h index 813c9fc82..8322dd3e2 100644 --- a/kcontrol/screensaver/advanceddialog.h +++ b/kcontrol/screensaver/advanceddialog.h @@ -2,25 +2,25 @@ #define ADVANCEDDIALOG_H #include <kdialogbase.h> -#include <qwidget.h> +#include <tqwidget.h> #include <kconfig.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qgroupbox.h> -#include <qobject.h> -#include <qcheckbox.h> -#include <qslider.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqgroupbox.h> +#include <tqobject.h> +#include <tqcheckbox.h> +#include <tqslider.h> #include "advanceddialogimpl.h" class AdvancedDialog : public AdvancedDialogImpl { public: - AdvancedDialog(QWidget *parent = 0, const char *name = 0); + AdvancedDialog(TQWidget *parent = 0, const char *name = 0); ~AdvancedDialog(); - void setMode(QComboBox *box, int i); - int mode(QComboBox *box); + void setMode(TQComboBox *box, int i); + int mode(TQComboBox *box); }; /* =================================================================================================== */ @@ -29,7 +29,7 @@ class KScreenSaverAdvancedDialog : public KDialogBase { Q_OBJECT public: - KScreenSaverAdvancedDialog(QWidget *parent, const char* name = 0); + KScreenSaverAdvancedDialog(TQWidget *parent, const char* name = 0); public slots: void slotOk(); @@ -44,11 +44,11 @@ protected slots: private: void readSettings(); - QCheckBox *m_topLeftCorner; - QCheckBox *m_bottomLeftCorner; - QCheckBox *m_topRightCorner; - QCheckBox *m_bottomRightCorner; - QSlider *mPrioritySlider; + TQCheckBox *m_topLeftCorner; + TQCheckBox *m_bottomLeftCorner; + TQCheckBox *m_topRightCorner; + TQCheckBox *m_bottomRightCorner; + TQSlider *mPrioritySlider; bool mChanged; int mPriority; diff --git a/kcontrol/screensaver/kssmonitor.h b/kcontrol/screensaver/kssmonitor.h index 72122e979..93f05653d 100644 --- a/kcontrol/screensaver/kssmonitor.h +++ b/kcontrol/screensaver/kssmonitor.h @@ -6,10 +6,10 @@ class KSSMonitor : public KSWidget { public: - KSSMonitor( QWidget *parent ) : KSWidget( parent ) {} + KSSMonitor( TQWidget *parent ) : KSWidget( parent ) {} // we don't want no steenking palette change - virtual void setPalette( const QPalette & ) {} + virtual void setPalette( const TQPalette & ) {} }; #endif diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index 58f28ff31..d13d131dc 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -7,7 +7,7 @@ #include <GL/glx.h> #endif -KSWidget::KSWidget( QWidget* parent, const char* name, int f ) +KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) : QXEmbed( parent, name, f ), colormap( None ) { // use visual with support for double-buffering, for opengl diff --git a/kcontrol/screensaver/kswidget.h b/kcontrol/screensaver/kswidget.h index 56d731955..11ec33a74 100644 --- a/kcontrol/screensaver/kswidget.h +++ b/kcontrol/screensaver/kswidget.h @@ -8,7 +8,7 @@ class KSWidget : public QXEmbed { Q_OBJECT public: - KSWidget( QWidget *parent = NULL, const char* name = NULL, int flags = 0 ); + KSWidget( TQWidget *parent = NULL, const char* name = NULL, int flags = 0 ); virtual ~KSWidget(); private: Colormap colormap; diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp index a32d61e0e..bf8cdc54a 100644 --- a/kcontrol/screensaver/saverconfig.cpp +++ b/kcontrol/screensaver/saverconfig.cpp @@ -7,7 +7,7 @@ SaverConfig::SaverConfig() { } -bool SaverConfig::read(const QString &file) +bool SaverConfig::read(const TQString &file) { KDesktopFile config(file, true); if( !config.tryExec()) diff --git a/kcontrol/screensaver/saverconfig.h b/kcontrol/screensaver/saverconfig.h index 1327dfdaa..82be8e01f 100644 --- a/kcontrol/screensaver/saverconfig.h +++ b/kcontrol/screensaver/saverconfig.h @@ -1,29 +1,29 @@ #ifndef SAVERCONFIG_H #define SAVERCONFIG_H -#include <qstring.h> +#include <tqstring.h> class SaverConfig { public: SaverConfig(); - bool read(const QString &file); + bool read(const TQString &file); - QString exec() const { return mExec; } - QString setup() const { return mSetup; } - QString saver() const { return mSaver; } - QString name() const { return mName; } - QString file() const { return mFile; } - QString category() const { return mCategory; } + TQString exec() const { return mExec; } + TQString setup() const { return mSetup; } + TQString saver() const { return mSaver; } + TQString name() const { return mName; } + TQString file() const { return mFile; } + TQString category() const { return mCategory; } protected: - QString mExec; - QString mSetup; - QString mSaver; - QString mName; - QString mFile; - QString mCategory; + TQString mExec; + TQString mSetup; + TQString mSaver; + TQString mName; + TQString mFile; + TQString mCategory; }; #endif diff --git a/kcontrol/screensaver/saverlist.cpp b/kcontrol/screensaver/saverlist.cpp index 6b27973e0..ccd525d9f 100644 --- a/kcontrol/screensaver/saverlist.cpp +++ b/kcontrol/screensaver/saverlist.cpp @@ -4,7 +4,7 @@ class SaverConfig; class QPtrCollection; -int SaverList::compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2) +int SaverList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2) { SaverConfig *s1 = (SaverConfig *)item1; SaverConfig *s2 = (SaverConfig *)item2; diff --git a/kcontrol/screensaver/saverlist.h b/kcontrol/screensaver/saverlist.h index e6f36be18..0030d6761 100644 --- a/kcontrol/screensaver/saverlist.h +++ b/kcontrol/screensaver/saverlist.h @@ -1,14 +1,14 @@ #ifndef SAVERLIST_H #define SAVERLIST_H -#include <qptrlist.h> +#include <tqptrlist.h> #include "saverconfig.h" -class SaverList : public QPtrList<SaverConfig> +class SaverList : public TQPtrList<SaverConfig> { protected: - virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2); + virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2); }; #endif diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index a40c51919..f80cc19e9 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -17,16 +17,16 @@ #include <sys/types.h> #include <sys/wait.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistview.h> -#include <qpushbutton.h> -#include <qslider.h> -#include <qtimer.h> -#include <qwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqslider.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> #include <dcopclient.h> @@ -48,7 +48,7 @@ #include <fixx11h.h> -template class QPtrList<SaverConfig>; +template class TQPtrList<SaverConfig>; const uint widgetEventMask = // X event mask (uint)( @@ -59,18 +59,18 @@ const uint widgetEventMask = // X event mask //=========================================================================== // DLL Interface for kcontrol -typedef KGenericFactory<KScreenSaver, QWidget > KSSFactory; +typedef KGenericFactory<KScreenSaver, TQWidget > KSSFactory; K_EXPORT_COMPONENT_FACTORY (kcm_screensaver, KSSFactory("kcmscreensaver") ) -static QString findExe(const QString &exe) { - QString result = locate("exe", exe); +static TQString findExe(const TQString &exe) { + TQString result = locate("exe", exe); if (result.isEmpty()) result = KStandardDirs::findExe(exe); return result; } -KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList&) +KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringList&) : KCModule(KSSFactory::instance(), parent, name) { mSetupProc = 0; @@ -99,7 +99,7 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList& setButtons( KCModule::Help | KCModule::Default | KCModule::Apply ); // Add KDE specific screensaver path - QString relPath="System/ScreenSavers/"; + TQString relPath="System/ScreenSavers/"; KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers" ); if (servGroup) { @@ -114,108 +114,108 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList& readSettings( false ); mSetupProc = new KProcess; - connect(mSetupProc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotSetupDone(KProcess *))); + connect(mSetupProc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotSetupDone(KProcess *))); mPreviewProc = new KProcess; - connect(mPreviewProc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotPreviewExited(KProcess *))); + connect(mPreviewProc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotPreviewExited(KProcess *))); - QBoxLayout *topLayout = new QHBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); // left column - QVBoxLayout *leftColumnLayout = - new QVBoxLayout(topLayout, KDialog::spacingHint()); - QBoxLayout *vLayout = - new QVBoxLayout(leftColumnLayout, KDialog::spacingHint()); + TQVBoxLayout *leftColumnLayout = + new TQVBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout *vLayout = + new TQVBoxLayout(leftColumnLayout, KDialog::spacingHint()); - mSaverGroup = new QGroupBox(i18n("Screen Saver"), this ); + mSaverGroup = new TQGroupBox(i18n("Screen Saver"), this ); mSaverGroup->setColumnLayout( 0, Qt::Horizontal ); vLayout->addWidget(mSaverGroup); vLayout->setStretchFactor( mSaverGroup, 10 ); - QBoxLayout *groupLayout = new QVBoxLayout( mSaverGroup->layout(), + TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(), KDialog::spacingHint() ); - mSaverListView = new QListView( mSaverGroup ); + mSaverListView = new TQListView( mSaverGroup ); mSaverListView->setMinimumHeight( 120 ); - mSaverListView->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mSaverListView->addColumn(""); mSaverListView->header()->hide(); mSelected = -1; groupLayout->addWidget( mSaverListView, 10 ); - connect( mSaverListView, SIGNAL(doubleClicked ( QListViewItem *)), this, SLOT( slotSetup())); - QWhatsThis::add( mSaverListView, i18n("Select the screen saver to use.") ); + connect( mSaverListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotSetup())); + TQWhatsThis::add( mSaverListView, i18n("Select the screen saver to use.") ); - QBoxLayout* hlay = new QHBoxLayout(groupLayout, KDialog::spacingHint()); - mSetupBt = new QPushButton( i18n("&Setup..."), mSaverGroup ); - connect( mSetupBt, SIGNAL( clicked() ), SLOT( slotSetup() ) ); + TQBoxLayout* hlay = new TQHBoxLayout(groupLayout, KDialog::spacingHint()); + mSetupBt = new TQPushButton( i18n("&Setup..."), mSaverGroup ); + connect( mSetupBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetup() ) ); mSetupBt->setEnabled(false); hlay->addWidget( mSetupBt ); - QWhatsThis::add( mSetupBt, i18n("Configure the screen saver's options, if any.") ); + TQWhatsThis::add( mSetupBt, i18n("Configure the screen saver's options, if any.") ); - mTestBt = new QPushButton( i18n("&Test"), mSaverGroup ); - connect( mTestBt, SIGNAL( clicked() ), SLOT( slotTest() ) ); + mTestBt = new TQPushButton( i18n("&Test"), mSaverGroup ); + connect( mTestBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotTest() ) ); mTestBt->setEnabled(false); hlay->addWidget( mTestBt ); - QWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") ); + TQWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") ); - mSettingsGroup = new QGroupBox( i18n("Settings"), this ); + mSettingsGroup = new TQGroupBox( i18n("Settings"), this ); mSettingsGroup->setColumnLayout( 0, Qt::Vertical ); leftColumnLayout->addWidget( mSettingsGroup ); - groupLayout = new QVBoxLayout( mSettingsGroup->layout(), + groupLayout = new TQVBoxLayout( mSettingsGroup->layout(), KDialog::spacingHint() ); - mEnabledCheckBox = new QCheckBox(i18n( + mEnabledCheckBox = new TQCheckBox(i18n( "Start a&utomatically"), mSettingsGroup); mEnabledCheckBox->setChecked(mEnabled); - QWhatsThis::add( mEnabledCheckBox, i18n( + TQWhatsThis::add( mEnabledCheckBox, i18n( "Automatically start the screen saver after a period of inactivity.") ); - connect(mEnabledCheckBox, SIGNAL(toggled(bool)), - this, SLOT(slotEnable(bool))); + connect(mEnabledCheckBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotEnable(bool))); groupLayout->addWidget(mEnabledCheckBox); - QBoxLayout *hbox = new QHBoxLayout(); + TQBoxLayout *hbox = new TQHBoxLayout(); groupLayout->addLayout(hbox); hbox->addSpacing(30); - mActivateLbl = new QLabel(i18n("After:"), mSettingsGroup); + mActivateLbl = new TQLabel(i18n("After:"), mSettingsGroup); mActivateLbl->setEnabled(mEnabled); hbox->addWidget(mActivateLbl); - mWaitEdit = new QSpinBox(mSettingsGroup); + mWaitEdit = new TQSpinBox(mSettingsGroup); mWaitEdit->setSteps(1, 10); mWaitEdit->setRange(1, INT_MAX); mWaitEdit->setSuffix(i18n(" min")); mWaitEdit->setValue(mTimeout/60); mWaitEdit->setEnabled(mEnabled); - connect(mWaitEdit, SIGNAL(valueChanged(int)), - this, SLOT(slotTimeoutChanged(int))); + connect(mWaitEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimeoutChanged(int))); mActivateLbl->setBuddy(mWaitEdit); hbox->addWidget(mWaitEdit); hbox->addStretch(1); - QString wtstr = i18n( + TQString wtstr = i18n( "The period of inactivity " "after which the screen saver should start."); - QWhatsThis::add( mActivateLbl, wtstr ); - QWhatsThis::add( mWaitEdit, wtstr ); + TQWhatsThis::add( mActivateLbl, wtstr ); + TQWhatsThis::add( mWaitEdit, wtstr ); - mLockCheckBox = new QCheckBox( i18n( + mLockCheckBox = new TQCheckBox( i18n( "&Require password to stop"), mSettingsGroup ); mLockCheckBox->setEnabled( mEnabled ); mLockCheckBox->setChecked( mLock ); - connect( mLockCheckBox, SIGNAL( toggled( bool ) ), - this, SLOT( slotLock( bool ) ) ); + connect( mLockCheckBox, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SLOT( slotLock( bool ) ) ); groupLayout->addWidget(mLockCheckBox); - QWhatsThis::add( mLockCheckBox, i18n( + TQWhatsThis::add( mLockCheckBox, i18n( "Prevent potential unauthorized use by requiring a password" " to stop the screen saver.") ); - hbox = new QHBoxLayout(); + hbox = new TQHBoxLayout(); groupLayout->addLayout(hbox); hbox->addSpacing(30); - mLockLbl = new QLabel(i18n("After:"), mSettingsGroup); + mLockLbl = new TQLabel(i18n("After:"), mSettingsGroup); mLockLbl->setEnabled(mEnabled && mLock); - QWhatsThis::add( mLockLbl, i18n( + TQWhatsThis::add( mLockLbl, i18n( "The amount of time, after the screen saver has started, to ask for the unlock password.") ); hbox->addWidget(mLockLbl); - mWaitLockEdit = new QSpinBox(mSettingsGroup); + mWaitLockEdit = new TQSpinBox(mSettingsGroup); mWaitLockEdit->setSteps(1, 10); mWaitLockEdit->setRange(1, 300); mWaitLockEdit->setSuffix(i18n(" sec")); @@ -230,38 +230,38 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList& mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); } - connect(mWaitLockEdit, SIGNAL(valueChanged(int)), - this, SLOT(slotLockTimeoutChanged(int))); + connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotLockTimeoutChanged(int))); mLockLbl->setBuddy(mWaitLockEdit); hbox->addWidget(mWaitLockEdit); hbox->addStretch(1); - QString wltstr = i18n( + TQString wltstr = i18n( "Choose the period " "after which the display will be locked. "); - QWhatsThis::add( mLockLbl, wltstr ); - QWhatsThis::add( mWaitLockEdit, wltstr ); + TQWhatsThis::add( mLockLbl, wltstr ); + TQWhatsThis::add( mWaitLockEdit, wltstr ); // right column - QBoxLayout* rightColumnLayout = - new QVBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout* rightColumnLayout = + new TQVBoxLayout(topLayout, KDialog::spacingHint()); - mMonitorLabel = new QLabel( this ); + mMonitorLabel = new TQLabel( this ); mMonitorLabel->setAlignment( AlignCenter ); - mMonitorLabel->setPixmap( QPixmap(locate("data", + mMonitorLabel->setPixmap( TQPixmap(locate("data", "kcontrol/pics/monitor.png"))); rightColumnLayout->addWidget(mMonitorLabel, 0); - QWhatsThis::add( mMonitorLabel, i18n("A preview of the selected screen saver.") ); + TQWhatsThis::add( mMonitorLabel, i18n("A preview of the selected screen saver.") ); - QBoxLayout* advancedLayout = new QHBoxLayout( rightColumnLayout, 3 ); - advancedLayout->addWidget( new QWidget( this ) ); - QPushButton* advancedBt = new QPushButton( + TQBoxLayout* advancedLayout = new TQHBoxLayout( rightColumnLayout, 3 ); + advancedLayout->addWidget( new TQWidget( this ) ); + TQPushButton* advancedBt = new TQPushButton( i18n( "Advanced &Options" ), this, "advancedBtn" ); - advancedBt->setSizePolicy( QSizePolicy( - QSizePolicy::Fixed, QSizePolicy::Fixed) ); - connect( advancedBt, SIGNAL( clicked() ), - this, SLOT( slotAdvanced() ) ); + advancedBt->setSizePolicy( TQSizePolicy( + TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); + connect( advancedBt, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotAdvanced() ) ); advancedLayout->addWidget( advancedBt ); - advancedLayout->addWidget( new QWidget( this ) ); + advancedLayout->addWidget( new TQWidget( this ) ); rightColumnLayout->addStretch(); @@ -275,8 +275,8 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList& // finding the savers can take some time, so defer loading until // we've started up. mNumLoaded = 0; - mLoadTimer = new QTimer( this ); - connect( mLoadTimer, SIGNAL(timeout()), SLOT(findSavers()) ); + mLoadTimer = new TQTimer( this ); + connect( mLoadTimer, TQT_SIGNAL(timeout()), TQT_SLOT(findSavers()) ); mLoadTimer->start( 100 ); mChanged = false; emit changed(false); @@ -296,7 +296,7 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList& //--------------------------------------------------------------------------- // -void KScreenSaver::resizeEvent( QResizeEvent * ) +void KScreenSaver::resizeEvent( TQResizeEvent * ) { if (mMonitor) @@ -308,7 +308,7 @@ void KScreenSaver::resizeEvent( QResizeEvent * ) //--------------------------------------------------------------------------- // -void KScreenSaver::mousePressEvent( QMouseEvent *) +void KScreenSaver::mousePressEvent( TQMouseEvent *) { if ( mTesting ) slotStopTest(); @@ -316,7 +316,7 @@ void KScreenSaver::mousePressEvent( QMouseEvent *) //--------------------------------------------------------------------------- // -void KScreenSaver::keyPressEvent( QKeyEvent *) +void KScreenSaver::keyPressEvent( TQKeyEvent *) { if ( mTesting ) slotStopTest(); @@ -356,7 +356,7 @@ void KScreenSaver::load( bool useDefaults ) //if no saver was selected, the "Reset" and the "Enable screensaver", it is only called when starting and when pressing reset, aleXXX // mSelected = -1; int i = 0; - QListViewItem *selectedItem = 0; + TQListViewItem *selectedItem = 0; for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) { if (saver->file() == mSaver) { @@ -467,7 +467,7 @@ void KScreenSaver::findSavers() if ( !mNumLoaded ) { mSaverFileList = KGlobal::dirs()->findAllResources("scrsav", "*.desktop", false, true); - new QListViewItem ( mSaverListView, i18n("Loading...") ); + new TQListViewItem ( mSaverListView, i18n("Loading...") ); if ( mSaverFileList.isEmpty() ) mLoadTimer->stop(); else @@ -477,7 +477,7 @@ void KScreenSaver::findSavers() for ( int i = 0; i < 5 && (unsigned)mNumLoaded < mSaverFileList.count(); i++, mNumLoaded++ ) { - QString file = mSaverFileList[mNumLoaded]; + TQString file = mSaverFileList[mNumLoaded]; SaverConfig *saver = new SaverConfig; if (saver->read(file)) { mSaverList.append(saver); @@ -486,7 +486,7 @@ void KScreenSaver::findSavers() } if ( (unsigned)mNumLoaded == mSaverFileList.count() ) { - QListViewItem *selectedItem = 0; + TQListViewItem *selectedItem = 0; int categoryCount = 0; int indx = 0; @@ -498,17 +498,17 @@ void KScreenSaver::findSavers() mSaverListView->clear(); for ( SaverConfig *s = mSaverList.first(); s != 0; s = mSaverList.next()) { - QListViewItem *item; + TQListViewItem *item; if (s->category().isEmpty()) - item = new QListViewItem ( mSaverListView, s->name(), "2" + s->name() ); + item = new TQListViewItem ( mSaverListView, s->name(), "2" + s->name() ); else { - QListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 ); + TQListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 ); if ( !categoryItem ) { - categoryItem = new QListViewItem ( mSaverListView, s->category(), "1" + s->category() ); + categoryItem = new TQListViewItem ( mSaverListView, s->category(), "1" + s->category() ); categoryItem->setPixmap ( 0, SmallIcon ( "kscreensaver" ) ); } - item = new QListViewItem ( categoryItem, s->name(), s->name() ); + item = new TQListViewItem ( categoryItem, s->name(), s->name() ); categoryCount++; } if (s->file() == mSaver) { @@ -519,10 +519,10 @@ void KScreenSaver::findSavers() } // Delete categories with only one item - QListViewItemIterator it ( mSaverListView ); + TQListViewItemIterator it ( mSaverListView ); for ( ; it.current(); it++ ) if ( it.current()->childCount() == 1 ) { - QListViewItem *item = it.current()->firstChild(); + TQListViewItem *item = it.current()->firstChild(); it.current()->takeItem( item ); mSaverListView->insertItem ( item ); delete it.current(); @@ -541,8 +541,8 @@ void KScreenSaver::findSavers() mTestBt->setEnabled(true); } - connect( mSaverListView, SIGNAL( currentChanged( QListViewItem * ) ), - this, SLOT( slotScreenSaver( QListViewItem * ) ) ); + connect( mSaverListView, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQT_SLOT( slotScreenSaver( TQListViewItem * ) ) ); setMonitor(); } @@ -587,12 +587,12 @@ void KScreenSaver::slotPreviewExited(KProcess *) if (mSelected >= 0) { mPreviewProc->clearArguments(); - QString saver = mSaverList.at(mSelected)->saver(); - QTextStream ts(&saver, IO_ReadOnly); + TQString saver = mSaverList.at(mSelected)->saver(); + TQTextStream ts(&saver, IO_ReadOnly); - QString word; + TQString word; ts >> word; - QString path = findExe(word); + TQString path = findExe(word); if (!path.isEmpty()) { @@ -632,7 +632,7 @@ void KScreenSaver::slotEnable(bool e) //--------------------------------------------------------------------------- // -void KScreenSaver::slotScreenSaver(QListViewItem *item) +void KScreenSaver::slotScreenSaver(TQListViewItem *item) { if (!item) return; @@ -690,15 +690,15 @@ void KScreenSaver::slotSetup() mSetupProc->clearArguments(); - QString saver = mSaverList.at(mSelected)->setup(); + TQString saver = mSaverList.at(mSelected)->setup(); if( saver.isEmpty()) return; - QTextStream ts(&saver, IO_ReadOnly); + TQTextStream ts(&saver, IO_ReadOnly); - QString word; + TQString word; ts >> word; bool kxsconfig = word == "kxsconfig"; - QString path = findExe(word); + TQString path = findExe(word); if (!path.isEmpty()) { @@ -758,12 +758,12 @@ void KScreenSaver::slotTest() } mTestProc->clearArguments(); - QString saver = mSaverList.at(mSelected)->saver(); - QTextStream ts(&saver, IO_ReadOnly); + TQString saver = mSaverList.at(mSelected)->saver(); + TQTextStream ts(&saver, IO_ReadOnly); - QString word; + TQString word; ts >> word; - QString path = findExe(word); + TQString path = findExe(word); if (!path.isEmpty()) { @@ -772,7 +772,7 @@ void KScreenSaver::slotTest() if (!mTestWin) { mTestWin = new TestWin(); - mTestWin->setBackgroundMode(QWidget::NoBackground); + mTestWin->setBackgroundMode(TQWidget::NoBackground); mTestWin->setGeometry(0, 0, kapp->desktop()->width(), kapp->desktop()->height()); } diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index 28d05b73c..2b67cca3b 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -9,7 +9,7 @@ #ifndef __SCRNSAVE_H__ #define __SCRNSAVE_H__ -#include <qwidget.h> +#include <tqwidget.h> #include <kcmodule.h> #include "kssmonitor.h" @@ -35,7 +35,7 @@ class KScreenSaver : public KCModule { Q_OBJECT public: - KScreenSaver(QWidget *parent, const char *name, const QStringList &); + KScreenSaver(TQWidget *parent, const char *name, const TQStringList &); ~KScreenSaver(); virtual void load(); @@ -48,7 +48,7 @@ public: protected slots: void slotEnable( bool ); - void slotScreenSaver( QListViewItem* ); + void slotScreenSaver( TQListViewItem* ); void slotSetup(); void slotAdvanced(); void slotTest(); @@ -68,9 +68,9 @@ protected: void getSaverNames(); void setMonitor(); void setDefaults(); - void resizeEvent( QResizeEvent * ); - void mousePressEvent(QMouseEvent *); - void keyPressEvent(QKeyEvent *); + void resizeEvent( TQResizeEvent * ); + void mousePressEvent(TQMouseEvent *); + void keyPressEvent(TQKeyEvent *); protected: TestWin *mTestWin; @@ -78,22 +78,22 @@ protected: KProcess *mSetupProc; KProcess *mPreviewProc; KSSMonitor *mMonitor; - QPushButton *mSetupBt; - QPushButton *mTestBt; - QListView *mSaverListView; + TQPushButton *mSetupBt; + TQPushButton *mTestBt; + TQListView *mSaverListView; QSpinBox *mWaitEdit; - QSpinBox *mWaitLockEdit; - QCheckBox *mLockCheckBox; - QCheckBox *mStarsCheckBox; - QCheckBox *mEnabledCheckBox; - QLabel *mMonitorLabel; - QLabel *mActivateLbl; - QLabel *mLockLbl; - QStringList mSaverFileList; + TQSpinBox *mWaitLockEdit; + TQCheckBox *mLockCheckBox; + TQCheckBox *mStarsCheckBox; + TQCheckBox *mEnabledCheckBox; + TQLabel *mMonitorLabel; + TQLabel *mActivateLbl; + TQLabel *mLockLbl; + TQStringList mSaverFileList; SaverList mSaverList; - QTimer *mLoadTimer; - QGroupBox *mSaverGroup; - QGroupBox *mSettingsGroup; + TQTimer *mLoadTimer; + TQGroupBox *mSaverGroup; + TQGroupBox *mSettingsGroup; int mSelected; int mPrevSelected; @@ -106,7 +106,7 @@ protected: int mLockTimeout; bool mLock; bool mEnabled; - QString mSaver; + TQString mSaver; bool mImmutable; }; diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index e56c72617..0a1ea39ef 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpushbutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> #include <dcopclient.h> @@ -43,11 +43,11 @@ #include "smartcard.h" -KSmartcardConfig::KSmartcardConfig(QWidget *parent, const char *name) +KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) : KCModule(parent, name),DCOPObject(name) { - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); config = new KConfig("ksmartcardrc", false, false); DCOPClient *dc = KApplication::kApplication()->dcopClient(); @@ -72,26 +72,26 @@ KSmartcardConfig::KSmartcardConfig(QWidget *parent, const char *name) _popUpKardChooser = new KPopupMenu(this,"KpopupKardChooser"); _popUpKardChooser->insertItem(i18n("Change Module..."), this, - SLOT(slotLaunchChooser())); + TQT_SLOT(slotLaunchChooser())); // The config backend - connect(base->launchManager, SIGNAL(clicked()), SLOT( changed() )); - connect(base->beepOnInsert, SIGNAL(clicked()), SLOT( changed() )); - connect(base->enableSupport, SIGNAL(clicked()), SLOT( changed() )); + connect(base->launchManager, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); + connect(base->beepOnInsert, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); + connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); - connect(base->enablePolling, SIGNAL(clicked()), SLOT( changed() )); + connect(base->enablePolling, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); connect(base->_readerHostsListView, - SIGNAL(rightButtonPressed(QListViewItem *,const QPoint &,int)), + TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)), this, - SLOT(slotShowPopup(QListViewItem *,const QPoint &,int))); + TQT_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int))); if (!connectDCOPSignal("", "", - "signalReaderListChanged(QStringList)", - "loadReadersTab(QStringList)", + "signalReaderListChanged(TQStringList)", + "loadReadersTab(TQStringList)", FALSE)) kdDebug()<<"Error connecting to DCOP server" <<endl; @@ -99,8 +99,8 @@ KSmartcardConfig::KSmartcardConfig(QWidget *parent, const char *name) if (!connectDCOPSignal("", "", - "signalCardStateChanged(QString,bool,QString)", - "updateReadersState (QString,bool,QString) ", + "signalCardStateChanged(TQString,bool,TQString)", + "updateReadersState (TQString,bool,TQString) ", FALSE)) kdDebug()<<"Error connecting to DCOP server" <<endl; @@ -131,7 +131,7 @@ void KSmartcardConfig::slotLaunchChooser(){ } -void KSmartcardConfig::slotShowPopup(QListViewItem * item ,const QPoint & _point,int i) +void KSmartcardConfig::slotShowPopup(TQListViewItem * item ,const TQPoint & _point,int i) { //The popup only appears in cards, not in the slots1 @@ -141,9 +141,9 @@ void KSmartcardConfig::slotShowPopup(QListViewItem * item ,const QPoint & _point } -void KSmartcardConfig::updateReadersState (QString readerName, +void KSmartcardConfig::updateReadersState (TQString readerName, bool isCardPresent, - QString atr) { + TQString atr) { KListViewItem * tID=(KListViewItem *) base->_readerHostsListView->findItem(readerName, 0); if (tID==0) return; @@ -165,13 +165,13 @@ void KSmartcardConfig::updateReadersState (QString readerName, -void KSmartcardConfig::loadReadersTab( QStringList lr){ +void KSmartcardConfig::loadReadersTab( TQStringList lr){ //Prepare data for dcop calls - QByteArray data, retval; - QCString rettype; - QDataStream arg(data, IO_WriteOnly); - QCString modName = "kardsvc"; + TQByteArray data, retval; + TQCString rettype; + TQDataStream arg(data, IO_WriteOnly); + TQCString modName = "kardsvc"; arg << modName; // New view items @@ -189,7 +189,7 @@ void KSmartcardConfig::loadReadersTab( QStringList lr){ // New view items KListViewItem * temp; - kapp->dcopClient()->call("kded", "kded", "unloadModule(QCString)", + kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", data, rettype, retval); (void) new KListViewItem(base->_readerHostsListView, @@ -208,21 +208,21 @@ void KSmartcardConfig::loadReadersTab( QStringList lr){ return; } - for (QStringList::Iterator _slot=lr.begin();_slot!=lr.end();++_slot){ + for (TQStringList::Iterator _slot=lr.begin();_slot!=lr.end();++_slot){ temp= new KListViewItem(base->_readerHostsListView,*_slot); - QByteArray dataATR; - QDataStream argATR(dataATR,IO_WriteOnly); + TQByteArray dataATR; + TQDataStream argATR(dataATR,IO_WriteOnly); argATR << *_slot; - kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(QString)", + kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)", dataATR, rettype, retval); - QString cardATR; - QDataStream retReaderATR(retval, IO_ReadOnly); + TQString cardATR; + TQDataStream retReaderATR(retval, IO_ReadOnly); retReaderATR>>cardATR; if (cardATR.isNull()){ @@ -242,7 +242,7 @@ void KSmartcardConfig::loadReadersTab( QStringList lr){ void KSmartcardConfig::getSupportingModule( KListViewItem * ant, - QString & cardATR) const{ + TQString & cardATR) const{ if (cardATR.isNull()){ @@ -252,12 +252,12 @@ void KSmartcardConfig::getSupportingModule( KListViewItem * ant, } - QString modName=_cardDB->getModuleName(cardATR); + TQString modName=_cardDB->getModuleName(cardATR); if (!modName.isNull()){ - QStringList mng= QStringList::split(",",modName); - QString type=mng[0]; - QString subType=mng[1]; - QString subSubType=mng[2]; + TQStringList mng= TQStringList::split(",",modName); + TQString type=mng[0]; + TQString subType=mng[1]; + TQString subSubType=mng[2]; KListViewItem * hil =new KListViewItem(ant, i18n("Managed by: "), type, @@ -282,10 +282,10 @@ void KSmartcardConfig::load(bool useDefaults ) { //Prepare data for dcop calls - QByteArray data, retval; - QCString rettype; - QDataStream arg(data, IO_WriteOnly); - QCString modName = "kardsvc"; + TQByteArray data, retval; + TQCString rettype; + TQDataStream arg(data, IO_WriteOnly); + TQCString modName = "kardsvc"; arg << modName; //Update the toggle buttons with the current configuration @@ -306,9 +306,9 @@ void KSmartcardConfig::load(bool useDefaults ) // We call kardsvc to retrieve the current readers kapp->dcopClient()->call("kded", "kardsvc", "getSlotList ()", data, rettype, retval); - QStringList readers; + TQStringList readers; readers.clear(); - QDataStream retReader(retval, IO_ReadOnly); + TQDataStream retReader(retval, IO_ReadOnly); retReader>>readers; //And we update the panel @@ -328,16 +328,16 @@ if (_ok) { config->writeEntry("Launch Manager", base->launchManager->isChecked()); - QByteArray data, retval; - QCString rettype; - QDataStream arg(data, IO_WriteOnly); - QCString modName = "kardsvc"; + TQByteArray data, retval; + TQCString rettype; + TQDataStream arg(data, IO_WriteOnly); + TQCString modName = "kardsvc"; arg << modName; // Start or stop the server as needed if (base->enableSupport->isChecked()) { - kapp->dcopClient()->call("kded", "kded", "loadModule(QCString)", + kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", data, rettype, retval); config->sync(); @@ -347,7 +347,7 @@ if (_ok) { - kapp->dcopClient()->call("kded", "kded", "unloadModule(QCString)", + kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", data, rettype, retval); } @@ -363,7 +363,7 @@ void KSmartcardConfig::defaults() -QString KSmartcardConfig::quickHelp() const +TQString KSmartcardConfig::quickHelp() const { return i18n("<h1>smartcard</h1> This module allows you to configure KDE support" " for smartcards. These can be used for various tasks such as storing" @@ -372,7 +372,7 @@ QString KSmartcardConfig::quickHelp() const extern "C" { - KDE_EXPORT KCModule *create_smartcard(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_smartcard(TQWidget *parent, const char *) { return new KSmartcardConfig(parent, "kcmsmartcard"); } @@ -384,12 +384,12 @@ extern "C" delete config; if (start) { - QByteArray data, retval; - QCString rettype; - QDataStream arg(data, IO_WriteOnly); - QCString modName = "kardsvc"; + TQByteArray data, retval; + TQCString rettype; + TQDataStream arg(data, IO_WriteOnly); + TQCString modName = "kardsvc"; arg << modName; - kapp->dcopClient()->call("kded", "kded", "loadModule(QCString)", + kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)", data, rettype, retval); } } diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h index 63f7e1e11..31fcea349 100644 --- a/kcontrol/smartcard/smartcard.h +++ b/kcontrol/smartcard/smartcard.h @@ -44,7 +44,7 @@ class KSmartcardConfig : public KCModule, public DCOPObject public: - KSmartcardConfig(QWidget *parent = 0L, const char *name = 0L); + KSmartcardConfig(TQWidget *parent = 0L, const char *name = 0L); virtual ~KSmartcardConfig(); SmartcardBase *base; @@ -55,19 +55,19 @@ public: void defaults(); int buttons(); - QString quickHelp() const; + TQString quickHelp() const; k_dcop: - void updateReadersState (QString readerName, + void updateReadersState (TQString readerName, bool isCardPresent, - QString atr); - void loadReadersTab (QStringList lr); + TQString atr); + void loadReadersTab (TQStringList lr); private slots: - void slotShowPopup(QListViewItem * item ,const QPoint & _point,int i); + void slotShowPopup(TQListViewItem * item ,const TQPoint & _point,int i); void slotLaunchChooser(); @@ -80,7 +80,7 @@ private: KPopupMenu * _popUpKardChooser; void getSupportingModule( KListViewItem * ant, - QString & cardATR) const ; + TQString & cardATR) const ; }; diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp index 9de1334b0..e1d22cf51 100644 --- a/kcontrol/smserver/kcmsmserver.cpp +++ b/kcontrol/smserver/kcmsmserver.cpp @@ -18,10 +18,10 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software */ -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qradiobutton.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqradiobutton.h> #include <dcopclient.h> @@ -33,10 +33,10 @@ #include "kcmsmserver.h" #include "smserverconfigimpl.h" -typedef KGenericFactory<SMServerConfig, QWidget > SMSFactory; +typedef KGenericFactory<SMServerConfig, TQWidget > SMSFactory; K_EXPORT_COMPONENT_FACTORY (kcm_smserver, SMSFactory("kcmsmserver") ) -SMServerConfig::SMServerConfig( QWidget *parent, const char* name, const QStringList & ) +SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStringList & ) : KCModule (SMSFactory::instance(), parent, name) { setQuickHelp( i18n("<h1>Session Manager</h1>" @@ -46,9 +46,9 @@ SMServerConfig::SMServerConfig( QWidget *parent, const char* name, const QString " and whether the computer should be automatically shut down after session" " exit by default.")); - QVBoxLayout *topLayout = new QVBoxLayout(this); + TQVBoxLayout *topLayout = new TQVBoxLayout(this); dialog = new SMServerConfigImpl(this); - connect(dialog, SIGNAL(changed()), SLOT(changed())); + connect(dialog, TQT_SIGNAL(changed()), TQT_SLOT(changed())); dialog->show(); topLayout->add(dialog); @@ -71,7 +71,7 @@ void SMServerConfig::load(bool useDefaults ) dialog->offerShutdownCheck->setChecked(en); dialog->sdGroup->setEnabled(en); - QString s = c->readEntry( "loginMode" ); + TQString s = c->readEntry( "loginMode" ); if ( s == "default" ) dialog->emptySessionRadio->setChecked(true); else if ( s == "restoreSavedSession" ) @@ -103,7 +103,7 @@ void SMServerConfig::save() c->setGroup("General"); c->writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked()); c->writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked()); - QString s = "restorePreviousLogout"; + TQString s = "restorePreviousLogout"; if ( dialog->emptySessionRadio->isChecked() ) s = "default"; else if ( dialog->savedSessionRadio->isChecked() ) @@ -121,7 +121,7 @@ void SMServerConfig::save() delete c; // update the k menu if necessary - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( "kicker", "kicker", "configure()", data ); } diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h index 4f51ab3d5..c1ea4a362 100644 --- a/kcontrol/smserver/kcmsmserver.h +++ b/kcontrol/smserver/kcmsmserver.h @@ -31,7 +31,7 @@ class SMServerConfig : public KCModule Q_OBJECT public: - SMServerConfig( QWidget *parent=0, const char* name=0, const QStringList &list=QStringList() ); + SMServerConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() ); void load(); void load(bool useDefaults); diff --git a/kcontrol/smserver/smserverconfigimpl.cpp b/kcontrol/smserver/smserverconfigimpl.cpp index 9a2afbd90..d9507a9d8 100644 --- a/kcontrol/smserver/smserverconfigimpl.cpp +++ b/kcontrol/smserver/smserverconfigimpl.cpp @@ -18,7 +18,7 @@ #include "smserverconfigimpl.h" #include "smserverconfigimpl.moc" -SMServerConfigImpl::SMServerConfigImpl(QWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) { +SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) { } SMServerConfigImpl::~SMServerConfigImpl(){ diff --git a/kcontrol/smserver/smserverconfigimpl.h b/kcontrol/smserver/smserverconfigimpl.h index d928c48ec..b516617cf 100644 --- a/kcontrol/smserver/smserverconfigimpl.h +++ b/kcontrol/smserver/smserverconfigimpl.h @@ -18,7 +18,7 @@ #ifndef SMSERVERCONFIGIMPL_H #define SMSERVERCONFIGIMPL_H -#include <qwidget.h> +#include <tqwidget.h> #include "smserverconfigdlg.h" /** @@ -28,7 +28,7 @@ class SMServerConfigImpl : public SMServerConfigDlg { Q_OBJECT public: - SMServerConfigImpl(QWidget *parent=0, const char *name=0); + SMServerConfigImpl(TQWidget *parent=0, const char *name=0); ~SMServerConfigImpl(); public slots: // Public slots /** No descriptions */ diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index d4e781844..6416f9e9c 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -15,8 +15,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qvgroupbox.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> #include <dcopclient.h> @@ -27,21 +27,21 @@ #include "spellchecking.h" -typedef KGenericFactory<KSpellCheckingConfig, QWidget > SpellFactory; +typedef KGenericFactory<KSpellCheckingConfig, TQWidget > SpellFactory; K_EXPORT_COMPONENT_FACTORY (kcm_spellchecking, SpellFactory("kcmspellchecking") ) -KSpellCheckingConfig::KSpellCheckingConfig(QWidget *parent, const char *name, const QStringList &): +KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &): KCModule(SpellFactory::instance(), parent, name) { - QBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QGroupBox *box = new QVGroupBox( i18n("Spell Checking Settings"), this ); + TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQGroupBox *box = new TQVGroupBox( i18n("Spell Checking Settings"), this ); box->layout()->setSpacing( KDialog::spacingHint() ); layout->addWidget(box); spellConfig = new KSpellConfig(box, 0L ,0L, false ); layout->addStretch(1); - connect(spellConfig,SIGNAL(configChanged()), SLOT( changed() )); + connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() )); setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the KDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The KDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between KDE applications and non-KDE applications.</p>")); @@ -55,7 +55,7 @@ void KSpellCheckingConfig::load() void KSpellCheckingConfig::save() { spellConfig->writeGlobalSettings(); - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); diff --git a/kcontrol/spellchecking/spellchecking.h b/kcontrol/spellchecking/spellchecking.h index f709a873d..130bf5e51 100644 --- a/kcontrol/spellchecking/spellchecking.h +++ b/kcontrol/spellchecking/spellchecking.h @@ -28,7 +28,7 @@ class KSpellCheckingConfig : public KCModule Q_OBJECT public: - KSpellCheckingConfig(QWidget *parent, const char *name, const QStringList &); + KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &); void load(); void save(); diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 098990afd..f351d3f2c 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -24,22 +24,22 @@ #include "config.h" #endif -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kcombobox.h> -#include <qlistbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qslider.h> -#include <qstylefactory.h> -#include <qtabwidget.h> -#include <qvbox.h> -#include <qfile.h> -#include <qsettings.h> -#include <qobjectlist.h> -#include <qpixmapcache.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> +#include <tqlistbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqslider.h> +#include <tqstylefactory.h> +#include <tqtabwidget.h> +#include <tqvbox.h> +#include <tqfile.h> +#include <tqsettings.h> +#include <tqobjectlist.h> +#include <tqpixmapcache.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> #include <dcopclient.h> #include <kapplication.h> @@ -73,7 +73,7 @@ // Danimo: Why do we use the old interface?! extern "C" { - KDE_EXPORT KCModule *create_style(QWidget *parent, const char*) + KDE_EXPORT KCModule *create_style(TQWidget *parent, const char*) { KGlobal::locale()->insertCatalogue("kcmstyle"); return new KCMStyle(parent, "kcmstyle"); @@ -93,8 +93,8 @@ extern "C" // Write some Qt root property. #ifndef __osf__ // this crashes under Tru64 randomly -- will fix later - QByteArray properties; - QDataStream d(properties, IO_WriteOnly); + TQByteArray properties; + TQDataStream d(properties, IO_WriteOnly); d.setVersion( 3 ); // Qt2 apps need this. d << kapp->palette() << KGlobalSettings::generalFont(); Atom a = XInternAtom(qt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false); @@ -110,12 +110,12 @@ extern "C" } /* -typedef KGenericFactory<KWidgetSettingsModule, QWidget> GeneralFactory; +typedef KGenericFactory<KWidgetSettingsModule, TQWidget> GeneralFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kcmstyle, GeneralFactory ) */ -KCMStyle::KCMStyle( QWidget* parent, const char* name ) +KCMStyle::KCMStyle( TQWidget* parent, const char* name ) : KCModule( parent, name ), appliedStyle(NULL) { setQuickHelp( i18n("<h1>Style</h1>" @@ -142,52 +142,52 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name ) setAboutData( about ); // Setup pages and mainLayout - mainLayout = new QVBoxLayout( this ); - tabWidget = new QTabWidget( this ); + mainLayout = new TQVBoxLayout( this ); + tabWidget = new TQTabWidget( this ); mainLayout->addWidget( tabWidget ); - page1 = new QWidget( tabWidget ); - page1Layout = new QVBoxLayout( page1, KDialog::marginHint(), KDialog::spacingHint() ); - page2 = new QWidget( tabWidget ); - page2Layout = new QVBoxLayout( page2, KDialog::marginHint(), KDialog::spacingHint() ); - page3 = new QWidget( tabWidget ); - page3Layout = new QVBoxLayout( page3, KDialog::marginHint(), KDialog::spacingHint() ); + page1 = new TQWidget( tabWidget ); + page1Layout = new TQVBoxLayout( page1, KDialog::marginHint(), KDialog::spacingHint() ); + page2 = new TQWidget( tabWidget ); + page2Layout = new TQVBoxLayout( page2, KDialog::marginHint(), KDialog::spacingHint() ); + page3 = new TQWidget( tabWidget ); + page3Layout = new TQVBoxLayout( page3, KDialog::marginHint(), KDialog::spacingHint() ); // Add Page1 (Style) // ----------------- - gbWidgetStyle = new QGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" ); + gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" ); gbWidgetStyle->setColumnLayout( 0, Qt::Vertical ); gbWidgetStyle->layout()->setMargin( KDialog::marginHint() ); gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); - gbWidgetStyleLayout = new QVBoxLayout( gbWidgetStyle->layout() ); + gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() ); gbWidgetStyleLayout->setAlignment( Qt::AlignTop ); - hbLayout = new QHBoxLayout( KDialog::spacingHint(), "hbLayout" ); + hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); cbStyle->setEditable( FALSE ); hbLayout->addWidget( cbStyle ); - pbConfigStyle = new QPushButton( i18n("Con&figure..."), gbWidgetStyle ); - pbConfigStyle->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum ); + pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); + pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); pbConfigStyle->setEnabled( FALSE ); hbLayout->addWidget( pbConfigStyle ); gbWidgetStyleLayout->addLayout( hbLayout ); - lblStyleDesc = new QLabel( gbWidgetStyle ); + lblStyleDesc = new TQLabel( gbWidgetStyle ); lblStyleDesc->setTextFormat(Qt::RichText); gbWidgetStyleLayout->addWidget( lblStyleDesc ); - cbIconsOnButtons = new QCheckBox( i18n("Sho&w icons on buttons"), gbWidgetStyle ); + cbIconsOnButtons = new TQCheckBox( i18n("Sho&w icons on buttons"), gbWidgetStyle ); gbWidgetStyleLayout->addWidget( cbIconsOnButtons ); - cbEnableTooltips = new QCheckBox( i18n("E&nable tooltips"), gbWidgetStyle ); + cbEnableTooltips = new TQCheckBox( i18n("E&nable tooltips"), gbWidgetStyle ); gbWidgetStyleLayout->addWidget( cbEnableTooltips ); - cbTearOffHandles = new QCheckBox( i18n("Show tear-off handles in &popup menus"), gbWidgetStyle ); + cbTearOffHandles = new TQCheckBox( i18n("Show tear-off handles in &popup menus"), gbWidgetStyle ); gbWidgetStyleLayout->addWidget( cbTearOffHandles ); cbTearOffHandles->hide(); // reenable when the corresponding Qt method is virtual and properly reimplemented - QGroupBox *gbPreview = new QGroupBox( i18n( "Preview" ), page1 ); + TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 ); gbPreview->setColumnLayout( 0, Vertical ); gbPreview->layout()->setMargin( 0 ); gbPreview->layout()->setSpacing( KDialog::spacingHint() ); @@ -199,84 +199,84 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name ) page1Layout->addWidget( gbPreview ); // Connect all required stuff - connect( cbStyle, SIGNAL(activated(int)), this, SLOT(styleChanged()) ); - connect( cbStyle, SIGNAL(activated(int)), this, SLOT(updateConfigButton())); - connect( pbConfigStyle, SIGNAL(clicked()), this, SLOT(styleSpecificConfig())); + connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(styleChanged()) ); + connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateConfigButton())); + connect( pbConfigStyle, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleSpecificConfig())); // Add Page2 (Effects) // ------------------- - cbEnableEffects = new QCheckBox( i18n("&Enable GUI effects"), page2 ); - containerFrame = new QFrame( page2 ); - containerFrame->setFrameStyle( QFrame::NoFrame | QFrame::Plain ); + cbEnableEffects = new TQCheckBox( i18n("&Enable GUI effects"), page2 ); + containerFrame = new TQFrame( page2 ); + containerFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); containerFrame->setMargin(0); - containerLayout = new QGridLayout( containerFrame, 1, 1, // rows, columns + containerLayout = new TQGridLayout( containerFrame, 1, 1, // rows, columns KDialog::marginHint(), KDialog::spacingHint() ); - comboComboEffect = new QComboBox( FALSE, containerFrame ); + comboComboEffect = new TQComboBox( FALSE, containerFrame ); comboComboEffect->insertItem( i18n("Disable") ); comboComboEffect->insertItem( i18n("Animate") ); - lblComboEffect = new QLabel( i18n("Combobo&x effect:"), containerFrame ); + lblComboEffect = new TQLabel( i18n("Combobo&x effect:"), containerFrame ); lblComboEffect->setBuddy( comboComboEffect ); containerLayout->addWidget( lblComboEffect, 0, 0 ); containerLayout->addWidget( comboComboEffect, 0, 1 ); - comboTooltipEffect = new QComboBox( FALSE, containerFrame ); + comboTooltipEffect = new TQComboBox( FALSE, containerFrame ); comboTooltipEffect->insertItem( i18n("Disable") ); comboTooltipEffect->insertItem( i18n("Animate") ); comboTooltipEffect->insertItem( i18n("Fade") ); - lblTooltipEffect = new QLabel( i18n("&Tool tip effect:"), containerFrame ); + lblTooltipEffect = new TQLabel( i18n("&Tool tip effect:"), containerFrame ); lblTooltipEffect->setBuddy( comboTooltipEffect ); containerLayout->addWidget( lblTooltipEffect, 1, 0 ); containerLayout->addWidget( comboTooltipEffect, 1, 1 ); - comboRubberbandEffect = new QComboBox( FALSE, containerFrame ); + comboRubberbandEffect = new TQComboBox( FALSE, containerFrame ); comboRubberbandEffect->insertItem( i18n("Disable") ); comboRubberbandEffect->insertItem( i18n("Make translucent") ); - lblRubberbandEffect = new QLabel( i18n("&Rubberband effect:"), containerFrame ); + lblRubberbandEffect = new TQLabel( i18n("&Rubberband effect:"), containerFrame ); lblRubberbandEffect->setBuddy( comboRubberbandEffect ); containerLayout->addWidget( lblRubberbandEffect, 2, 0 ); containerLayout->addWidget( comboRubberbandEffect, 2, 1 ); - comboMenuEffect = new QComboBox( FALSE, containerFrame ); + comboMenuEffect = new TQComboBox( FALSE, containerFrame ); comboMenuEffect->insertItem( i18n("Disable") ); comboMenuEffect->insertItem( i18n("Animate") ); comboMenuEffect->insertItem( i18n("Fade") ); comboMenuEffect->insertItem( i18n("Make Translucent") ); - lblMenuEffect = new QLabel( i18n("&Menu effect:"), containerFrame ); + lblMenuEffect = new TQLabel( i18n("&Menu effect:"), containerFrame ); lblMenuEffect->setBuddy( comboMenuEffect ); containerLayout->addWidget( lblMenuEffect, 3, 0 ); containerLayout->addWidget( comboMenuEffect, 3, 1 ); - comboMenuHandle = new QComboBox( FALSE, containerFrame ); + comboMenuHandle = new TQComboBox( FALSE, containerFrame ); comboMenuHandle->insertItem( i18n("Disable") ); comboMenuHandle->insertItem( i18n("Application Level") ); // comboMenuHandle->insertItem( i18n("Enable") ); - lblMenuHandle = new QLabel( i18n("Me&nu tear-off handles:"), containerFrame ); + lblMenuHandle = new TQLabel( i18n("Me&nu tear-off handles:"), containerFrame ); lblMenuHandle->setBuddy( comboMenuHandle ); containerLayout->addWidget( lblMenuHandle, 4, 0 ); containerLayout->addWidget( comboMenuHandle, 4, 1 ); - cbMenuShadow = new QCheckBox( i18n("Menu &drop shadow"), containerFrame ); + cbMenuShadow = new TQCheckBox( i18n("Menu &drop shadow"), containerFrame ); containerLayout->addWidget( cbMenuShadow, 5, 0 ); // Push the [label combo] to the left. - comboSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + comboSpacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); containerLayout->addItem( comboSpacer, 1, 2 ); // Separator. - QFrame* hline = new QFrame ( page2 ); - hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame* hline = new TQFrame ( page2 ); + hline->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); // Now implement the Menu Transparency container. - menuContainer = new QFrame( page2 ); - menuContainer->setFrameStyle( QFrame::NoFrame | QFrame::Plain ); + menuContainer = new TQFrame( page2 ); + menuContainer->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); menuContainer->setMargin(0); - menuContainerLayout = new QGridLayout( menuContainer, 1, 1, // rows, columns + menuContainerLayout = new TQGridLayout( menuContainer, 1, 1, // rows, columns KDialog::marginHint(), KDialog::spacingHint() ); menuPreview = new MenuPreview( menuContainer, /* opacity */ 90, MenuPreview::Blend ); - comboMenuEffectType = new QComboBox( FALSE, menuContainer ); + comboMenuEffectType = new TQComboBox( FALSE, menuContainer ); comboMenuEffectType->insertItem( i18n("Software Tint") ); comboMenuEffectType->insertItem( i18n("Software Blend") ); #ifdef HAVE_XRENDER @@ -284,25 +284,25 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name ) #endif // So much stuffing around for a simple slider.. - sliderBox = new QVBox( menuContainer ); + sliderBox = new TQVBox( menuContainer ); sliderBox->setSpacing( KDialog::spacingHint() ); sliderBox->setMargin( 0 ); - slOpacity = new QSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox ); - slOpacity->setTickmarks( QSlider::Below ); + slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox ); + slOpacity->setTickmarks( TQSlider::Below ); slOpacity->setTickInterval( 10 ); - QHBox* box1 = new QHBox( sliderBox ); + TQHBox* box1 = new TQHBox( sliderBox ); box1->setSpacing( KDialog::spacingHint() ); box1->setMargin( 0 ); - QLabel* lbl = new QLabel( i18n("0%"), box1 ); + TQLabel* lbl = new TQLabel( i18n("0%"), box1 ); lbl->setAlignment( AlignLeft ); - lbl = new QLabel( i18n("50%"), box1 ); + lbl = new TQLabel( i18n("50%"), box1 ); lbl->setAlignment( AlignHCenter ); - lbl = new QLabel( i18n("100%"), box1 ); + lbl = new TQLabel( i18n("100%"), box1 ); lbl->setAlignment( AlignRight ); - lblMenuEffectType = new QLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer ); + lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer ); lblMenuEffectType->setAlignment( AlignBottom | AlignLeft ); - lblMenuOpacity = new QLabel( slOpacity, i18n("Menu &opacity:"), menuContainer ); + lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer ); lblMenuOpacity->setAlignment( AlignBottom | AlignLeft ); menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 ); @@ -317,28 +317,28 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name ) page2Layout->addWidget( hline ); page2Layout->addWidget( menuContainer ); - QSpacerItem* sp1 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* sp1 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); page2Layout->addItem( sp1 ); // Data flow stuff. - connect( cbEnableEffects, SIGNAL(toggled(bool)), containerFrame, SLOT(setEnabled(bool)) ); - connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(menuEffectChanged(bool)) ); - connect( slOpacity, SIGNAL(valueChanged(int)),menuPreview, SLOT(setOpacity(int)) ); - connect( comboMenuEffect, SIGNAL(activated(int)), this, SLOT(menuEffectChanged()) ); - connect( comboMenuEffect, SIGNAL(highlighted(int)), this, SLOT(menuEffectChanged()) ); - connect( comboMenuEffectType, SIGNAL(activated(int)), this, SLOT(menuEffectTypeChanged()) ); - connect( comboMenuEffectType, SIGNAL(highlighted(int)), this, SLOT(menuEffectTypeChanged()) ); + connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), containerFrame, TQT_SLOT(setEnabled(bool)) ); + connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(menuEffectChanged(bool)) ); + connect( slOpacity, TQT_SIGNAL(valueChanged(int)),menuPreview, TQT_SLOT(setOpacity(int)) ); + connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectChanged()) ); + connect( comboMenuEffect, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectChanged()) ); + connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); + connect( comboMenuEffectType, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); // Add Page3 (Miscellaneous) // ------------------------- - cbHoverButtons = new QCheckBox( i18n("High&light buttons under mouse"), page3 ); - cbTransparentToolbars = new QCheckBox( i18n("Transparent tool&bars when moving"), page3 ); + cbHoverButtons = new TQCheckBox( i18n("High&light buttons under mouse"), page3 ); + cbTransparentToolbars = new TQCheckBox( i18n("Transparent tool&bars when moving"), page3 ); - QWidget * dummy = new QWidget( page3 ); + TQWidget * dummy = new TQWidget( page3 ); - QHBoxLayout* box2 = new QHBoxLayout( dummy, 0, KDialog::spacingHint() ); - lbl = new QLabel( i18n("Text pos&ition:"), dummy ); - comboToolbarIcons = new QComboBox( FALSE, dummy ); + TQHBoxLayout* box2 = new TQHBoxLayout( dummy, 0, KDialog::spacingHint() ); + lbl = new TQLabel( i18n("Text pos&ition:"), dummy ); + comboToolbarIcons = new TQComboBox( FALSE, dummy ); comboToolbarIcons->insertItem( i18n("Icons Only") ); comboToolbarIcons->insertItem( i18n("Text Only") ); comboToolbarIcons->insertItem( i18n("Text Alongside Icons") ); @@ -347,7 +347,7 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name ) box2->addWidget( lbl ); box2->addWidget( comboToolbarIcons ); - QSpacerItem* sp2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* sp2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); box2->addItem( sp2 ); page3Layout->addWidget( cbHoverButtons ); @@ -355,32 +355,32 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name ) page3Layout->addWidget( dummy ); // Layout page3. - QSpacerItem* sp3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* sp3 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); page3Layout->addItem( sp3 ); // Load settings load(); // Do all the setDirty connections. - connect(cbStyle, SIGNAL(activated(int)), this, SLOT(setStyleDirty())); + connect(cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); // Page2 - connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty())); - connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setStyleDirty())); - connect( comboTooltipEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty())); - connect( comboRubberbandEffect, SIGNAL(activated(int)), this, SLOT(setStyleDirty())); - connect( comboComboEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty())); - connect( comboMenuEffect, SIGNAL(activated(int)), this, SLOT(setStyleDirty())); - connect( comboMenuHandle, SIGNAL(activated(int)), this, SLOT(setStyleDirty())); - connect( comboMenuEffectType, SIGNAL(activated(int)), this, SLOT(setStyleDirty())); - connect( slOpacity, SIGNAL(valueChanged(int)),this, SLOT(setStyleDirty())); - connect( cbMenuShadow, SIGNAL(toggled(bool)), this, SLOT(setStyleDirty())); + connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); + connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); + connect( comboTooltipEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); + connect( comboRubberbandEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); + connect( comboComboEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); + connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); + connect( comboMenuHandle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); + connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); + connect( slOpacity, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty())); + connect( cbMenuShadow, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); // Page3 - connect( cbHoverButtons, SIGNAL(toggled(bool)), this, SLOT(setToolbarsDirty())); - connect( cbTransparentToolbars, SIGNAL(toggled(bool)), this, SLOT(setToolbarsDirty())); - connect( cbEnableTooltips, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty())); - connect( cbIconsOnButtons, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty())); - connect( cbTearOffHandles, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty())); - connect( comboToolbarIcons, SIGNAL(activated(int)), this, SLOT(setToolbarsDirty())); + connect( cbHoverButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); + connect( cbTransparentToolbars, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); + connect( cbEnableTooltips, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); + connect( cbIconsOnButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); + connect( cbTearOffHandles, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); + connect( comboToolbarIcons, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setToolbarsDirty())); addWhatsThis(); @@ -414,13 +414,13 @@ void KCMStyle::updateConfigButton() void KCMStyle::styleSpecificConfig() { - QString libname = styleEntries[currentStyle()]->configPage; + TQString libname = styleEntries[currentStyle()]->configPage; // Use KLibLoader to get the library, handling // any errors that arise KLibLoader* loader = KLibLoader::self(); - KLibrary* library = loader->library( QFile::encodeName(libname) ); + KLibrary* library = loader->library( TQFile::encodeName(libname) ); if (!library) { KMessageBox::detailedError(this, @@ -445,24 +445,24 @@ void KCMStyle::styleSpecificConfig() StyleConfigDialog* dial = new StyleConfigDialog(this, styleEntries[currentStyle()]->name); dial->enableButtonSeparator(true); - typedef QWidget*(* factoryRoutine)( QWidget* parent ); + typedef TQWidget*(* factoryRoutine)( TQWidget* parent ); //Get the factory, and make the widget. factoryRoutine factory = (factoryRoutine)(allocPtr); //Grmbl. So here I am on my //"never use C casts" moralizing streak, and I find that one can't go void* -> function ptr //even with a reinterpret_cast. - QWidget* pluginConfig = factory( dial ); + TQWidget* pluginConfig = factory( dial ); //Insert it in... dial->setMainWidget( pluginConfig ); //..and connect it to the wrapper - connect(pluginConfig, SIGNAL(changed(bool)), dial, SLOT(setDirty(bool))); - connect(dial, SIGNAL(defaults()), pluginConfig, SLOT(defaults())); - connect(dial, SIGNAL(save()), pluginConfig, SLOT(save())); + connect(pluginConfig, TQT_SIGNAL(changed(bool)), dial, TQT_SLOT(setDirty(bool))); + connect(dial, TQT_SIGNAL(defaults()), pluginConfig, TQT_SLOT(defaults())); + connect(dial, TQT_SIGNAL(save()), pluginConfig, TQT_SLOT(save())); - if (dial->exec() == QDialog::Accepted && dial->isDirty() ) { + if (dial->exec() == TQDialog::Accepted && dial->isDirty() ) { // Force re-rendering of the preview, to apply settings switchStyle(currentStyle(), true); @@ -526,7 +526,7 @@ void KCMStyle::save() } } - QString warn_string( i18n("<qt>Selected style: <b>%1</b><br><br>" + TQString warn_string( i18n("<qt>Selected style: <b>%1</b><br><br>" "One or more effects that you have chosen could not be applied because the selected " "style does not support them; they have therefore been disabled.<br>" "<br>" ).arg( cbStyle->currentText()) ); @@ -567,7 +567,7 @@ void KCMStyle::save() config.writeEntry( "EffectFadeTooltip", item == 2 ); item = comboRubberbandEffect->currentItem(); { - QSettings settings; // Only for KStyle stuff + TQSettings settings; // Only for KStyle stuff settings.writeEntry("/KStyle/Settings/SemiTransparentRubberband", item == 1); } item = comboMenuHandle->currentItem(); @@ -577,7 +577,7 @@ void KCMStyle::save() config.writeEntry( "EffectFadeMenu", item == 2 ); // Handle KStyle's menu effects - QString engine("Disabled"); + TQString engine("Disabled"); if (item == 3 && cbEnableEffects->isChecked()) // Make Translucent switch( comboMenuEffectType->currentItem()) { @@ -587,8 +587,8 @@ void KCMStyle::save() case 0: engine = "SoftwareTint"; break; } - { // Braces force a QSettings::sync() - QSettings settings; // Only for KStyle stuff + { // Braces force a TQSettings::sync() + TQSettings settings; // Only for KStyle stuff settings.writeEntry("/KStyle/Settings/MenuTransparencyEngine", engine); settings.writeEntry("/KStyle/Settings/MenuOpacity", slOpacity->value()/100.0); settings.writeEntry("/KStyle/Settings/MenuDropShadow", @@ -605,7 +605,7 @@ void KCMStyle::save() config.setGroup("Toolbar style"); config.writeEntry( "Highlighting", cbHoverButtons->isChecked(), true, true ); config.writeEntry( "TransparentMoving", cbTransparentToolbars->isChecked(), true, true ); - QString tbIcon; + TQString tbIcon; switch( comboToolbarIcons->currentItem() ) { case 1: tbIcon = "TextOnly"; break; @@ -646,7 +646,7 @@ void KCMStyle::save() } //update kicker to re-used tooltips kicker parameter otherwise, it overwritted //by style tooltips parameters. - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( "kicker", "kicker", "configure()", data ); // Clean up @@ -657,11 +657,11 @@ void KCMStyle::save() } -bool KCMStyle::findStyle( const QString& str, int& combobox_item ) +bool KCMStyle::findStyle( const TQString& str, int& combobox_item ) { StyleEntry* se = styleEntries.find(str.lower()); - QString name = se ? se->name : str; + TQString name = se ? se->name : str; combobox_item = 0; @@ -715,9 +715,9 @@ void KCMStyle::loadStyle( KConfig& config ) styleEntries.clear(); styleEntries.setAutoDelete(true); - QString strWidgetStyle; - QStringList list = KGlobal::dirs()->findAllResources("themes", "*.themerc", true, true); - for (QStringList::iterator it = list.begin(); it != list.end(); ++it) + TQString strWidgetStyle; + TQStringList list = KGlobal::dirs()->findAllResources("themes", "*.themerc", true, true); + for (TQStringList::iterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig config( *it, true ); if ( !(config.hasGroup("KDE") && config.hasGroup("Misc")) ) @@ -734,7 +734,7 @@ void KCMStyle::loadStyle( KConfig& config ) config.setGroup("Misc"); entry->name = config.readEntry("Name"); entry->desc = config.readEntry("Comment", i18n("No description available.")); - entry->configPage = config.readEntry("ConfigPage", QString::null); + entry->configPage = config.readEntry("ConfigPage", TQString::null); // Check if this style should be shown config.setGroup("Desktop Entry"); @@ -745,14 +745,14 @@ void KCMStyle::loadStyle( KConfig& config ) } // Obtain all style names - QStringList allStyles = QStyleFactory::keys(); + TQStringList allStyles = TQStyleFactory::keys(); // Get translated names, remove all hidden style entries. - QStringList styles; + TQStringList styles; StyleEntry* entry; - for (QStringList::iterator it = allStyles.begin(); it != allStyles.end(); it++) + for (TQStringList::iterator it = allStyles.begin(); it != allStyles.end(); it++) { - QString id = (*it).lower(); + TQString id = (*it).lower(); // Find the entry. if ( (entry = styleEntries.find(id)) != 0 ) { @@ -777,27 +777,27 @@ void KCMStyle::loadStyle( KConfig& config ) // Find out which style is currently being used config.setGroup( "General" ); - QString defaultStyle = KStyle::defaultStyle(); - QString cfgStyle = config.readEntry( "widgetStyle", defaultStyle ); + TQString defaultStyle = KStyle::defaultStyle(); + TQString cfgStyle = config.readEntry( "widgetStyle", defaultStyle ); // Select the current style // Do not use cbStyle->listBox() as this may be NULL for some styles when // they use QPopupMenus for the drop-down list! // ##### Since Trolltech likes to seemingly copy & paste code, - // QStringList::findItem() doesn't have a Qt::StringComparisonMode field. + // TQStringList::findItem() doesn't have a Qt::StringComparisonMode field. // We roll our own (yuck) cfgStyle = cfgStyle.lower(); int item = 0; for( int i = 0; i < cbStyle->count(); i++ ) { - QString id = nameToStyleKey[cbStyle->text(i)]; + TQString id = nameToStyleKey[cbStyle->text(i)]; item = i; if ( id == cfgStyle ) // ExactMatch break; else if ( id.contains( cfgStyle ) ) break; - else if ( id.contains( QApplication::style().className() ) ) + else if ( id.contains( TQApplication::style().className() ) ) break; item = 0; } @@ -808,7 +808,7 @@ void KCMStyle::loadStyle( KConfig& config ) switchStyle( currentStyle() ); // make resets visible } -QString KCMStyle::currentStyle() +TQString KCMStyle::currentStyle() { return nameToStyleKey[cbStyle->currentText()]; } @@ -820,19 +820,19 @@ void KCMStyle::styleChanged() } -void KCMStyle::switchStyle(const QString& styleName, bool force) +void KCMStyle::switchStyle(const TQString& styleName, bool force) { // Don't flicker the preview if the same style is chosen in the cb if (!force && appliedStyle && appliedStyle->name() == styleName) return; // Create an instance of the new style... - QStyle* style = QStyleFactory::create(styleName); + TQStyle* style = TQStyleFactory::create(styleName); if (!style) return; // Prevent Qt from wrongly caching radio button images - QPixmapCache::clear(); + TQPixmapCache::clear(); setStyleRecursive( stylePreview, style ); @@ -844,18 +844,18 @@ void KCMStyle::switchStyle(const QString& styleName, bool force) // Set the correct style description StyleEntry* entry = styleEntries.find( styleName ); - QString desc; + TQString desc; desc = i18n("Description: %1").arg( entry ? entry->desc : i18n("No description available.") ); lblStyleDesc->setText( desc ); } -void KCMStyle::setStyleRecursive(QWidget* w, QStyle* s) +void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s) { // Don't let broken styles kill the palette // for other styles being previewed. (e.g SGI style) w->unsetPalette(); - QPalette newPalette(KApplication::createApplicationPalette()); + TQPalette newPalette(KApplication::createApplicationPalette()); s->polish( newPalette ); w->setPalette(newPalette); @@ -863,18 +863,18 @@ void KCMStyle::setStyleRecursive(QWidget* w, QStyle* s) w->setStyle(s); // Recursively update all children. - const QObjectList *children = w->children(); + const TQObjectList *children = w->children(); if (!children) return; // Apply the style to each child widget. - QPtrListIterator<QObject> childit(*children); - QObject *child; + TQPtrListIterator<TQObject> childit(*children); + TQObject *child; while ((child = childit.current()) != 0) { ++childit; if (child->isWidgetType()) - setStyleRecursive((QWidget *) child, s); + setStyleRecursive((TQWidget *) child, s); } } @@ -902,7 +902,7 @@ void KCMStyle::loadEffects( KConfig& config ) else comboTooltipEffect->setCurrentItem( 0 ); - QSettings settings; + TQSettings settings; bool semiTransparentRubberband = settings.readBoolEntry("/KStyle/Settings/SemiTransparentRubberband", false); comboRubberbandEffect->setCurrentItem( semiTransparentRubberband ? 1 : 0 ); @@ -917,7 +917,7 @@ void KCMStyle::loadEffects( KConfig& config ) // KStyle Menu transparency and drop-shadow options... - QString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled"); + TQString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled"); #ifdef HAVE_XRENDER if (effectEngine == "XRender") { @@ -1007,7 +1007,7 @@ void KCMStyle::loadMisc( KConfig& config ) cbHoverButtons->setChecked(config.readBoolEntry("Highlighting", true)); cbTransparentToolbars->setChecked(config.readBoolEntry("TransparentMoving", true)); - QString tbIcon = config.readEntry("IconText", "IconOnly"); + TQString tbIcon = config.readEntry("IconText", "IconOnly"); if (tbIcon == "TextOnly") comboToolbarIcons->setCurrentItem(1); else if (tbIcon == "IconTextRight") @@ -1028,58 +1028,58 @@ void KCMStyle::loadMisc( KConfig& config ) void KCMStyle::addWhatsThis() { // Page1 - QWhatsThis::add( cbStyle, i18n("Here you can choose from a list of" + TQWhatsThis::add( cbStyle, i18n("Here you can choose from a list of" " predefined widget styles (e.g. the way buttons are drawn) which" " may or may not be combined with a theme (additional information" " like a marble texture or a gradient).") ); - QWhatsThis::add( stylePreview, i18n("This area shows a preview of the currently selected style " + TQWhatsThis::add( stylePreview, i18n("This area shows a preview of the currently selected style " "without having to apply it to the whole desktop.") ); // Page2 - QWhatsThis::add( page2, i18n("This page allows you to enable various widget style effects. " + TQWhatsThis::add( page2, i18n("This page allows you to enable various widget style effects. " "For best performance, it is advisable to disable all effects.") ); - QWhatsThis::add( cbEnableEffects, i18n( "If you check this box, you can select several effects " + TQWhatsThis::add( cbEnableEffects, i18n( "If you check this box, you can select several effects " "for different widgets like combo boxes, menus or tooltips.") ); - QWhatsThis::add( comboComboEffect, i18n( "<p><b>Disable: </b>do not use any combo box effects.</p>\n" + TQWhatsThis::add( comboComboEffect, i18n( "<p><b>Disable: </b>do not use any combo box effects.</p>\n" "<b>Animate: </b>Do some animation.") ); - QWhatsThis::add( comboTooltipEffect, i18n( "<p><b>Disable: </b>do not use any tooltip effects.</p>\n" + TQWhatsThis::add( comboTooltipEffect, i18n( "<p><b>Disable: </b>do not use any tooltip effects.</p>\n" "<p><b>Animate: </b>Do some animation.</p>\n" "<b>Fade: </b>Fade in tooltips using alpha-blending.") ); - QWhatsThis::add( comboRubberbandEffect, i18n( "<p><b>Disable: </b>do not use any rubberband effects.</p>\n" + TQWhatsThis::add( comboRubberbandEffect, i18n( "<p><b>Disable: </b>do not use any rubberband effects.</p>\n" "<b>Make Translucent: </b>Draw a translucent rubberband.") ); - QWhatsThis::add( comboMenuEffect, i18n( "<p><b>Disable: </b>do not use any menu effects.</p>\n" + TQWhatsThis::add( comboMenuEffect, i18n( "<p><b>Disable: </b>do not use any menu effects.</p>\n" "<p><b>Animate: </b>Do some animation.</p>\n" "<p><b>Fade: </b>Fade in menus using alpha-blending.</p>\n" "<b>Make Translucent: </b>Alpha-blend menus for a see-through effect. (KDE styles only)") ); - QWhatsThis::add( cbMenuShadow, i18n( "When enabled, all popup menus will have a drop-shadow, otherwise " + TQWhatsThis::add( cbMenuShadow, i18n( "When enabled, all popup menus will have a drop-shadow, otherwise " "drop-shadows will not be displayed. At present, only KDE styles can have this " "effect enabled.") ); - QWhatsThis::add( comboMenuEffectType, i18n( "<p><b>Software Tint: </b>Alpha-blend using a flat color.</p>\n" + TQWhatsThis::add( comboMenuEffectType, i18n( "<p><b>Software Tint: </b>Alpha-blend using a flat color.</p>\n" "<p><b>Software Blend: </b>Alpha-blend using an image.</p>\n" "<b>XRender Blend: </b>Use the XFree RENDER extension for image blending (if available). " "This method may be slower than the Software routines on non-accelerated displays, " "but may however improve performance on remote displays.</p>\n") ); - QWhatsThis::add( slOpacity, i18n("By adjusting this slider you can control the menu effect opacity.") ); + TQWhatsThis::add( slOpacity, i18n("By adjusting this slider you can control the menu effect opacity.") ); // Page3 - QWhatsThis::add( page3, i18n("<b>Note:</b> that all widgets in this combobox " + TQWhatsThis::add( page3, i18n("<b>Note:</b> that all widgets in this combobox " "do not apply to Qt-only applications.") ); - QWhatsThis::add( cbHoverButtons, i18n("If this option is selected, toolbar buttons will change " + TQWhatsThis::add( cbHoverButtons, i18n("If this option is selected, toolbar buttons will change " "their color when the mouse cursor is moved over them." ) ); - QWhatsThis::add( cbTransparentToolbars, i18n("If you check this box, the toolbars will be " + TQWhatsThis::add( cbTransparentToolbars, i18n("If you check this box, the toolbars will be " "transparent when moving them around.") ); - QWhatsThis::add( cbEnableTooltips, i18n( "If you check this option, the KDE application " + TQWhatsThis::add( cbEnableTooltips, i18n( "If you check this option, the KDE application " "will offer tooltips when the cursor remains over items in the toolbar." ) ); - QWhatsThis::add( comboToolbarIcons, i18n( "<p><b>Icons only:</b> Shows only icons on toolbar buttons. " + TQWhatsThis::add( comboToolbarIcons, i18n( "<p><b>Icons only:</b> Shows only icons on toolbar buttons. " "Best option for low resolutions.</p>" "<p><b>Text only: </b>Shows only text on toolbar buttons.</p>" "<p><b>Text alongside icons: </b> Shows icons and text on toolbar buttons. " "Text is aligned alongside the icon.</p>" "<b>Text under icons: </b> Shows icons and text on toolbar buttons. " "Text is aligned below the icon.") ); - QWhatsThis::add( cbIconsOnButtons, i18n( "If you enable this option, KDE Applications will " + TQWhatsThis::add( cbIconsOnButtons, i18n( "If you enable this option, KDE Applications will " "show small icons alongside some important buttons.") ); - QWhatsThis::add( cbTearOffHandles, i18n( "If you enable this option some pop-up menus will " + TQWhatsThis::add( cbTearOffHandles, i18n( "If you enable this option some pop-up menus will " "show so called tear-off handles. If you click them, you get the menu " "inside a widget. This can be very helpful when performing " "the same action multiple times.") ); diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h index 6f6da6d1c..17d3cfdfa 100644 --- a/kcontrol/style/kcmstyle.h +++ b/kcontrol/style/kcmstyle.h @@ -27,8 +27,8 @@ #ifndef __KCMSTYLE_H #define __KCMSTYLE_H -#include <qstring.h> -#include <qtimer.h> +#include <tqstring.h> +#include <tqtimer.h> #include <kcmodule.h> @@ -53,9 +53,9 @@ class StyleConfigDialog; class WidgetPreview; struct StyleEntry { - QString name; - QString desc; - QString configPage; + TQString name; + TQString desc; + TQString configPage; bool hidden; }; @@ -64,7 +64,7 @@ class KCMStyle : public KCModule Q_OBJECT public: - KCMStyle( QWidget* parent = 0, const char* name = 0 ); + KCMStyle( TQWidget* parent = 0, const char* name = 0 ); ~KCMStyle(); virtual void load(); @@ -73,9 +73,9 @@ public: virtual void defaults(); protected: - bool findStyle( const QString& str, int& combobox_item ); - void switchStyle(const QString& styleName, bool force = false); - void setStyleRecursive(QWidget* w, QStyle* s); + bool findStyle( const TQString& str, int& combobox_item ); + void switchStyle(const TQString& styleName, bool force = false); + void setStyleRecursive(TQWidget* w, TQStyle* s); void loadStyle( KConfig& config ); void loadEffects( KConfig& config ); @@ -96,68 +96,68 @@ protected slots: void menuEffectTypeChanged(); private: - QString currentStyle(); + TQString currentStyle(); bool m_bEffectsDirty, m_bStyleDirty, m_bToolbarsDirty; - QDict<StyleEntry> styleEntries; - QMap <QString,QString> nameToStyleKey; + TQDict<StyleEntry> styleEntries; + TQMap <TQString,TQString> nameToStyleKey; - QVBoxLayout* mainLayout; - QTabWidget* tabWidget; - QWidget *page1, *page2, *page3; - QVBoxLayout* page1Layout; - QVBoxLayout* page2Layout; - QVBoxLayout* page3Layout; + TQVBoxLayout* mainLayout; + TQTabWidget* tabWidget; + TQWidget *page1, *page2, *page3; + TQVBoxLayout* page1Layout; + TQVBoxLayout* page2Layout; + TQVBoxLayout* page3Layout; // Page1 widgets - QGroupBox* gbWidgetStyle; - QVBoxLayout* gbWidgetStyleLayout; - QHBoxLayout* hbLayout; + TQGroupBox* gbWidgetStyle; + TQVBoxLayout* gbWidgetStyleLayout; + TQHBoxLayout* hbLayout; KComboBox* cbStyle; - QPushButton* pbConfigStyle; - QLabel* lblStyleDesc; + TQPushButton* pbConfigStyle; + TQLabel* lblStyleDesc; StylePreview* stylePreview; - QStyle* appliedStyle; - QPalette palette; + TQStyle* appliedStyle; + TQPalette palette; // Page2 widgets - QCheckBox* cbEnableEffects; - - QFrame* containerFrame; - QGridLayout* containerLayout; - QComboBox* comboTooltipEffect; - QComboBox* comboRubberbandEffect; - QComboBox* comboComboEffect; - QComboBox* comboMenuEffect; - QComboBox* comboMenuHandle; - - QLabel* lblTooltipEffect; - QLabel* lblRubberbandEffect; - QLabel* lblComboEffect; - QLabel* lblMenuEffect; - QLabel* lblMenuHandle; - QSpacerItem* comboSpacer; - - QFrame* menuContainer; - QGridLayout* menuContainerLayout; + TQCheckBox* cbEnableEffects; + + TQFrame* containerFrame; + TQGridLayout* containerLayout; + TQComboBox* comboTooltipEffect; + TQComboBox* comboRubberbandEffect; + TQComboBox* comboComboEffect; + TQComboBox* comboMenuEffect; + TQComboBox* comboMenuHandle; + + TQLabel* lblTooltipEffect; + TQLabel* lblRubberbandEffect; + TQLabel* lblComboEffect; + TQLabel* lblMenuEffect; + TQLabel* lblMenuHandle; + TQSpacerItem* comboSpacer; + + TQFrame* menuContainer; + TQGridLayout* menuContainerLayout; MenuPreview* menuPreview; - QVBox* sliderBox; - QSlider* slOpacity; - QComboBox* comboMenuEffectType; - QLabel* lblMenuEffectType; - QLabel* lblMenuOpacity; - QCheckBox* cbMenuShadow; + TQVBox* sliderBox; + TQSlider* slOpacity; + TQComboBox* comboMenuEffectType; + TQLabel* lblMenuEffectType; + TQLabel* lblMenuOpacity; + TQCheckBox* cbMenuShadow; // Page3 widgets - QGroupBox* gbVisualAppearance; + TQGroupBox* gbVisualAppearance; - QCheckBox* cbHoverButtons; - QCheckBox* cbTransparentToolbars; - QCheckBox* cbEnableTooltips; - QComboBox* comboToolbarIcons; + TQCheckBox* cbHoverButtons; + TQCheckBox* cbTransparentToolbars; + TQCheckBox* cbEnableTooltips; + TQComboBox* comboToolbarIcons; - QCheckBox* cbIconsOnButtons; - QCheckBox* cbTearOffHandles; + TQCheckBox* cbIconsOnButtons; + TQCheckBox* cbTearOffHandles; }; #endif // __KCMSTYLE_H diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp index 28e0ce424..0350ab969 100644 --- a/kcontrol/style/keramik/keramikconf.cpp +++ b/kcontrol/style/keramik/keramikconf.cpp @@ -21,9 +21,9 @@ DEALINGS IN THE SOFTWARE. */ -#include <qcheckbox.h> -#include <qlayout.h> -#include <qsettings.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqsettings.h> #include <kdialog.h> #include <kglobal.h> #include <klocale.h> @@ -32,28 +32,28 @@ DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT QWidget* allocate_kstyle_config(QWidget* parent) + KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent) { return new KeramikStyleConfig(parent); } } -KeramikStyleConfig::KeramikStyleConfig(QWidget* parent): QWidget(parent) +KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent) { //Should have no margins here, the dialog provides them - QVBoxLayout* layout = new QVBoxLayout(this, 0, 0); + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); KGlobal::locale()->insertCatalogue("kstyle_keramik_config"); - //highlightLineEdits = new QCheckBox(i18n("Highlight active lineedits"), this); - highlightScrollBar = new QCheckBox(i18n("Highlight scroll bar handles"), this); - animateProgressBar = new QCheckBox(i18n("Animate progress bars"), this); + //highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this); + highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this); + animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this); //layout->add(highlightLineEdits); layout->add(highlightScrollBar); layout->add(animateProgressBar); layout->addStretch(1); - QSettings s; + TQSettings s; //origHlLineEdit = s.readBoolEntry("/keramik/Settings/highlightLineEdits", false); //highlightLineEdits->setChecked(origHlLineEdit); @@ -63,9 +63,9 @@ KeramikStyleConfig::KeramikStyleConfig(QWidget* parent): QWidget(parent) origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false); animateProgressBar->setChecked(origAnimProgressBar); - //connect(highlightLineEdits, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) ); - connect(highlightScrollBar, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) ); - connect(animateProgressBar, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) ); + //connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); + connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); + connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); } KeramikStyleConfig::~KeramikStyleConfig() @@ -76,7 +76,7 @@ KeramikStyleConfig::~KeramikStyleConfig() void KeramikStyleConfig::save() { - QSettings s; + TQSettings s; //s.writeEntry("/keramik/Settings/highlightLineEdits", highlightLineEdits->isChecked()); s.writeEntry("/keramik/Settings/highlightScrollBar", highlightScrollBar->isChecked()); s.writeEntry("/keramik/Settings/animateProgressBar", animateProgressBar->isChecked()); diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h index f482fdb14..727284d7e 100644 --- a/kcontrol/style/keramik/keramikconf.h +++ b/kcontrol/style/keramik/keramikconf.h @@ -30,7 +30,7 @@ class KeramikStyleConfig: public QWidget { Q_OBJECT public: - KeramikStyleConfig(QWidget* parent); + KeramikStyleConfig(TQWidget* parent); ~KeramikStyleConfig(); //This signal and the next two slots are the plugin @@ -49,9 +49,9 @@ protected slots: protected: //We store settings directly in widgets to //avoid the hassle of sync'ing things - //QCheckBox* highlightLineEdits; - QCheckBox* animateProgressBar; - QCheckBox* highlightScrollBar; + //TQCheckBox* highlightLineEdits; + TQCheckBox* animateProgressBar; + TQCheckBox* highlightScrollBar; //Original settings, for accurate dirtiness tracking //bool origHlLineEdit; diff --git a/kcontrol/style/main.cpp b/kcontrol/style/main.cpp index 543685502..252cee0fd 100644 --- a/kcontrol/style/main.cpp +++ b/kcontrol/style/main.cpp @@ -5,12 +5,12 @@ #include "kcmstyle.h" extern "C" { - KCModule *create_style(QWidget *parent, const char *) { + KCModule *create_style(TQWidget *parent, const char *) { return new KCMStyle(parent, "kcmstyle"); } } /* -typedef KGenericFactory<KWidgetSettingsModule, QWidget> GeneralFactory; +typedef KGenericFactory<KWidgetSettingsModule, TQWidget> GeneralFactory; K_EXPORT_COMPONENT_FACTORY( kcm_style, GeneralFactory ) */ diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index a8a74c981..112f2c241 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -19,8 +19,8 @@ #include "menupreview.h" -#include <qpainter.h> -#include <qimage.h> +#include <tqpainter.h> +#include <tqimage.h> #include <kpixmap.h> #include <kpixmapeffect.h> @@ -29,8 +29,8 @@ #include <kiconloader.h> -MenuPreview::MenuPreview( QWidget* parent, int opacity, PreviewMode pvm ) - : QWidget( parent, 0, WStyle_Customize | WRepaintNoErase ), +MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm ) + : TQWidget( parent, 0, WStyle_Customize | WRepaintNoErase ), pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL) { setFixedSize(150, 150); @@ -68,13 +68,13 @@ void MenuPreview::createPixmaps() if (pixBlended) pixBlended->resize( w, h ); - QColorGroup cg = colorGroup(); - QColor c1 = cg.background(); - QColor c2 = cg.mid(); + TQColorGroup cg = colorGroup(); + TQColor c1 = cg.background(); + TQColor c2 = cg.mid(); if (pixBackground) { // Paint checkerboard - QPainter p; + TQPainter p; p.begin(pixBackground); for(int x=0; x < pixBackground->width(); x+=5) for(int y=0; y < pixBackground->height(); y+=5) @@ -83,7 +83,7 @@ void MenuPreview::createPixmaps() ((y % 2) ? c2 : c1 ) : // See the grid? ;-) ((y % 2) ? c1 : c2 ) ); KIconLoader* icl = KGlobal::iconLoader(); - QPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState); + TQPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState); p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix ); } @@ -100,13 +100,13 @@ void MenuPreview::blendPixmaps() if (pixBlended && pixBackground) { if (mode == Blend && pixOverlay) { - QImage src = pixOverlay->convertToImage(); - QImage dst = pixBackground->convertToImage(); + TQImage src = pixOverlay->convertToImage(); + TQImage dst = pixBackground->convertToImage(); KImageEffect::blend(src, dst, menuOpacity); pixBlended->convertFromImage( dst ); } else if (mode == Tint) { - QColor clr = colorGroup().button(); - QImage dst = pixBackground->convertToImage(); + TQColor clr = colorGroup().button(); + TQImage dst = pixBackground->convertToImage(); KImageEffect::blend(clr, dst, menuOpacity); pixBlended->convertFromImage( dst ); } @@ -134,14 +134,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm ) } } -void MenuPreview::paintEvent( QPaintEvent* /* pe */ ) +void MenuPreview::paintEvent( TQPaintEvent* /* pe */ ) { // Paint the frame and blended pixmap - QColorGroup cg = colorGroup(); + TQColorGroup cg = colorGroup(); int x2 = width()-1; int y2 = height()-1; - QPainter p(this); + TQPainter p(this); p.setPen(cg.dark()); p.drawLine(0, 0, x2, 0); p.drawLine(0, 0, 0, y2); @@ -154,10 +154,10 @@ void MenuPreview::paintEvent( QPaintEvent* /* pe */ ) else if (mode != NoEffect && pixBlended) p.drawPixmap(1, 1, *pixBlended, 0, 0, --x2, --y2); - QRect r = rect(); + TQRect r = rect(); r.moveBy(6,3); p.setPen( cg.text() ); - p.drawText( r, AlignTop | AlignLeft, QString::number((int)(menuOpacity*100))+i18n("%") ); + p.drawText( r, AlignTop | AlignLeft, TQString::number((int)(menuOpacity*100))+i18n("%") ); } #include "menupreview.moc" diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h index 2b7cb8bc8..ad22e77af 100644 --- a/kcontrol/style/menupreview.h +++ b/kcontrol/style/menupreview.h @@ -20,7 +20,7 @@ #ifndef __MENUPREVIEW_H #define __MENUPREVIEW_H -#include <qwidget.h> +#include <tqwidget.h> class KPixmap; @@ -35,7 +35,7 @@ public: Blend }; - MenuPreview( QWidget* parent, int opacity, PreviewMode pvm ); + MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm ); ~MenuPreview(); public slots: @@ -43,7 +43,7 @@ public slots: void setPreviewMode( PreviewMode pvm ); protected: - void paintEvent( QPaintEvent* pe ); + void paintEvent( TQPaintEvent* pe ); private: void createPixmaps(); diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp index 6638b620d..1623a3a21 100644 --- a/kcontrol/style/styleconfdialog.cpp +++ b/kcontrol/style/styleconfdialog.cpp @@ -21,7 +21,7 @@ #include "styleconfdialog.h" #include <klocale.h> -StyleConfigDialog::StyleConfigDialog(QWidget* parent, QString styleName): +StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName): KDialogBase(parent, "StyleConfigDialog", true, /*modal*/ i18n("Configure %1").arg(styleName), @@ -29,8 +29,8 @@ StyleConfigDialog::StyleConfigDialog(QWidget* parent, QString styleName): KDialogBase::Cancel) { m_dirty = false; - connect( this, SIGNAL( defaultClicked() ), this, SIGNAL( defaults() )); - connect( this, SIGNAL( okClicked() ), this, SIGNAL( save() )); + connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SIGNAL( defaults() )); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SIGNAL( save() )); } bool StyleConfigDialog::isDirty() const diff --git a/kcontrol/style/styleconfdialog.h b/kcontrol/style/styleconfdialog.h index ab299225a..6555adee6 100644 --- a/kcontrol/style/styleconfdialog.h +++ b/kcontrol/style/styleconfdialog.h @@ -28,7 +28,7 @@ class StyleConfigDialog: public KDialogBase { Q_OBJECT public: - StyleConfigDialog(QWidget* parent, QString styleName); + StyleConfigDialog(TQWidget* parent, TQString styleName); bool isDirty() const; diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h index 09b50a0ce..076197955 100644 --- a/kcontrol/style/stylepreview.ui.h +++ b/kcontrol/style/stylepreview.ui.h @@ -27,38 +27,38 @@ ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ -#include <qobjectlist.h> +#include <tqobjectlist.h> void StylePreview::init() { // Ensure that the user can't toy with the child widgets. // Method borrowed from Qt's qtconfig. - QObjectList* l = queryList("QWidget"); - QObjectListIt it(*l); - QObject* obj; + TQObjectList* l = queryList("TQWidget"); + TQObjectListIt it(*l); + TQObject* obj; while ((obj = it.current()) != 0) { ++it; obj->installEventFilter(this); - ((QWidget*)obj)->setFocusPolicy(NoFocus); + ((TQWidget*)obj)->setFocusPolicy(NoFocus); } delete l; } -bool StylePreview::eventFilter( QObject* /* obj */, QEvent* ev ) +bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev ) { switch( ev->type() ) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: - case QEvent::KeyPress: - case QEvent::KeyRelease: - case QEvent::Enter: - case QEvent::Leave: - case QEvent::Wheel: - case QEvent::ContextMenu: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::MouseButtonDblClick: + case TQEvent::MouseMove: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: + case TQEvent::Enter: + case TQEvent::Leave: + case TQEvent::Wheel: + case TQEvent::ContextMenu: return TRUE; // ignore default: break; diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 08139b607..a13963e09 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -16,11 +16,11 @@ * along with this program; if not, write to the Free Software */ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qvaluelist.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqvaluelist.h> #include <dcopclient.h> @@ -31,7 +31,7 @@ #include <kgenericfactory.h> #include <kwin.h> #include <kcolorbutton.h> -#include <qlabel.h> +#include <tqlabel.h> #define protected public #include "kcmtaskbarui.h" @@ -41,10 +41,10 @@ #include "kcmtaskbar.h" #include "kcmtaskbar.moc" -typedef KGenericFactory<TaskbarConfig, QWidget > TaskBarFactory; +typedef KGenericFactory<TaskbarConfig, TQWidget > TaskBarFactory; K_EXPORT_COMPONENT_FACTORY (kcm_taskbar, TaskBarFactory("kcmtaskbar") ) -TaskbarAppearance::TaskbarAppearance(QString name, +TaskbarAppearance::TaskbarAppearance(TQString name, bool drawButtons, bool haloText, bool showButtonOnHover) @@ -77,10 +77,10 @@ void TaskbarAppearance::alterSettings() const } // These are the strings that are actually stored in the config file. -const QStringList& TaskbarConfig::actionList() +const TQStringList& TaskbarConfig::actionList() { - static QStringList list( - QStringList() << I18N_NOOP("Show Task List") << I18N_NOOP("Show Operations Menu") + static TQStringList list( + TQStringList() << I18N_NOOP("Show Task List") << I18N_NOOP("Show Operations Menu") << I18N_NOOP("Activate, Raise or Minimize Task") << I18N_NOOP("Activate Task") << I18N_NOOP("Raise Task") << I18N_NOOP("Lower Task") << I18N_NOOP("Minimize Task") @@ -90,38 +90,38 @@ const QStringList& TaskbarConfig::actionList() } // Get a translated version of the above string list. -QStringList TaskbarConfig::i18nActionList() +TQStringList TaskbarConfig::i18nActionList() { - QStringList i18nList; - for( QStringList::ConstIterator it = actionList().begin(); it != actionList().end(); ++it ) { + TQStringList i18nList; + for( TQStringList::ConstIterator it = actionList().begin(); it != actionList().end(); ++it ) { i18nList << i18n((*it).latin1()); } return i18nList; } // These are the strings that are actually stored in the config file. -const QStringList& TaskbarConfig::groupModeList() +const TQStringList& TaskbarConfig::groupModeList() { - static QStringList list( - QStringList() << I18N_NOOP("Never") << I18N_NOOP("When Taskbar Full") + static TQStringList list( + TQStringList() << I18N_NOOP("Never") << I18N_NOOP("When Taskbar Full") << I18N_NOOP("Always")); return list; } // Get a translated version of the above string list. -QStringList TaskbarConfig::i18nGroupModeList() +TQStringList TaskbarConfig::i18nGroupModeList() { - QStringList i18nList; - for( QStringList::ConstIterator it = groupModeList().begin(); it != groupModeList().end(); ++it ) { + TQStringList i18nList; + for( TQStringList::ConstIterator it = groupModeList().begin(); it != groupModeList().end(); ++it ) { i18nList << i18n((*it).latin1()); } return i18nList; } -TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringList&) +TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringList&) : KCModule(TaskBarFactory::instance(), parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); m_widget = new TaskbarConfigUI(this); layout->addWidget(m_widget); @@ -137,8 +137,8 @@ TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringLis m_widget->appearance->insertItem((*it).name()); } - connect(m_widget->appearance, SIGNAL(activated(int)), - this, SLOT(appearanceChanged(int))); + connect(m_widget->appearance, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(appearanceChanged(int))); addConfig(TaskBarSettings::self(), m_widget); setQuickHelp(i18n("<h1>Taskbar</h1> You can configure the taskbar here." @@ -146,15 +146,15 @@ TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringLis " windows at once or only those on the current desktop." " You can also configure whether or not the Window List button will be displayed.")); - QStringList list = i18nActionList(); + TQStringList list = i18nActionList(); m_widget->kcfg_LeftButtonAction->insertStringList(list); m_widget->kcfg_MiddleButtonAction->insertStringList(list); m_widget->kcfg_RightButtonAction->insertStringList(list); m_widget->kcfg_GroupTasks->insertStringList(i18nGroupModeList()); - connect(m_widget->kcfg_GroupTasks, SIGNAL(activated(int)), - this, SLOT(slotUpdateComboBox())); - connect(m_widget->kcfg_UseCustomColors, SIGNAL(stateChanged(int)), this, SLOT(slotUpdateCustomColors())); + connect(m_widget->kcfg_GroupTasks, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotUpdateComboBox())); + connect(m_widget->kcfg_UseCustomColors, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateCustomColors())); slotUpdateCustomColors(); updateAppearanceCombo(); @@ -166,12 +166,12 @@ TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringLis m_widget->spacer2->changeSize(0, 0); } - if (!QApplication::desktop()->isVirtualDesktop() || - QApplication::desktop()->numScreens() == 1) // No Ximerama + if (!TQApplication::desktop()->isVirtualDesktop() || + TQApplication::desktop()->numScreens() == 1) // No Ximerama { m_widget->showAllScreens->hide(); } - connect( m_widget->showAllScreens, SIGNAL( stateChanged( int )), SLOT( changed())); + connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed())); KAboutData *about = new KAboutData(I18N_NOOP("kcmtaskbar"), I18N_NOOP("KDE Taskbar Control Module"), @@ -184,7 +184,7 @@ TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringLis setAboutData(about); load(); - QTimer::singleShot(0, this, SLOT(notChanged())); + TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); } void TaskbarConfig::slotUpdateCustomColors() @@ -212,7 +212,7 @@ void TaskbarConfig::slotUpdateComboBox() } else { - QString action = i18nActionList()[pos]; + TQString action = i18nActionList()[pos]; m_widget->kcfg_LeftButtonAction->changeItem(action,pos); m_widget->kcfg_MiddleButtonAction->changeItem(action,pos); m_widget->kcfg_RightButtonAction->changeItem(action,pos); @@ -274,7 +274,7 @@ void TaskbarConfig::save() KCModule::save(); - QByteArray data; + TQByteArray data; kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data); } diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h index 6fd28e92d..877f26daf 100644 --- a/kcontrol/taskbar/kcmtaskbar.h +++ b/kcontrol/taskbar/kcmtaskbar.h @@ -19,7 +19,7 @@ #ifndef __kcmtaskbar_h__ #define __kcmtaskbar_h__ -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <kcmodule.h> @@ -28,20 +28,20 @@ class TaskbarConfigUI; class TaskbarAppearance { public: - typedef QValueList<TaskbarAppearance> List; + typedef TQValueList<TaskbarAppearance> List; TaskbarAppearance(); - TaskbarAppearance(QString name, + TaskbarAppearance(TQString name, bool drawButtons, bool haloText, bool showButtonOnHover); bool matchesSettings() const; void alterSettings() const; - QString name() const { return m_name; } + TQString name() const { return m_name; } private: - QString m_name; + TQString m_name; bool m_drawButtons; bool m_haloText; bool m_showButtonOnHover; @@ -52,8 +52,8 @@ class TaskbarConfig : public KCModule Q_OBJECT public: - TaskbarConfig(QWidget *parent = 0, const char* name = 0, - const QStringList &list = QStringList()); + TaskbarConfig(TQWidget *parent = 0, const char* name = 0, + const TQStringList &list = TQStringList()); public slots: void load(); @@ -69,10 +69,10 @@ protected slots: private: TaskbarAppearance::List m_appearances; void updateAppearanceCombo(); - static const QStringList& actionList(); - static QStringList i18nActionList(); - static const QStringList& groupModeList(); - static QStringList i18nGroupModeList(); + static const TQStringList& actionList(); + static TQStringList i18nActionList(); + static const TQStringList& groupModeList(); + static TQStringList i18nGroupModeList(); TaskbarConfigUI *m_widget; }; diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index 24cb1f1bd..f3a5a85df 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -8,13 +8,13 @@ * * ***************************************************************************/ -#include <qgroupbox.h> -#include <qheader.h> -#include <qlayout.h> -#include <qlistview.h> -#include <qsplitter.h> -#include <qtextview.h> -#include <qtimer.h> +#include <tqgroupbox.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqlistview.h> +#include <tqsplitter.h> +#include <tqtextview.h> +#include <tqtimer.h> #include <kaboutdata.h> #include <kdialog.h> @@ -23,10 +23,10 @@ #include "usbdevices.h" #include "kcmusb.moc" -typedef KGenericFactory<USBViewer, QWidget > USBFactory; +typedef KGenericFactory<USBViewer, TQWidget > USBFactory; K_EXPORT_COMPONENT_FACTORY (kcm_usb, USBFactory("kcmusb") ) -USBViewer::USBViewer(QWidget *parent, const char *name, const QStringList &) +USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) : KCModule(USBFactory::instance(), parent, name) { setButtons(Help); @@ -34,38 +34,38 @@ USBViewer::USBViewer(QWidget *parent, const char *name, const QStringList &) setQuickHelp( i18n("<h1>USB Devices</h1> This module allows you to see" " the devices attached to your USB bus(es).")); - QVBoxLayout *vbox = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QGroupBox *gbox = new QGroupBox(i18n("USB Devices"), this); + TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQGroupBox *gbox = new TQGroupBox(i18n("USB Devices"), this); gbox->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(gbox); - QVBoxLayout *vvbox = new QVBoxLayout(gbox->layout(), KDialog::spacingHint()); + TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint()); - QSplitter *splitter = new QSplitter(gbox); + TQSplitter *splitter = new TQSplitter(gbox); vvbox->addWidget(splitter); - _devices = new QListView(splitter); + _devices = new TQListView(splitter); _devices->addColumn(i18n("Device")); _devices->setRootIsDecorated(true); _devices->header()->hide(); _devices->setMinimumWidth(200); - _devices->setColumnWidthMode(0, QListView::Maximum); + _devices->setColumnWidthMode(0, TQListView::Maximum); - QValueList<int> sizes; + TQValueList<int> sizes; sizes.append(200); splitter->setSizes(sizes); - _details = new QTextView(splitter); + _details = new TQTextView(splitter); - splitter->setResizeMode(_devices, QSplitter::KeepSize); + splitter->setResizeMode(_devices, TQSplitter::KeepSize); - QTimer *refreshTimer = new QTimer(this); + TQTimer *refreshTimer = new TQTimer(this); // 1 sec seems to be a good compromise between latency and polling load. refreshTimer->start(1000); - connect(refreshTimer, SIGNAL(timeout()), SLOT(refresh())); - connect(_devices, SIGNAL(selectionChanged(QListViewItem*)), - this, SLOT(selectionChanged(QListViewItem*))); + connect(refreshTimer, TQT_SIGNAL(timeout()), TQT_SLOT(refresh())); + connect(_devices, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQT_SLOT(selectionChanged(TQListViewItem*))); KAboutData *about = new KAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("KDE USB Viewer"), @@ -97,12 +97,12 @@ static Q_UINT32 key_parent( USBDevice &dev ) return dev.bus()*256 + dev.parent(); } -static void delete_recursive( QListViewItem *item, const QIntDict<QListViewItem> &new_items ) +static void delete_recursive( TQListViewItem *item, const TQIntDict<TQListViewItem> &new_items ) { if (!item) return; - QListViewItemIterator it( item ); + TQListViewItemIterator it( item ); while ( it.current() ) { if (!new_items.find(it.current()->text(1).toUInt())) { delete_recursive( it.current()->firstChild(), new_items); @@ -114,7 +114,7 @@ static void delete_recursive( QListViewItem *item, const QIntDict<QListViewItem> void USBViewer::refresh() { - QIntDict<QListViewItem> new_items; + TQIntDict<TQListViewItem> new_items; if (!USBDevice::parse("/proc/bus/usb/devices")) USBDevice::parseSys("/sys/bus/usb/devices"); @@ -126,33 +126,33 @@ void USBViewer::refresh() { found = false; - QPtrListIterator<USBDevice> it(USBDevice::devices()); + TQPtrListIterator<USBDevice> it(USBDevice::devices()); for ( ; it.current(); ++it) if (it.current()->level() == level) { Q_UINT32 k = key(*it.current()); if (level == 0) { - QListViewItem *item = _items.find(k); + TQListViewItem *item = _items.find(k); if (!item) { - item = new QListViewItem(_devices, + item = new TQListViewItem(_devices, it.current()->product(), - QString::number(k)); + TQString::number(k)); } new_items.insert(k, item); found = true; } else { - QListViewItem *parent = new_items.find(key_parent(*it.current())); + TQListViewItem *parent = new_items.find(key_parent(*it.current())); if (parent) { - QListViewItem *item = _items.find(k); + TQListViewItem *item = _items.find(k); if (!item) { - item = new QListViewItem(parent, + item = new TQListViewItem(parent, it.current()->product(), - QString::number(k) ); + TQString::number(k) ); } new_items.insert(k, item); parent->setOpen(true); @@ -174,7 +174,7 @@ void USBViewer::refresh() } -void USBViewer::selectionChanged(QListViewItem *item) +void USBViewer::selectionChanged(TQListViewItem *item) { if (item) { diff --git a/kcontrol/usbview/kcmusb.h b/kcontrol/usbview/kcmusb.h index 275431078..472b289b4 100644 --- a/kcontrol/usbview/kcmusb.h +++ b/kcontrol/usbview/kcmusb.h @@ -12,7 +12,7 @@ #ifndef _KCMUSB_H #define _KCMUSB_H -#include <qintdict.h> +#include <tqintdict.h> #include <kcmodule.h> @@ -27,20 +27,20 @@ class USBViewer : public KCModule public: - USBViewer(QWidget *parent = 0L, const char *name = 0L, const QStringList &list=QStringList() ); + USBViewer(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &list=TQStringList() ); void load(); protected slots: - void selectionChanged(QListViewItem *item); + void selectionChanged(TQListViewItem *item); void refresh(); private: - QIntDict<QListViewItem> _items; - QListView *_devices; - QTextView *_details; + TQIntDict<TQListViewItem> _items; + TQListView *_devices; + TQTextView *_details; }; diff --git a/kcontrol/usbview/usbdb.cpp b/kcontrol/usbview/usbdb.cpp index 89cf973ba..c786ca40e 100644 --- a/kcontrol/usbview/usbdb.cpp +++ b/kcontrol/usbview/usbdb.cpp @@ -13,8 +13,8 @@ #include <iostream> -#include <qfile.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqregexp.h> #include <kstandarddirs.h> @@ -26,11 +26,11 @@ USBDB::USBDB() { #ifndef USBIDS_FILE - QString db = "/usr/share/hwdata/usb.ids"; /* on Fedora */ - if (!QFile::exists(db)) + TQString db = "/usr/share/hwdata/usb.ids"; /* on Fedora */ + if (!TQFile::exists(db)) db = locate("data", "kcmusb/usb.ids"); #else - QString db = USBIDS_FILE; + TQString db = USBIDS_FILE; #endif if (db.isEmpty()) return; @@ -38,19 +38,19 @@ USBDB::USBDB() _classes.setAutoDelete(true); _ids.setAutoDelete(true); - QFile f(db); + TQFile f(db); if (f.open(IO_ReadOnly)) { - QTextStream ts(&f); + TQTextStream ts(&f); - QString line, name; + TQString line, name; int id=0, subid=0, protid=0; - QRegExp vendor("[0-9a-fA-F]+ "); - QRegExp product("\\s+[0-9a-fA-F]+ "); - QRegExp cls("C [0-9a-fA-F][0-9a-fA-F]"); - QRegExp subclass("\\s+[0-9a-fA-F][0-9a-fA-F] "); - QRegExp prot("\\s+[0-9a-fA-F][0-9a-fA-F] "); + TQRegExp vendor("[0-9a-fA-F]+ "); + TQRegExp product("\\s+[0-9a-fA-F]+ "); + TQRegExp cls("C [0-9a-fA-F][0-9a-fA-F]"); + TQRegExp subclass("\\s+[0-9a-fA-F][0-9a-fA-F] "); + TQRegExp prot("\\s+[0-9a-fA-F][0-9a-fA-F] "); while (!ts.eof()) { line = ts.readLine(); @@ -65,34 +65,34 @@ USBDB::USBDB() { id = line.mid(2,2).toInt(0, 16); name = line.mid(4).stripWhiteSpace(); - _classes.insert(QString("%1").arg(id), new QString(name)); + _classes.insert(TQString("%1").arg(id), new TQString(name)); } else if (prot.search(line) == 0 && prot.matchedLength() > 5) { line = line.stripWhiteSpace(); protid = line.left(2).toInt(0, 16); name = line.mid(4).stripWhiteSpace(); - _classes.insert(QString("%1-%2-%3").arg(id).arg(subid).arg(protid), new QString(name)); + _classes.insert(TQString("%1-%2-%3").arg(id).arg(subid).arg(protid), new TQString(name)); } else if (subclass.search(line) == 0 && subclass.matchedLength() > 4) { line = line.stripWhiteSpace(); subid = line.left(2).toInt(0, 16); name = line.mid(4).stripWhiteSpace(); - _classes.insert(QString("%1-%2").arg(id).arg(subid), new QString(name)); + _classes.insert(TQString("%1-%2").arg(id).arg(subid), new TQString(name)); } else if (vendor.search(line) == 0 && vendor.matchedLength() == 5) { id = line.left(4).toInt(0,16); name = line.mid(6); - _ids.insert(QString("%1").arg(id), new QString(name)); + _ids.insert(TQString("%1").arg(id), new TQString(name)); } else if (product.search(line) == 0 && product.matchedLength() > 5 ) { line = line.stripWhiteSpace(); subid = line.left(4).toInt(0,16); name = line.mid(6); - _ids.insert(QString("%1-%2").arg(id).arg(subid), new QString(name)); + _ids.insert(TQString("%1-%2").arg(id).arg(subid), new TQString(name)); } } @@ -102,49 +102,49 @@ USBDB::USBDB() } -QString USBDB::vendor(int id) +TQString USBDB::vendor(int id) { - QString *s = _ids[QString("%1").arg(id)]; + TQString *s = _ids[TQString("%1").arg(id)]; if ((id!= 0) && s) { return *s; } - return QString::null; + return TQString::null; } -QString USBDB::device(int vendor, int id) +TQString USBDB::device(int vendor, int id) { - QString *s = _ids[QString("%1-%2").arg(vendor).arg(id)]; + TQString *s = _ids[TQString("%1-%2").arg(vendor).arg(id)]; if ((id != 0) && (vendor != 0) && s) return *s; - return QString::null; + return TQString::null; } -QString USBDB::cls(int cls) +TQString USBDB::cls(int cls) { - QString *s = _classes[QString("%1").arg(cls)]; + TQString *s = _classes[TQString("%1").arg(cls)]; if (s) return *s; - return QString::null; + return TQString::null; } -QString USBDB::subclass(int cls, int sub) +TQString USBDB::subclass(int cls, int sub) { - QString *s = _classes[QString("%1-%2").arg(cls).arg(sub)]; + TQString *s = _classes[TQString("%1-%2").arg(cls).arg(sub)]; if (s) return *s; - return QString::null; + return TQString::null; } -QString USBDB::protocol(int cls, int sub, int prot) +TQString USBDB::protocol(int cls, int sub, int prot) { - QString *s = _classes[QString("%1-%2-%2").arg(cls).arg(sub).arg(prot)]; + TQString *s = _classes[TQString("%1-%2-%2").arg(cls).arg(sub).arg(prot)]; if (s) return *s; - return QString::null; + return TQString::null; } diff --git a/kcontrol/usbview/usbdb.h b/kcontrol/usbview/usbdb.h index 2b4226937..0b8c9f550 100644 --- a/kcontrol/usbview/usbdb.h +++ b/kcontrol/usbview/usbdb.h @@ -13,7 +13,7 @@ #define __USB_DB_H__ -#include <qdict.h> +#include <tqdict.h> class USBDB @@ -22,16 +22,16 @@ public: USBDB(); - QString vendor(int id); - QString device(int vendor, int id); + TQString vendor(int id); + TQString device(int vendor, int id); - QString cls(int cls); - QString subclass(int cls, int sub); - QString protocol(int cls, int sub, int prot); + TQString cls(int cls); + TQString subclass(int cls, int sub); + TQString protocol(int cls, int sub, int prot); private: - QDict<QString> _classes, _ids; + TQDict<TQString> _classes, _ids; }; diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index 3d557a7ed..466fd9a98 100644 --- a/kcontrol/usbview/usbdevices.cpp +++ b/kcontrol/usbview/usbdevices.cpp @@ -15,9 +15,9 @@ #include <unistd.h> #include <stdio.h> -#include <qfile.h> -#include <qdir.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqregexp.h> #include <klocale.h> #include <kmessagebox.h> @@ -32,7 +32,7 @@ #include <sys/param.h> #endif -QPtrList<USBDevice> USBDevice::_devices; +TQPtrList<USBDevice> USBDevice::_devices; USBDB *USBDevice::_db; @@ -50,26 +50,26 @@ USBDevice::USBDevice() _db = new USBDB; } -static QString catFile(QString fname) +static TQString catFile(TQString fname) { char buffer[256]; - QString result; - int fd = ::open(QFile::encodeName(fname), O_RDONLY); + TQString result; + int fd = ::open(TQFile::encodeName(fname), O_RDONLY); if (fd<0) - return QString::null; + return TQString::null; if (fd >= 0) { ssize_t count; while ((count = ::read(fd, buffer, 256)) > 0) - result.append(QString(buffer).left(count)); + result.append(TQString(buffer).left(count)); ::close(fd); } return result.stripWhiteSpace(); } -void USBDevice::parseSysDir(int bus, int parent, int level, QString dname) +void USBDevice::parseSysDir(int bus, int parent, int level, TQString dname) { _level = level; _parent = parent; @@ -80,7 +80,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, QString dname) _device = catFile(dname + "/devnum").toUInt(); if (_device == 1) - _product += QString(" (%1)").arg(_bus); + _product += TQString(" (%1)").arg(_bus); _vendorID = catFile(dname + "/idVendor").toUInt(0, 16); _prodID = catFile(dname + "/idProduct").toUInt(0, 16); @@ -97,12 +97,12 @@ void USBDevice::parseSysDir(int bus, int parent, int level, QString dname) _verMajor = int(version); _verMinor = int(10*(version - floor(version))); - QDir dir(dname); - dir.setNameFilter(QString("%1-*").arg(bus)); - dir.setFilter(QDir::Dirs); - QStringList list = dir.entryList(); + TQDir dir(dname); + dir.setNameFilter(TQString("%1-*").arg(bus)); + dir.setFilter(TQDir::Dirs); + TQStringList list = dir.entryList(); - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { + for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { if ((*it).contains(':')) continue; @@ -111,7 +111,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, QString dname) } } -void USBDevice::parseLine(QString line) +void USBDevice::parseLine(TQString line) { if (line.startsWith("T:")) sscanf(line.local8Bit().data(), @@ -123,7 +123,7 @@ void USBDevice::parseLine(QString line) _product = line.mid(12); /* add bus number to root devices */ if (_device==1) - _product += QString(" (%1)").arg(_bus); + _product += TQString(" (%1)").arg(_bus); } else if (line.startsWith("S: SerialNumber")) _serial = line.mid(17); @@ -151,27 +151,27 @@ void USBDevice::parseLine(QString line) USBDevice *USBDevice::find(int bus, int device) { - QPtrListIterator<USBDevice> it(_devices); + TQPtrListIterator<USBDevice> it(_devices); for ( ; it.current(); ++it) if (it.current()->bus() == bus && it.current()->device() == device) return it.current(); return 0; } -QString USBDevice::product() +TQString USBDevice::product() { if (!_product.isEmpty()) return _product; - QString pname = _db->device(_vendorID, _prodID); + TQString pname = _db->device(_vendorID, _prodID); if (!pname.isEmpty()) return pname; return i18n("Unknown"); } -QString USBDevice::dump() +TQString USBDevice::dump() { - QString r; + TQString r; r = "<qml><h2><center>" + product() + "</center></h2><br/><hl/>"; @@ -182,41 +182,41 @@ QString USBDevice::dump() r += "<br/><table>"; - QString c = QString("<td>%1</td>").arg(_class); - QString cname = _db->cls(_class); + TQString c = TQString("<td>%1</td>").arg(_class); + TQString cname = _db->cls(_class); if (!cname.isEmpty()) c += "<td>(" + i18n(cname.latin1()) +")</td>"; r += i18n("<tr><td><i>Class</i></td>%1</tr>").arg(c); - QString sc = QString("<td>%1</td>").arg(_sub); - QString scname = _db->subclass(_class, _sub); + TQString sc = TQString("<td>%1</td>").arg(_sub); + TQString scname = _db->subclass(_class, _sub); if (!scname.isEmpty()) sc += "<td>(" + i18n(scname.latin1()) +")</td>"; r += i18n("<tr><td><i>Subclass</i></td>%1</tr>").arg(sc); - QString pr = QString("<td>%1</td>").arg(_prot); - QString prname = _db->protocol(_class, _sub, _prot); + TQString pr = TQString("<td>%1</td>").arg(_prot); + TQString prname = _db->protocol(_class, _sub, _prot); if (!prname.isEmpty()) pr += "<td>(" + prname +")</td>"; r += i18n("<tr><td><i>Protocol</i></td>%1</tr>").arg(pr); #ifndef Q_OS_FREEBSD r += i18n("<tr><td><i>USB Version</i></td><td>%1.%2</td></tr>") .arg(_verMajor,0,16) - .arg(QString::number(_verMinor,16).prepend('0').right(2)); + .arg(TQString::number(_verMinor,16).prepend('0').right(2)); #endif r += "<tr><td></td></tr>"; - QString v = QString::number(_vendorID,16); - QString name = _db->vendor(_vendorID); + TQString v = TQString::number(_vendorID,16); + TQString name = _db->vendor(_vendorID); if (!name.isEmpty()) v += "<td>(" + name +")</td>"; r += i18n("<tr><td><i>Vendor ID</i></td><td>0x%1</td></tr>").arg(v); - QString p = QString::number(_prodID,16); - QString pname = _db->device(_vendorID, _prodID); + TQString p = TQString::number(_prodID,16); + TQString pname = _db->device(_vendorID, _prodID); if (!pname.isEmpty()) p += "<td>(" + pname +")</td>"; r += i18n("<tr><td><i>Product ID</i></td><td>0x%1</td></tr>").arg(p); r += i18n("<tr><td><i>Revision</i></td><td>%1.%2</td></tr>") .arg(_revMajor,0,16) - .arg(QString::number(_revMinor,16).prepend('0').right(2)); + .arg(TQString::number(_revMinor,16).prepend('0').right(2)); r += "<tr><td></td></tr>"; r += i18n("<tr><td><i>Speed</i></td><td>%1 Mbit/s</td></tr>").arg(_speed); @@ -228,7 +228,7 @@ QString USBDevice::dump() r += i18n("<tr><td><i>Power Consumption</i></td><td>self powered</td></tr>"); r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.at(0)); if ( _devnodes.count() > 1 ) - for ( QStringList::Iterator it = _devnodes.at(1); it != _devnodes.end(); ++it ) + for ( TQStringList::Iterator it = _devnodes.at(1); it != _devnodes.end(); ++it ) r += "<tr><td></td><td>" + *it + "</td></tr>"; #else r += i18n("<tr><td><i>Max. Packet Size</i></td><td>%1</td></tr>").arg(_maxPacketSize); @@ -250,18 +250,18 @@ QString USBDevice::dump() #ifndef Q_OS_FREEBSD -bool USBDevice::parse(QString fname) +bool USBDevice::parse(TQString fname) { _devices.clear(); - QString result; + TQString result; // read in the complete file // - // Note: we can't use a QTextStream, as the files in /proc + // Note: we can't use a TQTextStream, as the files in /proc // are pseudo files with zero length char buffer[256]; - int fd = ::open(QFile::encodeName(fname), O_RDONLY); + int fd = ::open(TQFile::encodeName(fname), O_RDONLY); if (fd<0) return false; @@ -269,7 +269,7 @@ bool USBDevice::parse(QString fname) { ssize_t count; while ((count = ::read(fd, buffer, 256)) > 0) - result.append(QString(buffer).left(count)); + result.append(TQString(buffer).left(count)); ::close(fd); } @@ -277,10 +277,10 @@ bool USBDevice::parse(QString fname) // read in the device infos USBDevice *device = 0; int start=0, end; - result.replace(QRegExp("^\n"),""); + result.replace(TQRegExp("^\n"),""); while ((end = result.find('\n', start)) > 0) { - QString line = result.mid(start, end-start); + TQString line = result.mid(start, end-start); if (line.startsWith("T:")) device = new USBDevice(); @@ -293,17 +293,17 @@ bool USBDevice::parse(QString fname) return true; } -bool USBDevice::parseSys(QString dname) +bool USBDevice::parseSys(TQString dname) { - QDir d(dname); + TQDir d(dname); d.setNameFilter("usb*"); - QStringList list = d.entryList(); + TQStringList list = d.entryList(); - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { + for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { USBDevice* device = new USBDevice(); int bus = 0; - QRegExp bus_reg("[a-z]*([0-9]+)"); + TQRegExp bus_reg("[a-z]*([0-9]+)"); if (bus_reg.search(*it) != -1) bus = bus_reg.cap(1).toInt(); @@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent) _bus = di.udi_bus; _device = di.udi_addr; - _product = QString::fromLatin1(di.udi_product); + _product = TQString::fromLatin1(di.udi_product); if ( _device == 1 ) - _product += " " + QString::number( _bus ); - _manufacturer = QString::fromLatin1(di.udi_vendor); + _product += " " + TQString::number( _bus ); + _manufacturer = TQString::fromLatin1(di.udi_vendor); _prodID = di.udi_productNo; _vendorID = di.udi_vendorNo; _class = di.udi_class; @@ -387,13 +387,13 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent) -bool USBDevice::parse(QString fname) +bool USBDevice::parse(TQString fname) { static bool showErrorMessage = true; bool error = false; _devices.clear(); - QFile controller("/dev/usb0"); + TQFile controller("/dev/usb0"); int i = 1; while ( controller.exists() ) { @@ -418,7 +418,7 @@ bool USBDevice::parse(QString fname) } else { error = true; } - controller.setName( QString::fromLocal8Bit("/dev/usb%1").arg(i++) ); + controller.setName( TQString::fromLocal8Bit("/dev/usb%1").arg(i++) ); } if ( showErrorMessage && error ) { diff --git a/kcontrol/usbview/usbdevices.h b/kcontrol/usbview/usbdevices.h index 853df02b3..23717ee65 100644 --- a/kcontrol/usbview/usbdevices.h +++ b/kcontrol/usbview/usbdevices.h @@ -13,8 +13,8 @@ #define __USB_DEVICES_H__ -#include <qstring.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqptrlist.h> #ifdef Q_OS_FREEBSD #include <dev/usb/usb.h> @@ -29,45 +29,45 @@ public: USBDevice(); - void parseLine(QString line); - void parseSysDir(int bus, int parent, int level, QString line); + void parseLine(TQString line); + void parseSysDir(int bus, int parent, int level, TQString line); int level() { return _level; }; int device() { return _device; }; int parent() { return _parent; }; int bus() { return _bus; }; - QString product(); + TQString product(); - QString dump(); + TQString dump(); - static QPtrList<USBDevice> &devices() { return _devices; }; + static TQPtrList<USBDevice> &devices() { return _devices; }; static USBDevice *find(int bus, int device); - static bool parse(QString fname); - static bool parseSys(QString fname); + static bool parse(TQString fname); + static bool parseSys(TQString fname); private: - static QPtrList<USBDevice> _devices; + static TQPtrList<USBDevice> _devices; static USBDB *_db; int _bus, _level, _parent, _port, _count, _device, _channels, _power; float _speed; - QString _manufacturer, _product, _serial; + TQString _manufacturer, _product, _serial; int _bwTotal, _bwUsed, _bwPercent, _bwIntr, _bwIso; bool _hasBW; unsigned int _verMajor, _verMinor, _class, _sub, _prot, _maxPacketSize, _configs; - QString _className; + TQString _className; unsigned int _vendorID, _prodID, _revMajor, _revMinor; #ifdef Q_OS_FREEBSD void collectData( int fd, int level, usb_device_info &di, int parent ); - QStringList _devnodes; + TQStringList _devnodes; #endif }; diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index 87089b321..b178e07e3 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qpushbutton.h> -#include <qlistview.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqlistview.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kdialog.h> #include <kglobal.h> @@ -58,7 +58,7 @@ int my_reset_handler(raw1394handle_t handle, unsigned int ) } -View1394::View1394(QWidget *parent, const char *name) +View1394::View1394(TQWidget *parent, const char *name) :KCModule(parent,name) ,m_insideRescanBus(false) { @@ -79,15 +79,15 @@ View1394::View1394(QWidget *parent, const char *name) setButtons( KCModule::Help ); m_ouiDb=new OuiDb(); - QVBoxLayout *box=new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *box=new TQVBoxLayout(this, 0, KDialog::spacingHint()); m_view=new View1394Widget(this); for (int i=2; i<8; i++) m_view->m_listview->setColumnAlignment(i, AlignHCenter); m_view->m_listview->setColumnAlignment(8, AlignRight); m_view->m_listview->setColumnAlignment(9, AlignRight); box->addWidget(m_view); - connect(m_view->m_busResetPb, SIGNAL(clicked()), this, SLOT(generateBusReset())); - connect(&m_rescanTimer, SIGNAL(timeout()), this, SLOT(rescanBus())); + connect(m_view->m_busResetPb, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateBusReset())); + connect(&m_rescanTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(rescanBus())); m_notifiers.setAutoDelete(true); rescanBus(); } @@ -143,7 +143,7 @@ bool View1394::readConfigRom(raw1394handle_t handle, nodeid_t nodeid, quadlet_t& void View1394::callRaw1394EventLoop(int fd) { - for (QValueList<raw1394handle_t>::iterator it= m_handles.begin(); it!=m_handles.end(); ++it) + for (TQValueList<raw1394handle_t>::iterator it= m_handles.begin(); it!=m_handles.end(); ++it) if (raw1394_get_fd(*it)==fd) { raw1394_loop_iterate(*it); @@ -162,7 +162,7 @@ void View1394::rescanBus() // static int depth=0; // depth++; m_notifiers.clear(); - for (QValueList<raw1394handle_t>::iterator it=m_handles.begin(); it!=m_handles.end(); ++it) + for (TQValueList<raw1394handle_t>::iterator it=m_handles.begin(); it!=m_handles.end(); ++it) raw1394_destroy_handle(*it); m_handles.clear(); m_view->m_listview->clear(); @@ -188,12 +188,12 @@ void View1394::rescanBus() } raw1394_set_userdata(handle, this); raw1394_set_bus_reset_handler(handle, my_reset_handler); - QSocketNotifier *notif=new QSocketNotifier(raw1394_get_fd(handle),QSocketNotifier::Read); - connect(notif, SIGNAL(activated(int)), this, SLOT(callRaw1394EventLoop(int))); + TQSocketNotifier *notif=new TQSocketNotifier(raw1394_get_fd(handle),TQSocketNotifier::Read); + connect(notif, TQT_SIGNAL(activated(int)), this, TQT_SLOT(callRaw1394EventLoop(int))); m_notifiers.append(notif); m_handles.append(handle); - QListViewItem *card=new QListViewItem(m_view->m_listview,i18n("Port %1:\"%2\"").arg(i).arg(p_info[i].name)); + TQListViewItem *card=new TQListViewItem(m_view->m_listview,i18n("Port %1:\"%2\"").arg(i).arg(p_info[i].name)); int num_of_nodes=raw1394_get_nodecount(handle); int localNodeId=raw1394_get_local_id(handle); @@ -206,34 +206,34 @@ void View1394::rescanBus() quadlet_t cap=0; bool success=readConfigRom(handle, j, firstQuad, cap, guid); - QString nodeStr=i18n("Node %1").arg(j); + TQString nodeStr=i18n("Node %1").arg(j); if (!success) { - new QListViewItem(card,nodeStr, i18n("Not ready")); + new TQListViewItem(card,nodeStr, i18n("Not ready")); continue; } if (((firstQuad>>24) & 0xff)==1) //minimal config rom { - QString guidStr=QString::number(firstQuad,16); + TQString guidStr=TQString::number(firstQuad,16); guidStr="0x"+guidStr.rightJustify(6,'0'); - new QListViewItem(card,nodeStr, guidStr); + new TQListViewItem(card,nodeStr, guidStr); } else //general config rom { - QString guidStr; + TQString guidStr; char buf[32]; snprintf(buf, 32, "%"PRIX64, guid); guidStr=buf; guidStr="0x"+guidStr.rightJustify(16,'0'); - QString local=((j | 0xffc0) == localNodeId)?"X":""; - QString irmStr=(cap & 0x80000000) ? "X":""; - QString cmStr=(cap & 0x40000000) ? "X":""; - QString isStr=(cap & 0x20000000) ? "X":""; - QString bmStr=(cap & 0x10000000) ? "X":""; - QString pmStr=(cap & 0x08000000) ? "X":""; - QString accStr=QString::number((cap &0x00ff0000)>>16); + TQString local=((j | 0xffc0) == localNodeId)?"X":""; + TQString irmStr=(cap & 0x80000000) ? "X":""; + TQString cmStr=(cap & 0x40000000) ? "X":""; + TQString isStr=(cap & 0x20000000) ? "X":""; + TQString bmStr=(cap & 0x10000000) ? "X":""; + TQString pmStr=(cap & 0x08000000) ? "X":""; + TQString accStr=TQString::number((cap &0x00ff0000)>>16); int speed=( cap & 0x00000007); - QString speedStr; + TQString speedStr; switch(speed) { case(3): @@ -250,7 +250,7 @@ void View1394::rescanBus() speedStr="100"; break; } - QListViewItem* node=new QListViewItem(card); + TQListViewItem* node=new TQListViewItem(card); node->setText(0,nodeStr); node->setText(1, guidStr); node->setText(2,local); @@ -272,21 +272,21 @@ void View1394::rescanBus() void View1394::generateBusReset() { - for (QValueList<raw1394handle_t>::iterator it=m_handles.begin(); it!=m_handles.end(); ++it) + for (TQValueList<raw1394handle_t>::iterator it=m_handles.begin(); it!=m_handles.end(); ++it) raw1394_reset_bus(*it); } OuiDb::OuiDb() { - QString filename=locate("data","kcmview1394/oui.db"); + TQString filename=locate("data","kcmview1394/oui.db"); if (filename.isEmpty()) return; - QFile f(filename); + TQFile f(filename); if (!f.open(IO_ReadOnly)) return; - QByteArray ba=f.readAll(); + TQByteArray ba=f.readAll(); int bytesLeft=ba.size(); char* data=ba.data(); while(bytesLeft>8) @@ -306,12 +306,12 @@ OuiDb::OuiDb() f.close(); } -QString OuiDb::vendor(octlet_t guid) +TQString OuiDb::vendor(octlet_t guid) { guid=(guid & 0xffffff0000000000LL)>>40; - QString key=QString::number((unsigned int)(guid),16); + TQString key=TQString::number((unsigned int)(guid),16); key=key.rightJustify(6, '0').upper(); - QString v=m_vendorIds[key]; + TQString v=m_vendorIds[key]; if (v.isEmpty()) v=i18n("Unknown"); return v; @@ -324,7 +324,7 @@ QString OuiDb::vendor(octlet_t guid) extern "C" { - KDE_EXPORT KCModule *create_view1394(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_view1394(TQWidget *parent, const char *name) { KGlobal::locale()->insertCatalogue("kcmview1394"); return new View1394(parent, name); diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h index b328363b4..24a68de8a 100644 --- a/kcontrol/view1394/view1394.h +++ b/kcontrol/view1394/view1394.h @@ -23,11 +23,11 @@ #include <kcmodule.h> -#include <qmap.h> -#include <qsocketnotifier.h> -#include <qstring.h> -#include <qtimer.h> -#include <qvaluelist.h> +#include <tqmap.h> +#include <tqsocketnotifier.h> +#include <tqstring.h> +#include <tqtimer.h> +#include <tqvaluelist.h> #include "view1394widget.h" @@ -37,16 +37,16 @@ class OuiDb { public: OuiDb(); - QString vendor(octlet_t guid); + TQString vendor(octlet_t guid); private: - QMap<QString, QString> m_vendorIds; + TQMap<TQString, TQString> m_vendorIds; }; class View1394: public KCModule { Q_OBJECT public: - View1394(QWidget *parent = 0L, const char *name = 0L); + View1394(TQWidget *parent = 0L, const char *name = 0L); virtual ~View1394(); public slots: // Public slots @@ -55,11 +55,11 @@ class View1394: public KCModule private: View1394Widget *m_view; - QValueList<raw1394handle_t> m_handles; - QPtrList<QSocketNotifier> m_notifiers; + TQValueList<raw1394handle_t> m_handles; + TQPtrList<TQSocketNotifier> m_notifiers; bool readConfigRom(raw1394handle_t handle, nodeid_t nodeid, quadlet_t& firstQuad, quadlet_t& cap, octlet_t& guid); bool m_insideRescanBus; - QTimer m_rescanTimer; + TQTimer m_rescanTimer; OuiDb *m_ouiDb; private slots: void callRaw1394EventLoop(int fd); diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index 229672f6e..df9cbb6a6 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -31,16 +31,16 @@ #include <kmessagebox.h> #include <kwin.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qtable.h> -#include <qcolor.h> -#include <qpushbutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqtable.h> +#include <tqcolor.h> +#include <tqpushbutton.h> -KCMXinerama::KCMXinerama(QWidget *parent, const char *name) +KCMXinerama::KCMXinerama(TQWidget *parent, const char *name) : KCModule(parent, name) { _indicators.setAutoDelete(true); @@ -59,48 +59,48 @@ KCMXinerama::KCMXinerama(QWidget *parent, const char *name) config = new KConfig("kdeglobals", false, false); ksplashrc = new KConfig("ksplashrc", false, false); - connect(&_timer, SIGNAL(timeout()), this, SLOT(clearIndicator())); + connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearIndicator())); - QGridLayout *grid = new QGridLayout(this, 1, 1, KDialog::marginHint(), + TQGridLayout *grid = new TQGridLayout(this, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); // Setup the panel - _displays = QApplication::desktop()->numScreens(); + _displays = TQApplication::desktop()->numScreens(); - if (QApplication::desktop()->isVirtualDesktop()) { - QStringList dpyList; + if (TQApplication::desktop()->isVirtualDesktop()) { + TQStringList dpyList; xw = new XineramaWidget(this); grid->addWidget(xw, 0, 0); - QString label = i18n("Display %1"); + TQString label = i18n("Display %1"); xw->headTable->setNumRows(_displays); for (int i = 0; i < _displays; i++) { - QString l = label.arg(i+1); - QRect geom = QApplication::desktop()->screenGeometry(i); + TQString l = label.arg(i+1); + TQRect geom = TQApplication::desktop()->screenGeometry(i); xw->_unmanagedDisplay->insertItem(l); xw->_ksplashDisplay->insertItem(l); dpyList.append(l); - xw->headTable->setText(i, 0, QString::number(geom.x())); - xw->headTable->setText(i, 1, QString::number(geom.y())); - xw->headTable->setText(i, 2, QString::number(geom.width())); - xw->headTable->setText(i, 3, QString::number(geom.height())); + xw->headTable->setText(i, 0, TQString::number(geom.x())); + xw->headTable->setText(i, 1, TQString::number(geom.y())); + xw->headTable->setText(i, 2, TQString::number(geom.width())); + xw->headTable->setText(i, 3, TQString::number(geom.height())); } xw->_unmanagedDisplay->insertItem(i18n("Display Containing the Pointer")); xw->headTable->setRowLabels(dpyList); - connect(xw->_ksplashDisplay, SIGNAL(activated(int)), - this, SLOT(windowIndicator(int))); - connect(xw->_unmanagedDisplay, SIGNAL(activated(int)), - this, SLOT(windowIndicator(int))); - connect(xw->_identify, SIGNAL(clicked()), - this, SLOT(indicateWindows())); + connect(xw->_ksplashDisplay, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(windowIndicator(int))); + connect(xw->_unmanagedDisplay, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(windowIndicator(int))); + connect(xw->_identify, TQT_SIGNAL(clicked()), + this, TQT_SLOT(indicateWindows())); - connect(xw, SIGNAL(configChanged()), this, SLOT(changed())); + connect(xw, TQT_SIGNAL(configChanged()), this, TQT_SLOT(changed())); } else { // no Xinerama - QLabel *ql = new QLabel(i18n("<qt><p>This module is only for configuring systems with a single desktop spread across multiple monitors. You do not appear to have this configuration.</p></qt>"), this); + TQLabel *ql = new TQLabel(i18n("<qt><p>This module is only for configuring systems with a single desktop spread across multiple monitors. You do not appear to have this configuration.</p></qt>"), this); grid->addWidget(ql, 0, 0); } @@ -129,7 +129,7 @@ void KCMXinerama::load() { } void KCMXinerama::load(bool useDefaults) { - if (QApplication::desktop()->isVirtualDesktop()) { + if (TQApplication::desktop()->isVirtualDesktop()) { int item = 0; config->setReadDefaults( useDefaults ); config->setGroup("Windows"); @@ -138,17 +138,17 @@ void KCMXinerama::load(bool useDefaults) { xw->_enablePlacement->setChecked(config->readBoolEntry(KWIN_XINERAMA_PLACEMENT, true)); xw->_enableMaximize->setChecked(config->readBoolEntry(KWIN_XINERAMA_MAXIMIZE, true)); xw->_enableFullscreen->setChecked(config->readBoolEntry(KWIN_XINERAMA_FULLSCREEN, true)); - item = config->readNumEntry("Unmanaged", QApplication::desktop()->primaryScreen()); + item = config->readNumEntry("Unmanaged", TQApplication::desktop()->primaryScreen()); if ((item < 0 || item >= _displays) && (item != -3)) - xw->_unmanagedDisplay->setCurrentItem(QApplication::desktop()->primaryScreen()); + xw->_unmanagedDisplay->setCurrentItem(TQApplication::desktop()->primaryScreen()); else if (item == -3) // pointer warp xw->_unmanagedDisplay->setCurrentItem(_displays); else xw->_unmanagedDisplay->setCurrentItem(item); ksplashrc->setGroup("Xinerama"); - item = ksplashrc->readNumEntry("KSplashScreen", QApplication::desktop()->primaryScreen()); + item = ksplashrc->readNumEntry("KSplashScreen", TQApplication::desktop()->primaryScreen()); if (item < 0 || item >= _displays) - xw->_ksplashDisplay->setCurrentItem(QApplication::desktop()->primaryScreen()); + xw->_ksplashDisplay->setCurrentItem(TQApplication::desktop()->primaryScreen()); else xw->_ksplashDisplay->setCurrentItem(item); emit changed(useDefaults); @@ -159,7 +159,7 @@ void KCMXinerama::load(bool useDefaults) { void KCMXinerama::save() { - if (QApplication::desktop()->isVirtualDesktop()) { + if (TQApplication::desktop()->isVirtualDesktop()) { config->setGroup("Windows"); config->writeEntry(KWIN_XINERAMA, xw->_enableXinerama->isChecked()); @@ -215,18 +215,18 @@ void KCMXinerama::windowIndicator(int dpy) { _timer.start(1500, true); } -QWidget *KCMXinerama::indicator(int dpy) { - QLabel *si = new QLabel(QString::number(dpy+1), 0, "Screen Indicator", WX11BypassWM ); +TQWidget *KCMXinerama::indicator(int dpy) { + TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", WX11BypassWM ); - QFont fnt = KGlobalSettings::generalFont(); + TQFont fnt = KGlobalSettings::generalFont(); fnt.setPixelSize(100); si->setFont(fnt); - si->setFrameStyle(QFrame::Panel); - si->setFrameShadow(QFrame::Plain); + si->setFrameStyle(TQFrame::Panel); + si->setFrameShadow(TQFrame::Plain); si->setAlignment(Qt::AlignCenter); - QPoint screenCenter(QApplication::desktop()->screenGeometry(dpy).center()); - QRect targetGeometry(QPoint(0,0), si->sizeHint()); + TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center()); + TQRect targetGeometry(TQPoint(0,0), si->sizeHint()); targetGeometry.moveCenter(screenCenter); si->setGeometry(targetGeometry); si->show(); @@ -239,13 +239,13 @@ void KCMXinerama::clearIndicator() { } extern "C" { - KDE_EXPORT KCModule *create_xinerama(QWidget *parent, const char *name) { + KDE_EXPORT KCModule *create_xinerama(TQWidget *parent, const char *name) { KGlobal::locale()->insertCatalogue("kcmxinerama"); return new KCMXinerama(parent, name); } KDE_EXPORT bool test_xinerama() { - return QApplication::desktop()->isVirtualDesktop(); + return TQApplication::desktop()->isVirtualDesktop(); } } diff --git a/kcontrol/xinerama/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h index 07b835fbc..76efb21d7 100644 --- a/kcontrol/xinerama/kcmxinerama.h +++ b/kcontrol/xinerama/kcmxinerama.h @@ -22,8 +22,8 @@ #define _KCM_XINERAMA_H #include <kcmodule.h> -#include <qptrlist.h> -#include <qtimer.h> +#include <tqptrlist.h> +#include <tqtimer.h> #include "xineramawidget.h" @@ -33,7 +33,7 @@ class QWidget; class KCMXinerama : public KCModule { Q_OBJECT public: - KCMXinerama(QWidget *parent = 0L, const char *name = 0L); + KCMXinerama(TQWidget *parent = 0L, const char *name = 0L); virtual ~KCMXinerama(); void load(); @@ -48,11 +48,11 @@ public slots: void indicateWindows(); private: - QWidget* indicator(int dpy); + TQWidget* indicator(int dpy); KConfig *config, *ksplashrc; XineramaWidget *xw; - QTimer _timer; - QPtrList<QWidget> _indicators; + TQTimer _timer; + TQPtrList<TQWidget> _indicators; int _displays; |