diff options
Diffstat (limited to 'ksim/monitors')
-rw-r--r-- | ksim/monitors/cpu/ksimcpu.cpp | 2 | ||||
-rw-r--r-- | ksim/monitors/disk/ksimdisk.cpp | 10 | ||||
-rw-r--r-- | ksim/monitors/filesystem/filesystemstats.cpp | 2 | ||||
-rw-r--r-- | ksim/monitors/filesystem/filesystemwidget.cpp | 4 | ||||
-rw-r--r-- | ksim/monitors/filesystem/fsystemconfig.cpp | 4 | ||||
-rw-r--r-- | ksim/monitors/lm_sensors/sensorbase.cpp | 10 | ||||
-rw-r--r-- | ksim/monitors/lm_sensors/sensorsconfig.cpp | 4 | ||||
-rw-r--r-- | ksim/monitors/net/netdialog.cpp | 4 | ||||
-rw-r--r-- | ksim/monitors/snmp/browsedialogbase.ui | 4 | ||||
-rw-r--r-- | ksim/monitors/snmp/configwidget.ui | 4 | ||||
-rw-r--r-- | ksim/monitors/snmp/hostdialogbase.ui | 14 | ||||
-rw-r--r-- | ksim/monitors/snmp/monitorconfig.cpp | 4 | ||||
-rw-r--r-- | ksim/monitors/snmp/monitordialogbase.ui | 12 | ||||
-rw-r--r-- | ksim/monitors/snmp/proberesultdialogbase.ui | 2 | ||||
-rw-r--r-- | ksim/monitors/snmp/snmp.cpp | 10 | ||||
-rw-r--r-- | ksim/monitors/snmp/value.cpp | 6 |
16 files changed, 48 insertions, 48 deletions
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index 39bbffd..2f05e7c 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -397,7 +397,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_legendBox->tqlayout()->setMargin(0); m_legendLayout = new TQVBoxLayout(m_legendBox->tqlayout()); - m_legendLayout->tqsetAlignment(TQt::AlignTop); + m_legendLayout->setAlignment(TQt::AlignTop); m_legendLayout->setSpacing(6); m_legendLayout->setMargin(11); diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index c91f173..69c1219 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -414,19 +414,19 @@ TQString DiskView::diskName( int major, int minor ) const switch ( major ) { case IDE0_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("hda")); + returnValue.prepend(TQString::fromLatin1("hda")); break; case IDE1_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("hdc")); + returnValue.prepend(TQString::fromLatin1("hdc")); break; case IDE3_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("hde")); + returnValue.prepend(TQString::fromLatin1("hde")); break; case SCSI_DISK0_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("sda")); + returnValue.prepend(TQString::fromLatin1("sda")); break; case SCSI_GENERIC_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("sg0")); + returnValue.prepend(TQString::fromLatin1("sg0")); break; } diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp index fa215fc..1aa156d 100644 --- a/ksim/monitors/filesystem/filesystemstats.cpp +++ b/ksim/monitors/filesystem/filesystemstats.cpp @@ -184,7 +184,7 @@ FilesystemStats::List FilesystemStats::readEntries() #endif #ifdef USE_FAILSAFE - TQFile file( TQString::tqfromLatin1( _PATH_MOUNTED ) ); + TQFile file( TQString::fromLatin1( _PATH_MOUNTED ) ); if ( !file.open( IO_ReadOnly ) ) return list; diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index fb04470..3df1917 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -188,11 +188,11 @@ void FilesystemWidget::processExited(KProcess *) TQStringList::Iterator it; for (it = errorList.begin(); it != errorList.end(); ++it) { - message += TQString::tqfromLatin1("<li>%1</li>") + message += TQString::fromLatin1("<li>%1</li>") .tqarg((*it).replace(TQRegExp("[u]?mount: "), TQString())); } - message += TQString::tqfromLatin1("</ul></qt>"); + message += TQString::fromLatin1("</ul></qt>"); KMessageBox::sorry(0, message); } diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp index 6b8c928..1ffe5a8 100644 --- a/ksim/monitors/filesystem/fsystemconfig.cpp +++ b/ksim/monitors/filesystem/fsystemconfig.cpp @@ -71,7 +71,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name) m_intervalLabel = new TQLabel(this); m_intervalLabel->setText( i18n("Update interval:")); - m_intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mainLayout->addMultiCellWidget(m_intervalLabel, 3, 3, 0, 0); @@ -82,7 +82,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name) TQLabel *intervalLabel = new TQLabel(this); intervalLabel->setText(i18n("seconds")); - intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mainLayout->addMultiCellWidget(intervalLabel, 3, 3, 2, 2); diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index cabbf5a..45251db 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -126,7 +126,7 @@ void SensorBase::update() m_sensorList.append(SensorInfo(currentSensor++, label, TQString::fromUtf8(name), TQString::fromUtf8(chip->prefix), - chipset, sensorType(TQString::tqfromLatin1(name)))); + chipset, sensorType(TQString::fromLatin1(name)))); } } } @@ -134,13 +134,13 @@ void SensorBase::update() if (m_hasNVControl) { int temp = 0; if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_GPU_CORE_TEMPERATURE, &temp)) { - TQString name = TQString::tqfromLatin1("GPU Temp"); + TQString name = TQString::fromLatin1("GPU Temp"); m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp), name, TQString(), TQString(), sensorType(name))); } if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_AMBIENT_TEMPERATURE, &temp)) { - TQString name = TQString::tqfromLatin1("GPU Ambient Temp"); + TQString name = TQString::fromLatin1("GPU Ambient Temp"); m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp), name, TQString(), TQString(), sensorType(name))); } @@ -217,9 +217,9 @@ TQString SensorBase::sensorType(const TQString &name) if (name.findRev("temp", -1, false) != -1) if (SensorBase::fahrenheit()) - return TQString::tqfromLatin1("°F"); + return TQString::fromLatin1("°F"); else - return TQString::tqfromLatin1("°C"); + return TQString::fromLatin1("°C"); if (name.findRev(TQRegExp("[^\\+]?[^\\-]?V$")) != -1) return i18n("Volt", "V"); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 1f1cf10..95e65e5 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -86,7 +86,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) m_updateLabel = new TQLabel(this); m_updateLabel->setText(i18n("Update interval:")); - m_updateLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_updateLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_layout->addMultiCellWidget(m_updateLabel, 4, 4, 0, 0); @@ -95,7 +95,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) TQLabel *intervalLabel = new TQLabel(this); intervalLabel->setText(i18n("seconds")); - intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_layout->addMultiCellWidget(intervalLabel, 4, 4, 2, 2); } diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index c470a2c..997f9b2 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -65,7 +65,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_generalLayout->addMultiCellWidget(m_deviceLabel, 0, 0, 0, 0); m_deviceCombo = new KComboBox(true, m_generalTab); - m_deviceCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + m_deviceCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); m_deviceCombo->setFocus(); m_deviceCombo->setDuplicatesEnabled(false); @@ -89,7 +89,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_timerBox->tqlayout()->setSpacing(0); m_timerBox->tqlayout()->setMargin(0); m_timerBoxLayout = new TQVBoxLayout(m_timerBox->tqlayout()); - m_timerBoxLayout->tqsetAlignment(TQt::AlignTop); + m_timerBoxLayout->setAlignment(TQt::AlignTop); m_timerBoxLayout->setSpacing(6); m_timerBoxLayout->setMargin(11); diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui index b79fc80..9bfae99 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui index 608dc8f..69b94db 100644 --- a/ksim/monitors/snmp/configwidget.ui +++ b/ksim/monitors/snmp/configwidget.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>20</height> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui index d3da054..12fe8ab 100644 --- a/ksim/monitors/snmp/hostdialogbase.ui +++ b/ksim/monitors/snmp/hostdialogbase.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>160</width> <height>20</height> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -309,7 +309,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>351</width> <height>20</height> @@ -408,7 +408,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index 1bcbb0b..6ab85b6 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -117,8 +117,8 @@ TQString KSim::Snmp::monitorDisplayTypeToString( MonitorConfig::DisplayType type { switch ( type ) { - case MonitorConfig::Label: return TQString::tqfromLatin1( "Label" ); - case MonitorConfig::Chart: return TQString::tqfromLatin1( "Chart" ); + case MonitorConfig::Label: return TQString::fromLatin1( "Label" ); + case MonitorConfig::Chart: return TQString::fromLatin1( "Chart" ); default: assert( false ); }; return TQString(); diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index 5f9fb53..e466c66 100644 --- a/ksim/monitors/snmp/monitordialogbase.ui +++ b/ksim/monitors/snmp/monitordialogbase.ui @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>20</height> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>271</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>244</width> <height>20</height> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -335,7 +335,7 @@ <cstring>status</cstring> </property> <property name="text"> - <string>blehtqStatus</string> + <string>blehStatus</string> </property> </widget> <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="4"> diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui index c3df9bd..dcdbd2a 100644 --- a/ksim/monitors/snmp/proberesultdialogbase.ui +++ b/ksim/monitors/snmp/proberesultdialogbase.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp index d79c596..ae04b67 100644 --- a/ksim/monitors/snmp/snmp.cpp +++ b/ksim/monitors/snmp/snmp.cpp @@ -57,7 +57,7 @@ static TQStringList allStrings( const EnumStringMapInfo *array ) { TQStringList result; for ( uint i = 0; array[ i ].stringValue; ++i ) - result << TQString::tqfromLatin1( array[ i ].stringValue ); + result << TQString::fromLatin1( array[ i ].stringValue ); return result; } @@ -65,7 +65,7 @@ static TQString enumToString( const EnumStringMapInfo *array, int value ) { for ( uint i = 0; array[ i ].stringValue; ++i ) if ( array[ i ].enumValue == value ) - return TQString::tqfromLatin1( array[ i ].stringValue ); + return TQString::fromLatin1( array[ i ].stringValue ); assert( false ); return TQString(); @@ -76,7 +76,7 @@ static int stringToEnum( const EnumStringMapInfo *array, TQString string, bool * string = string.lower(); uint i; for ( i = 0; array[ i ].stringValue; ++i ) - if ( TQString::tqfromLatin1( array[ i ].stringValue ).lower() == string ) { + if ( TQString::fromLatin1( array[ i ].stringValue ).lower() == string ) { if ( ok ) *ok = true; return array[ i ].enumValue; } @@ -291,9 +291,9 @@ int KSim::Snmp::sessionErrorCode( netsnmp_session &session ) static TQString messageForErrorCode( int errorCode ) { if ( errorCode >= SNMPERR_MAX && errorCode <= SNMPERR_GENERR ) - return TQString::tqfromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) ); + return TQString::fromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) ); if ( errorCode >= SNMP_ERR_NOERROR && errorCode <= MAX_SNMP_ERR ) - return TQString::tqfromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) ); + return TQString::fromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) ); return TQString(); } diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp index 2803aec..667613a 100644 --- a/ksim/monitors/snmp/value.cpp +++ b/ksim/monitors/snmp/value.cpp @@ -294,9 +294,9 @@ TQString Value::toString( int conversionFlags ) const case Value::TimeTicks: return formatTimeTicks( toTimeTicks(), conversionFlags ); // not using i18n here, because it may be called from within a worker thread, and I'm // not sure it makes sense to translate it anyway - case Value::NoSuchObject: return TQString::tqfromLatin1( "No Such Object" ); - case Value::NoSuchInstance: return TQString::tqfromLatin1( "No Such Instance" ); - case Value::EndOfMIBView: return TQString::tqfromLatin1( "End Of MIB View" ); + case Value::NoSuchObject: return TQString::fromLatin1( "No Such Object" ); + case Value::NoSuchInstance: return TQString::fromLatin1( "No Such Instance" ); + case Value::EndOfMIBView: return TQString::fromLatin1( "End Of MIB View" ); case Value::Invalid: case Value::Null: return TQString(); } |