diff options
Diffstat (limited to 'kdf')
| -rw-r--r-- | kdf/disklist.cpp | 14 | ||||
| -rw-r--r-- | kdf/disklist.h | 2 | ||||
| -rw-r--r-- | kdf/disks.cpp | 38 | ||||
| -rw-r--r-- | kdf/kdf.cpp | 2 | ||||
| -rw-r--r-- | kdf/kdfwidget.cpp | 2 | ||||
| -rw-r--r-- | kdf/kwikdisk.cpp | 28 |
6 files changed, 43 insertions, 43 deletions
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp index 66f25a2..0b41acc 100644 --- a/kdf/disklist.cpp +++ b/kdf/disklist.cpp @@ -49,7 +49,7 @@ DiskList::DiskList(TQObject *parent, const char *name) } disks = new Disks; - disks->setAutoDelete(TRUE); + disks->setAutoDelete(true); // BackgroundProcesses **************************************** dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); @@ -58,7 +58,7 @@ DiskList::DiskList(TQObject *parent, const char *name) connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ), this, TQ_SLOT(dfDone() ) ); - readingDFStdErrOut=FALSE; + readingDFStdErrOut=false; config = kapp->config(); loadSettings(); } @@ -188,7 +188,7 @@ TQFile f(FSTAB); // skip LABEL entries as long as kdf can't handle them properly // kdDebug() << "GOT: [" << s << "]" << endl; disk = new DiskEntry();// TQ_CHECK_PTR(disk); - disk->setMounted(FALSE); + disk->setMounted(false); disk->setDeviceName(expandEscapes(s.left(s.find(BLANK)))); s=s.remove(0,s.find(BLANK)+1 ); // kdDebug() << " deviceName: [" << disk->deviceName() << "]" << endl; @@ -280,9 +280,9 @@ void DiskList::dfDone() if (updatesDisabled) return; //Don't touch the data for now.. - readingDFStdErrOut=TRUE; + readingDFStdErrOut=true; for ( DiskEntry *disk=disks->first(); disk != 0; disk=disks->next() ) - disk->setMounted(FALSE); // set all devs unmounted + disk->setMounted(false); // set all devs unmounted TQTextStream t (dfStringErrOut, IO_ReadOnly); TQString s=t.readLine(); @@ -348,7 +348,7 @@ void DiskList::dfDone() && (disk->mountPoint() != "/dev/pts") && (disk->mountPoint() != "/dev/shm") && (disk->mountPoint().find("/proc") == -1 ) ) { - disk->setMounted(TRUE); // its now mounted (df lists only mounted) + disk->setMounted(true); // its now mounted (df lists only mounted) replaceDeviceEntry(disk); } else delete disk; @@ -356,7 +356,7 @@ void DiskList::dfDone() }//if not header }//while further lines available - readingDFStdErrOut=FALSE; + readingDFStdErrOut=false; loadSettings(); //to get the mountCommands emit readDFDone(); } diff --git a/kdf/disklist.h b/kdf/disklist.h index 5ba6ddb..b0088ad 100644 --- a/kdf/disklist.h +++ b/kdf/disklist.h @@ -62,7 +62,7 @@ typedef TQPtrListIterator<DiskEntry> DisksIterator; class Disks : public DisksBase { public: - Disks(bool deepCopies=TRUE) { dc = deepCopies;} + Disks(bool deepCopies=true) { dc = deepCopies;} ~Disks() { clear(); } private: int compareItems( DiskEntry s1, DiskEntry s2 ) diff --git a/kdf/disks.cpp b/kdf/disks.cpp index 1f7acba..59be665 100644 --- a/kdf/disks.cpp +++ b/kdf/disks.cpp @@ -46,10 +46,10 @@ void DiskEntry::init() size=0; used=0; avail=0; - isMounted=FALSE; + isMounted=false; mntcmd=""; umntcmd=""; - iconSetByUser=FALSE; + iconSetByUser=false; icoName=""; @@ -60,7 +60,7 @@ void DiskEntry::init() this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); connect( sysProc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int) ), this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); - readingSysStdErrOut=FALSE; + readingSysStdErrOut=false; } @@ -114,7 +114,7 @@ int DiskEntry::mount() kdDebug() << "mount-cmd: [" << cmdS << "]" << endl; int e=sysCall(cmdS); - if (!e) setMounted(TRUE); + if (!e) setMounted(true); kdDebug() << "mount-cmd: e=" << e << endl; return e; } @@ -131,7 +131,7 @@ int DiskEntry::umount() kdDebug() << "umount-cmd: [" << cmdS << "]" << endl; int e=sysCall(cmdS); - if (!e) setMounted(FALSE); + if (!e) setMounted(false); kdDebug() << "umount-cmd: e=" << e << endl; return e; @@ -169,7 +169,7 @@ void DiskEntry::setUmountCommand(const TQString & umnt) void DiskEntry::setIconName(const TQString & iconName) { - iconSetByUser=TRUE; + iconSetByUser=true; icoName=iconName; if (icoName.right(6) == "_mount") icoName.truncate(icoName.length()-6); @@ -193,23 +193,23 @@ TQString DiskEntry::guessIconName() { 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"; - else if (-1!=mountPoint().find("writer",0,FALSE)) iconName+="cdwriter"; - else if (-1!=deviceName().find("writer",0,FALSE)) iconName+="cdwriter"; - else if (-1!=mountPoint().find("mo",0,FALSE)) iconName+="mo"; - else if (-1!=deviceName().find("mo",0,FALSE)) iconName+="mo"; - else if (-1!=deviceName().find("fd",0,FALSE)) { - if (-1!=deviceName().find("360",0,FALSE)) iconName+="5floppy"; - if (-1!=deviceName().find("1200",0,FALSE)) iconName+="5floppy"; + if (-1!=mountPoint().find("cdrom",0,false)) iconName+="cdrom"; + else if (-1!=deviceName().find("cdrom",0,false)) iconName+="cdrom"; + else if (-1!=mountPoint().find("writer",0,false)) iconName+="cdwriter"; + else if (-1!=deviceName().find("writer",0,false)) iconName+="cdwriter"; + else if (-1!=mountPoint().find("mo",0,false)) iconName+="mo"; + else if (-1!=deviceName().find("mo",0,false)) iconName+="mo"; + else if (-1!=deviceName().find("fd",0,false)) { + if (-1!=deviceName().find("360",0,false)) iconName+="5floppy"; + if (-1!=deviceName().find("1200",0,false)) iconName+="5floppy"; else iconName+="3floppy"; } - else if (-1!=mountPoint().find("floppy",0,FALSE)) iconName+="3floppy"; - else if (-1!=mountPoint().find("zip",0,FALSE)) iconName+="zip"; - else if (-1!=fsType().find("nfs",0,FALSE)) iconName+="nfs"; + else if (-1!=mountPoint().find("floppy",0,false)) iconName+="3floppy"; + else if (-1!=mountPoint().find("zip",0,false)) iconName+="zip"; + else if (-1!=fsType().find("nfs",0,false)) iconName+="nfs"; else iconName+="hdd"; mounted() ? iconName+="_mount" : iconName+="_unmount"; -// if ( -1==mountOptions().find("user",0,FALSE) ) +// if ( -1==mountOptions().find("user",0,false) ) // iconName.prepend("root_"); // special root icon, normal user canīt mount //debug("device %s is %s",deviceName().latin1(),iconName.latin1()); diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp index ea3263a..04e2c56 100644 --- a/kdf/kdf.cpp +++ b/kdf/kdf.cpp @@ -39,7 +39,7 @@ static const char version[] = "v0.5"; KDFTopLevel::KDFTopLevel(TQWidget *, const char *name) : TDEMainWindow(0, name) { - kdf = new KDFWidget(this,"kdf",FALSE); + kdf = new KDFWidget(this,"kdf",false); TQ_CHECK_PTR(kdf); (void) new TDEAction( i18n( "&Update" ), 0, kdf, TQ_SLOT( updateDF() ), actionCollection(), "updatedf" ); diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index 54b592c..cf37994 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -309,7 +309,7 @@ void KDFWidget::updateDF( void ) // if( mPopup == 0 ) { - readingDF = TRUE; + readingDF = true; mDiskList.readFSTAB(); mDiskList.readDF(); } diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp index aba455b..b6b301c 100644 --- a/kdf/kwikdisk.cpp +++ b/kdf/kwikdisk.cpp @@ -58,10 +58,10 @@ static TDECmdLineOptions options[] = KwikDisk::KwikDisk() : KSystemTray() - , m_readingDF(FALSE) - , m_dirty(TRUE) - , m_menuVisible(FALSE) - , m_inside(FALSE) + , m_readingDF(false) + , m_dirty(true) + , m_menuVisible(false) + , m_inside(false) , m_optionDialog(0) { kdDebug() << k_funcinfo << endl; @@ -83,19 +83,19 @@ void KwikDisk::aboutToHide() { kdDebug() << k_funcinfo << endl; if( !m_inside ) - m_menuVisible = FALSE; + m_menuVisible = false; } void KwikDisk::enterEvent(TQEvent *) { kdDebug() << k_funcinfo << endl; - m_inside = TRUE; + m_inside = true; } void KwikDisk::leaveEvent(TQEvent *) { kdDebug() << k_funcinfo << endl; - m_inside = FALSE; + m_inside = false; } void KwikDisk::mousePressEvent(TQMouseEvent *me) @@ -108,14 +108,14 @@ void KwikDisk::mousePressEvent(TQMouseEvent *me) if( m_menuVisible ) { contextMenu()->hide(); - m_menuVisible = FALSE; + m_menuVisible = false; me->ignore(); return; } contextMenuAboutToShow(contextMenu()); contextMenu()->popup( me->globalPos() ); - m_menuVisible = TRUE; + m_menuVisible = true; } void KwikDisk::loadSettings() @@ -149,7 +149,7 @@ void KwikDisk::setUpdateFrequency(int frequency) void KwikDisk::timerEvent(TQTimerEvent *) { kdDebug() << k_funcinfo << endl; - m_dirty = TRUE; + m_dirty = true; } void KwikDisk::updateDF() @@ -165,8 +165,8 @@ void KwikDisk::updateDFDone() { kdDebug() << k_funcinfo << endl; - m_readingDF = FALSE; - m_dirty = FALSE; + m_readingDF = false; + m_dirty = false; contextMenu()->clear(); contextMenu()->insertTitle(KSystemTray::loadIcon("kdf"), i18n("KwikDisk")); @@ -276,7 +276,7 @@ void KwikDisk::toggleMount(int item) system( TQFile::encodeName(cmd) ); } } - m_dirty = TRUE; + m_dirty = true; } void KwikDisk::criticallyFull(DiskEntry *disk) @@ -295,7 +295,7 @@ void KwikDisk::changeSettings() { if( m_optionDialog == 0 ) { - m_optionDialog = new COptionDialog(this, "options", FALSE); + m_optionDialog = new COptionDialog(this, "options", false); if( !m_optionDialog ) return; connect(m_optionDialog, TQ_SIGNAL(valueChanged()), this, TQ_SLOT(loadSettings())); |
