summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/background/bgdialog.cpp4
-rw-r--r--kcontrol/background/bgrender.h2
-rw-r--r--kcontrol/info/info_solaris.cpp12
-rw-r--r--kcontrol/input/xcursor/themepage.cpp2
-rw-r--r--kcontrol/randr/ktimerdialog.cpp6
-rw-r--r--kcontrol/randr/ktimerdialog.h6
-rw-r--r--kcontrol/smartcard/nosmartcardbase.ui2
-rw-r--r--kcontrol/smartcard/smartcardbase.ui6
-rw-r--r--kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO12
-rw-r--r--kcontrol/tdm/main.cpp8
-rw-r--r--kcontrol/tdm/main.h2
11 files changed, 31 insertions, 31 deletions
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 67756d466..aaa6f3260 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -528,7 +528,7 @@ void BGDialog::loadWallpaperFilesList() {
// Wallpapers
// the following TQMap is lower cased names mapped to cased names and URLs
// this way we get case insensitive sorting
- TQMap<TQString, QPair<TQString, TQString> > papers;
+ TQMap<TQString, TQPair<TQString, TQString> > papers;
//search for .desktop files before searching for images without .desktop files
TQStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true);
@@ -620,7 +620,7 @@ void BGDialog::loadWallpaperFilesList() {
comboWallpaper->clear();
m_wallpaper.clear();
int i = 0;
- for (TQMap<TQString, QPair<TQString, TQString> >::Iterator it = papers.begin();
+ for (TQMap<TQString, TQPair<TQString, TQString> >::Iterator it = papers.begin();
it != papers.end();
++it)
{
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index 5b96f31b0..f9042dd56 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -120,7 +120,7 @@ private:
* images. Usage is similar to KBackgroundRenderer: connect to the imageDone
* signal.
*/
-class KVirtualBGRenderer : public QObject
+class KVirtualBGRenderer : public TQObject
{
TQ_OBJECT
public:
diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp
index f52927424..f6ab922ea 100644
--- a/kcontrol/info/info_solaris.cpp
+++ b/kcontrol/info/info_solaris.cpp
@@ -486,7 +486,7 @@ TQString propvalue( di_prop_t prop ) {
char *strp;
int *intp;
uchar_t *bytep;
- QString result;
+ TQString result;
/*
* Since a lot of printable strings seem to be tagged as 'byte',
@@ -565,11 +565,11 @@ int dump_node( di_node_t node, void *arg ) {
TQListViewItem *top = (TQListViewItem *) arg,
*parent,
*previous;
- char *path;
- char *drivername;
- char *names;
- QString compatnames;
- int i, n;
+ char *path;
+ char *drivername;
+ char *names;
+ TQString compatnames;
+ int i, n;
di_prop_t prop;
path = di_devfs_path( node );
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index b323b44da..d131aca8c 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -580,7 +580,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
// Calculate the image size
int size = kMax( iconSize, kMax( r.width(), r.height() ) );
- // Create the intermediate QImage
+ // Create the intermediate TQImage
TQImage image( size, size, 32 );
image.setAlphaBuffer( true );
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index 1aa0f58df..1c72b1ccc 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -35,9 +35,9 @@
#include "ktimerdialog.h"
#include "ktimerdialog.moc"
-KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent,
+KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent,
const char *name, bool modal,
- const QString &caption,
+ const TQString &caption,
int buttonMask, ButtonCode defaultButton,
bool separator,
const KGuiItem &user1,
@@ -90,7 +90,7 @@ int KTimerDialog::exec()
return KDialogBase::exec();
}
-void KTimerDialog::setMainWidget( QWidget *widget )
+void KTimerDialog::setMainWidget( TQWidget *widget )
{
// yuck, here goes.
QVBox *newWidget = new QVBox( this );
diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h
index 759f87cd9..74891d048 100644
--- a/kcontrol/randr/ktimerdialog.h
+++ b/kcontrol/randr/ktimerdialog.h
@@ -67,9 +67,9 @@ class KTimerDialog : public KDialogBase
*
* For the rest of the arguments, See @see KDialogBase .
*/
- KTimerDialog( int msec, TimerStyle style=CountDown, QWidget *parent=0,
+ KTimerDialog( int msec, TimerStyle style=CountDown, TQWidget *parent=0,
const char *name=0, bool modal=true,
- const QString &caption=QString::null,
+ const TQString &caption=TQString::null,
int buttonMask=Ok|Apply|Cancel, ButtonCode defaultButton=Ok,
bool separator=false,
const KGuiItem &user1=KGuiItem(),
@@ -117,7 +117,7 @@ class KTimerDialog : public KDialogBase
* Overridden function which is used to set the main widget of the dialog.
* @see KDialogBase::setMainWidget.
*/
- void setMainWidget( QWidget *widget );
+ void setMainWidget( TQWidget *widget );
signals:
/**
diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui
index 3b32d63b7..d4ad3e1b7 100644
--- a/kcontrol/smartcard/nosmartcardbase.ui
+++ b/kcontrol/smartcard/nosmartcardbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>NoSmartcardBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>NoSmartcardBase</cstring>
</property>
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index e7a3344ce..9dee7d69b 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>SmartcardBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>SmartcardBase</cstring>
</property>
@@ -23,7 +23,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -127,7 +127,7 @@
</spacer>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
diff --git a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
index a592d4b57..b96168964 100644
--- a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
+++ b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
@@ -29,7 +29,7 @@ NEW PROPERTIES:
===============
X-TDE-UA-TAG
FIELD: REQUIRED
-TYPE: QString
+TYPE: TQString
TRANSLATE: NO
DESCRIPTION:
An abbreviation of the actual browser-brand and is used
@@ -42,7 +42,7 @@ actual user-agent name (X-TDE-UA-NAME).
X-TDE-UA-FULL
FIELD: REQUIRED
-TYPE: QString
+TYPE: TQString
TRANSLATE: NO
DESCRIPTION:
The full user-agent description that will be sent to the remote
@@ -62,21 +62,21 @@ and set its value to 1 (for true).
X-TDE-UA-NAME
FIELD: REQUIRED
-TYPE: QString
+TYPE: TQString
TRANSLATE: YES
DESCRIPTION:
The actual name of the browser or user-agent.
X-TDE-UA-VERSION
FIELD: REQUIRED
-TYPE: QString
+TYPE: TQString
TRANSLATE: YES
DESCRIPTION:
The actual version of the browser or user-agent.
X-TDE-UA-SYSNAME
FIELD: OPTIONAL
-TYPE: QString
+TYPE: TQString
TRANSLATE: YES
DESCRIPTION:
The system name (for example Linux) where the browser
@@ -84,7 +84,7 @@ identification was obtained from.
X-TDE-UA-SYSRELEASE
FIELD: OPTIONAL
-TYPE: QString
+TYPE: TQString
TRANSLATE: YES
DESCRIPTION:
The system version (for example 2.4.1) where the browser
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index 2a5f72895..be0ee58a7 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -127,13 +127,13 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
TQMap<gid_t,TQStringList> tgmap;
TQMap<gid_t,TQStringList>::Iterator tgmapi;
TQMap<gid_t,TQStringList>::ConstIterator tgmapci;
- TQMap<TQString, QPair<int,TQStringList> >::Iterator umapi;
+ TQMap<TQString, TQPair<int,TQStringList> >::Iterator umapi;
struct passwd *ps;
for (setpwent(); (ps = getpwent()); ) {
TQString un( TQFile::decodeName( ps->pw_name ) );
if (usermap.find( un ) == usermap.end()) {
- usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) );
+ usermap.insert( un, TQPair<int,TQStringList>( ps->pw_uid, sl ) );
if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end())
(*tgmapi).append( un );
else
@@ -298,7 +298,7 @@ void TDModule::propagateUsers()
groupmap.clear();
emit clearUsers();
TQMap<TQString,int> lusers;
- TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+ TQMapConstIterator<TQString, TQPair<int,TQStringList> > it;
TQStringList::ConstIterator jt;
TQMap<TQString,int>::Iterator gmapi;
for (it = usermap.begin(); it != usermap.end(); ++it) {
@@ -321,7 +321,7 @@ void TDModule::slotMinMaxUID(int min, int max)
{
if (updateOK) {
TQMap<TQString,int> alusers, dlusers;
- TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+ TQMapConstIterator<TQString, TQPair<int,TQStringList> > it;
TQStringList::ConstIterator jt;
TQMap<TQString,int>::Iterator gmapi;
for (it = usermap.begin(); it != usermap.end(); ++it) {
diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h
index c2ee65526..4274e8323 100644
--- a/kcontrol/tdm/main.h
+++ b/kcontrol/tdm/main.h
@@ -71,7 +71,7 @@ private:
TDMUsersWidget *users;
TDMConvenienceWidget *convenience;
- TQMap<TQString, QPair<int,TQStringList> > usermap;
+ TQMap<TQString, TQPair<int,TQStringList> > usermap;
TQMap<TQString,int> groupmap;
int minshowuid, maxshowuid;
bool updateOK;