diff options
Diffstat (limited to 'ksim')
117 files changed, 286 insertions, 1160 deletions
diff --git a/ksim/CMakeL10n.txt b/ksim/CMakeL10n.txt index f264ed9..efcf490 100644 --- a/ksim/CMakeL10n.txt +++ b/ksim/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "ksim" ) + +tde_l10n_create_template( + CATALOG "desktop_files/ksim-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/ksim/CMakeLists.txt b/ksim/CMakeLists.txt index 59037f7..e6dbfa7 100644 --- a/ksim/CMakeLists.txt +++ b/ksim/CMakeLists.txt @@ -50,12 +50,12 @@ tde_add_kpart( ksim_panelextension AUTOMOC ##### other data ################################ -install( FILES ksim.desktop - DESTINATION - ${DATA_INSTALL_DIR}/kicker/extensions +tde_create_translated_desktop( + SOURCE ksim.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions + PO_DIR ksim-desktops ) install( FILES ksim_panelextensionrc DESTINATION ${CONFIG_INSTALL_DIR} ) - diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp index 42148d6..ee601c2 100644 --- a/ksim/generalprefs.cpp +++ b/ksim/generalprefs.cpp @@ -48,7 +48,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name) m_sizeBox = new TQGroupBox(this); m_sizeBox->setTitle(i18n("Graph Size")); - m_sizeBox->setColumnLayout(0, Qt::Horizontal); + m_sizeBox->setColumnLayout(0, TQt::Horizontal); TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->layout()); sizeBoxLayout->setSpacing(6); @@ -174,21 +174,21 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeCombo->insertItem(i18n("%dd %h:%m")); m_uptimeCombo->insertItem(i18n("Uptime: %h:%m:%s")); connect(m_uptimeCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(uptimeContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(uptimeContextMenu(TQPopupMenu *))); m_uptimeAdd = new TQPushButton(this); m_uptimeAdd->setPixmap(SmallIcon("go-down")); - connect(m_uptimeAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertUptimeItem())); + connect(m_uptimeAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertUptimeItem())); TQToolTip::add(m_uptimeAdd, i18n("Insert item")); m_uptimeCheck = new TQCheckBox(this); m_uptimeCheck->setText(i18n("Show uptime")); m_uptimeCheck->setChecked(true); - connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)), - m_uptimeCombo, TQT_SLOT(setEnabled(bool))); - connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)), - m_uptimeAdd, TQT_SLOT(setEnabled(bool))); + connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)), + m_uptimeCombo, TQ_SLOT(setEnabled(bool))); + connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)), + m_uptimeAdd, TQ_SLOT(setEnabled(bool))); m_mainLayout->addWidget(m_uptimeCheck); m_subLayout = new TQHBoxLayout; @@ -210,7 +210,7 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeBox = new TQGroupBox(this); m_uptimeBox->setTitle(i18n("Uptime Legend")); - m_uptimeBox->setColumnLayout(0, Qt::Vertical); + m_uptimeBox->setColumnLayout(0, TQt::Vertical); m_uptimeBox->layout()->setSpacing(0); m_uptimeBox->layout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_uptimeBox->layout()); @@ -273,9 +273,9 @@ void KSim::UptimePrefs::uptimeContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); menu->insertItem(m_addIcon, i18n("Insert Item"), - this, TQT_SLOT(insertUptimeItem())); + this, TQ_SLOT(insertUptimeItem())); menu->insertItem(m_removeIcon, i18n("Remove Item"), - this, TQT_SLOT(removeUptimeItem())); + this, TQ_SLOT(removeUptimeItem())); } void KSim::UptimePrefs::insertUptimeItem() @@ -310,21 +310,21 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) //m_memCombo->insertItem(i18n("%tM - %fM free")); //m_memCombo->insertItem(i18n("%tM - %uM used")); connect(m_memCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(memoryContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(memoryContextMenu(TQPopupMenu *))); m_memoryAdd = new TQPushButton(this); m_memoryAdd->setPixmap(SmallIcon("go-down")); - connect(m_memoryAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertMemoryItem())); + connect(m_memoryAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertMemoryItem())); TQToolTip::add(m_memoryAdd, i18n("Insert item")); m_memCheck = new TQCheckBox(this); m_memCheck->setText(i18n("Show memory and free memory")); m_memCheck->setChecked(false); - connect(m_memCheck, TQT_SIGNAL(toggled(bool)), - m_memCombo, TQT_SLOT(setEnabled(bool))); - connect(m_memCheck, TQT_SIGNAL(toggled(bool)), - m_memoryAdd, TQT_SLOT(setEnabled(bool))); + connect(m_memCheck, TQ_SIGNAL(toggled(bool)), + m_memCombo, TQ_SLOT(setEnabled(bool))); + connect(m_memCheck, TQ_SIGNAL(toggled(bool)), + m_memoryAdd, TQ_SLOT(setEnabled(bool))); m_mainLayout->addWidget(m_memCheck); m_subLayout = new TQHBoxLayout; @@ -346,7 +346,7 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) m_memBox = new TQGroupBox(this); m_memBox->setTitle(i18n("Memory Legend")); - m_memBox->setColumnLayout(0, Qt::Vertical); + m_memBox->setColumnLayout(0, TQt::Vertical); m_memBox->layout()->setSpacing(0); m_memBox->layout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_memBox->layout()); @@ -421,9 +421,9 @@ void KSim::MemoryPrefs::memoryContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); menu->insertItem(m_addIcon, i18n("Insert Item"), - this, TQT_SLOT(insertMemoryItem())); + this, TQ_SLOT(insertMemoryItem())); menu->insertItem(m_removeIcon, i18n("Remove Item"), - this, TQT_SLOT(removeMemoryItem())); + this, TQ_SLOT(removeMemoryItem())); } void KSim::MemoryPrefs::insertMemoryItem() @@ -464,20 +464,20 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) //m_swapCombo->insertItem(i18n("%tM - %uM used")); connect(m_swapCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(swapContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(swapContextMenu(TQPopupMenu *))); m_swapAdd = new TQPushButton(this); m_swapAdd->setPixmap(SmallIcon("go-down")); - connect(m_swapAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertSwapItem())); + connect(m_swapAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertSwapItem())); TQToolTip::add(m_swapAdd, i18n("Insert item")); m_subLayout = new TQHBoxLayout; m_subLayout->setSpacing(6); - connect(m_swapCheck, TQT_SIGNAL(toggled(bool)), - m_swapCombo, TQT_SLOT(setEnabled(bool))); - connect(m_swapCheck, TQT_SIGNAL(toggled(bool)), - m_swapAdd, TQT_SLOT(setEnabled(bool))); + connect(m_swapCheck, TQ_SIGNAL(toggled(bool)), + m_swapCombo, TQ_SLOT(setEnabled(bool))); + connect(m_swapCheck, TQ_SIGNAL(toggled(bool)), + m_swapAdd, TQ_SLOT(setEnabled(bool))); m_swapFormat = new TQLabel(this); m_swapFormat->setText(i18n("Swap format:")); @@ -495,7 +495,7 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) m_swapBox = new TQGroupBox(this); m_swapBox->setTitle(i18n("Swap Legend")); - m_swapBox->setColumnLayout(0, Qt::Vertical); + m_swapBox->setColumnLayout(0, TQt::Vertical); m_swapBox->layout()->setSpacing(0); m_swapBox->layout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_swapBox->layout()); @@ -553,8 +553,8 @@ void KSim::SwapPrefs::readConfig(KSim::Config *config) void KSim::SwapPrefs::swapContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); - menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQT_SLOT(insertSwapItem())); - menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQT_SLOT(removeSwapItem())); + menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQ_SLOT(insertSwapItem())); + menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQ_SLOT(removeSwapItem())); } void KSim::SwapPrefs::insertSwapItem() diff --git a/ksim/generalprefs.h b/ksim/generalprefs.h index 997cbac..e945c26 100644 --- a/ksim/generalprefs.h +++ b/ksim/generalprefs.h @@ -42,7 +42,7 @@ namespace KSim class GeneralPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: GeneralPrefs(TQWidget *parent, const char *name=0); @@ -65,7 +65,7 @@ namespace KSim class ClockPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ClockPrefs(TQWidget *parent, const char *name=0); @@ -83,7 +83,7 @@ namespace KSim class UptimePrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: UptimePrefs(TQWidget *parent, const char *name=0); @@ -118,7 +118,7 @@ namespace KSim class MemoryPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MemoryPrefs(TQWidget *parent, const char *name=0); @@ -155,7 +155,7 @@ namespace KSim class SwapPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SwapPrefs(TQWidget *parent, const char *name=0); diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp index 4d70777..445ba8c 100644 --- a/ksim/ksim.cpp +++ b/ksim/ksim.cpp @@ -36,7 +36,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) + TDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) { TDEGlobal::locale()->insertCatalogue("ksim"); return new KSim::PanelExtension(configFile, KPanelExtension::Normal, diff --git a/ksim/ksim.desktop b/ksim/ksim.desktop index d9ecbbf..b22e34f 100644 --- a/ksim/ksim.desktop +++ b/ksim/ksim.desktop @@ -1,133 +1,13 @@ [Desktop Entry] +Name=KSim + GenericName=System Monitor -GenericName[af]=Stelsel Monitor -GenericName[ar]=مراقب النظام -GenericName[az]=Sistem İzləyici -GenericName[bg]=Мониторинг на системата -GenericName[br]=Diskwel saviad ar reizhiad -GenericName[bs]=Monitor sistema -GenericName[ca]=Monitor del sistema -GenericName[cs]=Monitor systému -GenericName[cy]=Monitr Cysawd -GenericName[da]=Systemovervågningsprogram -GenericName[de]=Systemüberwachung -GenericName[el]=Επόπτης συστήματος -GenericName[eo]=Sistemstato-programo -GenericName[es]=Monitor del sistema -GenericName[et]=Süsteemi monitor -GenericName[eu]=Sistemaren Begiralea -GenericName[fa]=نمایشگر سیستم -GenericName[fi]=Järjestelmänvalvontaohjelma -GenericName[fr]=Indicateurs du système -GenericName[ga]=Monatóir Córais -GenericName[gl]=Monitor do Sistema -GenericName[he]=צג מערכת -GenericName[hi]=तंत्र मॉनीटर -GenericName[hr]=Monitor sustava -GenericName[hu]=Rendszermonitor -GenericName[id]=Monitor Sistem -GenericName[is]=Kerfiseftirlit -GenericName[it]=Controllo di sistema -GenericName[ja]=システムモニタ -GenericName[ka]=სისტემური მონიტორი -GenericName[kk]=Жүйені қадағалау -GenericName[km]=កម្មវិធីត្រួតពិនិត្យប្រព័ន្ធ -GenericName[ko]=X용 시스템 지켜보기 (Xosview) -GenericName[lt]=Sistemos stebėtojas -GenericName[lv]=Sistēmas Monitors -GenericName[mk]=Монитор на системот -GenericName[ms]=Pemerhati Sistem -GenericName[mt]=Monitur tas-sistema -GenericName[nb]=Systemovervåker -GenericName[nds]=Systeemkieker -GenericName[ne]=प्रणाली मोनिटर -GenericName[nl]=Systeemmonitor -GenericName[nn]=Systemovervakar -GenericName[nso]=Molebeledi wa System -GenericName[pa]=ਸਿਸਟਮ ਨਿਗਰਾਨ -GenericName[pl]=Monitor systemu -GenericName[pt]=Monitor do Sistema -GenericName[pt_BR]=Monitor de sistema -GenericName[ro]=Program de monitorizare a sistemului -GenericName[ru]=Системный монитор -GenericName[rw]=Mugaragaza Sisitemu -GenericName[sk]=Monitor systému -GenericName[sl]=Sistemski nadzornik -GenericName[sr]=Надгледање система -GenericName[sr@Latn]=Nadgledanje sistema -GenericName[sv]=Systemövervakare -GenericName[ta]=அமைப்பு கண்காணி -GenericName[tg]=Дидабони Системавӣ -GenericName[th]=สอดส่องการทำงานของระบบ -GenericName[tr]=Sistem İzleyici -GenericName[uk]=Монітор системи -GenericName[uz]=Tizimni nazorat qilish -GenericName[uz@cyrillic]=Тизимни назорат қилиш -GenericName[ven]=Mugadi wa Maitele -GenericName[vi]=Trình theo dõi hềEthống -GenericName[wa]=Corwaitoe do sistinme -GenericName[xh]=Umphendli Wendlela Esetyenziswayo -GenericName[zh_CN]=系统监视器 -GenericName[zh_TW]=系統監視器 -GenericName[zu]=Umlawuli Wesistimu + Comment=System Information Monitor (GKrellM style) -Comment[ar]=مراقب معلومات نظام K (أسلوب GKrellM) -Comment[bg]=Информация за състоянието на системата (стил GKrellM) -Comment[bs]=Nadzor sistemskih informacija (nalik na GKrellM) -Comment[ca]=Monitor d'informació del sistema (similar a GKrellM) -Comment[cs]=Monitor systémových informací (ve stulu programu GKrellM) -Comment[da]=Systeminformationsovervågning (GKrellM-lignende) -Comment[de]=System-Informationsüberwachung (GKrellM-Stil) -Comment[el]=Επόπτης πληροφοριών συστήματος (στο στυλ του GKrellM) -Comment[eo]=Monitoro por Sisteminformoj (GKrellM-stilo) -Comment[es]=Monitor de información del sistema (estilo GKrellM) -Comment[et]=Süsteemi monitooring (GKrellM stiil) -Comment[eu]=Sistemaren Informazioaren Begiralea (GKrellM estiloa) -Comment[fa]=نمایشگر اطلاعات سیستم (GKrellM سبک) -Comment[fi]=Järjestelmätietomonitori (GKrellM-tyylinen) -Comment[fr]=Indicateur d'informations système (dans le style de GKrellM) -Comment[ga]=Monatóir Eolais an Chórais (stíl GKrellM) -Comment[he]=צג מידע מערכת (נוסח GKrellM) -Comment[hu]=Rendszermonitor (GKrellM-stílusú) -Comment[is]=Kerfisupplýsingavaki (líkur GKrellM) -Comment[it]=Controllo delle informazioni di sistema (simile a GKrellM) -Comment[ja]=システム情報モニタ (GKrellM スタイル) -Comment[ka]= სისტემური ინფორმაციის მონიტორი (GKrellM style) -Comment[kk]=Жүені қадағалау ақпараты (GKrellM стилінде) -Comment[km]=កម្មវិធីត្រួតពិនិត្យព័ត៌មានរបស់ប្រព័ន្ធ (GKrellM style) -Comment[lt]=Sistemos informacijos stebėtojas (GKrellM stilius) -Comment[nb]=Overvåkning av K systeminformasjon (GKrellM stil) -Comment[nds]=Kieker för Systeeminformatschonen (GKrellM-Stil) -Comment[ne]=प्रणाली सूचना मोनिटर (GKrellM शैली) -Comment[nl]=Systeeminformatiemonitor (gKrellM-stijl) -Comment[nn]=Systeminfovisar (GKrellM-stil) -Comment[pa]=ਸਿਸਟਮ ਜਾਣਕਾਰੀ ਨਿਗਰਾਨ (GKrellM ਸ਼ੈਲੀ) -Comment[pl]=Informacja o stanie systemu (w stylu GKrellM) -Comment[pt]=Monitor de Informações do Sistema (estilo GKrellM) -Comment[pt_BR]=Monitor de Informações do Sistema (estilo GKrellM) -Comment[ru]=Информационный монитор (в стиле GKrellM) -Comment[sk]=Monitor systémových informácií (v štýle GKrellM) -Comment[sl]=Nadzornik sistemskih informacij (v slogu GKrellM) -Comment[sr]=Надгледање системских информација (у стилу GKrellM-а) -Comment[sr@Latn]=Nadgledanje sistemskih informacija (u stilu GKrellM-a) -Comment[sv]=Systeminformationsövervakare (Gkrellm-stil) -Comment[tr]=Sistem Bildirimileri İzleyici (GKrellM stili) -Comment[uk]=Монітор системної інформації (в стилі GKrellM) -Comment[zh_CN]=系统信息监视器(GKrellM 风格) -Comment[zh_TW]=系統資訊監視器 (GKrellM 風格) + X-DocPath=ksim/index.html Icon=ksim -MimeType= -Name=KSim -Name[af]=Ksim -Name[cy]=kSim -Name[eo]=Simulilo -Name[hi]=के-सिम -Name[ne]=केडीई सिम -Name[sv]=Ksim -Name[ta]=கேசிம் -Name[th]=สอดส่องระบบ -Name[zh_TW]=KSim 系統監視器 + X-TDE-Library=ksim_panelextension X-TDE-UniqueApplet=true Categories=Qt;TDE;System; diff --git a/ksim/ksim.h b/ksim/ksim.h index 36903fb..50e0232 100644 --- a/ksim/ksim.h +++ b/ksim/ksim.h @@ -34,7 +34,7 @@ namespace KSim class PanelExtension : public KPanelExtension { - Q_OBJECT + TQ_OBJECT public: PanelExtension( const TQString & configFile, Type type, diff --git a/ksim/ksimframe.h b/ksim/ksimframe.h index 87f5389..58a2b6b 100644 --- a/ksim/ksimframe.h +++ b/ksim/ksimframe.h @@ -33,7 +33,7 @@ namespace KSim */ class Frame : public TQWidget, public KSim::Base { - Q_OBJECT + TQ_OBJECT public: Frame(int type, TQWidget *parent, const char *name = 0); diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp index 1c1efbd..b5600db 100644 --- a/ksim/ksimpref.cpp +++ b/ksim/ksimpref.cpp @@ -84,17 +84,17 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config, list << ' ' + i18n("Miscellaneous") << ' ' + i18n("Swap"); TQFrame *swap = addHBoxPage(list, i18n("Swap Options"), - SmallIcon("drive-harddisk")); + SmallIcon("drive-harddisk-unmounted")); m_swapPage = new KSim::SwapPrefs(swap); TQFrame *theme = addHBoxPage(' ' + i18n("Themes"), i18n("Theme Selector"), BarIcon("folder_image", TDEIcon::SizeSmall)); m_themePage = new KSim::ThemePrefs(theme); - connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs())); - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(closePrefs())); - connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(loadPluginConfig())); - connect(parent, TQT_SIGNAL(reload()), TQT_SLOT(reload())); + connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(savePrefs())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(closePrefs())); + connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(loadPluginConfig())); + connect(parent, TQ_SIGNAL(reload()), TQ_SLOT(reload())); KSim::PluginList::ConstIterator it; const KSim::PluginList &pluginList = KSim::PluginLoader::self().pluginList(); @@ -164,8 +164,8 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin) plugin.configPage()->readConfig(); // TODO: implement this correctly one day -// connect (info.configPage(), TQT_SIGNAL(pageChanged()), -// this, TQT_SLOT(enableButtons())); +// connect (info.configPage(), TQ_SIGNAL(pageChanged()), +// this, TQ_SLOT(enableButtons())); } void KSim::ConfigDialog::savePrefs() diff --git a/ksim/ksimpref.h b/ksim/ksimpref.h index 6eda8d9..b5f1156 100644 --- a/ksim/ksimpref.h +++ b/ksim/ksimpref.h @@ -70,9 +70,9 @@ namespace KSim ~ChangedPluginList() {} }; - class KDE_EXPORT ConfigDialog : public KDialogBase + class TDE_EXPORT ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(KSim::Config *config, TQWidget *parent, const char *name = 0); diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index 1f204b7..e6b58e8 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -55,10 +55,10 @@ KSim::Sysinfo::Sysinfo(KSim::Config *config, //m_procsLabel = 0L; m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(clockUptimeUpdate())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(clockUptimeUpdate())); m_sysTimer = new TQTimer(this); - connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(sysUpdate())); + connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(sysUpdate())); createView(); } diff --git a/ksim/ksimsysinfo.h b/ksim/ksimsysinfo.h index 89b8598..1f9cc38 100644 --- a/ksim/ksimsysinfo.h +++ b/ksim/ksimsysinfo.h @@ -33,7 +33,7 @@ namespace KSim class Sysinfo : public TQWidget, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index 5e83641..91fd84c 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -140,8 +140,8 @@ KSim::MainView::MainView(TDEConfig *config, m_sizeLayout->addWidget(m_rightFrame); connect(&KSim::PluginLoader::self(), - TQT_SIGNAL(pluginLoaded(const KSim::Plugin &)), - this, TQT_SLOT(addMonitor(const KSim::Plugin &))); + TQ_SIGNAL(pluginLoaded(const KSim::Plugin &)), + this, TQ_SLOT(addMonitor(const KSim::Plugin &))); KSim::ThemeLoader::self().themeColours(this); @@ -150,7 +150,7 @@ KSim::MainView::MainView(TDEConfig *config, addPlugins(); } - connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView())); + connect(&m_maskTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMaskMainView())); } KSim::MainView::~MainView() @@ -371,8 +371,8 @@ void KSim::MainView::addMonitor(const KSim::Plugin &plugin) // kdDebug(2003) << "m_oldLocation: " << m_oldLocation << endl; // kdDebug(2003) << "location: " << location << endl; m_pluginLayout->addWidget(plugin.view()); - connect(plugin.view(), TQT_SIGNAL(runCommand(const TQCString &)), - TQT_SLOT(runCommand(const TQCString &))); + connect(plugin.view(), TQ_SIGNAL(runCommand(const TQCString &)), + TQ_SLOT(runCommand(const TQCString &))); // if (location > m_oldLocation) // m_oldLocation = location; @@ -393,8 +393,8 @@ void KSim::MainView::preferences() { if (m_prefDialog == 0L) { m_prefDialog = new KSim::ConfigDialog(m_config, this, "m_prefDialog"); - connect(m_prefDialog, TQT_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)), - this, TQT_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &))); + connect(m_prefDialog, TQ_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)), + this, TQ_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &))); } m_prefDialog->exec(); @@ -458,9 +458,9 @@ TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const return TQSize(width, height); } -void KSim::MainView::positionChange(Qt::Orientation o) +void KSim::MainView::positionChange(TQt::Orientation o) { - if (o == Qt::Vertical) + if (o == TQt::Vertical) m_pluginLayout->setDirection(TQBoxLayout::TopToBottom); else m_pluginLayout->setDirection(TQBoxLayout::LeftToRight); diff --git a/ksim/ksimview.h b/ksim/ksimview.h index 7495076..6526f2d 100644 --- a/ksim/ksimview.h +++ b/ksim/ksimview.h @@ -46,9 +46,9 @@ namespace KSim class ConfigDialog; class ChangedPluginList; - class KDE_EXPORT MainView : public TQWidget, virtual public DCOPObject + class TDE_EXPORT MainView : public TQWidget, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: @@ -64,7 +64,7 @@ namespace KSim void makeDirs(); TQSize sizeHint(KPanelExtension::Position, TQSize maxSize) const; - void positionChange(Qt::Orientation); + void positionChange(TQt::Orientation); k_dcop: const TQString &hostname() const; diff --git a/ksim/library/Makefile.am b/ksim/library/Makefile.am index f68b0a5..1b1947f 100644 --- a/ksim/library/Makefile.am +++ b/ksim/library/Makefile.am @@ -7,7 +7,7 @@ libksimcore_la_SOURCES = common.cpp themeloader.cpp \ pluginmodule.cpp ksimconfig.cpp libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined -libksimcore_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) -ltdefx +libksimcore_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) -ltdefx ksiminclude_HEADERS = common.h themeloader.h \ chart.h label.h \ diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index 9995769..8f07f30 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -49,8 +49,8 @@ class KSim::Chart::Timer tqAddPostRoutine(cleanup); } - TQObject::connect(m_timer, TQT_SIGNAL(timeout()), - chart, TQT_SLOT(updateDisplay())); + TQObject::connect(m_timer, TQ_SIGNAL(timeout()), + chart, TQ_SLOT(updateDisplay())); } static void disconnect(KSim::Chart *chart) @@ -58,8 +58,8 @@ class KSim::Chart::Timer if (!m_timer) return; - TQObject::disconnect(m_timer, TQT_SIGNAL(timeout()), - chart, TQT_SLOT(updateDisplay())); + TQObject::disconnect(m_timer, TQ_SIGNAL(timeout()), + chart, TQ_SLOT(updateDisplay())); } private: @@ -373,7 +373,7 @@ void KSim::Chart::setMaxValue(int maxValue) void KSim::Chart::setValue(int valueIn, int valueOut) { - d->values.prepend(tqMakePair(range(valueIn), range(valueOut))); + d->values.prepend(qMakePair(range(valueIn), range(valueOut))); if (d->variableGraphs) { d->maxValues.prepend(valueIn > valueOut ? valueIn : valueOut); diff --git a/ksim/library/chart.h b/ksim/library/chart.h index e2e7494..1cb53be 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -33,9 +33,9 @@ namespace KSim * provides a graph displaying data onscreen using gkrellm themes * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Chart : public TQWidget, public KSim::Base + class TDE_EXPORT Chart : public TQWidget, public KSim::Base { - Q_OBJECT + TQ_OBJECT public: enum DataType { DataIn = 0, DataOut }; diff --git a/ksim/library/common.h b/ksim/library/common.h index 9fc01c0..6f6ae56 100644 --- a/ksim/library/common.h +++ b/ksim/library/common.h @@ -72,7 +72,7 @@ namespace KSim * @short base class for widgets * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Base + class TDE_EXPORT Base { public: Base(); diff --git a/ksim/library/ksimconfig.h b/ksim/library/ksimconfig.h index 8f7376d..f16a67e 100644 --- a/ksim/library/ksimconfig.h +++ b/ksim/library/ksimconfig.h @@ -33,7 +33,7 @@ namespace KSim /** * @internal */ - class KDE_EXPORT Config + class TDE_EXPORT Config { public: Config(TDEConfig *config); diff --git a/ksim/library/label.h b/ksim/library/label.h index dce2adc..40c0b48 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -34,9 +34,9 @@ namespace KSim * @short Label widget * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Label : public TQWidget, public KSim::Base + class TDE_EXPORT Label : public TQWidget, public KSim::Base { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/library/led.h b/ksim/library/led.h index 510f959..de912c8 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -34,7 +34,7 @@ namespace KSim * @short led using gkrellm themes * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Led : public TQPixmap + class TDE_EXPORT Led : public TQPixmap { public: enum Type { First = 0, Second }; @@ -104,9 +104,9 @@ namespace KSim * @short Label widget with 2 leds * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT LedLabel : public KSim::Progress + class TDE_EXPORT LedLabel : public KSim::Progress { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/library/pluginglobal.h b/ksim/library/pluginglobal.h index e094198..7258ce5 100644 --- a/ksim/library/pluginglobal.h +++ b/ksim/library/pluginglobal.h @@ -38,7 +38,7 @@ namespace KSim * A class that holds various information about a plugin * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Plugin + class TDE_EXPORT Plugin { public: /** @@ -135,7 +135,7 @@ namespace KSim * use pluginList() from KSim::PluginLoader instead * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginList : public TQValueList<Plugin> + class TDE_EXPORT PluginList : public TQValueList<Plugin> { public: /** diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h index 912297c..7f3b3f8 100644 --- a/ksim/library/pluginloader.h +++ b/ksim/library/pluginloader.h @@ -27,7 +27,7 @@ namespace KSim { - class KDE_EXPORT PluginInfo + class TDE_EXPORT PluginInfo { friend class PluginLoader; public: @@ -61,9 +61,9 @@ namespace KSim * Provides a loader for the plugins * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginLoader : public TQObject + class TDE_EXPORT PluginLoader : public TQObject { - Q_OBJECT + TQ_OBJECT friend class MainView; public: diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index 7f450de..150a2ba 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -123,7 +123,7 @@ KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) d->parent = parent; d->popupMenu = new TQPopupMenu(this); d->popupMenu->insertItem(i18n("About"), this, - TQT_SLOT(showAbout()), 0, -1, 0); + TQ_SLOT(showAbout()), 0, -1, 0); if (parent && !parent->configFileName().isEmpty()) d->config = new TDEConfig(parent->configFileName() + "rc"); @@ -159,7 +159,7 @@ void KSim::PluginView::doCommand() void KSim::PluginView::mousePressEvent(TQMouseEvent *ev) { - if (ev->button() == Qt::LeftButton) + if (ev->button() == TQt::LeftButton) doCommand(); } diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h index b93a98e..e7dc363 100644 --- a/ksim/library/pluginmodule.h +++ b/ksim/library/pluginmodule.h @@ -29,7 +29,7 @@ class TDEConfig; #define KSIM_INIT_PLUGIN(className) \ extern "C" { \ - KDE_EXPORT KSim::PluginObject *init_plugin(const char *name) { \ + TDE_EXPORT KSim::PluginObject *init_plugin(const char *name) { \ return new className(name); \ } \ } @@ -50,7 +50,7 @@ namespace KSim * @see KSim::PluginView KSim::PluginPage * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginObject + class TDE_EXPORT PluginObject { public: /** @@ -111,9 +111,9 @@ namespace KSim * the config() to gain access to your config file * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginPage : public TQWidget + class TDE_EXPORT PluginPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -160,9 +160,9 @@ namespace KSim * when apply or ok gets clicked in the config dialog * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginView : public TQWidget + class TDE_EXPORT PluginView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/library/progress.h b/ksim/library/progress.h index c857000..1439652 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -30,9 +30,9 @@ namespace KSim * provides a label with a progress bar meter * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Progress : public KSim::Label + class TDE_EXPORT Progress : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: enum ProgressType { Panel, Meter }; diff --git a/ksim/library/themeloader.h b/ksim/library/themeloader.h index c70dc92..cb38b2c 100644 --- a/ksim/library/themeloader.h +++ b/ksim/library/themeloader.h @@ -44,7 +44,7 @@ namespace KSim * @author Robbie Ward <linuxphreak@gmx.co.uk> * @short Provides a loader for the themes */ - class KDE_EXPORT Theme + class TDE_EXPORT Theme { friend class ThemeLoader; public: @@ -397,7 +397,7 @@ namespace KSim * @author Robbie Ward <linuxphreak@gmx.co.uk> * @short Provides a loader for the themes */ - class KDE_EXPORT ThemeLoader + class TDE_EXPORT ThemeLoader { public: /** diff --git a/ksim/monitorprefs.h b/ksim/monitorprefs.h index 477210d..26f6d7b 100644 --- a/ksim/monitorprefs.h +++ b/ksim/monitorprefs.h @@ -29,7 +29,7 @@ namespace KSim class MonitorPrefs : public TDEListView { - Q_OBJECT + TQ_OBJECT public: MonitorPrefs(TQWidget *parent, const char *name=0); diff --git a/ksim/monitors/cpu/CMakeLists.txt b/ksim/monitors/cpu/CMakeLists.txt index 416d3df..7cd6889 100644 --- a/ksim/monitors/cpu/CMakeLists.txt +++ b/ksim/monitors/cpu/CMakeLists.txt @@ -40,7 +40,8 @@ tde_install_icons( ) ##### other data ################################ -install( FILES cpu.desktop +tde_create_translated_desktop( + SOURCE cpu.desktop DESTINATION ${DATA_INSTALL_DIR}/ksim/monitors + PO_DIR ksim-desktops ) - diff --git a/ksim/monitors/cpu/cpu.desktop b/ksim/monitors/cpu/cpu.desktop index c8130ec..66bf914 100644 --- a/ksim/monitors/cpu/cpu.desktop +++ b/ksim/monitors/cpu/cpu.desktop @@ -1,92 +1,7 @@ [Desktop Entry] Icon=ksim_cpu Name=CPU -Name[af]=Sve -Name[ar]=وحدة المعالجة المركزية -Name[bg]=Процесори -Name[cs]=Procesor -Name[el]=KME -Name[eo]=Procezilo -Name[fa]=واحد پردازش مرکزی -Name[fr]=Processeur -Name[he]=מעבד -Name[hi]=सीपीयू -Name[hr]=Procesor -Name[is]=Örgjörvi -Name[kk]=Процессор -Name[mk]=Процесор -Name[pl]=procesor -Name[ru]=Процессор -Name[sk]=Procesor -Name[sl]=CPE -Name[sv]=Processor -Name[ta]= சிபியு -Name[tg]=ВПМ -Name[th]=ซีพียู -Name[tr]=İşlemci -Name[uk]=ЦП -Name[uz]=Protsessor -Name[uz@cyrillic]=Процессор -Name[wa]=Processeu Comment=CPU Monitor Plugin -Comment[af]=Sve Monitor Inplak -Comment[ar]=ملحق مراقبة وحدة المعالجة المركزيّة -Comment[bg]=Мониторинг на процесора(ите) -Comment[bs]=Dodatak za nadzor CPUa -Comment[ca]=Monitor de CPU -Comment[cs]=Modul pro monitorování procesoru -Comment[cy]=Atodyn Monitro CPU -Comment[da]=CPU-overvågnings-plugin -Comment[de]=CPU-Nutzungsanzeige -Comment[el]=Πρόσθετο εποπτείας KME -Comment[eo]=Prozecilo-observila kromaĵo -Comment[es]=Extensión de monitorización de la CPU -Comment[et]=Protsessori monitooring -Comment[eu]=CPU Plugin Begiralea -Comment[fa]=وصلۀ نمایشگر واحد پردازش مرکزی -Comment[fi]=Suorittimentarkkailusovelma -Comment[fr]=Module de surveillance du processeur -Comment[ga]=Breiseán Monatóireachta LAP -Comment[he]=תוסף צג מעבד -Comment[hi]=सीपीयू मॉनीटर प्लगइन -Comment[hu]=CPU-figyelő bővítőmodul -Comment[is]=Örgjörva eftirlitsíforrit -Comment[it]=Plugin di controllo CPU -Comment[ja]=CPU モニタプラグイン -Comment[ka]= პროცესორის მონიტორის მოდული -Comment[kk]=Процессорды бақылау модулі -Comment[km]=កម្មវិធីជំនួយនៃកម្មវិធីត្រួតពិនិត្យថាស CPU Monitor -Comment[lt]=CPU stebėtojo priedas -Comment[mk]=Приклучок за следење на процесорот -Comment[ms]=Plug masuk Pemerhati CPU -Comment[nb]=Programtillegg for CPU-overvåkning -Comment[nds]=CPU-Kiekmoduul -Comment[ne]=CPU मोनिटर प्लगइन -Comment[nl]=CPU monitor-plugin -Comment[nn]=Programtillegg for CPU-overvaking -Comment[pa]=CPU ਨਿਗਰਾਨੀ ਪਲੱਗਿੰਨ -Comment[pl]=Stan procesora -Comment[pt]='Plugin' de monitorização do processador -Comment[pt_BR]=Plug-in de monitoramento da CPU -Comment[ro]=Modul monitorizare CPU -Comment[ru]=Монитор процессора -Comment[sk]=Modul pre monitorovanie CPU -Comment[sl]=Vstavek za opazovanje stanja CPE -Comment[sr]=Прикључак за надгледање CPU-а -Comment[sr@Latn]=Priključak za nadgledanje CPU-a -Comment[sv]=Insticksprogram för processoraktivitet -Comment[ta]= சிபியு கண்காணி சொருகுப்பொருள் -Comment[tg]=Модули Дидабони ВПМ -Comment[th]=ปลั๊กอินสอดส่องซีพียู -Comment[tr]=İşlemci İzleyici Eklentisi -Comment[uk]=Втулок датчика ЦП -Comment[uz]=Protsessorni nazorat qilish plagini -Comment[uz@cyrillic]=Процессорни назорат қилиш плагини -Comment[wa]=Tchôke-divins di corwaitaedje do CPU -Comment[xh]=Iplagi yangaphakathi ye Monitor CPU -Comment[zh_CN]=CPU 监视器插件 -Comment[zh_TW]=CPU 監視器外掛程式 -Comment[zu]=I-plugin Yomlawuli we-CPU X-KSIM-VERSION=0.1 X-KSIM-LIBRARY=cpu X-KSIM-AUTHOR=Robbie Ward diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index af6074c..68d720b 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -126,7 +126,7 @@ CpuView::CpuView(KSim::PluginObject *parent, const char *name) addDisplay(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateView())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateView())); m_timer->start(CPU_SPEED); updateView(); } @@ -372,8 +372,8 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_listView->addColumn(i18n("Chart Format")); m_listView->setAllColumnsShowFocus(true); m_listView->setSelectionMode(TQListView::Single); - connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_listView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); mainLayout->addWidget( m_listView ); @@ -386,12 +386,12 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); layout->addWidget( m_modify ); mainLayout->addLayout( layout ); m_legendBox = new TQGroupBox(this); - m_legendBox->setColumnLayout(0, Qt::Vertical); + m_legendBox->setColumnLayout(0, TQt::Vertical); m_legendBox->setTitle(i18n("Chart Legend")); m_legendBox->layout()->setSpacing(0); m_legendBox->layout()->setMargin(0); diff --git a/ksim/monitors/cpu/ksimcpu.h b/ksim/monitors/cpu/ksimcpu.h index 1ca3fca..9f9dd99 100644 --- a/ksim/monitors/cpu/ksimcpu.h +++ b/ksim/monitors/cpu/ksimcpu.h @@ -51,7 +51,7 @@ class CpuPlugin : public KSim::PluginObject class CpuView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: CpuView(KSim::PluginObject *parent, const char *name); @@ -200,7 +200,7 @@ class CpuView : public KSim::PluginView class CpuConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: CpuConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/disk/CMakeLists.txt b/ksim/monitors/disk/CMakeLists.txt index b37ca18..ebd30a8 100644 --- a/ksim/monitors/disk/CMakeLists.txt +++ b/ksim/monitors/disk/CMakeLists.txt @@ -35,7 +35,8 @@ tde_add_kpart( ksim_disk AUTOMOC ##### other data ################################ -install( FILES disk.desktop +tde_create_translated_desktop( + SOURCE disk.desktop DESTINATION ${DATA_INSTALL_DIR}/ksim/monitors + PO_DIR ksim-desktops ) - diff --git a/ksim/monitors/disk/disk.desktop b/ksim/monitors/disk/disk.desktop index d7a7cfa..1c2d924 100644 --- a/ksim/monitors/disk/disk.desktop +++ b/ksim/monitors/disk/disk.desktop @@ -1,106 +1,5 @@ [Desktop Entry] Comment=Disk Monitor Plugin -Comment[af]=Disket Monitor Inplak -Comment[ar]=ملحق مراقبة القرص -Comment[bg]=Мониторинг на входно-изходите операции с диска -Comment[bs]=Dodatak za nadzor diska -Comment[ca]=Monitor de disc -Comment[cs]=Modul pro monitorování disku -Comment[cy]=Atodyn Monitro Disg -Comment[da]=Diskovervågnings-plugin -Comment[de]=Hilfsprogramm zur Festplattenüberwachung -Comment[el]=Πρόσθετο εποπτείας δίσκου -Comment[eo]=Disk-observa kromaĵo -Comment[es]=Extensión de monitorización de disco -Comment[et]=Ketta monitooring -Comment[eu]=Diskoaren Plugin Begiralea -Comment[fa]=وصلۀ نمایشگر دیسک -Comment[fi]=Levyntarkkailusovelma -Comment[fr]=Module de surveillance du disque -Comment[ga]=Breiseán Monatóireachta Diosca -Comment[he]=תוסף צג דיסק -Comment[hi]=डिस्क मॉनीटर प्लगइन -Comment[hu]=Lemezfigyelő bővítőmodul -Comment[is]=Disk eftirlitsforrit -Comment[it]=Plugin di controllo disco -Comment[ja]=ディスクモニタプラグイン -Comment[ka]= დისკის მონიტორის მოდული -Comment[kk]=Дискін бақылау модулі -Comment[km]=កម្មវិធីជំនួយនៃកម្មវិធីត្រួតពិនិត្យថាស -Comment[lt]=Disko stebėtojo priedas -Comment[mk]=Приклучок за следење на дискот -Comment[ms]=Plug masuk Pemerhati Monitor -Comment[nb]=Programtillegg for diskovervåkning -Comment[nds]=Fastplaat-Kiekmoduul -Comment[ne]=डिस्क मोनिटर प्लगइन -Comment[nl]=Disk monitor-plugin -Comment[nn]=Programtillegg for diskovervaking -Comment[pa]=ਡਿਸਕ ਨਿਗਰਾਨ ਪਲੱਗਿੰਨ -Comment[pl]=Stan dysku -Comment[pt]='Plugin' de Monitorização do Disco -Comment[pt_BR]=Plug-in de monitoramento do Disco -Comment[ro]=Modul monitorizare disc -Comment[ru]=Монитор дискового пространства -Comment[sk]=Modul pre monitorovanie disku -Comment[sl]=Vstavek za opazovanje diska -Comment[sr]=Прикључак за надгледање диска -Comment[sr@Latn]=Priključak za nadgledanje diska -Comment[sv]=Insticksprogram för diskövervakning -Comment[ta]= வட்டு கண்காணி சொருகுப்பொருள் -Comment[tg]=Модули Дидабони Диск -Comment[th]=ปลั๊กอินตรวจการทำงานดิสก์ -Comment[tr]=Disk İzleyici Eklentisi -Comment[uk]=Втулок датчика диску -Comment[uz]=Diskni nazorat qilish plagini -Comment[uz@cyrillic]=Дискни назорат қилиш плагини -Comment[wa]=Tchôke-divins di corwaitaedje del deure plake -Comment[xh]=Iplagi efakiweyo ye Monitor Yediski -Comment[zh_CN]=磁盘监视器插件 -Comment[zh_TW]=磁碟監視器外掛程式 -Comment[zu]=I-plugin Yomlawuli Wediski Icon=drive-harddisk-mounted Name=Disk -Name[af]=Disket -Name[ar]=قرص -Name[bg]=Дискове -Name[br]=Pladenn -Name[ca]=Disc -Name[el]=Δίσκος -Name[eo]=Disko -Name[es]=Disco -Name[et]=Ketas -Name[eu]=Diskoa -Name[fa]=دیسک -Name[fi]=Levy -Name[ga]=Diosca -Name[he]=דיסק -Name[hi]=डिस्क -Name[hu]=Lemez -Name[is]=Diskur -Name[it]=Disco -Name[ja]=ディスク -Name[kk]=Дискі -Name[km]=ថាស -Name[lt]=Diskas -Name[lv]=Disks -Name[mk]=Диск -Name[ms]=Cakera -Name[nds]=Fastplaat -Name[ne]=डिस्क -Name[pa]=ਡਿਸਕ -Name[pl]=Dysk -Name[pt]=Disco -Name[pt_BR]=Disco -Name[ro]=Disc -Name[ru]=Диск -Name[sr]=Диск -Name[ta]=வட்டு -Name[tg]=Диск -Name[th]=ดิสก์ -Name[uk]=Диск -Name[uz@cyrillic]=Диск -Name[wa]=Deure plake -Name[xh]=Idiski -Name[zh_CN]=磁盘 -Name[zu]=Idiski X-KSIM-LIBRARY=disk diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index d3a3827..fe278b5 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -126,7 +126,7 @@ DiskView::DiskView(KSim::PluginObject *parent, const char *name) init(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateDisplay())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateDisplay())); m_timer->start(DISK_SPEED); updateDisplay(); } @@ -491,12 +491,12 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name) m_add = new TQPushButton(this); m_add->setText(i18n("Add...")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); layout->addWidget(m_add); m_remove = new TQPushButton(this); m_remove->setText(i18n("Remove")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); layout->addWidget(m_remove); m_layout->addLayout(layout); diff --git a/ksim/monitors/disk/ksimdisk.h b/ksim/monitors/disk/ksimdisk.h index 3cf62d1..079efbe 100644 --- a/ksim/monitors/disk/ksimdisk.h +++ b/ksim/monitors/disk/ksimdisk.h @@ -54,7 +54,7 @@ class DiskPlugin : public KSim::PluginObject class DiskView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: DiskView(KSim::PluginObject *parent, const char *name); @@ -131,7 +131,7 @@ class DiskView : public KSim::PluginView class DiskConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: DiskConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/filesystem/CMakeLists.txt b/ksim/monitors/filesystem/CMakeLists.txt index cc6d0cb..bcb591e 100644 --- a/ksim/monitors/filesystem/CMakeLists.txt +++ b/ksim/monitors/filesystem/CMakeLists.txt @@ -37,7 +37,8 @@ tde_add_kpart( ksim_filesystem AUTOMOC ##### other data ################################ -install( FILES DFree.desktop +tde_create_translated_desktop( + SOURCE DFree.desktop DESTINATION ${DATA_INSTALL_DIR}/ksim/monitors + PO_DIR ksim-desktops ) - diff --git a/ksim/monitors/filesystem/DFree.desktop b/ksim/monitors/filesystem/DFree.desktop index d6f23b1..f445d39 100644 --- a/ksim/monitors/filesystem/DFree.desktop +++ b/ksim/monitors/filesystem/DFree.desktop @@ -1,84 +1,7 @@ [Desktop Entry] -Icon=drive-harddisk +Icon=drive-harddisk-mounted Name=DFree -Name[af]=Dfree -Name[bg]=Дялове -Name[ca]=Disc lliure -Name[cs]=Volný disk -Name[eo]=Diskuzo -Name[et]=Vaba kettaruum -Name[he]=מחיצות -Name[hi]=डी-फ्री -Name[it]=Disco libero -Name[kk]=Тіркеген бөлімдер -Name[ko]=디스크 사용량 -Name[ne]=डिफ्रि -Name[pt_BR]=Disco Livre -Name[ru]=Смонтированные разделы -Name[sk]=Voľný disk -Name[sv]=Ledigt diskutrymme -Name[ta]= Dபிரீ -Name[tg]=DОзод -Name[th]=พื้นที่ว่างของดิสก์ Comment=Mounted Partitions Monitor -Comment[af]=Gekoppelde Partisies Monitor -Comment[ar]=مراقب الأقسام المضمومة -Comment[bg]=Мониторинг на монтираните дялове -Comment[bs]=Nadzor montiranih particija -Comment[ca]=Monitor de les particions muntades -Comment[cs]=Monitor připojených diskových oddílů -Comment[cy]=Monitr Rhaniadau Mowntiedig -Comment[da]=Overvågning af monterede partitioner -Comment[de]=Anzeige für eingebundene Laufwerke -Comment[el]=Επόπτης προσαρτημένων κατατμήσεων -Comment[eo]=Vidigilo por la kroĉitaj subdiskoj -Comment[es]=Monitor de particiones montadas -Comment[et]=Ühendatud partitsioonide monitooring -Comment[eu]=Muntatutako Partizioen Begiralea -Comment[fa]=نمایشگر افرازهای سوارشده -Comment[fi]=Liitettyjen osioiden valvonta -Comment[fr]=Surveillant des lecteurs montés -Comment[ga]=Monatóir Rannta Feistithe -Comment[he]=צג מחיצות מחוברות -Comment[hi]=माउन्टेड पार्टीशन्स मॉनीटर -Comment[hu]=Lemezcsatlakoztatás-figyelő -Comment[is]=Eftirlit með tengdum disksneiðum -Comment[it]=Controllo delle partizioni montate -Comment[ja]=マウントされたパーティションのモニタ -Comment[ka]= მონტირებული პარტიციების მონიტორი -Comment[kk]=Тіркеген бөлімдерді бақылау -Comment[km]=កម្មវិធីត្រួតពិនិត្យភាគដែលបានម៉ោន -Comment[lt]=Sumontuotų skirsnių stebėtojas -Comment[mk]=Монитор на монтираните партиции -Comment[ms]=Pemerhati Partisi yang telah Dilekapkan -Comment[nb]=Overvåkning av monterte partisjoner -Comment[nds]=Kieker för inhangte Partitschonen -Comment[ne]=माउन्ट गरिएको विभाजन मोनिटर -Comment[nl]=Monitor van aangekoppelde partities -Comment[nn]=Overvaking av monterte partisjonar -Comment[pa]=ਮਾਊਂਟ ਭਾਗ ਨਿਗਰਾਨ -Comment[pl]=Stan zamontowanych partycji -Comment[pt]=Monitor de Partições Montadas -Comment[pt_BR]=Monitor das Partições Montadas -Comment[ro]=Monitor partiţii montate -Comment[ru]=Монитор смонтированных разделов -Comment[sk]=Monitor pripojených diskových oddielov -Comment[sl]=Nadzornik priklopljenih razdelkov -Comment[sr]=Надгледање монтираних партиција -Comment[sr@Latn]=Nadgledanje montiranih particija -Comment[sv]=Övervakar monterade partitioner -Comment[ta]=ஏற்றப்பட்ட பகுக்கப்பட்ட கண்காணி -Comment[tg]=Дидабони Қисмҳои Насбшуда -Comment[th]=สอดส่องพาร์ติชันที่เมานท์ไว้แล้ว -Comment[tr]=Bağlanmış Disk Bölümü İzleyici -Comment[uk]=Монітор змонтованих розділів -Comment[uz]=Diskning ulangan qismlarini nazorat qilish plagini -Comment[uz@cyrillic]=Дискнинг уланган қисмларини назорат қилиш плагини -Comment[wa]=Corwaitoe des montêyès pårticions -Comment[xh]=Ulwahlulo Lonyuso lwe Monitor -Comment[zh_CN]=已挂载分区监视器 -Comment[zh_TW]=已掛載的分割區監視器 -Comment[zu]=Umlawuli Wezahlukaniso Ezinyukile X-KSIM-VERSION=0.1 X-KSIM-LIBRARY=filesystem X-KSIM-PREFS=File System diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp index f60ce58..5c1cf3a 100644 --- a/ksim/monitors/filesystem/filesystemstats.cpp +++ b/ksim/monitors/filesystem/filesystemstats.cpp @@ -176,7 +176,9 @@ FilesystemStats::List FilesystemStats::readEntries() entry.dir = sfs[i].f_mntonname; entry.fsname = sfs[i].f_mntfromname; -#ifndef __osf__ +#ifdef __osf__ + entry.type = getvfsbynumber(sfs[i].f_type); +#else entry.type = sfs[i].f_fstypename; #endif diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 1435195..21aebff 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -141,7 +141,7 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) while ((filesystem = it.current()) != 0) { ++it; - if (TQT_BASE_OBJECT(filesystem->display()) == TQT_BASE_OBJECT(o)) { + if (filesystem->display() == o) { progressBar = filesystem->display(); break; } @@ -149,15 +149,15 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) ++i; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(progressBar) && e->type() == TQEvent::MouseButtonPress) + if (o == progressBar && e->type() == TQEvent::MouseButtonPress) { - switch(TQT_TQMOUSEEVENT(e)->button()) { - case Qt::RightButton: + switch(static_cast<TQMouseEvent*>(e)->button()) { + case TQt::RightButton: showMenu(i); break; default: break; - case Qt::LeftButton: + case TQt::LeftButton: if (parentWidget()->inherits("KSim::PluginView")) static_cast<KSim::PluginView *>(parentWidget())->doCommand(); break; @@ -200,11 +200,11 @@ void FilesystemWidget::createProcess(const TQString &command, const TQString &po { m_process = new TDEProcess(); connect(m_process, - TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); connect(m_process, - TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(processExited(TDEProcess *))); + TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(processExited(TDEProcess *))); (*m_process) << command << point; void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)); @@ -217,7 +217,7 @@ void FilesystemWidget::showMenu(uint id) TQPopupMenu menu; menu.insertItem(SmallIcon("drive-harddisk-mounted"), i18n("&Mount Device"), 1); - menu.insertItem(SmallIcon("drive-harddisk"), i18n("&Unmount Device"), 2); + menu.insertItem(SmallIcon("drive-harddisk-unmounted"), i18n("&Unmount Device"), 2); switch (menu.exec(TQCursor::pos())) { case 1: diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h index 2a8f116..6e7f330 100644 --- a/ksim/monitors/filesystem/filesystemwidget.h +++ b/ksim/monitors/filesystem/filesystemwidget.h @@ -29,7 +29,7 @@ class TQVBoxLayout; class FilesystemWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FilesystemWidget(TQWidget *parent, const char *name); diff --git a/ksim/monitors/filesystem/fsystemconfig.h b/ksim/monitors/filesystem/fsystemconfig.h index fe37957..8322bcd 100644 --- a/ksim/monitors/filesystem/fsystemconfig.h +++ b/ksim/monitors/filesystem/fsystemconfig.h @@ -32,7 +32,7 @@ class TQListBoxItem; class FsystemConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: FsystemConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index 278a891..262ae93 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -100,7 +100,7 @@ Fsystem::Fsystem(KSim::PluginObject *parent, const char *name) createFreeInfo(); m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateFS())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateFS())); m_updateTimer->start(config()->readNumEntry("updateValue", 60) * 1000); } @@ -193,7 +193,7 @@ Fsystem::MountEntryList Fsystem::makeList(const TQStringList &list) const TQStringList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { splitList = TQStringList::split(":", (*it)); - newList.append(tqMakePair(splitList[0], splitList[1])); + newList.append(qMakePair(splitList[0], splitList[1])); } return newList; diff --git a/ksim/monitors/filesystem/ksimfsystem.h b/ksim/monitors/filesystem/ksimfsystem.h index 1583ba1..63e192c 100644 --- a/ksim/monitors/filesystem/ksimfsystem.h +++ b/ksim/monitors/filesystem/ksimfsystem.h @@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject class Fsystem : public KSim::PluginView, public FsystemIface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/monitors/i8k/CMakeLists.txt b/ksim/monitors/i8k/CMakeLists.txt index e3eef0d..1afc456 100644 --- a/ksim/monitors/i8k/CMakeLists.txt +++ b/ksim/monitors/i8k/CMakeLists.txt @@ -35,7 +35,8 @@ tde_add_kpart( ksim_i8k AUTOMOC ##### other data ################################ -install( FILES i8k.desktop +tde_create_translated_desktop( + SOURCE i8k.desktop DESTINATION ${DATA_INSTALL_DIR}/ksim/monitors + PO_DIR ksim-desktops ) - diff --git a/ksim/monitors/i8k/i8k.desktop b/ksim/monitors/i8k/i8k.desktop index 053089a..f9a2fad 100644 --- a/ksim/monitors/i8k/i8k.desktop +++ b/ksim/monitors/i8k/i8k.desktop @@ -1,62 +1,5 @@ [Desktop Entry] Comment=Dell I8K Hardware Monitor Plugin -Comment[ar]=ملحق لمراقبة عتاد Dell I8K -Comment[bg]=Мониторинг на Dell I8K -Comment[bs]=Dell I8K dodatak za nadzor hardvera -Comment[ca]=Connector per a controlar el maquinari Dell I8K -Comment[cs]=Modul sledování hardwaru pro Dell I8K -Comment[cy]=Ategyn Arsylwydd Caledwedd Dell I8K -Comment[de]=Dell I8K Hardware Überwachungs-Plugin -Comment[el]=Πρόσθετο εποπτείας υλικού Dell I8K -Comment[es]=Extensión de monitorización de hardware para Dell I8K -Comment[et]=Dell I8K riistvara monitooringu plugin -Comment[eu]=Dell I8K Hardwarearen Plugin Begiralea -Comment[fa]=وصلۀ نمایشگر سختافزار Dell I8K -Comment[fi]=Dell I8K-laitteistomonitoriliitännäinen -Comment[fr]=Module de surveillance du Dell l8K -Comment[ga]=Breiseán Monatóireachta Cruaearraí Dell I8K -Comment[hi]=डेल I8K हार्डवेयर मॉनीटर प्लगइन -Comment[hu]=Dell I8K hardvermonitor bővítőmodul -Comment[is]=Íforrit til að fylgjast með Dell I8K vélbúnaði -Comment[it]=Plugin di controllo hardware Dell I8K -Comment[ja]=Dell I8K ハードウェアモニタプラグイン -Comment[ka]=Dell I8K მოწყობილობათა მონიტორის მოდული -Comment[kk]=Dell I8K жабдықтарын бақылау модулі -Comment[km]=កម្មវិធីជំនួយរបស់កម្មវិធីត្រួតពិនិត្យផ្នែករឹង Dell I8K -Comment[lt]=Dell I8K aparatinės įrangos stebėjimo priedas -Comment[mk]=Приклучок за следење на хардверот Dell I8K -Comment[ms]=Plug masuk Pemerhati Perkakasan Dell I8K -Comment[nb]=Programtillegg for overvåkning av maskinvare Dell I8K -Comment[nds]=Kiekmoduul för Dell I8K-Hardware -Comment[ne]=डेल I8K हार्डवेयर मोनिटर प्लगइन -Comment[nl]=Dell I8000 Hardware Monitor-plugin -Comment[nn]=Programtillegg for overvaking av Dell I8K-maskinvare -Comment[pa]=Dell I8K ਜੰਤਰ ਨਿਗਰਾਨ ਪਲੱਗਿੰਨ -Comment[pl]=Wtyczka monitorowania Dell I8K -Comment[pt]='Plugin' de monitorização de hardware para o Dell I8K -Comment[pt_BR]=Plug-in de monitoramento do Hardware Dell I8K -Comment[ro]=Modul monitorizare Dell I8K -Comment[ru]=Модуль монитора оборудования Dell I8K -Comment[sk]=Modul pre monitorovanie hardware Dell I8K -Comment[sl]=Vstavek za opazovanje strojne opreme Dell I8K -Comment[sr]=Прикључак за надгледање Dell-овог I8K хардвера -Comment[sr@Latn]=Priključak za nadgledanje Dell-ovog I8K hardvera -Comment[sv]=Insticksprogram för Dell I8K-övervakning -Comment[ta]=டெல்I8K வன்பொருள் கண்காணி சொருகுபொருள் -Comment[tg]=Модули Дидабони Сахтафзори Dell I8K -Comment[tr]=Dell I8K Donanım Monitör Plugini -Comment[uk]=Втулок датчика апаратного забезпечення Dell I8K -Comment[wa]=Tchôke-divins di corwaitaedje di l' éndjolreye pol Dell I8K -Comment[zh_CN]=Dell I8K 硬件邮件监视器插件 -Comment[zh_TW]=Dell I8K 硬體監視器外掛程式 Icon=drive-harddisk-mounted Name=Dell I8K -Name[fr]=Dell l8K -Name[he]=Dell l8k -Name[hi]=डेल I8K -Name[nb]=Dell 18K -Name[ne]=डेल I8K -Name[sr]=Dell-ов I8K -Name[sr@Latn]=Dell-ov I8K -Name[ta]= டெல் I8K X-KSIM-LIBRARY=i8k diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index 979c682..556f15c 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -121,7 +121,7 @@ void I8KView::openStream() { m_procStream = new TQTextIStream( m_procFile ); disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateView() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateView() ) ); m_timer->start( m_interval*1000 ); kdDebug( 2003 ) << "i8k: Success" << endl; @@ -130,7 +130,7 @@ void I8KView::openStream() { // i8k module is not loaded. Try again after 30 secs. disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( openStream() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( openStream() ) ); m_timer->start( 30*1000 ); kdDebug( 2003 ) << "i8k: Failed...retry after 30 secs" << endl; } @@ -252,6 +252,3 @@ void I8TDEConfig::saveConfig() } #include "ksimi8k.moc" - -/* vim: et sw=2 ts=2 -*/ diff --git a/ksim/monitors/i8k/ksimi8k.h b/ksim/monitors/i8k/ksimi8k.h index 9c1ce1a..492af64 100644 --- a/ksim/monitors/i8k/ksimi8k.h +++ b/ksim/monitors/i8k/ksimi8k.h @@ -49,7 +49,7 @@ class I8KPlugin : public KSim::PluginObject class I8KView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: I8KView(KSim::PluginObject *parent, const char *name); @@ -81,7 +81,7 @@ class I8KView : public KSim::PluginView class I8TDEConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: I8TDEConfig(KSim::PluginObject *parent, const char *name); @@ -99,6 +99,3 @@ class I8TDEConfig : public KSim::PluginPage }; #endif // KSIMI8K_H - -/* vim: et sw=2 ts=2 -*/ diff --git a/ksim/monitors/lm_sensors/CMakeLists.txt b/ksim/monitors/lm_sensors/CMakeLists.txt index b5a26a5..67b670e 100644 --- a/ksim/monitors/lm_sensors/CMakeLists.txt +++ b/ksim/monitors/lm_sensors/CMakeLists.txt @@ -43,7 +43,8 @@ tde_add_kpart( ksim_sensors AUTOMOC ##### other data ################################ -install( FILES Lm_sensors.desktop +tde_create_translated_desktop( + SOURCE Lm_sensors.desktop DESTINATION ${DATA_INSTALL_DIR}/ksim/monitors + PO_DIR ksim-desktops ) - diff --git a/ksim/monitors/lm_sensors/Lm_sensors.desktop b/ksim/monitors/lm_sensors/Lm_sensors.desktop index d700e0d..39af1a1 100644 --- a/ksim/monitors/lm_sensors/Lm_sensors.desktop +++ b/ksim/monitors/lm_sensors/Lm_sensors.desktop @@ -1,81 +1,7 @@ [Desktop Entry] Comment=Lm_sensors Status Monitor -Comment[ar]=مراقب حالة Lm_sensors -Comment[bg]=Мониторинг на Lm_sensors -Comment[bs]=Nadzor statusa lm_sensors -Comment[ca]=Monitor de l'estat de Lm_sensors -Comment[cs]=Monitor stavu lm_sensorů -Comment[cy]=Monitr Statws Lm_sensors -Comment[da]=Statusovervågning af lm_følere -Comment[de]=Statusanzeige für LM-Sensoren -Comment[el]=Επόπτης κατάστασης lm_sensors -Comment[eo]=Rigardilo por la stato de Lm-sentiloj -Comment[es]=Monitor de estado de los sensores Lm -Comment[et]=Lm_sensors olekute monitooring -Comment[eu]=Lm_sentsoreen Egoera Begiralea -Comment[fa]=Lm_نمایشگر وضعیت حسگرهای -Comment[fi]=Lm_sensors tilavalvonta -Comment[fr]=Indicateur d'état lm_sensors -Comment[ga]=Monatóir Stádais Lm_sensors -Comment[he]=צג מצב Lm_sensors -Comment[hi]=एलएम_सेंसर्स स्थिति मॉनीटर -Comment[hu]=Lm_sensors hardvermonitor -Comment[is]=Eftirlit með stöðu Lm_sensors -Comment[it]=Controllo di stato Lm_sensors -Comment[ja]=Lm センサーの状態モニタ -Comment[ka]=Lm_sensors სტატუსის მონიტორი -Comment[kk]=Lm_sensor сенсорларының күйін бақылау -Comment[km]=កម្មវិធីត្រួតពិនិត្យស្ថានភាព Lm_sensors -Comment[lt]=Lm_sensors būsenos stebėtojas -Comment[mk]=Монитор за статусот на Lm_sensors -Comment[ms]=Pemerhati Status Lm_sensors -Comment[nb]=Statusovervåkning av Lm_sensorer -Comment[nds]=LM_Sensors-Statuskieker -Comment[ne]=Lm_sensors स्थिति मोनिटर -Comment[nl]=Lm_sensors statusmonitor -Comment[nn]=Lm_sensors-statusovervaking -Comment[pa]=Lm_sensors ਹਾਲਤ ਨਿਗਰਾਨ -Comment[pl]=Stan Lm_sensors -Comment[pt]=Monitor de Estado do Lm_sensors -Comment[pt_BR]=Monitor de estado dos sensores do sistema -Comment[ro]=Monitor stare lm_sensors -Comment[ru]=Монитор состояния датчиков lm_sensors -Comment[sk]=Monitor stavu lm_sensors -Comment[sl]=Nadzornik stanja Lm_senzorji -Comment[sr]=Надгледање статуса lm-сензора -Comment[sr@Latn]=Nadgledanje statusa lm-senzora -Comment[sv]=Lm_sensors statusövervakare -Comment[ta]=Lm_உணர்கருவி நிலை கண்காணி -Comment[tg]=Дидабони Ҳолати Lm_sensors -Comment[th]=Lm_sensors - เครื่องมือสอดส่องสถานะ -Comment[tr]=Lm_sensors Durum İzleyici -Comment[uk]=Монітор стану Lm_sensors -Comment[zh_CN]=Lm_sensors 状态监视器 -Comment[zh_TW]=Lm_sensors 狀態監視器 -Comment[zu]=Umlawuli Wezinga we-Lm_sensors Icon=memory Name=Lm_sensors -Name[cs]=Lm_sensory -Name[da]=Lm_følere -Name[de]=LM-Sensoren -Name[eo]=Lm-sentiloj -Name[es]=Sensores Lm -Name[eu]=Lm_sentsoreak -Name[fa]=Lm_حسگرهای -Name[he]=חיישנים -Name[hi]=एलएम_सेंसर्स -Name[ja]=Lm センサー -Name[kk]=Lm_sensor сенсорлары -Name[ko]=Lm 센서 -Name[lv]=Lm_sensori -Name[nb]=Lm_sensorer -Name[nds]=LM-Sensoren -Name[ro]=Senzori LM -Name[ru]=Датчики lm_sensors -Name[sl]=Lm_senzorji -Name[sr]=Lm-сензори -Name[sr@Latn]=Lm-senzori -Name[ta]= Lm_சென்சார்ஸ் X-KSIM-VERSION=0.1 X-KSIM-LIBRARY=sensors X-KSIM-PREFS=Sensors diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index 9514bc5..e920df9 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -77,8 +77,8 @@ SensorsView::SensorsView(KSim::PluginObject *parent, const char *name) config()->setGroup("Sensors"); (new TQVBoxLayout(this))->setAutoAdd(true); - connect(SensorBase::self(), TQT_SIGNAL(updateSensors(const SensorList &)), - this, TQT_SLOT(updateSensors(const SensorList &))); + connect(SensorBase::self(), TQ_SIGNAL(updateSensors(const SensorList &)), + this, TQ_SLOT(updateSensors(const SensorList &))); insertSensors(); } diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h index 9c1e801..f53082d 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.h +++ b/ksim/monitors/lm_sensors/ksimsensors.h @@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject class SensorsView : public KSim::PluginView, public KSimSensorsIface { - Q_OBJECT + TQ_OBJECT public: SensorsView(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index c81ad56..0584870 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -76,7 +76,7 @@ SensorBase::SensorBase() : TQObject() } m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(update())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(update())); } SensorBase::~SensorBase() diff --git a/ksim/monitors/lm_sensors/sensorbase.h b/ksim/monitors/lm_sensors/sensorbase.h index 948a09b..8882920 100644 --- a/ksim/monitors/lm_sensors/sensorbase.h +++ b/ksim/monitors/lm_sensors/sensorbase.h @@ -90,7 +90,7 @@ class SensorList : public TQValueList<SensorInfo> class SensorBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: static SensorBase *self(); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 1a1f4a1..e8afb88 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -67,18 +67,18 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) m_sensorView->setColumnWidth(1, 60); m_sensorView->setColumnWidth(2, 80); m_sensorView->setAllColumnsShowFocus(true); - connect(m_sensorView, TQT_SIGNAL(contextMenu(TDEListView *, - TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(TDEListView *, + connect(m_sensorView, TQ_SIGNAL(contextMenu(TDEListView *, + TQListViewItem *, const TQPoint &)), this, TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_sensorView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); m_layout->addMultiCellWidget(m_sensorView, 1, 1, 0, 3); m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); m_layout->addMultiCellWidget( m_modify, 2, 2, 3, 3 ); m_fahrenBox = new TQCheckBox(i18n("Display Fahrenheit"), this); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.h b/ksim/monitors/lm_sensors/sensorsconfig.h index dff799e..7922433 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.h +++ b/ksim/monitors/lm_sensors/sensorsconfig.h @@ -35,7 +35,7 @@ class TQTimer; class SensorsConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: SensorsConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/mail/CMakeLists.txt b/ksim/monitors/mail/CMakeLists.txt index 0e207ee..bfc9264 100644 --- a/ksim/monitors/mail/CMakeLists.txt +++ b/ksim/monitors/mail/CMakeLists.txt @@ -33,7 +33,8 @@ tde_add_kpart( ksim_mail AUTOMOC ##### other data ################################ -install( FILES mail.desktop +tde_create_translated_desktop( + SOURCE mail.desktop DESTINATION ${DATA_INSTALL_DIR}/ksim/monitors + PO_DIR ksim-desktops ) - diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index 942397b..fdfc977 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -93,7 +93,7 @@ MailLabel::MailLabel( TQWidget* parent ) // label->setPixmap( KSim::ThemeLoader::self().current().krellMail() ); configureObject( false ); TQTimer* timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( animation() ) ); + connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( animation() ) ); timer->start( 100 ); } @@ -156,5 +156,3 @@ void MailConfig::saveConfig() void MailConfig::readConfig() { } - -// vim: ts=4 sw=4 noet diff --git a/ksim/monitors/mail/ksimmail.h b/ksim/monitors/mail/ksimmail.h index 8f9dc9c..1d1ff80 100644 --- a/ksim/monitors/mail/ksimmail.h +++ b/ksim/monitors/mail/ksimmail.h @@ -38,7 +38,7 @@ public: class MailView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: MailView( KSim::PluginObject* parent, const char* name ); @@ -52,7 +52,7 @@ private slots: class MailLabel : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: MailLabel( TQWidget* parent ); @@ -78,7 +78,7 @@ private: class MailConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: MailConfig( KSim::PluginObject* parent, const char* name ); @@ -89,5 +89,3 @@ public: }; #endif - -// vim: ts=4 sw=4 noet diff --git a/ksim/monitors/mail/mail.desktop b/ksim/monitors/mail/mail.desktop index f65ed27..c93285c 100644 --- a/ksim/monitors/mail/mail.desktop +++ b/ksim/monitors/mail/mail.desktop @@ -1,119 +1,5 @@ [Desktop Entry] Comment=Mail Monitor Plugin -Comment[af]=Pos Monitor Inplak -Comment[ar]=ملحق مراقبة البريد -Comment[bg]=Мониторинг на електронната поща -Comment[bs]=Dodatak za praćenje pošte -Comment[ca]=Monitor de correu -Comment[cs]=Modul pro monitorování pošty -Comment[cy]=Atodyn Monitro Post -Comment[da]=Postovervågnings-plugin -Comment[de]=Hilfsprogramm zur Mailüberwachung -Comment[el]=Πρόσθετο εποπτείας αλληλογραφίας -Comment[eo]=Disk-observa kromaĵo -Comment[es]=Extensión de monitorización de correo -Comment[et]=E-posti monitooring -Comment[eu]=Postaren Plugin Begiralea -Comment[fa]=وصلۀ نمایشگر نامه -Comment[fi]=Sähköpostin monitorointisovelma -Comment[fr]=Module de surveillance de boîtes aux lettres -Comment[ga]=Breiseán Monatóireachta Ríomhphoist -Comment[he]=תוסף צג דואר -Comment[hi]=डाक मॉनीटर प्लगइन -Comment[hu]=E-mail-figyelő bővítőmodul -Comment[is]=Pósteftirlitsforrit -Comment[it]=Plugin di controllo posta -Comment[ja]=メールモニタプラグイン -Comment[ka]= ფოსტის მონიტორის მოდული -Comment[kk]=Поштаны бақылау модулі -Comment[km]=កម្មវិធីជំនួយរបស់កម្មវិធីត្រួតពិនិត្យសំបុត្រ -Comment[lt]=Pašto stebėtojo priedas -Comment[mk]=Приклучок за следење на е-поштата -Comment[ms]=Plug masuk Pemerhati Mel -Comment[nb]=Programtillegg for E-postovervåking -Comment[nds]=Nettpost-Kiekmoduul -Comment[ne]=मेल मोनिटर प्लगइन -Comment[nl]=Mail monitor-plugin -Comment[nn]=Programtillegg for e-postovervaking -Comment[pa]=ਪੱਤਰ ਨਿਗਰਾਨ ਪਲੱਗਿੰਨ -Comment[pl]=Stan skrzynki pocztowej -Comment[pt]='Plugin' de Monitorização do Correio -Comment[pt_BR]=Plug-in de monitoramento de e-mail -Comment[ro]=Modul monitorizare e-mail -Comment[ru]=Монитор почты -Comment[sk]=Modul pre monitorovanie pošty -Comment[sl]=Vstavek za opazovanje pošte -Comment[sr]=Прикључак за надгледање поште -Comment[sr@Latn]=Priključak za nadgledanje pošte -Comment[sv]=Insticksprogram för e-postövervakning -Comment[ta]= அஞ்சல் கண்காணி சொருகுப்பொருள் -Comment[tg]=Модули Дидабони Пост -Comment[th]=ปลั๊กอินตรวจสอบจดหมาย -Comment[tr]=Posta İzleyici Eklentisi -Comment[uk]=Втулок датчика пошти -Comment[uz]=Xat-xabarni nazorat qilish plagini -Comment[uz@cyrillic]=Хат-хабарни назорат қилиш плагини -Comment[wa]=Tchôke-divins di corwaitaedje di l' emilaedje -Comment[xh]=Iplagi efakiweyo Monitor Yeposi -Comment[zh_CN]=邮件监视器插件 -Comment[zh_TW]=電子郵件監視器外掛程式 -Comment[zu]=I-plugin Yomlawuli Weposi Icon=kmail Name=Mail -Name[af]=Pos -Name[ar]=البريد -Name[bg]=Поща -Name[br]=Lizher -Name[ca]=Correu -Name[cs]=Pošta -Name[cy]=Post -Name[da]=Post -Name[el]=Αλληλογραφία -Name[eo]=Retpoŝto -Name[es]=Correo -Name[et]=Kirjad -Name[eu]=Posta -Name[fa]=نامه -Name[fi]=Sähköposti -Name[fr]=Courrier -Name[ga]=Ríomhphost -Name[he]=דואר -Name[hi]=डाक -Name[hr]=Pošta -Name[is]=Póstur -Name[it]=Posta -Name[ja]=メール -Name[ka]=ფოსტა -Name[kk]=Пошта -Name[km]=សំបុត្រ -Name[lt]=Paštas -Name[lv]=Pasts -Name[mk]=Е-пошта -Name[mt]=Imejl -Name[nb]=E-Post -Name[nds]=Nettpost -Name[ne]=मेल -Name[nn]=E-post -Name[pa]=ਪੱਤਰ -Name[pl]=Poczta -Name[pt]=E-mail -Name[pt_BR]=E-mail -Name[ru]=Почта -Name[sk]=Pošta -Name[sl]=Pošta -Name[sr]=Пошта -Name[sr@Latn]=Pošta -Name[sv]=E-post -Name[ta]= அஞ்சல் -Name[tg]=Пост -Name[th]=จดหมาย -Name[tr]=E-posta -Name[uk]=Пошта -Name[uz]=Xat-xabar -Name[uz@cyrillic]=Хат-хабар -Name[wa]=Emilaedje -Name[xh]=Iposi -Name[zh_CN]=邮件 -Name[zh_TW]=電子郵件 -Name[zu]=Iposi X-KSIM-LIBRARY=mail diff --git a/ksim/monitors/net/CMakeLists.txt b/ksim/monitors/net/CMakeLists.txt index a0d6f4b..807121a 100644 --- a/ksim/monitors/net/CMakeLists.txt +++ b/ksim/monitors/net/CMakeLists.txt @@ -35,7 +35,8 @@ tde_add_kpart( ksim_net AUTOMOC ##### other data ################################ -install( FILES Net.desktop +tde_create_translated_desktop( + SOURCE Net.desktop DESTINATION ${DATA_INSTALL_DIR}/ksim/monitors + PO_DIR ksim-desktops ) - diff --git a/ksim/monitors/net/Net.desktop b/ksim/monitors/net/Net.desktop index 2fa6b87..ab95941 100644 --- a/ksim/monitors/net/Net.desktop +++ b/ksim/monitors/net/Net.desktop @@ -1,109 +1,7 @@ [Desktop Entry] Comment=Net Status Monitor -Comment[ar]=مراقب حالة الشبكة -Comment[bg]=Мониторинг на мрежата -Comment[bs]=Nadzor statusa mreže -Comment[ca]=Monitor de l'estat de xarxa -Comment[cs]=Monitor stavu sítě -Comment[cy]=Monitr Statws Rhwyd -Comment[da]=Overvågning af netstatus -Comment[de]=Statusanzeige fürs Netzwerk -Comment[el]=Επόπτης κατάστασης δικτύου -Comment[eo]=Rigardilo por la retstato -Comment[es]=Monitor de estado de la red -Comment[et]=Võrgu oleku monitooring -Comment[eu]=Sarearen Egoera Begiralea -Comment[fa]=Net نمایشگر وضعیت -Comment[fi]=Verkon tilavalvonta -Comment[fr]=Indicateur d'état réseau -Comment[ga]=Monatóir Stádais an Ghréasáin -Comment[he]=צג מצב רשת -Comment[hi]=नेट स्थिति मॉनीटर -Comment[hu]=Hálózati állapotfigyelő -Comment[is]=Eftirlit með stöðu netsins -Comment[it]=Controllo dello stato della rete -Comment[ja]=ネットワーク状態モニタ -Comment[ka]=ქსელის სტატუსის სტატუსი -Comment[kk]=Желінің күйін бақылау -Comment[km]=កម្មវិធីត្រួតពិនិត្យស្ថានភាពបណ្តាញ -Comment[lt]=Net būsenos stebėtojas -Comment[mk]=Монитор за статусот на мрежата -Comment[ms]=Pemerhati Status Net -Comment[nb]=Overvåkning av nettstatus -Comment[nds]=Statuskieker för't Nettwark -Comment[ne]=सञ्जाल स्थिति मोनिटर -Comment[nl]=Netstatus-monitor -Comment[nn]=Overvaking av nettstatus -Comment[pa]=ਨੈੱਟ ਹਾਲਤ ਨਿਗਰਾਨ -Comment[pl]=Ruch w sieci -Comment[pt]=Monitor de Estado da Rede -Comment[pt_BR]=Monitor de estado da rede -Comment[ro]=Monitor stare reţea -Comment[ru]=Монитор сети -Comment[sk]=Monitor stavu siete -Comment[sl]=Nadzornik stanja mreže -Comment[sr]=Надгледање статуса мреже -Comment[sr@Latn]=Nadgledanje statusa mreže -Comment[sv]=Övervakar nätverkets status -Comment[ta]=வலை நிலை கண்காணி -Comment[tg]=Дидабони Ҳолати Шабака -Comment[th]=เครื่องมือสอดส่องสถานะของเน็ต -Comment[tr]=Ağ İçin Durum İzleyici -Comment[uk]=Монітор стану мережі -Comment[uz]=Tarmoqni nazorat qilish plagini -Comment[uz@cyrillic]=Тармоқни назорат қилиш плагини -Comment[wa]=Corwaitoe di l' estat del rantoele -Comment[zh_CN]=网络状态监视器 -Comment[zh_TW]=網路狀態監視器 -Comment[zu]=Umlawuli Wezinga Lenethi Icon=network Name=Net -Name[ar]=الشبكة -Name[bg]=Мрежа -Name[br]=Rouedad -Name[ca]=Xarxa -Name[cs]=Síť -Name[cy]=Rhwyd -Name[el]=Δίκτυο -Name[eo]=Reto -Name[es]=Red -Name[ga]=Gréasán -Name[he]=רשת -Name[hi]=नेट -Name[is]=Netið -Name[it]=Rete -Name[ja]=ネット -Name[kk]=Желі -Name[km]=បណ្តាញ -Name[lv]=Tīkls -Name[mk]=Мрежа -Name[nb]=Nett -Name[nds]=Nett -Name[ne]=सञ्जाल -Name[nn]=Nett -Name[pa]=ਨੈੱਟ -Name[pl]=Sieć -Name[pt]=Rede -Name[pt_BR]=Rede -Name[ro]=Reţea -Name[ru]=Сеть -Name[sk]=Sieť -Name[sl]=Mreža -Name[sr]=Мрежа -Name[sr@Latn]=Mreža -Name[sv]=Nätverk -Name[ta]= வலை -Name[tg]=Шабака -Name[th]=เน็ต -Name[tr]=ağ -Name[uk]=Мережа -Name[uz]=Tarmoq -Name[uz@cyrillic]=Тармоқ -Name[wa]=Rantoele -Name[xh]=Umnatha -Name[zh_CN]=网络 -Name[zh_TW]=網路 -Name[zu]=Inethi X-KSIM-VERSION=0.1 X-KSIM-LIBRARY=net X-KSIM-COPYRIGHT=(C) 2001 Robbie Ward diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index 065797d..2167abe 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -119,11 +119,11 @@ NetView::NetView(KSim::PluginObject *parent, const char *name) addDisplay(); m_netTimer = new TQTimer(this); - connect(m_netTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph())); + connect(m_netTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateGraph())); m_netTimer->start(NET_UPDATE); m_lightTimer = new TQTimer(this); - connect(m_lightTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateLights())); + connect(m_lightTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateLights())); m_lightTimer->start(LED_UPDATE); updateGraph(); @@ -444,10 +444,10 @@ TQPopupMenu *NetView::addPopupMenu(const TQString &device, int value) { TQPopupMenu *popup = new TQPopupMenu(this); popup->insertItem(SmallIcon("network"), i18n("Connect"), this, - TQT_SLOT(runConnectCommand(int)), 0, 1); + TQ_SLOT(runConnectCommand(int)), 0, 1); popup->setItemParameter(1, value); popup->insertItem(SmallIcon("network"), i18n("Disconnect"), this, - TQT_SLOT(runDisconnectCommand(int)), 0, 2); + TQ_SLOT(runDisconnectCommand(int)), 0, 2); popup->setItemParameter(2, value); menu()->insertItem(device, popup, 100 + value); return popup; @@ -632,7 +632,7 @@ bool NetView::eventFilter( TQObject * o, TQEvent * e ) Network::List::Iterator it; for ( it = m_networkList.begin(); it != m_networkList.end(); ++it ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).chart()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).label()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).led()) ) + if ( o == ( *it ).chart() || o == ( *it ).label() || o == ( *it ).led() ) { break; } @@ -642,7 +642,7 @@ bool NetView::eventFilter( TQObject * o, TQEvent * e ) if ( e->type() == TQEvent::MouseButtonPress ) { - if ( TQT_TQMOUSEEVENT( e )->button() == Qt::RightButton ) + if ( static_cast<TQMouseEvent*>( e )->button() == TQt::RightButton ) { showMenu(i); } diff --git a/ksim/monitors/net/ksimnet.h b/ksim/monitors/net/ksimnet.h index 5da4165..c699112 100644 --- a/ksim/monitors/net/ksimnet.h +++ b/ksim/monitors/net/ksimnet.h @@ -42,7 +42,7 @@ class NetPlugin : public KSim::PluginObject class NetView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: NetView(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index eb2c1a3..2cfc1af 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -49,11 +49,11 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) usingBox ->addColumn(i18n("Commands")); usingBox->setAllColumnsShowFocus(true); - connect(usingBox, TQT_SIGNAL(contextMenu(TDEListView *, + connect(usingBox, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - TQT_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect(usingBox, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_SLOT(modifyItem(TQListViewItem *))); + TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(usingBox, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + TQ_SLOT(modifyItem(TQListViewItem *))); mainLayout->addWidget(usingBox); layout = new TQHBoxLayout; @@ -65,17 +65,17 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) insertButton = new TQPushButton(this); insertButton->setText(i18n("Add...")); - connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog())); + connect(insertButton, TQ_SIGNAL(clicked()), TQ_SLOT(showNetDialog())); layout->addWidget(insertButton); modifyButton = new TQPushButton(this); modifyButton->setText(i18n("Modify...")); - connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent())); + connect(modifyButton, TQ_SIGNAL(clicked()), TQ_SLOT(modifyCurrent())); layout->addWidget(modifyButton); removeButton = new TQPushButton(this); removeButton->setText(i18n("Remove")); - connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent())); + connect(removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeCurrent())); layout->addWidget(removeButton); mainLayout->addLayout(layout); diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h index 2a62158..6e43933 100644 --- a/ksim/monitors/net/netconfig.h +++ b/ksim/monitors/net/netconfig.h @@ -32,7 +32,7 @@ class TQListViewItem; class NetConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: NetConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index 21d6236..39ea761 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -85,7 +85,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_timerBox = new TQGroupBox(m_generalTab); m_timerBox->setTitle(i18n("Timer")); - m_timerBox->setColumnLayout(0, Qt::Vertical); + m_timerBox->setColumnLayout(0, TQt::Vertical); m_timerBox->layout()->setSpacing(0); m_timerBox->layout()->setMargin(0); m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout()); @@ -99,8 +99,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_showTimer = new TQCheckBox(m_timerBox); m_showTimer->setText(i18n("Show timer")); - connect(m_showTimer, TQT_SIGNAL(toggled(bool)), - m_timerEdit, TQT_SLOT(setEnabled(bool))); + connect(m_showTimer, TQ_SIGNAL(toggled(bool)), + m_timerEdit, TQ_SLOT(setEnabled(bool))); m_timerBoxLayout->addWidget(m_showTimer); m_timerBoxLayout->addWidget(m_timerEdit); @@ -138,8 +138,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_connectRequester = new KURLRequester(m_commandTab); m_connectRequester->setMinimumSize(145, 0); m_connectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_connectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_connectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_connectRequester, 1, 1, 1, 2); m_dCommand = new TQLabel(m_commandTab); @@ -149,8 +149,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_disconnectRequester = new KURLRequester(m_commandTab); m_disconnectRequester->setMinimumSize(145, 0); m_disconnectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_disconnectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_disconnectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_disconnectRequester, 2, 2, 1, 2); TQSpacerItem *commandSpacer = new TQSpacerItem(20, 20, @@ -160,7 +160,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect(this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(sendClicked())); + connect(this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(sendClicked())); } NetDialog::~NetDialog() diff --git a/ksim/monitors/net/netdialog.h b/ksim/monitors/net/netdialog.h index 1c6cd85..f75692a 100644 --- a/ksim/monitors/net/netdialog.h +++ b/ksim/monitors/net/netdialog.h @@ -34,7 +34,7 @@ class KURLRequester; class NetDialog : public TQTabDialog { - Q_OBJECT + TQ_OBJECT public: NetDialog(TQWidget *parent, const char *name = 0); diff --git a/ksim/monitors/snmp/CMakeLists.txt b/ksim/monitors/snmp/CMakeLists.txt index b86b909..82acc95 100644 --- a/ksim/monitors/snmp/CMakeLists.txt +++ b/ksim/monitors/snmp/CMakeLists.txt @@ -45,7 +45,8 @@ tde_add_kpart( ksim_snmp AUTOMOC ##### other data ################################ -install( FILES Snmp.desktop +tde_create_translated_desktop( + SOURCE Snmp.desktop DESTINATION ${DATA_INSTALL_DIR}/ksim/monitors + PO_DIR ksim-desktops ) - diff --git a/ksim/monitors/snmp/Snmp.desktop b/ksim/monitors/snmp/Snmp.desktop index b6ceb4c..c0972ab 100644 --- a/ksim/monitors/snmp/Snmp.desktop +++ b/ksim/monitors/snmp/Snmp.desktop @@ -1,67 +1,7 @@ [Desktop Entry] Comment=Snmp Status Monitor -Comment[ar]=مراقب حالة Snmp -Comment[bg]=Мониторинг на Snmp -Comment[bs]=Nadzor SNMP statusa -Comment[ca]=Monitor d'estat snmp -Comment[cs]=Monitor stavu SNMP -Comment[cy]=Monitr Cyflwr Snmp -Comment[da]=Snmp statusovervågning -Comment[de]=Statusanzeige für SNMP -Comment[el]=Επόπτης κατάστασης snmp -Comment[eo]=Monitoro por la Snmp-stato -Comment[es]=Monitor de estado de Snmp -Comment[et]=Snmp oleku monitooring -Comment[eu]=Snmp Egoera Begiralea -Comment[fa]=نمایشگر وضعیت Snmp -Comment[fi]=SNPP-tilavalvoja -Comment[fr]=Indicateur d'état snmp -Comment[ga]=Monatóir Stádais SNMP -Comment[hi]=एसएनएमपी स्थिति मॉनीटर -Comment[hu]=Snmp állapotmonitor -Comment[is]=Snmp eftirlitstól -Comment[it]=Controllo di stato SNMP -Comment[ja]=Snmp ステータスモニタ -Comment[ka]=Snmp სტატუსის მონიტორი -Comment[kk]=SNMP күйін бақылау -Comment[km]=កម្មវិធីត្រួតពិនិត្យស្ថានភាព Snmp -Comment[lt]=Snmp būsenos stebėtojas -Comment[mk]=Монитор за статусот на Snmp -Comment[nb]=Overvåkning av status via SNMP -Comment[nds]=SNMP-Statuskieker -Comment[ne]=Snmp स्थिति मोनिटर -Comment[nl]=Snmp Statusbewaking -Comment[nn]=Overvaking av status via SNMP -Comment[pa]=Snmp ਹਾਲਤ ਨਿਗਰਾਨ -Comment[pl]=Monitor statusu Snmp -Comment[pt]=Monitor de Estado do SNMP -Comment[pt_BR]=Monitor de estado do SNMP -Comment[ro]=Monitor stare SNMP -Comment[ru]=Монитор состояния SNMP -Comment[sk]=Monitor stavu SNMP -Comment[sl]=Nadzornik stanja Snmp -Comment[sr]=Надгледање статуса Snmp-а -Comment[sr@Latn]=Nadgledanje statusa Snmp-a -Comment[sv]=Övervakar SNMP-status -Comment[ta]=Snmp நிலை கண்காணி -Comment[tg]=Дидабони Ҳолати Snmp -Comment[tr]=Snmp Durum Monitörü -Comment[uk]=Монітор стану мережі (snmp протокол) -Comment[wa]=Corwaitoe di l' estat snmp -Comment[zh_CN]=Snmp 状态监视器 -Comment[zh_TW]=Snmp 狀態監視器 Icon=network Name=Snmp -Name[cs]=SNMP -Name[de]=SNMP -Name[ga]=SNMP -Name[hi]=एसएनएमपी -Name[it]=SNMP -Name[kk]=SNMP -Name[nds]=SNMP -Name[ro]=SNMP -Name[sk]=SNMP -Name[sv]=SNMP X-KSIM-VERSION=0.1 X-KSIM-LIBRARY=snmp X-KSIM-COPYRIGHT=(C) 2003 Simon Hausmann diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp index 8627c59..3aeb2b1 100644 --- a/ksim/monitors/snmp/browsedialog.cpp +++ b/ksim/monitors/snmp/browsedialog.cpp @@ -95,11 +95,11 @@ void BrowseDialog::startWalk( const Identifier &startOid ) { stopWalker(); - m_walker = new Walker( m_host, startOid, TQT_TQOBJECT(this) ); - connect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - connect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + m_walker = new Walker( m_host, startOid, this ); + connect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + connect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); stop->setEnabled( true ); } @@ -109,10 +109,10 @@ void BrowseDialog::stopWalker() if ( !m_walker ) return; - disconnect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - disconnect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + disconnect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + disconnect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); m_walker->deleteLater(); m_walker = 0; @@ -143,5 +143,3 @@ void BrowseDialog::applyFilter( TQListViewItem *item ) } #include "browsedialog.moc" -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/browsedialog.h b/ksim/monitors/snmp/browsedialog.h index 1bd641f..910a3e0 100644 --- a/ksim/monitors/snmp/browsedialog.h +++ b/ksim/monitors/snmp/browsedialog.h @@ -38,7 +38,7 @@ namespace Snmp class BrowseDialog : public BrowseDialogBase { - Q_OBJECT + TQ_OBJECT public: BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *parent, const char *name = 0 ); @@ -68,5 +68,3 @@ private: } #endif // BROWSEDIALOG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui index 103537a..94255e7 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -251,11 +251,11 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">stopAllWalks()</slot> <slot access="protected">applyFilter()</slot> <slot access="protected">objectSelected(TQListViewItem *)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/chartmonitor.cpp b/ksim/monitors/snmp/chartmonitor.cpp index 5b8438f..a13be36 100644 --- a/ksim/monitors/snmp/chartmonitor.cpp +++ b/ksim/monitors/snmp/chartmonitor.cpp @@ -78,6 +78,3 @@ TQ_UINT64 ChartMonitor::convertToInt( const Value &data ) } #include "chartmonitor.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/chartmonitor.h b/ksim/monitors/snmp/chartmonitor.h index 803f97e..c128de3 100644 --- a/ksim/monitors/snmp/chartmonitor.h +++ b/ksim/monitors/snmp/chartmonitor.h @@ -30,7 +30,7 @@ namespace Snmp class ChartMonitor : public KSim::Chart { - Q_OBJECT + TQ_OBJECT public: ChartMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); @@ -51,5 +51,3 @@ private: } #endif // CHARTMONITOR_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index d1f24a5..4ecd44e 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -50,24 +50,24 @@ ConfigPage::ConfigPage( Plugin *parent, const char *name ) m_page = new ConfigWidget( this ); - connect( m_page->addHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewHost() ) ); - connect( m_page->modifyHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyHost() ) ); - connect( m_page->removeHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeHost() ) ); - - connect( m_page->addMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewMonitor() ) ); - connect( m_page->modifyMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyMonitor() ) ); - connect( m_page->removeMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeMonitor() ) ); - - connect( m_page->hosts, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); - connect( m_page->monitors, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->addHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewHost() ) ); + connect( m_page->modifyHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyHost() ) ); + connect( m_page->removeHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeHost() ) ); + + connect( m_page->addMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewMonitor() ) ); + connect( m_page->modifyMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyMonitor() ) ); + connect( m_page->removeMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeMonitor() ) ); + + connect( m_page->hosts, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->monitors, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); } ConfigPage::~ConfigPage() @@ -309,5 +309,3 @@ TQStringList ConfigPage::monitorsForHost( const HostConfig &host ) const } #include "configpage.moc" -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h index b0d1331..03246f9 100644 --- a/ksim/monitors/snmp/configpage.h +++ b/ksim/monitors/snmp/configpage.h @@ -78,7 +78,7 @@ class Plugin; class ConfigPage : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: ConfigPage( Plugin *parent, const char *name ); @@ -117,5 +117,3 @@ private: } #endif // CONFIGPAGE_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/hostconfig.cpp b/ksim/monitors/snmp/hostconfig.cpp index 844bee5..51f6b01 100644 --- a/ksim/monitors/snmp/hostconfig.cpp +++ b/ksim/monitors/snmp/hostconfig.cpp @@ -147,6 +147,3 @@ TQStringList HostConfigMap::save( TDEConfigBase &config ) const return hostList; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/hostconfig.h b/ksim/monitors/snmp/hostconfig.h index 3726eb5..bf704cd 100644 --- a/ksim/monitors/snmp/hostconfig.h +++ b/ksim/monitors/snmp/hostconfig.h @@ -82,5 +82,3 @@ struct HostConfigMap : public TQMap< TQString, HostConfig > } #endif // HOSTCONFIG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp index 0712e54..0f32df9 100644 --- a/ksim/monitors/snmp/hostdialog.cpp +++ b/ksim/monitors/snmp/hostdialog.cpp @@ -188,6 +188,3 @@ void HostDialog::loadSettingsFromHostConfig( const HostConfig &src ) } #include "hostdialog.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/hostdialog.h b/ksim/monitors/snmp/hostdialog.h index 5a856e8..3b5cb6c 100644 --- a/ksim/monitors/snmp/hostdialog.h +++ b/ksim/monitors/snmp/hostdialog.h @@ -32,7 +32,7 @@ namespace Snmp class HostDialog : public HostDialogBase { - Q_OBJECT + TQ_OBJECT public: HostDialog( TQWidget *parent, const char *name = 0 ); @@ -56,5 +56,3 @@ private: } #endif // HOSTDIALOG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui index d02104d..650e262 100644 --- a/ksim/monitors/snmp/hostdialogbase.ui +++ b/ksim/monitors/snmp/hostdialogbase.ui @@ -508,12 +508,12 @@ <tabstop>buttonCancel</tabstop> <tabstop>communityString</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private">showSnmpAuthenticationDetailsForVersion(const TQString &)</slot> <slot>enableDisabledAuthenticationAndPrivacyElementsForSecurityLevel(const TQString &)</slot> <slot>checkValidity()</slot> <slot access="protected">testHost()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/identifier.cpp b/ksim/monitors/snmp/identifier.cpp index 355f019..b867757 100644 --- a/ksim/monitors/snmp/identifier.cpp +++ b/ksim/monitors/snmp/identifier.cpp @@ -124,6 +124,3 @@ bool Identifier::isNull() const { return d->length == 0; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/identifier.h b/ksim/monitors/snmp/identifier.h index e14e58a..8415d31 100644 --- a/ksim/monitors/snmp/identifier.h +++ b/ksim/monitors/snmp/identifier.h @@ -68,5 +68,3 @@ typedef TQMap<Identifier, Value> ValueMap; } #endif // IDENTIFIER_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/labelmonitor.cpp b/ksim/monitors/snmp/labelmonitor.cpp index 2245a09..7738401 100644 --- a/ksim/monitors/snmp/labelmonitor.cpp +++ b/ksim/monitors/snmp/labelmonitor.cpp @@ -40,6 +40,3 @@ void LabelMonitor::setData( const Value &data ) } #include "labelmonitor.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/labelmonitor.h b/ksim/monitors/snmp/labelmonitor.h index ef7f91b..73a54d5 100644 --- a/ksim/monitors/snmp/labelmonitor.h +++ b/ksim/monitors/snmp/labelmonitor.h @@ -32,7 +32,7 @@ namespace Snmp class LabelMonitor : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: LabelMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); @@ -49,5 +49,3 @@ private: } #endif // LABELMONITOR_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp index 052d2c0..1294c10 100644 --- a/ksim/monitors/snmp/monitor.cpp +++ b/ksim/monitors/snmp/monitor.cpp @@ -32,7 +32,7 @@ Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQ else m_timerId = -1; - TQTimer::singleShot( 0, this, TQT_SLOT( performSnmpRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( performSnmpRequest() ) ); } Monitor::~Monitor() @@ -91,6 +91,3 @@ bool Monitor::performSyncSnmpRequest( Value &data, ErrorInfo *errorInfo ) } #include "monitor.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitor.h b/ksim/monitors/snmp/monitor.h index f2eb1b9..e56f81c 100644 --- a/ksim/monitors/snmp/monitor.h +++ b/ksim/monitors/snmp/monitor.h @@ -33,7 +33,7 @@ namespace Snmp class Monitor : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent = 0, const char *name = 0 ); @@ -74,5 +74,3 @@ private: } #endif // MONITOR_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index d2dee45..4e42bda 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -107,9 +107,9 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name else w = new ChartMonitor( *this, parent, name ); - Monitor *monitor = new Monitor( host, id, refresh, TQT_TQOBJECT(w) ); - TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ), - w, TQT_SLOT( setData( const Value & ) ) ); + Monitor *monitor = new Monitor( host, id, refresh, w ); + TQObject::connect( monitor, TQ_SIGNAL( newData( const Value & ) ), + w, TQ_SLOT( setData( const Value & ) ) ); return w; } @@ -178,6 +178,3 @@ TQStringList MonitorConfigMap::save( TDEConfigBase &config ) const return names; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitorconfig.h b/ksim/monitors/snmp/monitorconfig.h index 5ad6a32..5ff6c35 100644 --- a/ksim/monitors/snmp/monitorconfig.h +++ b/ksim/monitors/snmp/monitorconfig.h @@ -80,5 +80,3 @@ TQStringList allDisplayTypes(); } #endif // MONITORCONFIG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitordialog.cpp b/ksim/monitors/snmp/monitordialog.cpp index bed4798..e9b3234 100644 --- a/ksim/monitors/snmp/monitordialog.cpp +++ b/ksim/monitors/snmp/monitordialog.cpp @@ -174,5 +174,3 @@ HostConfig MonitorDialog::currentHost() const } #include "monitordialog.moc" -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitordialog.h b/ksim/monitors/snmp/monitordialog.h index 9f962e5..bbb1ecb 100644 --- a/ksim/monitors/snmp/monitordialog.h +++ b/ksim/monitors/snmp/monitordialog.h @@ -31,7 +31,7 @@ namespace Snmp class MonitorDialog : public MonitorDialogBase { - Q_OBJECT + TQ_OBJECT public: MonitorDialog( const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 ); @@ -57,5 +57,3 @@ private: } #endif // MONITORDIALOG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index a6d2e2d..285514f 100644 --- a/ksim/monitors/snmp/monitordialogbase.ui +++ b/ksim/monitors/snmp/monitordialogbase.ui @@ -428,10 +428,10 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">checkValues()</slot> <slot access="protected">browse()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/pdu.cpp b/ksim/monitors/snmp/pdu.cpp index 1619086..9ad1110 100644 --- a/ksim/monitors/snmp/pdu.cpp +++ b/ksim/monitors/snmp/pdu.cpp @@ -48,7 +48,7 @@ PDU::~PDU() void PDU::addNullVariables( const IdentifierList &oids ) { std::for_each( oids.begin(), oids.end(), - std::bind1st( std::mem_fun( &PDU::addNullVariable ), this ) ); + std::bind( std::mem_fn( &PDU::addNullVariable ), this, std::placeholders::_1 ) ); } void PDU::addNullVariable( Identifier oid ) @@ -93,6 +93,3 @@ ValueMap PDU::variables() const return result; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/pdu.h b/ksim/monitors/snmp/pdu.h index 2e648d4..21d8c74 100644 --- a/ksim/monitors/snmp/pdu.h +++ b/ksim/monitors/snmp/pdu.h @@ -56,5 +56,3 @@ private: } #endif // PDU_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/plugin.cpp b/ksim/monitors/snmp/plugin.cpp index 90683a2..f79832d 100644 --- a/ksim/monitors/snmp/plugin.cpp +++ b/ksim/monitors/snmp/plugin.cpp @@ -47,6 +47,3 @@ KSim::PluginPage *Plugin::createConfigPage( const char *name ) void Plugin::showAbout() { } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/plugin.h b/ksim/monitors/snmp/plugin.h index 3e0fb66..9bf741c 100644 --- a/ksim/monitors/snmp/plugin.h +++ b/ksim/monitors/snmp/plugin.h @@ -45,5 +45,3 @@ public: } #endif // KSIM_PLUGIN_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp index 435ec9e..2c9e930 100644 --- a/ksim/monitors/snmp/probedialog.cpp +++ b/ksim/monitors/snmp/probedialog.cpp @@ -77,12 +77,12 @@ void ProbeDialog::probeOne() Identifier oid = m_probeOIDs.pop(); delete m_currentMonitor; - m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, TQT_TQOBJECT(this) ); + m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, this ); - connect( m_currentMonitor, TQT_SIGNAL( newData( const Identifier &, const Value & ) ), - this, TQT_SLOT( probeResult( const Identifier &, const Value & ) ) ); - connect( m_currentMonitor, TQT_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), - this, TQT_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( newData( const Identifier &, const Value & ) ), + this, TQ_SLOT( probeResult( const Identifier &, const Value & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), + this, TQ_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); } void ProbeDialog::probeResult( const Identifier &oid, const Value &value ) @@ -108,10 +108,7 @@ void ProbeDialog::nextProbe() if ( m_canceled ) KProgressDialog::done( TQDialog::Rejected ); else - TQTimer::singleShot( 0, this, TQT_SLOT( probeOne() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( probeOne() ) ); } #include "probedialog.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/probedialog.h b/ksim/monitors/snmp/probedialog.h index 7f8d0ab..b307435 100644 --- a/ksim/monitors/snmp/probedialog.h +++ b/ksim/monitors/snmp/probedialog.h @@ -37,7 +37,7 @@ class Monitor; class ProbeDialog : public KProgressDialog { - Q_OBJECT + TQ_OBJECT public: ProbeDialog( const HostConfig &hostConfig, TQWidget *parent, const char *name = 0 ); @@ -84,5 +84,3 @@ private: } #endif // PROBEDIALOG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp index 7550447..d24577d 100644 --- a/ksim/monitors/snmp/proberesultdialog.cpp +++ b/ksim/monitors/snmp/proberesultdialog.cpp @@ -50,6 +50,3 @@ void ProbeResultDialog::addResultItem( const ProbeDialog::ProbeResult &result ) } #include "proberesultdialog.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/proberesultdialog.h b/ksim/monitors/snmp/proberesultdialog.h index 9d4884c..47a758c 100644 --- a/ksim/monitors/snmp/proberesultdialog.h +++ b/ksim/monitors/snmp/proberesultdialog.h @@ -32,7 +32,7 @@ namespace Snmp class ProbeResultDialog : public ProbeResultDialogBase { - Q_OBJECT + TQ_OBJECT public: ProbeResultDialog( const HostConfig &hostConfig, const ProbeDialog::ProbeResultList &probeResults, @@ -46,5 +46,3 @@ private: } #endif // PROBERESULTDIALOG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp index 6d63fab..b52fe5c 100644 --- a/ksim/monitors/snmp/session.cpp +++ b/ksim/monitors/snmp/session.cpp @@ -186,9 +186,16 @@ bool Session::initialize( ErrorInfo *error ) } switch ( source.privacy.protocol ) { + case AESPrivacy: { + d->defaultSession.securityPrivProto = usmAESPrivProtocol; + d->defaultSession.securityPrivProtoLen = USM_PRIV_PROTO_AES_LEN; + break; + } case DESPrivacy: { +#ifndef NETSNMP_DISABLE_DES d->defaultSession.securityPrivProto = usmDESPrivProtocol; d->defaultSession.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN; +#endif break; } default: assert( false ); @@ -278,6 +285,3 @@ Session::~Session() SnmpLib::self()->snmp_close( d->session ); delete d; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/session.h b/ksim/monitors/snmp/session.h index b34bc68..6af8e1d 100644 --- a/ksim/monitors/snmp/session.h +++ b/ksim/monitors/snmp/session.h @@ -60,5 +60,3 @@ private: } #endif // SESSION_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp index ae04b67..1256228 100644 --- a/ksim/monitors/snmp/snmp.cpp +++ b/ksim/monitors/snmp/snmp.cpp @@ -48,7 +48,8 @@ static const struct EnumStringMapInfo { MD5Auth, "MD5", 0 }, { SHA1Auth, "SHA1", 0 }, { 0, 0, 0 } -}, privacyProtocolStrings[ 2 ] = { +}, privacyProtocolStrings[ 3 ] = { + { AESPrivacy, "AES", 0 }, { DESPrivacy, "DES", 0 }, { 0, 0, 0 } }; @@ -315,6 +316,3 @@ ErrorInfo::ErrorInfo( ErrorType error ) if ( error != NoError && error != ErrUnknown ) m_errorMessage = messageForErrorCode( convertErrorInfoToSnmpLibError( error ) ); } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmp.h b/ksim/monitors/snmp/snmp.h index 213fa22..4b1e4fb 100644 --- a/ksim/monitors/snmp/snmp.h +++ b/ksim/monitors/snmp/snmp.h @@ -46,7 +46,10 @@ TQStringList allAuthenticationProtocols(); TQString authenticationProtocolToString( AuthenticationProtocol proto ); AuthenticationProtocol stringToAuthenticationProtocol( TQString string, bool *ok = 0 ); -enum PrivacyProtocol { DESPrivacy }; +enum PrivacyProtocol { + AESPrivacy, + DESPrivacy +}; TQStringList allPrivacyProtocols(); TQString privacyProtocolToString( PrivacyProtocol proto ); PrivacyProtocol stringToPrivacyProtocol( TQString string, bool *ok = 0 ); @@ -161,5 +164,3 @@ private: } #endif // KSIMSNMP_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmp_p.h b/ksim/monitors/snmp/snmp_p.h index 9d96868..a44fc6e 100644 --- a/ksim/monitors/snmp/snmp_p.h +++ b/ksim/monitors/snmp/snmp_p.h @@ -55,5 +55,3 @@ struct Identifier::Data } #endif // SNMP_P_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmplib.cpp b/ksim/monitors/snmp/snmplib.cpp index b042c7f..ee091bc 100644 --- a/ksim/monitors/snmp/snmplib.cpp +++ b/ksim/monitors/snmp/snmplib.cpp @@ -146,6 +146,3 @@ int SnmpLib::generate_Ku( const oid * hashtype, u_int hashtype_len, { return ::generate_Ku( hashtype, hashtype_len, P, pplen, Ku, kulen ); } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmplib.h b/ksim/monitors/snmp/snmplib.h index 388c918..2498e06 100644 --- a/ksim/monitors/snmp/snmplib.h +++ b/ksim/monitors/snmp/snmplib.h @@ -138,6 +138,3 @@ private: #endif // SNMPLIB_H -/* vim: et sw=4 ts=4 - */ - diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp index bb5b0c4..724082b 100644 --- a/ksim/monitors/snmp/value.cpp +++ b/ksim/monitors/snmp/value.cpp @@ -328,6 +328,3 @@ TQString Value::formatTimeTicks( int ticks, int conversionFlags ) return result; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/value.h b/ksim/monitors/snmp/value.h index d1461d8..921ce5f 100644 --- a/ksim/monitors/snmp/value.h +++ b/ksim/monitors/snmp/value.h @@ -102,5 +102,3 @@ private: } #endif // VALUE_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/value_p.h b/ksim/monitors/snmp/value_p.h index 4ff2d8f..0727174 100644 --- a/ksim/monitors/snmp/value_p.h +++ b/ksim/monitors/snmp/value_p.h @@ -59,5 +59,3 @@ struct ValueImpl } #endif // VALUE_P_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp index d109139..5456aa6 100644 --- a/ksim/monitors/snmp/view.cpp +++ b/ksim/monitors/snmp/view.cpp @@ -75,6 +75,3 @@ void View::reparseConfig() } #include "view.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/view.h b/ksim/monitors/snmp/view.h index d40d44d..6ddae38 100644 --- a/ksim/monitors/snmp/view.h +++ b/ksim/monitors/snmp/view.h @@ -34,7 +34,7 @@ class Plugin; class View : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: View( Plugin *parent, const char *name ); @@ -52,5 +52,3 @@ private: } #endif // VIEW_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/walker.cpp b/ksim/monitors/snmp/walker.cpp index 0aa6c0a..c74097b 100644 --- a/ksim/monitors/snmp/walker.cpp +++ b/ksim/monitors/snmp/walker.cpp @@ -29,7 +29,7 @@ using namespace KSim::Snmp; namespace { template <class T> - struct Deleter : public std::unary_function<T, void> + struct Deleter : public std::function<void(T)> { void operator()( T arg ) { delete arg; } @@ -117,5 +117,3 @@ void Walker::customEvent( TQCustomEvent * ) } #include "walker.moc" -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/walker.h b/ksim/monitors/snmp/walker.h index cda0ad8..64052cf 100644 --- a/ksim/monitors/snmp/walker.h +++ b/ksim/monitors/snmp/walker.h @@ -35,7 +35,7 @@ namespace Snmp class Walker : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: Walker( const HostConfig &host, const Identifier &startOid, TQObject *parent, const char *name = 0 ); @@ -79,5 +79,3 @@ private: } #endif // WALKER_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index 9ab7f60..b39d02c 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -77,11 +77,11 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_urlLabel = new KURLLabel(this); m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder")); m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir); - connect(m_urlLabel, TQT_SIGNAL(leftClickedURL(const TQString &)), - this, TQT_SLOT(openURL(const TQString &))); + connect(m_urlLabel, TQ_SIGNAL(leftClickedURL(const TQString &)), + this, TQ_SLOT(openURL(const TQString &))); m_themeLayout->addMultiCellWidget(m_urlLabel, 1, 1, 0, 4); - m_line = new KSeparator(Qt::Horizontal, this); + m_line = new KSeparator(TQt::Horizontal, this); m_themeLayout->addMultiCellWidget(m_line, 2, 2, 0, 4); m_authorLabel = new TQLabel(this); @@ -99,8 +99,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_listView = new TDEListView(this); m_listView->addColumn(i18n("Theme")); m_listView->setFullWidth(true); - connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(selectItem(TQListViewItem *))); + connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(selectItem(TQListViewItem *))); m_themeLayout->addMultiCellWidget(m_listView, 4, 4, 0, 4); m_alternateLabel = new TQLabel(this); @@ -126,8 +126,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_fontsCombo->insertItem(i18n("Default")); m_fontsCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect(m_fontsCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(showFontDialog(int))); + connect(m_fontsCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(showFontDialog(int))); m_themeLayout->addMultiCellWidget(m_fontsCombo, 5, 5, 4, 4); TQStringList locatedFiles = TDEGlobal::dirs()->findDirs("data", "ksim/themes"); diff --git a/ksim/themeprefs.h b/ksim/themeprefs.h index 8fca089..828d649 100644 --- a/ksim/themeprefs.h +++ b/ksim/themeprefs.h @@ -75,7 +75,7 @@ namespace KSim class ThemePrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ThemePrefs(TQWidget *parent, const char *name=0); |