summaryrefslogtreecommitdiffstats
path: root/kcontrol/kicker
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
commitc663b6440964f6ac48027143ac9e63298991f9d0 (patch)
tree6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /kcontrol/kicker
parenta061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff)
downloadtdebase-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/kicker')
-rw-r--r--kcontrol/kicker/advancedDialog.cpp54
-rw-r--r--kcontrol/kicker/advancedDialog.h2
-rw-r--r--kcontrol/kicker/applettab_impl.cpp76
-rw-r--r--kcontrol/kicker/applettab_impl.h12
-rw-r--r--kcontrol/kicker/extensionInfo.cpp18
-rw-r--r--kcontrol/kicker/extensionInfo.h20
-rw-r--r--kcontrol/kicker/hidingconfig.cpp20
-rw-r--r--kcontrol/kicker/hidingconfig.h2
-rw-r--r--kcontrol/kicker/hidingtab_impl.cpp60
-rw-r--r--kcontrol/kicker/hidingtab_impl.h2
-rw-r--r--kcontrol/kicker/lookandfeelconfig.cpp20
-rw-r--r--kcontrol/kicker/lookandfeelconfig.h2
-rw-r--r--kcontrol/kicker/lookandfeeltab_impl.cpp66
-rw-r--r--kcontrol/kicker/lookandfeeltab_impl.h12
-rw-r--r--kcontrol/kicker/lookandfeeltab_kcm.cpp10
-rw-r--r--kcontrol/kicker/lookandfeeltab_kcm.h4
-rw-r--r--kcontrol/kicker/main.cpp74
-rw-r--r--kcontrol/kicker/main.h18
-rw-r--r--kcontrol/kicker/menuconfig.cpp20
-rw-r--r--kcontrol/kicker/menuconfig.h2
-rw-r--r--kcontrol/kicker/menutab_impl.cpp86
-rw-r--r--kcontrol/kicker/menutab_impl.h20
-rw-r--r--kcontrol/kicker/positionconfig.cpp20
-rw-r--r--kcontrol/kicker/positionconfig.h2
-rw-r--r--kcontrol/kicker/positiontab_impl.cpp174
-rw-r--r--kcontrol/kicker/positiontab_impl.h10
26 files changed, 403 insertions, 403 deletions
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;