summaryrefslogtreecommitdiffstats
path: root/ksim/monitors/disk
diff options
context:
space:
mode:
Diffstat (limited to 'ksim/monitors/disk')
-rw-r--r--ksim/monitors/disk/ksimdisk.cpp50
-rw-r--r--ksim/monitors/disk/ksimdisk.h10
2 files changed, 31 insertions, 29 deletions
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index 13f0425..cdcae83 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -103,8 +103,8 @@ void DiskPlugin::showAbout()
KAboutApplication(&aboutData).exec();
}
-DiskView::DiskView(KSim::PluginObject *parent, const char *name)
- : KSim::PluginView(parent, name)
+DiskView::DiskView(KSim::PluginObject *tqparent, const char *name)
+ : KSim::PluginView(tqparent, name)
{
#ifdef Q_OS_LINUX
m_bLinux24 = true;
@@ -216,13 +216,13 @@ void DiskView::updateDisplay()
if (m_useSeperatly) {
it.current()->first->setValue(diskData.readBlocks, diskData.writeBlocks);
it.current()->first->setText(i18n("in: %1k")
- .arg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
- i18n("out: %1k").arg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
+ .tqarg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
+ i18n("out: %1k").tqarg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
}
else {
it.current()->first->setValue(diff, 0);
it.current()->first->setText(i18n("%1k")
- .arg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
+ .tqarg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
}
it.current()->second->setMaxValue(it.current()->first->maxValue());
@@ -239,7 +239,7 @@ void DiskView::updateData(DiskList &disks)
if (!m_procStream)
return;
- m_procStream->device()->reset();
+ m_procStream->tqdevice()->reset();
fseek(m_procFile, 0L, SEEK_SET);
if (m_bLinux24)
@@ -248,7 +248,7 @@ void DiskView::updateData(DiskList &disks)
// (3,0):(108911,48080,1713380,60831,1102644)
TQRegExp regexp("\\([0-9]+,[0-9]+\\):\\([0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\\)");
TQString content = m_procStream->read();
- if (content.find("disk_io") == -1)
+ if (content.tqfind("disk_io") == -1)
{
m_bLinux24 = false;
@@ -267,8 +267,8 @@ void DiskView::updateData(DiskList &disks)
{
idx += regexp.matchedLength();
TQString diskStr = regexp.cap(0);
- diskStr.replace(':', ',');
- diskStr.replace(TQRegExp("\\)?\\(?"), TQString::null);
+ diskStr.tqreplace(':', ',');
+ diskStr.tqreplace(TQRegExp("\\)?\\(?"), TQString());
TQStringList list = TQStringList::split(',', diskStr);
if (list.count() < 7)
@@ -414,23 +414,23 @@ TQString DiskView::diskName( int major, int minor ) const
switch ( major )
{
case IDE0_MAJOR:
- returnValue.prepend(TQString::fromLatin1("hda"));
+ returnValue.prepend(TQString::tqfromLatin1("hda"));
break;
case IDE1_MAJOR:
- returnValue.prepend(TQString::fromLatin1("hdc"));
+ returnValue.prepend(TQString::tqfromLatin1("hdc"));
break;
case IDE3_MAJOR:
- returnValue.prepend(TQString::fromLatin1("hde"));
+ returnValue.prepend(TQString::tqfromLatin1("hde"));
break;
case SCSI_DISK0_MAJOR:
- returnValue.prepend(TQString::fromLatin1("sda"));
+ returnValue.prepend(TQString::tqfromLatin1("sda"));
break;
case SCSI_GENERIC_MAJOR:
- returnValue.prepend(TQString::fromLatin1("sg0"));
+ returnValue.prepend(TQString::tqfromLatin1("sg0"));
break;
}
- returnValue.at(2) = returnValue.at(2).latin1() + minor;
+ returnValue.tqat(2) = returnValue.tqat(2).latin1() + minor;
return returnValue;
#else
Q_UNUSED(major);
@@ -472,8 +472,8 @@ void DiskView::cleanup()
m_addAll = false;
}
-DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name)
- : KSim::PluginPage(parent, name)
+DiskConfig::DiskConfig(KSim::PluginObject *tqparent, const char *name)
+ : KSim::PluginPage(tqparent, name)
{
m_layout = new TQVBoxLayout(this);
m_layout->setSpacing(6);
@@ -482,23 +482,23 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name)
m_listview->addColumn(i18n("Disks"));
m_layout->addWidget(m_listview);
- TQHBoxLayout *layout = new TQHBoxLayout;
- layout->setSpacing(6);
+ TQHBoxLayout *tqlayout = new TQHBoxLayout;
+ tqlayout->setSpacing(6);
TQSpacerItem *spacer = new TQSpacerItem(20, 20,
TQSizePolicy::Expanding, TQSizePolicy::Minimum);
- layout->addItem(spacer);
+ tqlayout->addItem(spacer);
m_add = new TQPushButton(this);
m_add->setText(i18n("Add..."));
connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
- layout->addWidget(m_add);
+ tqlayout->addWidget(m_add);
m_remove = new TQPushButton(this);
m_remove->setText(i18n("Remove"));
connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
- layout->addWidget(m_remove);
- m_layout->addLayout(layout);
+ tqlayout->addWidget(m_remove);
+ m_layout->addLayout(tqlayout);
m_buttonBox = new TQVButtonGroup(i18n("Disk Styles"), this);
m_layout->addWidget(m_buttonBox);
@@ -527,7 +527,7 @@ void DiskConfig::readConfig()
TQStringList::ConstIterator it;
for (it = list.begin(); it != list.end(); ++it) {
TQString text = ((*it) == "complete" ? i18n("All Disks") : (*it));
- if (!m_listview->findItem(text, 0))
+ if (!m_listview->tqfindItem(text, 0))
new TQListViewItem(m_listview, text);
}
}
@@ -551,7 +551,7 @@ void DiskConfig::addItem()
{
bool ok = false;
TQString text = KInputDialog::getText(i18n("Add Disk Device"), i18n("Disk name:"),
- TQString::null, &ok, this);
+ TQString(), &ok, this);
if (text.startsWith("/dev/"))
text = text.mid(5);
diff --git a/ksim/monitors/disk/ksimdisk.h b/ksim/monitors/disk/ksimdisk.h
index 3d3679a..f122fbf 100644
--- a/ksim/monitors/disk/ksimdisk.h
+++ b/ksim/monitors/disk/ksimdisk.h
@@ -55,8 +55,9 @@ class DiskPlugin : public KSim::PluginObject
class DiskView : public KSim::PluginView
{
Q_OBJECT
+ TQ_OBJECT
public:
- DiskView(KSim::PluginObject *parent, const char *name);
+ DiskView(KSim::PluginObject *tqparent, const char *name);
~DiskView();
virtual void reparseConfig();
@@ -105,7 +106,7 @@ class DiskView : public KSim::PluginView
};
typedef TQValueList<DiskData> DiskList;
- typedef QPair<KSim::Chart *, KSim::Progress *> DiskPair;
+ typedef TQPair<KSim::Chart *, KSim::Progress *> DiskPair;
void updateData(DiskList &disks);
TQString diskName( int, int ) const;
@@ -115,7 +116,7 @@ class DiskView : public KSim::PluginView
void init();
void cleanup();
- TQValueVector<QPair<DiskData, DiskData> > m_data;
+ TQValueVector<TQPair<DiskData, DiskData> > m_data;
TQTimer *m_timer;
bool m_bLinux24;
FILE *m_procFile;
@@ -131,8 +132,9 @@ class DiskView : public KSim::PluginView
class DiskConfig : public KSim::PluginPage
{
Q_OBJECT
+ TQ_OBJECT
public:
- DiskConfig(KSim::PluginObject *parent, const char *name);
+ DiskConfig(KSim::PluginObject *tqparent, const char *name);
~DiskConfig();
virtual void saveConfig();
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-30 08:53:30 +0000