summaryrefslogtreecommitdiffstats
path: root/kdf
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:52:55 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:52:55 +0000
commit5f5ee2367157176ed223b86343eb0a9e4022e020 (patch)
tree6a9c87f14ee38e90eff3c77c784f14e4f38fd5a1 /kdf
parent4facf42feec57b22dcf46badc115ad6c5b5cc512 (diff)
downloadtdeutils-5f5ee2367157176ed223b86343eb0a9e4022e020.tar.gz
tdeutils-5f5ee2367157176ed223b86343eb0a9e4022e020.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1157653 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdf')
-rw-r--r--kdf/disklist.cpp48
-rw-r--r--kdf/disklist.h12
-rw-r--r--kdf/disks.cpp80
-rw-r--r--kdf/disks.h68
-rw-r--r--kdf/kcmdf.cpp10
-rw-r--r--kdf/kcmdf.h6
-rw-r--r--kdf/kconftest.cpp10
-rw-r--r--kdf/kdf.cpp10
-rw-r--r--kdf/kdf.h2
-rw-r--r--kdf/kdfconfig.cpp76
-rw-r--r--kdf/kdfconfig.h28
-rw-r--r--kdf/kdfwidget.cpp86
-rw-r--r--kdf/kdfwidget.h38
-rw-r--r--kdf/kwikdisk.cpp66
-rw-r--r--kdf/kwikdisk.h8
-rw-r--r--kdf/listview.cpp34
-rw-r--r--kdf/listview.h12
-rw-r--r--kdf/mntconfig.cpp102
-rw-r--r--kdf/mntconfig.h28
-rw-r--r--kdf/optiondialog.cpp18
-rw-r--r--kdf/optiondialog.h2
-rw-r--r--kdf/stdoption.cpp6
-rw-r--r--kdf/stdoption.h10
23 files changed, 380 insertions, 380 deletions
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index b2718ac..3326320 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -37,8 +37,8 @@
/***************************************************************************
* constructor
**/
-DiskList::DiskList(QObject *parent, const char *name)
- : QObject(parent,name)
+DiskList::DiskList(TQObject *parent, const char *name)
+ : TQObject(parent,name)
{
kdDebug() << k_funcinfo << endl;
@@ -53,10 +53,10 @@ DiskList::DiskList(QObject *parent, const char *name)
// BackgroundProcesses ****************************************
dfProc = new KProcess(); Q_CHECK_PTR(dfProc);
- connect( dfProc, SIGNAL(receivedStdout(KProcess *, char *, int) ),
- this, SLOT (receivedDFStdErrOut(KProcess *, char *, int)) );
- connect(dfProc,SIGNAL(processExited(KProcess *) ),
- this, SLOT(dfDone() ) );
+ connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ),
+ this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) );
+ connect(dfProc,TQT_SIGNAL(processExited(KProcess *) ),
+ this, TQT_SLOT(dfDone() ) );
readingDFStdErrOut=FALSE;
config = kapp->config();
@@ -87,9 +87,9 @@ void DiskList::applySettings()
{
kdDebug() << k_funcinfo << endl;
- QString oldgroup=config->group();
+ TQString oldgroup=config->group();
config->setGroup("DiskList");
- QString key;
+ TQString key;
DiskEntry *disk;
for (disk=disks->first();disk!=0;disk=disks->next()) {
key.sprintf("Mount%s%s%s%s",SEPARATOR,disk->deviceName().latin1()
@@ -117,7 +117,7 @@ void DiskList::loadSettings()
kdDebug() << k_funcinfo << endl;
config->setGroup("DiskList");
- QString key;
+ TQString key;
DiskEntry *disk;
for (disk=disks->first();disk!=0;disk=disks->next()) {
key.sprintf("Mount%s%s%s%s",SEPARATOR,disk->deviceName().latin1()
@@ -130,14 +130,14 @@ void DiskList::loadSettings()
key.sprintf("Icon%s%s%s%s",SEPARATOR,disk->deviceName().latin1()
,SEPARATOR,disk->mountPoint().latin1());
- QString icon=config->readPathEntry(key);
+ TQString icon=config->readPathEntry(key);
if (!icon.isEmpty()) disk->setIconName(icon);
}
}
-static QString expandEscapes(const QString& s) {
-QString rc;
+static TQString expandEscapes(const TQString& s) {
+TQString rc;
for (unsigned int i = 0; i < s.length(); i++) {
if (s[i] == '\\') {
i++;
@@ -172,10 +172,10 @@ int DiskList::readFSTAB()
if (readingDFStdErrOut || dfProc->isRunning()) return -1;
-QFile f(FSTAB);
+TQFile f(FSTAB);
if ( f.open(IO_ReadOnly) ) {
- QTextStream t (&f);
- QString s;
+ TQTextStream t (&f);
+ TQString s;
DiskEntry *disk;
//disks->clear(); // ############
@@ -243,7 +243,7 @@ void DiskList::receivedDFStdErrOut(KProcess *, char *data, int len )
*/
- QString tmp = QString::fromLatin1(data, len);
+ TQString tmp = TQString::fromLatin1(data, len);
dfStringErrOut.append(tmp);
}
@@ -283,12 +283,12 @@ void DiskList::dfDone()
for ( DiskEntry *disk=disks->first(); disk != 0; disk=disks->next() )
disk->setMounted(FALSE); // set all devs unmounted
- QTextStream t (dfStringErrOut, IO_ReadOnly);
- QString s=t.readLine();
+ TQTextStream t (dfStringErrOut, IO_ReadOnly);
+ TQString s=t.readLine();
if ( ( s.isEmpty() ) || ( s.left(10) != "Filesystem" ) )
qFatal("Error running df command... got [%s]",s.latin1());
while ( !t.atEnd() ) {
- QString u,v;
+ TQString u,v;
DiskEntry *disk;
s=t.readLine();
s=s.simplifyWhiteSpace();
@@ -361,7 +361,7 @@ void DiskList::dfDone()
}
-void DiskList::deleteAllMountedAt(const QString &mountpoint)
+void DiskList::deleteAllMountedAt(const TQString &mountpoint)
{
kdDebug() << k_funcinfo << endl;
@@ -396,8 +396,8 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk)
//
//int pos=disks->find(disk);
- QString deviceRealName = disk->deviceRealName();
- QString realMountPoint = disk->realMountPoint();
+ TQString deviceRealName = disk->deviceRealName();
+ TQString realMountPoint = disk->realMountPoint();
int pos = -1;
for( u_int i=0; i<disks->count(); i++ )
@@ -425,7 +425,7 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk)
// cachefs deviceNames have no / behind the host-column
// eg. /cache/cache/.cfs_mnt_points/srv:_home_jesus
// ^ ^
- QString odiskName = olddisk->deviceName();
+ TQString odiskName = olddisk->deviceName();
int ci=odiskName.find(':'); // goto host-column
while ((ci =odiskName.find('/',ci)) > 0) {
odiskName.replace(ci,1,"_");
@@ -460,7 +460,7 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk)
if ( (-1!=olddisk->mountOptions().find("user")) &&
(-1==disk->mountOptions().find("user")) ) {
// add "user" option to new diskEntry
- QString s=disk->mountOptions();
+ TQString s=disk->mountOptions();
if (s.length()>0) s.append(",");
s.append("user");
disk->setMountOptions(s);
diff --git a/kdf/disklist.h b/kdf/disklist.h
index 7a99841..cd9613c 100644
--- a/kdf/disklist.h
+++ b/kdf/disklist.h
@@ -31,7 +31,7 @@
//#include <kcontrol.h>
// defines the os-type
-#include <qglobal.h>
+#include <tqglobal.h>
#include "disks.h"
@@ -55,8 +55,8 @@
#define SEPARATOR "|"
/***************************************************************************/
-typedef QPtrList<DiskEntry> DisksBase;
-typedef QPtrListIterator<DiskEntry> DisksIterator;
+typedef TQPtrList<DiskEntry> DisksBase;
+typedef TQPtrListIterator<DiskEntry> DisksIterator;
/***************************************************************************/
class Disks : public DisksBase
@@ -96,7 +96,7 @@ private:
class DiskList : public QObject
{ Q_OBJECT
public:
- DiskList( QObject *parent=0, const char *name=0 );
+ DiskList( TQObject *parent=0, const char *name=0 );
~DiskList();
int readFSTAB();
int readDF();
@@ -106,7 +106,7 @@ public:
DiskEntry* next() {return disks->next();}
uint count() { return disks->count(); }
- void deleteAllMountedAt(const QString &mountpoint);
+ void deleteAllMountedAt(const TQString &mountpoint);
void setUpdatesDisabled(bool disable);
signals:
@@ -126,7 +126,7 @@ private:
Disks *disks;
KProcess *dfProc;
- QString dfStringErrOut;
+ TQString dfStringErrOut;
bool readingDFStdErrOut;
KConfig *config;
bool updatesDisabled;
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index c1a4a0e..ca8f263 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qfileinfo.h>
-#include <qdir.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
#include <kglobal.h>
#include <kdebug.h>
@@ -56,23 +56,23 @@ void DiskEntry::init()
// BackgroundProcesses ****************************************
sysProc = new KShellProcess(); Q_CHECK_PTR(sysProc);
- connect( sysProc, SIGNAL(receivedStdout(KProcess *, char *, int) ),
- this, SLOT (receivedSysStdErrOut(KProcess *, char *, int)) );
- connect( sysProc, SIGNAL(receivedStderr(KProcess *, char *, int) ),
- this, SLOT (receivedSysStdErrOut(KProcess *, char *, int)) );
+ connect( sysProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ),
+ this, TQT_SLOT (receivedSysStdErrOut(KProcess *, char *, int)) );
+ connect( sysProc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int) ),
+ this, TQT_SLOT (receivedSysStdErrOut(KProcess *, char *, int)) );
readingSysStdErrOut=FALSE;
}
-DiskEntry::DiskEntry(QObject *parent, const char *name)
- : QObject (parent, name)
+DiskEntry::DiskEntry(TQObject *parent, const char *name)
+ : TQObject (parent, name)
{
init();
}
-DiskEntry::DiskEntry(const QString & deviceName, QObject *parent, const char *name)
- : QObject (parent, name)
+DiskEntry::DiskEntry(const TQString & deviceName, TQObject *parent, const char *name)
+ : TQObject (parent, name)
{
init();
@@ -94,7 +94,7 @@ int DiskEntry::toggleMount()
int DiskEntry::mount()
{
- QString cmdS=mntcmd;
+ TQString cmdS=mntcmd;
if (cmdS.isEmpty()) // generate default mount cmd
if (getuid()!=0 ) // user mountable
{
@@ -104,13 +104,13 @@ int DiskEntry::mount()
{
// FreeBSD's mount(8) is picky: -o _must_ go before
// the device and mountpoint.
- cmdS=QString::fromLatin1("mount -t%t -o%o %d %m");
+ cmdS=TQString::fromLatin1("mount -t%t -o%o %d %m");
}
- cmdS.replace(QString::fromLatin1("%d"),deviceName());
- cmdS.replace(QString::fromLatin1("%m"),mountPoint());
- cmdS.replace(QString::fromLatin1("%t"),fsType());
- cmdS.replace(QString::fromLatin1("%o"),mountOptions());
+ cmdS.replace(TQString::fromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::fromLatin1("%t"),fsType());
+ cmdS.replace(TQString::fromLatin1("%o"),mountOptions());
kdDebug() << "mount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
@@ -122,12 +122,12 @@ int DiskEntry::mount()
int DiskEntry::umount()
{
kdDebug() << "umounting" << endl;
- QString cmdS=umntcmd;
+ TQString cmdS=umntcmd;
if (cmdS.isEmpty()) // generate default umount cmd
cmdS="umount %d";
- cmdS.replace(QString::fromLatin1("%d"),deviceName());
- cmdS.replace(QString::fromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::fromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
kdDebug() << "umount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
@@ -142,7 +142,7 @@ int DiskEntry::remount()
if (mntcmd.isEmpty() && umntcmd.isEmpty() // default mount/umount commands
&& (getuid()==0)) // you are root
{
- QString oldOpt=options;
+ TQString oldOpt=options;
if (options.isEmpty())
options="remount";
else
@@ -157,17 +157,17 @@ int DiskEntry::remount()
}
}
-void DiskEntry::setMountCommand(const QString & mnt)
+void DiskEntry::setMountCommand(const TQString & mnt)
{
mntcmd=mnt;
}
-void DiskEntry::setUmountCommand(const QString & umnt)
+void DiskEntry::setUmountCommand(const TQString & umnt)
{
umntcmd=umnt;
}
-void DiskEntry::setIconName(const QString & iconName)
+void DiskEntry::setIconName(const TQString & iconName)
{
iconSetByUser=TRUE;
icoName=iconName;
@@ -179,9 +179,9 @@ void DiskEntry::setIconName(const QString & iconName)
emit iconNameChanged();
}
-QString DiskEntry::iconName()
+TQString DiskEntry::iconName()
{
- QString iconName=icoName;
+ TQString iconName=icoName;
if (iconSetByUser) {
mounted() ? iconName+="_mount" : iconName+="_unmount";
return iconName;
@@ -189,9 +189,9 @@ QString DiskEntry::iconName()
return guessIconName();
}
-QString DiskEntry::guessIconName()
+TQString DiskEntry::guessIconName()
{
- QString iconName;
+ TQString iconName;
// try to be intelligent
if (-1!=mountPoint().find("cdrom",0,FALSE)) iconName+="cdrom";
else if (-1!=deviceName().find("cdrom",0,FALSE)) iconName+="cdrom";
@@ -222,7 +222,7 @@ QString DiskEntry::guessIconName()
/***************************************************************************
* starts a command on the underlying system via /bin/sh
**/
-int DiskEntry::sysCall(const QString & command)
+int DiskEntry::sysCall(const TQString & command)
{
if (readingSysStdErrOut || sysProc->isRunning() ) return -1;
@@ -243,7 +243,7 @@ int DiskEntry::sysCall(const QString & command)
**/
void DiskEntry::receivedSysStdErrOut(KProcess *, char *data, int len)
{
- QString tmp = QString::fromLocal8Bit(data, len);
+ TQString tmp = TQString::fromLocal8Bit(data, len);
sysStringErrOut.append(tmp);
}
@@ -256,19 +256,19 @@ float DiskEntry::percentFull() const
}
}
-void DiskEntry::setDeviceName(const QString & deviceName)
+void DiskEntry::setDeviceName(const TQString & deviceName)
{
device=deviceName;
emit deviceNameChanged();
}
-QString DiskEntry::deviceRealName() const
+TQString DiskEntry::deviceRealName() const
{
- QFileInfo inf( device );
- QDir dir( inf.dirPath( true ) );
- QString relPath = inf.fileName();
+ TQFileInfo inf( device );
+ TQDir dir( inf.dirPath( true ) );
+ TQString relPath = inf.fileName();
if ( inf.isSymLink() ) {
- QString link = inf.readLink();
+ TQString link = inf.readLink();
if ( link.startsWith( "/" ) )
return link;
relPath = link;
@@ -276,25 +276,25 @@ QString DiskEntry::deviceRealName() const
return dir.canonicalPath() + "/" + relPath;
}
-void DiskEntry::setMountPoint(const QString & mountPoint)
+void DiskEntry::setMountPoint(const TQString & mountPoint)
{
mountedOn=mountPoint;
emit mountPointChanged();
}
-QString DiskEntry::realMountPoint() const
+TQString DiskEntry::realMountPoint() const
{
- QDir dir( mountedOn );
+ TQDir dir( mountedOn );
return dir.canonicalPath();
}
-void DiskEntry::setMountOptions(const QString & mountOptions)
+void DiskEntry::setMountOptions(const TQString & mountOptions)
{
options=mountOptions;
emit mountOptionsChanged();
}
-void DiskEntry::setFsType(const QString & fsType)
+void DiskEntry::setFsType(const TQString & fsType)
{
type=fsType;
emit fsTypeChanged();
diff --git a/kdf/disks.h b/kdf/disks.h
index 9899927..ed80c3d 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -25,12 +25,12 @@
#ifndef __DISKS_H__
#define __DISKS_H__
-#include <qobject.h>
-#include <qstring.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qprogressbar.h>
-#include <qfile.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqprogressbar.h>
+#include <tqfile.h>
#include <kio/global.h>
#include <kprogress.h>
@@ -41,17 +41,17 @@ class DiskEntry : public QObject
{
Q_OBJECT
public:
- DiskEntry(QObject *parent=0, const char *name=0);
- DiskEntry(const QString & deviceName, QObject *parent=0, const char *name=0);
+ DiskEntry(TQObject *parent=0, const char *name=0);
+ DiskEntry(const TQString & deviceName, TQObject *parent=0, const char *name=0);
~DiskEntry();
- QString lastSysError() {return sysStringErrOut; }
- QString deviceName() const { return device; }
+ TQString lastSysError() {return sysStringErrOut; }
+ TQString deviceName() const { return device; }
// The real device (in case deviceName() is a symlink)
- QString deviceRealName() const;
- QString mountPoint() const { return mountedOn; }
- QString mountOptions() const { return options; }
+ TQString deviceRealName() const;
+ TQString mountPoint() const { return mountedOn; }
+ TQString mountOptions() const { return options; }
// The real device (in case deviceName() is a symlink)
- QString realMountPoint() const;
+ TQString realMountPoint() const;
/**
* sets the used mountCommand for the actual DiskEntry.
* @param mntcmd is a string containing the executable file and
@@ -63,7 +63,7 @@ public:
* all this information is gained from the objects' data
* if no mountCommand is set it defaults to "mount %d"
**/
- QString mountCommand() const { return mntcmd; }
+ TQString mountCommand() const { return mntcmd; }
/**
* sets the used umountCommand for the actual DiskEntry.
* @param mntcmd is a string containing the executable file and
@@ -73,17 +73,17 @@ public:
* all this information is gained from the objects' data
* if no umountCommand is set it defaults to "umount %d"
**/
- QString umountCommand() const { return umntcmd; }
- QString fsType() const { return type; }
+ TQString umountCommand() const { return umntcmd; }
+ TQString fsType() const { return type; }
bool mounted() const { return isMounted; }
int kBSize() const { return size; }
- QString iconName();
- QString realIconName() { return icoName; }
- QString prettyKBSize() const { return KIO::convertSizeFromKB(size); }
+ TQString iconName();
+ TQString realIconName() { return icoName; }
+ TQString prettyKBSize() const { return KIO::convertSizeFromKB(size); }
int kBUsed() const { return used; }
- QString prettyKBUsed() const { return KIO::convertSizeFromKB(used); }
+ TQString prettyKBUsed() const { return KIO::convertSizeFromKB(used); }
int kBAvail() const { return avail; }
- QString prettyKBAvail() const { return KIO::convertSizeFromKB(avail); }
+ TQString prettyKBAvail() const { return KIO::convertSizeFromKB(avail); }
float percentFull() const;
signals:
@@ -104,32 +104,32 @@ public slots:
int mount();
int umount();
int remount();
- void setMountCommand(const QString & mnt);
- void setUmountCommand(const QString & umnt);
- void setDeviceName(const QString & deviceName);
- void setMountPoint(const QString & mountPoint);
- void setIconName(const QString & iconName);
- void setMountOptions(const QString & mountOptions);
- void setFsType(const QString & fsType);
+ void setMountCommand(const TQString & mnt);
+ void setUmountCommand(const TQString & umnt);
+ void setDeviceName(const TQString & deviceName);
+ void setMountPoint(const TQString & mountPoint);
+ void setIconName(const TQString & iconName);
+ void setMountOptions(const TQString & mountOptions);
+ void setFsType(const TQString & fsType);
void setMounted(bool nowMounted);
void setKBSize(int kb_size);
void setKBUsed(int kb_used);
void setKBAvail(int kb_avail);
- QString guessIconName();
+ TQString guessIconName();
private slots:
void receivedSysStdErrOut(KProcess *, char *data, int len);
private:
void init();
- int sysCall(const QString & command);
- QString prettyPrint(int kBValue) const;
+ int sysCall(const TQString & command);
+ TQString prettyPrint(int kBValue) const;
KShellProcess *sysProc;
- QString sysStringErrOut;
+ TQString sysStringErrOut;
bool readingSysStdErrOut;
- QString device,
+ TQString device,
type,
mountedOn,
options,
diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp
index 3c30a01..2e26113 100644
--- a/kdf/kcmdf.cpp
+++ b/kdf/kcmdf.cpp
@@ -28,16 +28,16 @@
#include <kdialog.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include "kcmdf.h"
-KDiskFreeWidget::KDiskFreeWidget( QWidget *parent, const char *name )
+KDiskFreeWidget::KDiskFreeWidget( TQWidget *parent, const char *name )
: KCModule( parent, name )
{
setButtons(Help);
- QVBoxLayout *topLayout = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
mKdf = new KDFWidget( this, "kdf", false );
topLayout->addWidget( mKdf );
@@ -48,7 +48,7 @@ KDiskFreeWidget::~KDiskFreeWidget()
mKdf->applySettings();
}
-QString KDiskFreeWidget::quickHelp() const
+TQString KDiskFreeWidget::quickHelp() const
{
return i18n("<h3>Hardware Information</h3><br> All the information modules return information"
" about a certain aspect of your computer hardware or your operating system."
@@ -57,7 +57,7 @@ QString KDiskFreeWidget::quickHelp() const
extern "C"
{
- KDE_EXPORT KCModule* create_kdf( QWidget *parent, const char * /*name*/ )
+ KDE_EXPORT KCModule* create_kdf( TQWidget *parent, const char * /*name*/ )
{
return new KDiskFreeWidget( parent , "kdf" );
}
diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h
index c3e2b58..030b7dd 100644
--- a/kdf/kcmdf.h
+++ b/kdf/kcmdf.h
@@ -28,17 +28,17 @@
#include "mntconfig.h"
#include <kcmodule.h>
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
class KDiskFreeWidget : public KCModule
{
Q_OBJECT
public:
- KDiskFreeWidget( QWidget *parent=0, const char *name=0 );
+ KDiskFreeWidget( TQWidget *parent=0, const char *name=0 );
~KDiskFreeWidget();
- QString quickHelp() const;
+ TQString quickHelp() const;
private:
KDFWidget *mKdf;
diff --git a/kdf/kconftest.cpp b/kdf/kconftest.cpp
index 75d13fd..6ee63f0 100644
--- a/kdf/kconftest.cpp
+++ b/kdf/kconftest.cpp
@@ -32,8 +32,8 @@
#include <iostream>
-#include <qstring.h>
-#include <qdict.h>
+#include <tqstring.h>
+#include <tqdict.h>
#include <kconfig.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -52,15 +52,15 @@ main(int argc, char ** argv)
KApplication app;
KConfig * cfg = kapp->config();
- QDict<char> dict;
+ TQDict<char> dict;
dict.insert("Blah", "Arse");
dict.insert("Blah", "Smack");
dict.insert("Blah", "Monkey");
- QDictIterator<char> it(dict);
+ TQDictIterator<char> it(dict);
- QString key = "TestConfigItem";
+ TQString key = "TestConfigItem";
for (; it.current(); ++it) {
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index f48cf48..606c44e 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -36,16 +36,16 @@ static const char version[] = "v0.5";
/***************************************************************/
-KDFTopLevel::KDFTopLevel(QWidget *, const char *name)
+KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
: KMainWindow(0, name)
{
kdf = new KDFWidget(this,"kdf",FALSE);
Q_CHECK_PTR(kdf);
- (void) new KAction( i18n( "&Update" ), 0, kdf, SLOT( updateDF() ), actionCollection(), "updatedf" );
+ (void) new KAction( i18n( "&Update" ), 0, kdf, TQT_SLOT( updateDF() ), actionCollection(), "updatedf" );
- KStdAction::quit(this, SLOT(close()), actionCollection());
- KStdAction::preferences(kdf, SLOT(settingsBtnClicked()), actionCollection());
- KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()),
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::preferences(kdf, TQT_SLOT(settingsBtnClicked()), actionCollection());
+ KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
setCentralWidget(kdf);
// kdf->setMinimumSize(kdf->sizeHint());
diff --git a/kdf/kdf.h b/kdf/kdf.h
index 9cae3c7..84c0411 100644
--- a/kdf/kdf.h
+++ b/kdf/kdf.h
@@ -33,7 +33,7 @@ class KDFTopLevel : public KMainWindow
Q_OBJECT
public:
- KDFTopLevel(QWidget *parent=0, const char *name=0);
+ KDFTopLevel(TQWidget *parent=0, const char *name=0);
~KDFTopLevel() { };
protected slots:
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index 499e2e3..e13ebcd 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -24,16 +24,16 @@
//
// 1999-11-29 Espen Sand
-// Converted to QLayout and QListView + cleanups
+// Converted to TQLayout and TQListView + cleanups
//
-#include <qcheckbox.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlcdnumber.h>
-#include <qlineedit.h>
+#include <tqcheckbox.h>
+#include <tqheader.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlcdnumber.h>
+#include <tqlineedit.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -50,8 +50,8 @@ static bool GUI;
#endif
-KDFConfigWidget::KDFConfigWidget(QWidget *parent, const char *name, bool init)
- : QWidget( parent, name)
+KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
+ : TQWidget( parent, name)
{
mTabName.resize(8);
@@ -68,24 +68,24 @@ KDFConfigWidget::KDFConfigWidget(QWidget *parent, const char *name, bool init)
GUI = !init;
if(GUI)
{
- QString text;
- QVBoxLayout *topLayout = new QVBoxLayout( this, 0, KDialog::spacingHint());
+ TQString text;
+ TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint());
mList = new CListView( this, "list", 1 );
mList->setAllColumnsShowFocus(true);
- mList->setFrameStyle( QFrame::WinPanel + QFrame::Sunken );
+ mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken );
mList->header()->setMovingEnabled(false);
for( uint i=0; i < mTabName.size(); i++ )
{
mList->addColumn( mTabName[i]->mName );
}
- connect( mList, SIGNAL(clicked(QListViewItem *, const QPoint &, int)),
- this, SLOT(toggleListText(QListViewItem *,const QPoint &,int)));
- connect( mList, SIGNAL(clicked(QListViewItem *, const QPoint &, int)),
- this, SLOT(slotChanged()));
+ connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
+ this, TQT_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int)));
+ connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
+ this, TQT_SLOT(slotChanged()));
topLayout->addWidget( mList );
- QListViewItem *mListItem = new QListViewItem( mList );
+ TQListViewItem *mListItem = new TQListViewItem( mList );
for( uint i=mList->header()->count(); i>0; i-- )
{
mListItem->setText(i-1, i18n("visible") );
@@ -93,51 +93,51 @@ KDFConfigWidget::KDFConfigWidget(QWidget *parent, const char *name, bool init)
}
mList->setSelected( mListItem, true );
- QGridLayout *gl = new QGridLayout( 2, 2 );
+ TQGridLayout *gl = new TQGridLayout( 2, 2 );
topLayout->addLayout( gl );
gl->setColStretch( 1, 10 );
- mScroll = new QScrollBar( this );
+ mScroll = new TQScrollBar( this );
Q_CHECK_PTR(mScroll);
- mScroll->setOrientation( QScrollBar::Horizontal );
+ mScroll->setOrientation( TQScrollBar::Horizontal );
mScroll->setSteps(1,20);
mScroll->setRange(0, 180 );
gl->addWidget( mScroll, 1, 1 );
- connect(mScroll,SIGNAL(valueChanged(int)),this,SLOT(slotChanged()));
+ connect(mScroll,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged()));
- mLCD = new QLCDNumber( this );
+ mLCD = new TQLCDNumber( this );
Q_CHECK_PTR(mLCD);
mLCD->setNumDigits( 3 );
- mLCD->setSegmentStyle(QLCDNumber::Filled);
- connect(mScroll,SIGNAL(valueChanged(int)),mLCD,SLOT(display(int)));
+ mLCD->setSegmentStyle(TQLCDNumber::Filled);
+ connect(mScroll,TQT_SIGNAL(valueChanged(int)),mLCD,TQT_SLOT(display(int)));
gl->addMultiCellWidget( mLCD, 0, 1, 0, 0 );
text = i18n("Update frequency [seconds]. The value 0 disables update" );
- QLabel *label = new QLabel( text, this );
+ TQLabel *label = new TQLabel( text, this );
Q_CHECK_PTR(label);
gl->addWidget( label, 0, 1 );
- label = new QLabel( i18n("File manager (e.g. konsole -e mc %m):") ,this);
+ label = new TQLabel( i18n("File manager (e.g. konsole -e mc %m):") ,this);
Q_CHECK_PTR(label);
topLayout->addWidget( label );
- mFileManagerEdit = new QLineEdit( this );
+ mFileManagerEdit = new TQLineEdit( this );
Q_CHECK_PTR(mFileManagerEdit);
topLayout->addWidget( mFileManagerEdit );
- connect(mFileManagerEdit,SIGNAL(textChanged (const QString &)),this,SLOT(slotChanged()));
+ connect(mFileManagerEdit,TQT_SIGNAL(textChanged (const TQString &)),this,TQT_SLOT(slotChanged()));
text = i18n("Open file manager automatically on mount");
- mOpenMountCheck = new QCheckBox(text, this );
+ mOpenMountCheck = new TQCheckBox(text, this );
Q_CHECK_PTR(mOpenMountCheck);
topLayout->addWidget( mOpenMountCheck );
- connect(mOpenMountCheck,SIGNAL(toggled(bool)),this,SLOT(slotChanged()));
+ connect(mOpenMountCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged()));
text = i18n("Pop up a window when a disk gets critically full");
- mPopupFullCheck = new QCheckBox( text, this );
+ mPopupFullCheck = new TQCheckBox( text, this );
Q_CHECK_PTR(mPopupFullCheck);
topLayout->addWidget( mPopupFullCheck );
- connect(mPopupFullCheck,SIGNAL(toggled(bool)),this,SLOT(slotChanged()));
+ connect(mPopupFullCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged()));
}
loadSettings();
@@ -153,7 +153,7 @@ KDFConfigWidget::~KDFConfigWidget()
}
-void KDFConfigWidget::closeEvent(QCloseEvent *)
+void KDFConfigWidget::closeEvent(TQCloseEvent *)
{
applySettings();
kapp->quit();
@@ -176,7 +176,7 @@ void KDFConfigWidget::applySettings( void )
mStd.setOpenFileManager( mOpenMountCheck->isChecked() );
mStd.writeConfiguration();
- QListViewItem *item = mList->firstChild();
+ TQListViewItem *item = mList->firstChild();
if( item != 0 )
{
for( int i=mList->header()->count(); i>0; i-- )
@@ -208,7 +208,7 @@ void KDFConfigWidget::loadSettings( void )
mOpenMountCheck->setChecked( mStd.openFileManager() );
mFileManagerEdit->setText( mStd.fileManager() );
- QListViewItem *item = mList->firstChild();
+ TQListViewItem *item = mList->firstChild();
if( item != 0 )
{
for( int i=mList->header()->count(); i>0; i-- )
@@ -232,7 +232,7 @@ void KDFConfigWidget::defaultsBtnClicked( void )
mOpenMountCheck->setChecked( mStd.openFileManager() );
mFileManagerEdit->setText( mStd.fileManager() );
- QListViewItem *item = mList->firstChild();
+ TQListViewItem *item = mList->firstChild();
if( item != 0 )
{
for( int i=mList->header()->count(); i>0; i-- )
@@ -245,11 +245,11 @@ void KDFConfigWidget::defaultsBtnClicked( void )
}
-void KDFConfigWidget::toggleListText( QListViewItem *item, const QPoint &,
+void KDFConfigWidget::toggleListText( TQListViewItem *item, const TQPoint &,
int column )
{
if (!item) return;
- QString text = item->text( column );
+ TQString text = item->text( column );
item->setText(column, text==i18n("visible")?i18n("hidden"):i18n("visible"));
item->setPixmap( column, text==i18n("visible") ? UserIcon ( "delete" )
: UserIcon ( "tick" ) );
diff --git a/kdf/kdfconfig.h b/kdf/kdfconfig.h
index 34aa7d4..7cc82c5 100644
--- a/kdf/kdfconfig.h
+++ b/kdf/kdfconfig.h
@@ -25,8 +25,8 @@
#ifndef __KDFCONFIG_H__
#define __KDFCONFIG_H__
-#include <qmemarray.h>
-#include <qstring.h>
+#include <tqmemarray.h>
+#include <tqstring.h>
#include "stdoption.h"
@@ -46,7 +46,7 @@ class KDFConfigWidget : public QWidget
class CTabName
{
public:
- CTabName( const QString &res, const QString &name )
+ CTabName( const TQString &res, const TQString &name )
{
mRes = res;
mName = name;
@@ -54,12 +54,12 @@ class KDFConfigWidget : public QWidget
CTabName( void ) { }
~CTabName( void ) { }
- QString mRes;
- QString mName;
+ TQString mRes;
+ TQString mName;
};
public:
- KDFConfigWidget( QWidget *parent=0, const char *name=0, bool init=false);
+ KDFConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false);
~KDFConfigWidget();
public slots:
@@ -71,19 +71,19 @@ class KDFConfigWidget : public QWidget
void slotChanged();
private slots:
- void toggleListText( QListViewItem *item, const QPoint &, int column );
+ void toggleListText( TQListViewItem *item, const TQPoint &, int column );
protected:
- void closeEvent( QCloseEvent * );
+ void closeEvent( TQCloseEvent * );
private:
- QMemArray<CTabName*> mTabName;
+ TQMemArray<CTabName*> mTabName;
CListView *mList;
- QScrollBar *mScroll;
- QLCDNumber *mLCD;
- QLineEdit *mFileManagerEdit;
- QCheckBox *mOpenMountCheck;
- QCheckBox *mPopupFullCheck;
+ TQScrollBar *mScroll;
+ TQLCDNumber *mLCD;
+ TQLineEdit *mFileManagerEdit;
+ TQCheckBox *mOpenMountCheck;
+ TQCheckBox *mPopupFullCheck;
CStdOption mStd;
signals:
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index ea7aee9..00f1968 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -23,17 +23,17 @@
//
// 1999-11-29 Espen Sand
-// Converted to QLayout and QListView + cleanups
+// Converted to TQLayout and TQListView + cleanups
// 1999-12-05 Espen Sand
// Usage bars should work again.
//
#include <stdlib.h>
-#include <qheader.h>
-#include <qtimer.h>
-#include <qlayout.h>
-#include <qpainter.h>
+#include <tqheader.h>
+#include <tqtimer.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
#include <kapplication.h>
#include <kcmenumngr.h>
@@ -56,13 +56,13 @@ static bool GUI;
/**************************************************************/
-CListViewItem::CListViewItem( CListView * parent, QListViewItem * after )
- :QListViewItem( parent, after )
+CListViewItem::CListViewItem( CListView * parent, TQListViewItem * after )
+ :TQListViewItem( parent, after )
{}
-int CListViewItem::compare ( QListViewItem *i, int column, bool ) const
+int CListViewItem::compare ( TQListViewItem *i, int column, bool ) const
{
- QString tmp;
+ TQString tmp;
CListViewItem *c = static_cast<CListViewItem*>(i);
@@ -92,13 +92,13 @@ void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full)
/**************************************************************/
-KDFWidget::KDFWidget( QWidget *parent, const char *name, bool init )
- : QWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0)
+KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init )
+ : TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0)
{
- connect(&mDiskList , SIGNAL(readDFDone() ),
- this, SLOT (updateDFDone()) );
- connect(&mDiskList , SIGNAL(criticallyFull(DiskEntry*)),
- this, SLOT (criticallyFull(DiskEntry*)) );
+ connect(&mDiskList , TQT_SIGNAL(readDFDone() ),
+ this, TQT_SLOT (updateDFDone()) );
+ connect(&mDiskList , TQT_SIGNAL(criticallyFull(DiskEntry*)),
+ this, TQT_SLOT (criticallyFull(DiskEntry*)) );
mTabProp.resize(8);
mTabProp[0] = new CTabEntry( "Icon", i18n("Icon"), true, 32);
@@ -114,24 +114,24 @@ KDFWidget::KDFWidget( QWidget *parent, const char *name, bool init )
GUI = !init;
if( GUI )
{
- QVBoxLayout *topLayout = new QVBoxLayout( this, 0, 0 );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, 0 );
mList = new CListView( this, "list" );
topLayout->addWidget( mList );
mList->setAllColumnsShowFocus( true );
- mList->setFrameStyle( QFrame::WinPanel + QFrame::Sunken );
+ mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken );
mList->setShowSortIndicator(true);
connect( mList,
- SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int )),
- this, SLOT( rightButtonPressed( QListViewItem *, const QPoint &, int )));
+ TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )),
+ this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int )));
connect( mList,
- SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int )),
- this, SLOT( rightButtonClicked( QListViewItem *, const QPoint &, int )));
- connect( mList->header(), SIGNAL(sizeChange(int, int, int)),
- this, SLOT(columnSizeChanged(int, int, int)) );
+ TQT_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )),
+ this, TQT_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int )));
+ connect( mList->header(), TQT_SIGNAL(sizeChange(int, int, int)),
+ this, TQT_SLOT(columnSizeChanged(int, int, int)) );
makeColumns();
- mIsTopLevel = QString(parent->className()) == "KDFTopLevel" ? true : false;
+ mIsTopLevel = TQString(parent->className()) == "KDFTopLevel" ? true : false;
}
loadSettings();
@@ -183,7 +183,7 @@ void KDFWidget::makeColumns( void )
/******************************************************************/
-void KDFWidget::closeEvent(QCloseEvent *)
+void KDFWidget::closeEvent(TQCloseEvent *)
{
applySettings();
kapp->quit();
@@ -266,8 +266,8 @@ void KDFWidget::settingsBtnClicked( void )
{
mOptionDialog = new COptionDialog( this, "options", false );
if( mOptionDialog == 0 ) { return; }
- connect( mOptionDialog, SIGNAL(valueChanged()),
- this, SLOT(settingsChanged()) );
+ connect( mOptionDialog, TQT_SIGNAL(valueChanged()),
+ this, TQT_SLOT(settingsChanged()) );
}
mOptionDialog->show();
}
@@ -293,7 +293,7 @@ void KDFWidget::setUpdateFrequency( int frequency )
/***************************************************************************
* Update (reread) all disk-dependencies
**/
-void KDFWidget::timerEvent(QTimerEvent *)
+void KDFWidget::timerEvent(TQTimerEvent *)
{
updateDF();
}
@@ -329,7 +329,7 @@ void KDFWidget::updateDFDone( void ){
for( DiskEntry *disk=mDiskList.first(); disk!=0; disk=mDiskList.next() )
{
i++;
- QString size, percent;
+ TQString size, percent;
if( disk->kBSize() > 0 )
{
percent = KGlobal::locale()->formatNumber(disk->percentFull(), 1) + '%';
@@ -362,7 +362,7 @@ void KDFWidget::updateDFDone( void ){
/***************************************************************************
* Update display
**/
-void KDFWidget::resizeEvent( QResizeEvent * )
+void KDFWidget::resizeEvent( TQResizeEvent * )
{
updateDiskBarPixmaps();
}
@@ -376,7 +376,7 @@ void KDFWidget::criticallyFull( DiskEntry *disk )
{
if( mStd.popupIfFull() == true )
{
- QString msg = i18n("Device [%1] on [%2] is getting critically full!").
+ TQString msg = i18n("Device [%1] on [%2] is getting critically full!").
arg(disk->deviceName()).arg(disk->mountPoint());
KMessageBox::sorry( this, msg, i18n("Warning"));
}
@@ -386,7 +386,7 @@ void KDFWidget::criticallyFull( DiskEntry *disk )
/**************************************************************************
* find correct disk related to list item
**/
-DiskEntry *KDFWidget::selectedDisk( QListViewItem *item )
+DiskEntry *KDFWidget::selectedDisk( TQListViewItem *item )
{
if( item == 0 )
{
@@ -426,7 +426,7 @@ DiskEntry *KDFWidget::selectedDisk( QListViewItem *item )
// return(0);
}
-void KDFWidget::rightButtonPressed( QListViewItem *item, const QPoint &p, int )
+void KDFWidget::rightButtonPressed( TQListViewItem *item, const TQPoint &p, int )
{
if( KContextMenuManager::showOnButtonPress() == true )
{
@@ -435,7 +435,7 @@ void KDFWidget::rightButtonPressed( QListViewItem *item, const QPoint &p, int )
}
-void KDFWidget::rightButtonClicked( QListViewItem *item, const QPoint &p, int )
+void KDFWidget::rightButtonClicked( TQListViewItem *item, const TQPoint &p, int )
{
if( KContextMenuManager::showOnButtonPress() == false )
{
@@ -447,7 +447,7 @@ void KDFWidget::rightButtonClicked( QListViewItem *item, const QPoint &p, int )
/**************************************************************************
* pops up and asks for mount/umount right-clicked device
**/
-void KDFWidget::popupMenu( QListViewItem *item, const QPoint &p )
+void KDFWidget::popupMenu( TQListViewItem *item, const TQPoint &p )
{
if (mPopup) //The user may even be able to popup another menu while this open is active...
return;
@@ -514,7 +514,7 @@ void KDFWidget::popupMenu( QListViewItem *item, const QPoint &p )
kdDebug() << "opening filemanager" << endl;
if( mStd.fileManager().isEmpty() == false )
{
- QString cmd = mStd.fileManager();
+ TQString cmd = mStd.fileManager();
int pos = cmd.find("%m");
if( pos > 0 )
{
@@ -524,7 +524,7 @@ void KDFWidget::popupMenu( QListViewItem *item, const QPoint &p )
{
cmd += " " + KProcess::quote(disk->mountPoint()) +" &";
}
- system( QFile::encodeName(cmd) );
+ system( TQFile::encodeName(cmd) );
}
}
@@ -567,7 +567,7 @@ void KDFWidget::updateDiskBarPixmaps( void )
}
int i=0;
- for(QListViewItem *it=mList->firstChild(); it!=0;it=it->nextSibling(),i++ )
+ for(TQListViewItem *it=mList->firstChild(); it!=0;it=it->nextSibling(),i++ )
{
// I can't get find() to work. The Disks::compareItems(..) is
// never called.
@@ -601,14 +601,14 @@ void KDFWidget::updateDiskBarPixmaps( void )
int w = mList->columnWidth(usageCol)-2;
if( w <= 0 ) { continue; }
- QPixmap *pix = new QPixmap( w, h );
+ TQPixmap *pix = new TQPixmap( w, h );
if( pix == 0 ) { continue; }
pix->fill(white);
- QPainter p(pix);
+ TQPainter p(pix);
p.setPen(black);
p.drawRect(0,0,w,h);
- QColor c;
+ TQColor c;
if ( (disk->iconName().find("cdrom") != -1)
|| (disk->iconName().find("writer") != -1) )
c = gray;
@@ -631,8 +631,8 @@ void KDFWidget::columnSizeChanged( int, int, int )
if( mTimer == 0 )
{
- mTimer = new QTimer( this );
- connect( mTimer, SIGNAL(timeout()), this, SLOT(updateDiskBarPixmaps()) );
+ mTimer = new TQTimer( this );
+ connect( mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateDiskBarPixmaps()) );
}
else if( mTimer->isActive() == true )
{
diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h
index 13e14ed..2882408 100644
--- a/kdf/kdfwidget.h
+++ b/kdf/kdfwidget.h
@@ -25,10 +25,10 @@
#ifndef __KDFWIDGET_H__
#define __KDFWIDGET_H__
-#include <qmemarray.h>
-#include <qglobal.h>
-#include <qstring.h>
-#include <qlistview.h>
+#include <tqmemarray.h>
+#include <tqglobal.h>
+#include <tqstring.h>
+#include <tqlistview.h>
#include "disks.h"
#include "disklist.h"
@@ -46,7 +46,7 @@ class KPopupMenu;
class CTabEntry
{
public:
- CTabEntry( const QString &res, const QString &name, bool visible,
+ CTabEntry( const TQString &res, const TQString &name, bool visible,
uint width )
{
mRes = res;
@@ -58,8 +58,8 @@ class CTabEntry
~CTabEntry( void ) { }
- QString mRes;
- QString mName;
+ TQString mRes;
+ TQString mName;
bool mVisible;
uint mWidth;
};
@@ -75,9 +75,9 @@ class CTabEntry
class CListViewItem : public QListViewItem
{
public:
- CListViewItem ( CListView * parent, QListViewItem * after );
+ CListViewItem ( CListView * parent, TQListViewItem * after );
- virtual int compare ( QListViewItem* i, int col, bool) const;
+ virtual int compare ( TQListViewItem* i, int col, bool) const;
void setKeys ( int kb_size, int kb_avail, float percent_full ) ;
@@ -107,7 +107,7 @@ class KDFWidget : public QWidget
};
public:
- KDFWidget( QWidget *parent=0, const char *name=0, bool init=false);
+ KDFWidget( TQWidget *parent=0, const char *name=0, bool init=false);
~KDFWidget( void );
public slots:
@@ -120,30 +120,30 @@ class KDFWidget : public QWidget
private slots:
void criticallyFull( DiskEntry *disk );
- void rightButtonPressed( QListViewItem *item, const QPoint &p, int );
- void rightButtonClicked( QListViewItem *item, const QPoint &p, int );
- void popupMenu( QListViewItem *item, const QPoint &p );
+ void rightButtonPressed( TQListViewItem *item, const TQPoint &p, int );
+ void rightButtonClicked( TQListViewItem *item, const TQPoint &p, int );
+ void popupMenu( TQListViewItem *item, const TQPoint &p );
void setUpdateFrequency( int frequency );
void columnSizeChanged( int column, int, int newSize );
void updateDiskBarPixmaps( void );
void invokeHelp( void );
protected:
- void timerEvent( QTimerEvent * );
- void closeEvent( QCloseEvent * );
- void resizeEvent( QResizeEvent * );
+ void timerEvent( TQTimerEvent * );
+ void closeEvent( TQCloseEvent * );
+ void resizeEvent( TQResizeEvent * );
private:
void makeColumns( void );
- DiskEntry *selectedDisk( QListViewItem *item=0 );
+ DiskEntry *selectedDisk( TQListViewItem *item=0 );
private:
bool readingDF;
- QMemArray<CTabEntry*> mTabProp;
+ TQMemArray<CTabEntry*> mTabProp;
CListView *mList;
COptionDialog *mOptionDialog;
KPopupMenu *mPopup;
- QTimer *mTimer;
+ TQTimer *mTimer;
DiskList mDiskList;
bool mIsTopLevel;
CStdOption mStd;
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index d287b16..5ca97f5 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -31,9 +31,9 @@
#include <stdlib.h>
-#include <qpen.h>
-#include <qbitmap.h>
-#include <qpainter.h>
+#include <tqpen.h>
+#include <tqbitmap.h>
+#include <tqpainter.h>
#include <kmainwindow.h>
#include <klocale.h>
@@ -69,11 +69,11 @@ KwikDisk::KwikDisk()
setPixmap(KSystemTray::loadIcon("kdf"));
show();
- connect( &m_diskList, SIGNAL(readDFDone()), this, SLOT(updateDFDone()) );
- connect( &m_diskList, SIGNAL(criticallyFull(DiskEntry*)),
- this, SLOT(criticallyFull(DiskEntry*)) );
+ connect( &m_diskList, TQT_SIGNAL(readDFDone()), this, TQT_SLOT(updateDFDone()) );
+ connect( &m_diskList, TQT_SIGNAL(criticallyFull(DiskEntry*)),
+ this, TQT_SLOT(criticallyFull(DiskEntry*)) );
- connect( contextMenu(), SIGNAL(aboutToHide()), this, SLOT(aboutToHide()) );
+ connect( contextMenu(), TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(aboutToHide()) );
loadSettings();
updateDF();
@@ -86,19 +86,19 @@ void KwikDisk::aboutToHide()
m_menuVisible = FALSE;
}
-void KwikDisk::enterEvent(QEvent *)
+void KwikDisk::enterEvent(TQEvent *)
{
kdDebug() << k_funcinfo << endl;
m_inside = TRUE;
}
-void KwikDisk::leaveEvent(QEvent *)
+void KwikDisk::leaveEvent(TQEvent *)
{
kdDebug() << k_funcinfo << endl;
m_inside = FALSE;
}
-void KwikDisk::mousePressEvent(QMouseEvent *me)
+void KwikDisk::mousePressEvent(TQMouseEvent *me)
{
kdDebug() << k_funcinfo << endl;
@@ -146,7 +146,7 @@ void KwikDisk::setUpdateFrequency(int frequency)
* popup menu is about to become visible. Note: A current visible popup
* will not be updated now.
*/
-void KwikDisk::timerEvent(QTimerEvent *)
+void KwikDisk::timerEvent(TQTimerEvent *)
{
kdDebug() << k_funcinfo << endl;
m_dirty = TRUE;
@@ -175,20 +175,20 @@ void KwikDisk::updateDFDone()
for( DiskEntry *disk = m_diskList.first(); disk != 0; disk = m_diskList.next() )
{
// FIXME: tool tips are unused atm
- QString toolTipText = i18n("%1 (%2) %3 on %4")
+ TQString toolTipText = i18n("%1 (%2) %3 on %4")
.arg( disk->mounted() ? i18n("Unmount") : i18n("Mount"))
.arg(disk->fsType()).arg(disk->deviceName()).arg(disk->mountPoint());
- QString entryName = disk->mountPoint();
+ TQString entryName = disk->mountPoint();
if( disk->mounted() )
{
- entryName += QString("\t\t\t[%1]").arg(disk->prettyKBAvail());
+ entryName += TQString("\t\t\t[%1]").arg(disk->prettyKBAvail());
}
- int id = contextMenu()->insertItem("", this, SLOT(toggleMount(int)) );
+ int id = contextMenu()->insertItem("", this, TQT_SLOT(toggleMount(int)) );
contextMenu()->setItemParameter(id, itemNo);
itemNo++;
- QPixmap *pix = new QPixmap(KSystemTray::loadIcon(disk->iconName()));
+ TQPixmap *pix = new TQPixmap(KSystemTray::loadIcon(disk->iconName()));
if( getuid() !=0 && disk->mountOptions().find("user",0, false) == -1 )
{
@@ -197,25 +197,25 @@ void KwikDisk::updateDFDone()
//
// 2000-01-23 Espen Sand
// Careful here: If the mask has not been defined we can
- // not use QPixmap::mask() because it returns 0 => segfault
+ // not use TQPixmap::mask() because it returns 0 => segfault
//
if( pix->mask() != 0 )
{
- QBitmap *bm = new QBitmap(*(pix->mask()));
+ TQBitmap *bm = new TQBitmap(*(pix->mask()));
if( bm != 0 )
{
- QPainter qp( bm );
- qp.setPen(QPen(white,1));
+ TQPainter qp( bm );
+ qp.setPen(TQPen(white,1));
qp.drawRect(0,0,bm->width(),bm->height());
qp.end();
pix->setMask(*bm);
}
- QPainter qp( pix );
- qp.setPen(QPen(red,1));
+ TQPainter qp( pix );
+ qp.setPen(TQPen(red,1));
qp.drawRect(0,0,pix->width(),pix->height());
qp.end();
}
- contextMenu()->disconnectItem(id,disk,SLOT(toggleMount()));
+ contextMenu()->disconnectItem(id,disk,TQT_SLOT(toggleMount()));
toolTipText = i18n("You must login as root to mount this disk");
}
@@ -226,21 +226,21 @@ void KwikDisk::updateDFDone()
contextMenu()->insertItem(
KSystemTray::loadIcon("kdf"),
- i18n("&Start KDiskFree"), this, SLOT(startKDF()),0);
+ i18n("&Start KDiskFree"), this, TQT_SLOT(startKDF()),0);
contextMenu()->insertItem(
KSystemTray::loadIcon("configure"),
- i18n("&Configure KwikDisk..."), this, SLOT(changeSettings()),0);
+ i18n("&Configure KwikDisk..."), this, TQT_SLOT(changeSettings()),0);
contextMenu()->insertItem(
KSystemTray::loadIcon("help"),
- KStdGuiItem::help().text(), this, SLOT(invokeHelp()),0);
+ KStdGuiItem::help().text(), this, TQT_SLOT(invokeHelp()),0);
contextMenu()->insertSeparator();
contextMenu()->insertItem(
KSystemTray::loadIcon("exit"),
- KStdGuiItem::quit().text(), this, SIGNAL(quitSelected()) );
+ KStdGuiItem::quit().text(), this, TQT_SIGNAL(quitSelected()) );
}
void KwikDisk::toggleMount(int item)
@@ -263,7 +263,7 @@ void KwikDisk::toggleMount(int item)
kdDebug() << "opening filemanager" << endl;
if( m_options.fileManager().isEmpty() == false )
{
- QString cmd = m_options.fileManager();
+ TQString cmd = m_options.fileManager();
int pos = cmd.find("%m");
if( pos > 0 )
{
@@ -273,7 +273,7 @@ void KwikDisk::toggleMount(int item)
{
cmd += " " + KProcess::quote(disk->mountPoint()) +" &";
}
- system( QFile::encodeName(cmd) );
+ system( TQFile::encodeName(cmd) );
}
}
m_dirty = TRUE;
@@ -285,7 +285,7 @@ void KwikDisk::criticallyFull(DiskEntry *disk)
if( m_options.popupIfFull() == true )
{
- QString msg = i18n("Device [%1] on [%2] is getting critically full!")
+ TQString msg = i18n("Device [%1] on [%2] is getting critically full!")
.arg(disk->deviceName()).arg(disk->mountPoint());
KMessageBox::sorry( this, msg, i18n("Warning"));
}
@@ -297,8 +297,8 @@ void KwikDisk::changeSettings()
{
m_optionDialog = new COptionDialog(this, "options", FALSE);
if( !m_optionDialog ) return;
- connect(m_optionDialog, SIGNAL(valueChanged()),
- this, SLOT(loadSettings()));
+ connect(m_optionDialog, TQT_SIGNAL(valueChanged()),
+ this, TQT_SLOT(loadSettings()));
}
m_optionDialog->show();
}
@@ -335,7 +335,7 @@ int main(int argc, char **argv)
KwikDisk *mainWin = 0;
mainWin = new KwikDisk;
- QObject::connect(mainWin, SIGNAL(quitSelected()), &app, SLOT(quit()));
+ TQObject::connect(mainWin, TQT_SIGNAL(quitSelected()), &app, TQT_SLOT(quit()));
// mainWin has WDestructiveClose flag by default, so it will delete itself.
return app.exec();
diff --git a/kdf/kwikdisk.h b/kdf/kwikdisk.h
index 09066cc..c404e84 100644
--- a/kdf/kwikdisk.h
+++ b/kdf/kwikdisk.h
@@ -56,10 +56,10 @@ class KwikDisk : public KSystemTray
void aboutToHide();
private:
- void mousePressEvent(QMouseEvent *);
- void timerEvent(QTimerEvent *);
- void enterEvent(QEvent *);
- void leaveEvent(QEvent *);
+ void mousePressEvent(TQMouseEvent *);
+ void timerEvent(TQTimerEvent *);
+ void enterEvent(TQEvent *);
+ void leaveEvent(TQEvent *);
void setUpdateFrequency(int frequency);
diff --git a/kdf/listview.cpp b/kdf/listview.cpp
index b522a22..0334101 100644
--- a/kdf/listview.cpp
+++ b/kdf/listview.cpp
@@ -24,17 +24,17 @@
// 2) Provide a pixmap collection
//
-#include <qbitmap.h>
-#include <qheader.h>
-#include <qpainter.h>
+#include <tqbitmap.h>
+#include <tqheader.h>
+#include <tqpainter.h>
#include <kiconloader.h>
#include "listview.h"
-template class QDict<QPixmap>;
+template class TQDict<TQPixmap>;
-CListView::CListView( QWidget *parent, const char *name, int visibleItem )
+CListView::CListView( TQWidget *parent, const char *name, int visibleItem )
:KListView( parent, name ), mVisibleItem(QMAX( 1, visibleItem ))
{
setVisibleItem(visibleItem);
@@ -46,15 +46,15 @@ void CListView::setVisibleItem( int visibleItem, bool updateSize )
mVisibleItem = QMAX( 1, visibleItem );
if( updateSize == true )
{
- QSize s = sizeHint();
+ TQSize s = sizeHint();
setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
lineWidth() * 2, s.height() );
}
}
-QSize CListView::sizeHint( void ) const
+TQSize CListView::sizeHint( void ) const
{
- QSize s = QListView::sizeHint();
+ TQSize s = TQListView::sizeHint();
int h = fontMetrics().height() + 2*itemMargin();
if( h % 2 > 0 ) { h++; }
@@ -65,34 +65,34 @@ QSize CListView::sizeHint( void ) const
-const QPixmap &CListView::icon( const QString &iconName, bool drawBorder )
+const TQPixmap &CListView::icon( const TQString &iconName, bool drawBorder )
{
- QPixmap *pix = mPixDict[ iconName ];
+ TQPixmap *pix = mPixDict[ iconName ];
if( pix == 0 )
{
- pix = new QPixmap( SmallIcon( iconName ) );
+ pix = new TQPixmap( SmallIcon( iconName ) );
if( drawBorder == true )
{
//
// 2000-01-23 Espen Sand
// Careful here: If the mask has not been defined we can
- // not use QPixmap::mask() because it returns 0 => segfault
+ // not use TQPixmap::mask() because it returns 0 => segfault
//
if( pix->mask() != 0 )
{
- QBitmap *bm = new QBitmap(*(pix->mask()));
+ TQBitmap *bm = new TQBitmap(*(pix->mask()));
if( bm != 0 )
{
- QPainter qp(bm);
- qp.setPen(QPen(white,1));
+ TQPainter qp(bm);
+ qp.setPen(TQPen(white,1));
qp.drawRect(0,0,bm->width(),bm->height());
qp.end();
pix->setMask(*bm);
}
- QPainter qp(pix);
- qp.setPen(QPen(red,1));
+ TQPainter qp(pix);
+ qp.setPen(TQPen(red,1));
qp.drawRect(0,0,pix->width(),pix->height());
qp.end();
delete bm;
diff --git a/kdf/listview.h b/kdf/listview.h
index 0bb4bc5..d051fdf 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -20,8 +20,8 @@
#ifndef _LISTVIEW_H_
#define _LISTVIEW_H_
-#include <qdict.h>
-#include <qpixmap.h>
+#include <tqdict.h>
+#include <tqpixmap.h>
#include <klistview.h>
@@ -30,15 +30,15 @@ class CListView : public KListView
Q_OBJECT
public:
- CListView( QWidget *parent=0, const char *name=0, int visibleItem=10 );
+ CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
void setVisibleItem( int visibleItem, bool updateSize=true );
- virtual QSize sizeHint( void ) const;
- const QPixmap &icon( const QString &iconName, bool drawBorder );
+ virtual TQSize sizeHint( void ) const;
+ const TQPixmap &icon( const TQString &iconName, bool drawBorder );
private:
int mVisibleItem;
- QDict<QPixmap> mPixDict;
+ TQDict<TQPixmap> mPixDict;
};
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index c1c1bbe..0186cc4 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -24,13 +24,13 @@
//
// 1999-11-29 Espen Sand
-// Converted to QLayout and QListView + cleanups
+// Converted to TQLayout and TQListView + cleanups
//
-#include <qgroupbox.h>
-#include <qheader.h>
-#include <qlayout.h>
-#include <qlineedit.h>
+#include <tqgroupbox.h>
+#include <tqheader.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
#undef Unsorted
@@ -47,8 +47,8 @@ static bool GUI;
#endif
-MntConfigWidget::MntConfigWidget(QWidget *parent, const char *name, bool init)
- : QWidget(parent, name)
+MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
+ : TQWidget(parent, name)
{
mInitializing = false;
@@ -59,10 +59,10 @@ MntConfigWidget::MntConfigWidget(QWidget *parent, const char *name, bool init)
mDiskList.readFSTAB();
mDiskList.readDF();
mInitializing = true;
- connect( &mDiskList,SIGNAL(readDFDone()),this,SLOT(readDFDone()));
+ connect( &mDiskList,TQT_SIGNAL(readDFDone()),this,TQT_SLOT(readDFDone()));
- QString text;
- QVBoxLayout *topLayout = new QVBoxLayout( this, 0, KDialog::spacingHint());
+ TQString text;
+ TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint());
mList = new CListView( this, "list", 8 );
mList->setAllColumnsShowFocus( true );
@@ -71,69 +71,69 @@ MntConfigWidget::MntConfigWidget(QWidget *parent, const char *name, bool init)
mList->addColumn( i18n("Mount Point") );
mList->addColumn( i18n("Mount Command") );
mList->addColumn( i18n("Unmount Command") );
- mList->setFrameStyle( QFrame::WinPanel + QFrame::Sunken );
- connect( mList, SIGNAL(selectionChanged(QListViewItem *)),
- this, SLOT(clicked(QListViewItem *)));
+ mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken );
+ connect( mList, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
+ this, TQT_SLOT(clicked(TQListViewItem *)));
topLayout->addWidget( mList );
- text = QString("%1: %2 %3: %4").
+ text = TQString("%1: %2 %3: %4").
arg(mList->header()->label(DEVCOL)).
arg(i18n("None")).
arg(mList->header()->label(MNTPNTCOL)).
arg(i18n("None"));
- mGroupBox = new QGroupBox( text, this );
+ mGroupBox = new TQGroupBox( text, this );
Q_CHECK_PTR(mGroupBox);
topLayout->addWidget(mGroupBox);
- QGridLayout *gl = new QGridLayout(mGroupBox, 3, 4, KDialog::spacingHint());
+ TQGridLayout *gl = new TQGridLayout(mGroupBox, 3, 4, KDialog::spacingHint());
if( gl == 0 ) { return; }
gl->addRowSpacing( 0, fontMetrics().lineSpacing() );
- mIconLineEdit = new QLineEdit(mGroupBox);
+ mIconLineEdit = new TQLineEdit(mGroupBox);
Q_CHECK_PTR(mIconLineEdit);
mIconLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 );
- connect( mIconLineEdit, SIGNAL(textChanged(const QString&)),
- this,SLOT(iconChanged(const QString&)));
- connect( mIconLineEdit, SIGNAL(textChanged(const QString&)),
- this,SLOT(slotChanged()));
+ connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ this,TQT_SLOT(iconChanged(const TQString&)));
+ connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ this,TQT_SLOT(slotChanged()));
gl->addWidget( mIconLineEdit, 2, 0 );
mIconButton = new KIconButton(mGroupBox);
mIconButton->setIconType(KIcon::Small, KIcon::Device);
Q_CHECK_PTR(mIconButton);
mIconButton->setFixedWidth( mIconButton->sizeHint().height() );
- connect(mIconButton,SIGNAL(iconChanged(QString)),this,SLOT(iconChangedButton(QString)));
+ connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString)));
gl->addWidget( mIconButton, 2, 1 );
//Mount
- mMountButton = new QPushButton( i18n("Get Mount Command"), mGroupBox );
+ mMountButton = new TQPushButton( i18n("Get Mount Command"), mGroupBox );
Q_CHECK_PTR(mMountButton);
- connect(mMountButton,SIGNAL(clicked()),this,SLOT(selectMntFile()));
+ connect(mMountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectMntFile()));
gl->addWidget( mMountButton, 1, 2 );
- mMountLineEdit = new QLineEdit(mGroupBox);
+ mMountLineEdit = new TQLineEdit(mGroupBox);
Q_CHECK_PTR(mMountLineEdit);
mMountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 );
- connect(mMountLineEdit,SIGNAL(textChanged(const QString&)),
- this,SLOT(mntCmdChanged(const QString&)));
- connect( mMountLineEdit, SIGNAL(textChanged(const QString&)),
- this,SLOT(slotChanged()));
+ connect(mMountLineEdit,TQT_SIGNAL(textChanged(const TQString&)),
+ this,TQT_SLOT(mntCmdChanged(const TQString&)));
+ connect( mMountLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ this,TQT_SLOT(slotChanged()));
gl->addWidget( mMountLineEdit, 1, 3 );
//Umount
- mUmountButton = new QPushButton(i18n("Get Unmount Command"), mGroupBox );
+ mUmountButton = new TQPushButton(i18n("Get Unmount Command"), mGroupBox );
Q_CHECK_PTR( mUmountButton );
- connect(mUmountButton,SIGNAL(clicked()),this,SLOT(selectUmntFile()));
+ connect(mUmountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectUmntFile()));
gl->addWidget( mUmountButton, 2, 2 );
- mUmountLineEdit=new QLineEdit(mGroupBox);
+ mUmountLineEdit=new TQLineEdit(mGroupBox);
Q_CHECK_PTR(mUmountLineEdit);
mUmountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 );
- connect(mUmountLineEdit,SIGNAL(textChanged(const QString&)),
- this,SLOT(umntCmdChanged(const QString&)));
- connect( mUmountLineEdit, SIGNAL(textChanged(const QString&)),
- this,SLOT(slotChanged()));
+ connect(mUmountLineEdit,TQT_SIGNAL(textChanged(const TQString&)),
+ this,TQT_SLOT(umntCmdChanged(const TQString&)));
+ connect( mUmountLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ this,TQT_SLOT(slotChanged()));
gl->addWidget( mUmountLineEdit, 2, 3 );
}
@@ -161,10 +161,10 @@ void MntConfigWidget::readDFDone( void )
mDiskLookup.resize(mDiskList.count());
int i=0;
- QListViewItem *item = 0;
+ TQListViewItem *item = 0;
for( DiskEntry *disk=mDiskList.first(); disk!=0; disk=mDiskList.next(),++i )
{
- item = new QListViewItem( mList, item, QString::null, disk->deviceName(),
+ item = new TQListViewItem( mList, item, TQString::null, disk->deviceName(),
disk->mountPoint(), disk->mountCommand(), disk->umountCommand() );
item->setPixmap( ICONCOL, SmallIcon( disk->iconName() ) );
mDiskLookup[i] = item;
@@ -203,7 +203,7 @@ void MntConfigWidget::loadSettings( void )
resize(w,h);
}
- QListViewItem *item = mList->selectedItem();
+ TQListViewItem *item = mList->selectedItem();
if( item != 0 )
{
clicked( item );
@@ -212,17 +212,17 @@ void MntConfigWidget::loadSettings( void )
}
-void MntConfigWidget::clicked( QListViewItem *item )
+void MntConfigWidget::clicked( TQListViewItem *item )
{
mGroupBox->setEnabled( true );
- mGroupBox->setTitle( QString("%1: %2 %3: %4").
+ mGroupBox->setTitle( TQString("%1: %2 %3: %4").
arg(mList->header()->label(DEVCOL)).
arg(item->text(DEVCOL)).
arg(mList->header()->label(MNTPNTCOL)).
arg(item->text(MNTPNTCOL)) );
- const QPixmap *pix = item->pixmap(ICONCOL);
+ const TQPixmap *pix = item->pixmap(ICONCOL);
if( pix != 0 )
{
mIconButton->setPixmap( *pix );
@@ -245,17 +245,17 @@ void MntConfigWidget::clicked( QListViewItem *item )
}
-void MntConfigWidget::iconChangedButton(QString iconName)
+void MntConfigWidget::iconChangedButton(TQString iconName)
{
iconChanged(iconName);
}
-void MntConfigWidget::iconChanged(const QString &iconName)
+void MntConfigWidget::iconChanged(const TQString &iconName)
{
if( iconName.findRev('_') == 0 ||
(iconName.right(iconName.length()-iconName.findRev('_'))!="_mount" &&
iconName.right(iconName.length()-iconName.findRev('_'))!="_unmount"))
{
- QString msg = i18n(""
+ TQString msg = i18n(""
"This filename is not valid: %1\n"
"It must end with "
"\"_mount\" or \"_unmount\".").arg(iconName);
@@ -263,7 +263,7 @@ void MntConfigWidget::iconChanged(const QString &iconName)
return;
}
- QListViewItem *item = mList->selectedItem();
+ TQListViewItem *item = mList->selectedItem();
for(unsigned i=0 ; i < mDiskList.count() ; ++i)
{
if (mDiskLookup[i] == item)
@@ -314,9 +314,9 @@ void MntConfigWidget::selectUmntFile()
mUmountLineEdit->setText( url.path() );
}
-void MntConfigWidget::mntCmdChanged( const QString &data )
+void MntConfigWidget::mntCmdChanged( const TQString &data )
{
- QListViewItem *item = mList->selectedItem();
+ TQListViewItem *item = mList->selectedItem();
for(unsigned i=0 ; i < mDiskList.count() ; ++i)
{
if (mDiskLookup[i] == item)
@@ -333,9 +333,9 @@ void MntConfigWidget::mntCmdChanged( const QString &data )
}
-void MntConfigWidget::umntCmdChanged( const QString &data )
+void MntConfigWidget::umntCmdChanged( const TQString &data )
{
- QListViewItem *item = mList->selectedItem();
+ TQListViewItem *item = mList->selectedItem();
for(unsigned i=0 ; i < mDiskList.count() ; ++i)
{
if (mDiskLookup[i] == item)
@@ -352,7 +352,7 @@ void MntConfigWidget::umntCmdChanged( const QString &data )
}
-void MntConfigWidget::closeEvent(QCloseEvent *)
+void MntConfigWidget::closeEvent(TQCloseEvent *)
{
}
diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h
index d24c8b1..757d196 100644
--- a/kdf/mntconfig.h
+++ b/kdf/mntconfig.h
@@ -58,7 +58,7 @@ class MntConfigWidget : public QWidget
};
public:
- MntConfigWidget( QWidget *parent=0, const char *name=0, bool init=false );
+ MntConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false );
~MntConfigWidget();
public slots:
@@ -70,29 +70,29 @@ class MntConfigWidget : public QWidget
private slots:
void readDFDone( void );
- void clicked( QListViewItem *item );
+ void clicked( TQListViewItem *item );
void selectMntFile( void );
void selectUmntFile( void );
- void iconChangedButton(QString);
- void iconChanged( const QString & );
- void mntCmdChanged( const QString & );
- void umntCmdChanged( const QString & );
+ void iconChangedButton(TQString);
+ void iconChanged( const TQString & );
+ void mntCmdChanged( const TQString & );
+ void umntCmdChanged( const TQString & );
protected:
- void closeEvent( QCloseEvent * );
+ void closeEvent( TQCloseEvent * );
private:
CListView *mList;
- QGroupBox *mGroupBox;
- QLineEdit *mIconLineEdit;
- QLineEdit *mMountLineEdit;
- QLineEdit *mUmountLineEdit;
- QPushButton *mMountButton;
- QPushButton *mUmountButton;
+ TQGroupBox *mGroupBox;
+ TQLineEdit *mIconLineEdit;
+ TQLineEdit *mMountLineEdit;
+ TQLineEdit *mUmountLineEdit;
+ TQPushButton *mMountButton;
+ TQPushButton *mUmountButton;
KIconButton *mIconButton;
DiskList mDiskList;
bool mInitializing;
- QMemArray<QListViewItem*> mDiskLookup;
+ TQMemArray<TQListViewItem*> mDiskLookup;
signals:
void configChanged();
diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp
index 05c5570..8da8dc2 100644
--- a/kdf/optiondialog.cpp
+++ b/kdf/optiondialog.cpp
@@ -17,29 +17,29 @@
*
*/
-#include <qlayout.h>
+#include <tqlayout.h>
#include "kdfconfig.h"
#include "mntconfig.h"
#include "optiondialog.h"
-COptionDialog::COptionDialog( QWidget *parent, const char *name, bool modal )
+COptionDialog::COptionDialog( TQWidget *parent, const char *name, bool modal )
:KDialogBase( Tabbed, i18n("Configure"), Help|Apply|Ok|Cancel, Ok,
parent, name, modal )
{
- setHelp( "kcontrol/kdf/index.html", QString::null );
+ setHelp( "kcontrol/kdf/index.html", TQString::null );
- QFrame *f1 = addPage( i18n("General Settings") );
- QVBoxLayout *l1 = new QVBoxLayout( f1 );
+ TQFrame *f1 = addPage( i18n("General Settings") );
+ TQVBoxLayout *l1 = new TQVBoxLayout( f1 );
mConf = new KDFConfigWidget( f1, "kdfconf" );
l1->addWidget(mConf);
- connect( mConf, SIGNAL( configChanged() ), this, SLOT( slotChanged() ) );
+ connect( mConf, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
- QFrame *f2 = addPage( i18n("Mount Commands") );
- QVBoxLayout *l2 = new QVBoxLayout( f2 );
+ TQFrame *f2 = addPage( i18n("Mount Commands") );
+ TQVBoxLayout *l2 = new TQVBoxLayout( f2 );
mMnt = new MntConfigWidget( f2, "mntconf");
l2->addWidget(mMnt);
- connect( mMnt, SIGNAL( configChanged() ), this, SLOT( slotChanged() ) );
+ connect( mMnt, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
enableButton( Apply, false );
dataChanged = false;
}
diff --git a/kdf/optiondialog.h b/kdf/optiondialog.h
index d1a7a5c..6a4bb74 100644
--- a/kdf/optiondialog.h
+++ b/kdf/optiondialog.h
@@ -30,7 +30,7 @@ class COptionDialog : public KDialogBase
Q_OBJECT
public:
- COptionDialog( QWidget *parent=0, const char *name=0, bool modal=true );
+ COptionDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
~COptionDialog( void );
protected slots:
diff --git a/kdf/stdoption.cpp b/kdf/stdoption.cpp
index 16a9e07..04b75f5 100644
--- a/kdf/stdoption.cpp
+++ b/kdf/stdoption.cpp
@@ -31,7 +31,7 @@
#include "stdoption.h"
-QString CStdOption::mDefaultFileManager = "kfmclient openURL %m";
+TQString CStdOption::mDefaultFileManager = "kfmclient openURL %m";
int CStdOption::mDefaultUpdateFrequency = 60;
CStdOption::CStdOption( void )
@@ -82,7 +82,7 @@ void CStdOption::writeDefaultFileManager( void )
-QString CStdOption::fileManager( void )
+TQString CStdOption::fileManager( void )
{
return( mFileManager );
}
@@ -115,7 +115,7 @@ void CStdOption::setDefault( void )
}
-void CStdOption::setFileManager( const QString &fileManager )
+void CStdOption::setFileManager( const TQString &fileManager )
{
mFileManager = fileManager;
}
diff --git a/kdf/stdoption.h b/kdf/stdoption.h
index 282a16b..9ebd09d 100644
--- a/kdf/stdoption.h
+++ b/kdf/stdoption.h
@@ -27,7 +27,7 @@
#ifndef _STD_OPTION_H_
#define _STD_OPTION_H_
-#include <qstring.h>
+#include <tqstring.h>
class CStdOption
{
@@ -39,22 +39,22 @@ class CStdOption
void writeConfiguration( void );
void writeDefaultFileManager( void );
- QString fileManager( void );
+ TQString fileManager( void );
int updateFrequency( void );
bool popupIfFull( void );
bool openFileManager( void );
void setDefault( void );
- void setFileManager( const QString &fileManager );
+ void setFileManager( const TQString &fileManager );
void setUpdateFrequency( int frequency );
void setPopupIfFull( bool popupIfFull );
void setOpenFileManager( bool openFileManagerOnMount );
private:
- static QString mDefaultFileManager;
+ static TQString mDefaultFileManager;
static int mDefaultUpdateFrequency;
- QString mFileManager;
+ TQString mFileManager;
int mUpdateFrequency;
bool mPopupIfFull;
bool mOpenFileManagerOnMount;