diff options
Diffstat (limited to 'ksysguard')
107 files changed, 668 insertions, 1133 deletions
diff --git a/ksysguard/CMakeL10n.txt b/ksysguard/CMakeL10n.txt index b585ce4af..5595c48a5 100644 --- a/ksysguard/CMakeL10n.txt +++ b/ksysguard/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/ksysguard-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/ksysguard/example/CMakeL10n.txt b/ksysguard/example/CMakeL10n.txt new file mode 100644 index 000000000..f0026a280 --- /dev/null +++ b/ksysguard/example/CMakeL10n.txt @@ -0,0 +1,7 @@ +##### create translation templates ############## + +tde_l10n_create_template( + CATALOG "desktop_files/ksysguard-eventsrc/" + SOURCES eventsrc + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/ksysguard/example/CMakeLists.txt b/ksysguard/example/CMakeLists.txt index 7cb6e750f..a275dccfc 100644 --- a/ksysguard/example/CMakeLists.txt +++ b/ksysguard/example/CMakeLists.txt @@ -9,5 +9,9 @@ # ################################################# -install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/ksysguard ) +tde_create_translated_desktop( + SOURCE eventsrc + DESTINATION ${DATA_INSTALL_DIR}/ksysguard + PO_DIR ksysguard-eventsrc +) install( FILES ksysguarddrc DESTINATION ${SYSCONF_INSTALL_DIR} ) diff --git a/ksysguard/example/eventsrc b/ksysguard/example/eventsrc index dfc069c60..9fb7f027c 100644 --- a/ksysguard/example/eventsrc +++ b/ksysguard/example/eventsrc @@ -1,305 +1,11 @@ [!Global!] IconName=ksysguard Comment=System Guard -Comment[af]=Stelsel Wag -Comment[ar]=حارس النظام -Comment[az]=Sistem Cangüdəni -Comment[be]=Ахоўнік сістэмы -Comment[bg]=Системна защита -Comment[bn]=কে.ডি.ই. সিস্টেম গার্ড -Comment[br]=Gward Reizhiad -Comment[bs]=zaštita sistema -Comment[ca]=Vigilant del sistema -Comment[cs]=Správce systému -Comment[csb]=Wachtôrz Systemë -Comment[cy]=Gwarchodwr Cysawd -Comment[da]=Systemvagt -Comment[de]=Systemüberwachung -Comment[el]=Φρουρός συστήματος του -Comment[eo]=Sistemobservilo -Comment[es]=Guardián del sistema de -Comment[et]=süsteemi valvur -Comment[eu]=ren sistemaren kontrola -Comment[fa]=محافظ سیستم -Comment[fi]=järjestelmänvalvonta -Comment[fr]=Surveillance du système -Comment[fy]=systeembefeiliging -Comment[ga]=Garda an Chórais -Comment[gl]=Vixiante do Sistema de -Comment[he]=משמר המערכת של -Comment[hi]=केडीई तंत्र गार्ड -Comment[hr]=zaštitnik sustava -Comment[hu]=rendszermonitor -Comment[is]=kerfisvörður -Comment[it]=Controllo di sistema di -Comment[ja]=システムガード -Comment[ka]=სისტემური მონიტორი -Comment[kk]=жүйелік бақылаушысы -Comment[km]=ការពារប្រព័ន្ធ -Comment[ko]=시스템 지킴이 -Comment[lo]=ເຄື່ອງມືຶປ້ອງກັນລະບົບຂອງ -Comment[lt]=sistemos apsauga -Comment[lv]=Sistēmas Sargs -Comment[mk]=Системски чувар -Comment[mn]=КДЭ-Системийн хяналт -Comment[ms]=Pengawas Sistem -Comment[mt]=Gwardja tas-Sistema -Comment[nb]=Systemovervåker -Comment[nds]=Systeemwachter -Comment[ne]=प्रणाली रक्षक -Comment[nl]=systeembewaking -Comment[nn]=Systemvakt -Comment[nso]=Thlokomelo ya System ya -Comment[pa]=ਸਿਸਟਮ ਗਾਰਡ -Comment[pl]=Strażnik Systemu -Comment[pt]=Vigilante do sistema do -Comment[pt_BR]=Sistema de Guarda do -Comment[ro]=Sistem de gardă -Comment[ru]=Системный монитор -Comment[rw]=Umurinzi Sisitemu -Comment[se]=vuogádatfákta -Comment[sk]=Strážca systému -Comment[sl]=Sistemski varuh -Comment[sr]=чувар система -Comment[sr@Latn]=čuvar sistema -Comment[sv]=systemövervakare -Comment[ta]=கணினி காவலன் -Comment[tg]=Муҳофизи системаи -Comment[th]=เครื่องมือป้องกันระบบ -Comment[tr]=Sistem Koruyucu -Comment[tt]=nıñ Sistem Saqçısı -Comment[uk]=Системний вартовий -Comment[uz]=tizim nazoratchisi -Comment[uz@cyrillic]=тизим назоратчиси -Comment[ven]=Mulindi wa maitele a -Comment[vi]=Trình bảo vệ Hệ thống -Comment[wa]=Gåre sistinme -Comment[xh]=Ukhuselo lendlela yokusebenza -Comment[zh_CN]=系统卫士 -Comment[zh_TW]=系統守衛 -Comment[zu]=Unogada Wesistimu ye [pattern_match] Name=pattern_match -Name[az]=uyğun_naxış -Name[bn]=নকশা_মিল -Name[csb]=dopasowanié_mùstra -Name[cy]=cydweddiad_patrwm -Name[da]=mønster_match -Name[de]=Musterübereinstimmung -Name[eo]=ŝablon_serĉo -Name[es]=concordancia de patrón -Name[fr]=correspondance_avec_motif -Name[gl]=patrón_coincidente -Name[hi]=पैटर्न-मैच -Name[hr]=pronalaženje_uzoraka -Name[hu]=illeszkedő_minta -Name[it]=corrispondenza_schema -Name[ja]=パターンマッチ -Name[km]=លំនាំ ផ្គូផ្គង -Name[ko]=검색 패턴이 일치함 -Name[lo]=ເຂົ້າກັບຮູບແບບ -Name[lt]=šablono atitikimas -Name[lv]=šablona_atbilstība -Name[mk]=совпаѓање_шема -Name[mn]=Загвар-зохицуулга -Name[nb]=mønster_treff -Name[nds]=Musterövereenstimmen -Name[ne]=बाँन्की मिल्दो -Name[nn]=mønster_treff -Name[nso]=tshwanetsano ya mokgwa -Name[pa]=ਪੈਟਰਨ ਮੇਲ -Name[pl]=dopasowanie_wzorca -Name[ro]=potrivire model -Name[rw]=Ishusho_bihura -Name[se]=minsttar_deaivan -Name[sl]=vzorec_zadetek -Name[sr]=подударан_узорак -Name[sr@Latn]=podudaran_uzorak -Name[sv]=mönsterigenkänning -Name[ta]=மாதிரி_பொருத்தம் -Name[ven]=Maitele_Fana -Name[vi]=khớp_mẫu -Name[wa]=va_avou_modele -Name[xh]=umlinganiselo_thelekisa -Name[zh_TW]=比對正確 -Name[zu]=ukufanisa_iphethini Comment=Search pattern matched -Comment[af]=Soek patroon opgespoor -Comment[ar]=تم ايجاد تماثل -Comment[be]=Пошук супадзенняў з шаблонам -Comment[bg]=Съвпадение на търсения низ -Comment[bn]=সন্ধান করা প্যাটার্ন-এর মিল পাওয়া গেছে -Comment[bs]=Pronađen uzorak za pretragu -Comment[ca]=Cerca coincidència de patró -Comment[cs]=Hledaný vzor odpovídá -Comment[csb]=Mùster òstôł dopasowóny -Comment[da]=Søgemønsteret matchede -Comment[de]=Übereinstimmung mit Suchmuster -Comment[el]=Ταίριασμα μοτίβου αναζήτησης -Comment[eo]=Serĉoŝablonesprimo kongruas -Comment[es]=Coincidencia con el patrón de búsqueda -Comment[et]=Otsingu muster sobib -Comment[eu]=bilatutako eredua bat dator -Comment[fa]=جستجوی الگوی تطبیقشده -Comment[fi]=Hakumerkkijono osui -Comment[fr]=Motif de recherche trouvé -Comment[fy]=Sykpatroan komt oerien -Comment[gl]=o patrón a procurar atopou-se -Comment[he]=נמצאה התאמה לדפוס החיפוש -Comment[hi]=सर्च पैटर्न मेल खाते हैं -Comment[hr]=Traženi je uzorak pronađen -Comment[hu]=Illeszkedő keresési minta -Comment[is]=finna skv. leitarmynstri -Comment[it]=Schema di ricerca trovato -Comment[ja]=検索パターンにマッチしました -Comment[ka]=ძიების ნიმუშთან შესაბამისობა -Comment[kk]=Ізделген үлгіге сәйкестік -Comment[km]=លំនាំស្វែងរកបានផ្គូផ្គង -Comment[ko]=검색 패턴이 일치함 -Comment[lt]=Paieškos šablonas atitiko -Comment[lv]=Meklēšanas šablons atbilst -Comment[mk]=Пребарувањето се поклопува -Comment[ms]=Cari corak sepadan -Comment[mt]=skema ta' tfittxija qablet -Comment[nb]=Søkemønsteret passet -Comment[nds]=Söökmuster passt -Comment[ne]=बाँन्की मिल्दो खोजी गर्नुहोस् -Comment[nl]=Zoekpatroon komt overeen -Comment[nn]=Søkjemønsteret passa -Comment[pa]=ਖੋਜ ਤਰਤੀਬ ਮੇਲ -Comment[pl]=Dopasowano wzorzec -Comment[pt]=Padrão de pesquisa encontrado -Comment[pt_BR]=Padrão de busca encontrado -Comment[ro]=Modelul căutat s-a potrivit -Comment[ru]=Соответствие шаблону поиска -Comment[rw]=Gushakisha ishusho byahuye -Comment[se]=Ohcanminsttar heivii -Comment[sk]=Nájdené podľa vzorky -Comment[sl]=Iskalni vzorec se ujema -Comment[sr]=Подударан узорак је пронађен -Comment[sr@Latn]=Podudaran uzorak je pronađen -Comment[sv]=Sökmönster igenkänt -Comment[ta]=மாதிரி பொருத்தத்தை தேடு -Comment[th]=ค้นหารูปแบบที่เข้าคู่กัน -Comment[tr]=Eşleşen örüntüyü ara -Comment[tt]=Ezlängäne belän kileşte -Comment[uk]=Знайдено взірець пошуку -Comment[vi]=Tìm các mẫu khớp -Comment[wa]=Trover des modeles ki vont avou -Comment[zh_CN]=搜索匹配的模式 -Comment[zh_TW]=尋找比對正確 [sensor_alarm] Name=sensor_alarm -Name[bn]=বিপদ_সংকেত -Name[cy]=larwm_synhwyrydd -Name[de]=Sensormeldung -Name[eo]=sentilo_alarmo -Name[es]=alarma de sensor -Name[fr]=alarme_des_capteurs -Name[fy]=sensormelding -Name[gl]=alarma_sensor -Name[hi]=सेंसर-अलार्म -Name[hr]=osjetilo_alarma -Name[hu]=érzékelő_riasztás -Name[it]=allarme_dei_sensori -Name[ja]=センサーアラーム -Name[km]=សំឡេងរោទិ៍ឧបករណ៍ស្ទង់ -Name[ko]=센서 알람 -Name[lo]=ການເຕື່ອນກວດຈັບ -Name[lt]=daviklio aliarmas -Name[lv]=sensora_trauksme -Name[mk]=аларм_сензор -Name[mn]=Мэдрэгчийн дохио -Name[nds]=Sensormellen -Name[ne]=सचेतक -Name[nl]=sensormelding -Name[nso]=alamo ya sekwi -Name[pa]=ਸੰਕੇਤਕ ਚੇਤਾਵਨੀ -Name[ro]=alarmă senzor -Name[rw]=impuruza_rukuruzi -Name[se]=dovddan_alarbma -Name[sl]=senzor_alarm -Name[sr]=аларм_сензора -Name[sr@Latn]=alarm_senzora -Name[sv]=sensorlarm -Name[ta]=உணர் எச்சரிக்கை -Name[ven]=Zwipfi_Alamu -Name[vi]=báo động của đầu dò -Name[wa]=sinteu_d'_alarme -Name[xh]=uluvo_oluvusayo -Name[zh_TW]=偵測器通知 -Name[zu]=i-alamu_enemizwa Comment=Sensor exceeded critical limit -Comment[af]=Sensor oorskry krities beperk -Comment[be]=Сэнсар перавысіў крытычную мяжу -Comment[bg]=Преминат е критичния лимит от даден сензор -Comment[bn]=সেনসর বিপদসীমা ছাড়িয়ে গেছে -Comment[bs]=Senzor je prekoračio kritičnu granicu -Comment[ca]=EL sensor ha excedit el límit crític -Comment[cs]=Senzor překročil kritickou hodnotu -Comment[csb]=Czujnik przestãpił kriticzną grańcã -Comment[cy]=Aethpwyd dros gyfyngder critigol y synhwyrydd -Comment[da]=Sensor gik ud over kritisk grænse -Comment[de]=Sensor zeigt Überschreitung der kritischen Grenze an -Comment[el]=Ο αισθητήρας ξεπέρασε το κρίσιμο όριο -Comment[eo]=Sentilo transiris danĝeran limon -Comment[es]=El sensor excedió el límite crítico -Comment[et]=Sensor ületas kriitilise piiri -Comment[eu]=Sensoreak bere muga kritikoa gainditu du -Comment[fa]=حسگر فراتر از حد بحرانی شد -Comment[fi]=Tunnistin ylitti kriittisen rajan -Comment[fr]=Le capteur a dépassé sa limite critique -Comment[fy]=Sensor limyt giet oer de kritike grins -Comment[gl]=O sensor excedeu o límite crítico -Comment[he]=החיישן חרג מהמגבלה הקריטית -Comment[hi]=सेंसर क्रिटिकल लिमिट से ज्यादा -Comment[hr]=Osjetilo je nadmašilo kritičnu razinu -Comment[hu]=Egy figyelt érték elérte a kritikus szintet -Comment[is]=Skynjari fór yfir hámark -Comment[it]=Il sensore ha superato la soglia critica -Comment[ja]=センサーは危険度の限界を超えました -Comment[ka]=სენსორმა გადააჭარბა კრიტიკულ ზღვარს -Comment[kk]=Сенсор шекті деңгейден асып кетті -Comment[km]=ឧបករណ៍ស្ទង់បានលើសព្រំដែនចុងក្រោយ -Comment[ko]=센서에서 치명적 한계를 넘었음 -Comment[lt]=Daviklis viršijo kritinį limitą -Comment[lv]=Sensors pārsniedzis kritisko limitu -Comment[mk]=Сензорот ја надмина критичната граница -Comment[mn]=Мэдрэгч критик хязгаарын давалтыг заах -Comment[ms]=Penderia melebihi had kritikal -Comment[mt]=Sensur eċċeda l-limitu kritiku -Comment[nb]=Sensorene oversteg en kritisk grense -Comment[nds]=En Sensor hett en Weert meldt, de baven vun de kritische Grenz liggt -Comment[ne]=सचेतक असामान्य सीमा भन्दा अगाडि बढ्यो -Comment[nl]=Sensor overschreed kritieke limiet -Comment[nn]=Sensoren gjekk over kritisk grense -Comment[nso]=Sekwi se fetile magomo a kganetso -Comment[pa]=ਸੰਕੇਤਕ ਘਾਤਕ ਸੀਮਾ ਨੂੰ ਪਾਰ ਕਰ ਗਿਆ ਹੈ -Comment[pl]=Czujnik przekroczył granicę krytyczną -Comment[pt]=o sensor excedeu o limite crítico -Comment[pt_BR]=Sensor excedeu o limite crítico -Comment[ro]=Senzorul a depășit limita critică -Comment[ru]=Датчик превысил критический предел -Comment[rw]= Rukuruzi yarenze impera ngombwa -Comment[sk]=Senzor prekročil kritický limit -Comment[sl]=Senzor je presegel kritično mejo -Comment[sr]=Сензор је прешао дозвољену границу -Comment[sr@Latn]=Senzor je prešao dozvoljenu granicu -Comment[sv]=Sensor överskred den kritiska gränsen -Comment[ta]=உணர்வான் சிக்கல் கட்டத்தை தாண்டியது -Comment[tg]=Датчик аз ҳад гузашт -Comment[th]=ตัวตรวจจับเกินกว่าค่าวิกฤติ -Comment[tr]=Alıcı kritik limiti geçti -Comment[tt]=Sizgeçneñ eşläw waqıtı ütte -Comment[uk]=Датчик перевищив критичний рівень -Comment[uz]=Sensor havfli chegaradan oʻtdi -Comment[uz@cyrillic]=Сенсор ҳавфли чегарадан ўтди -Comment[ven]=Tshisedzi tsho engedza phungudzo i sasaladzeaho -Comment[vi]=Đầu dò vượt quá giới hạn chịu đựng -Comment[wa]=Li sinteu a stî pus lon kel limite -Comment[xh]=Umda wokufumana ingxaki ekhoyo woluvo -Comment[zh_CN]=传感器达到关键限制 -Comment[zh_TW]=偵測器超過臨界限制 -Comment[zu]=Umuzwa udlule isilinganiso esibucayi diff --git a/ksysguard/gui/CMakeL10n.txt b/ksysguard/gui/CMakeL10n.txt index 9ffcf735f..a5b7fb63b 100644 --- a/ksysguard/gui/CMakeL10n.txt +++ b/ksysguard/gui/CMakeL10n.txt @@ -2,6 +2,7 @@ tde_l10n_create_template( CATALOG "ksysguard" + SOURCES "." ATTRIBUTES "SystemLoad.sgrd:display,title" "KSysGuardApplet.xml:display,title" diff --git a/ksysguard/gui/CMakeLists.txt b/ksysguard/gui/CMakeLists.txt index 7313b6b5d..a21e21c0c 100644 --- a/ksysguard/gui/CMakeLists.txt +++ b/ksysguard/gui/CMakeLists.txt @@ -30,16 +30,28 @@ link_directories( ##### other data ################################ -install( FILES ksysguard.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES x-ksysguard.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) +tde_create_translated_desktop( + SOURCE ksysguard.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} + PO_DIR ksysguard-desktops +) +tde_create_translated_desktop( + SOURCE x-ksysguard.desktop + DESTINATION ${MIME_INSTALL_DIR}/application + PO_DIR ksysguard-desktops +) install( FILES ProcessTable.sgrd SystemLoad.sgrd KSysGuardApplet.xml ksysguardui.rc DESTINATION ${DATA_INSTALL_DIR}/ksysguard ) -install( FILES ksysguardapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE ksysguardapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR ksysguard-desktops +) ##### sysguard_panelapplet (module) ############# tde_add_kpart( sysguard_panelapplet AUTOMOC - SOURCES KSysGuardApplet.cc KSGAppletSettings.cc + SOURCES KSysGuardApplet.cpp KSGAppletSettings.cpp LINK sensordisplays-static ksgrd-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -49,8 +61,8 @@ tde_add_kpart( sysguard_panelapplet AUTOMOC tde_add_executable( ksysguard AUTOMOC SOURCES - SensorBrowser.cc WorkSheet.cc WorkSheetSettings.cc - Workspace.cc ksysguard.cc ksysguard.skel + SensorBrowser.cpp WorkSheet.cpp WorkSheetSettings.cpp + Workspace.cpp ksysguard.cpp ksysguard.skel LINK sensordisplays-static ksgrd-shared tdednssd-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cpp index 01b2e0b1a..01b2e0b1a 100644 --- a/ksysguard/gui/KSGAppletSettings.cc +++ b/ksysguard/gui/KSGAppletSettings.cpp diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cpp index ae31d4a60..d5ae18b46 100644 --- a/ksysguard/gui/KSysGuardApplet.cc +++ b/ksysguard/gui/KSysGuardApplet.cpp @@ -120,9 +120,9 @@ void KSysGuardApplet::preferences() } mSettingsDlg = new KSGAppletSettings( this ); - connect( mSettingsDlg, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDlg, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDlg, TQT_SIGNAL( finished() ), TQT_SLOT( preferencesFinished() ) ); + connect( mSettingsDlg, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDlg, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDlg, TQ_SIGNAL( finished() ), TQ_SLOT( preferencesFinished() ) ); mSettingsDlg->setNumDisplay( mDockCount ); mSettingsDlg->setSizeRatio( (int) ( mSizeRatio * 100.0 + 0.5 ) ); @@ -142,7 +142,7 @@ void KSysGuardApplet::applySettings() resizeDocks( mSettingsDlg->numDisplay() ); for ( uint i = 0; i < mDockCount; ++i ) - if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) + if ( !mDockList[ i ]->isA( "TQFrame" ) ) ((KSGRD::SensorDisplay*)mDockList[ i ])->setUpdateInterval( updateInterval() ); save(); @@ -156,7 +156,7 @@ void KSysGuardApplet::sensorDisplayModified( bool modified ) void KSysGuardApplet::layout() { - if ( orientation() == Qt::Horizontal ) { + if ( orientation() == TQt::Horizontal ) { int h = height(); int w = (int) ( h * mSizeRatio + 0.5 ); for ( uint i = 0; i < mDockCount; ++i ) @@ -173,7 +173,7 @@ void KSysGuardApplet::layout() int KSysGuardApplet::findDock( const TQPoint& point ) { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) return ( point.x() / (int) ( height() * mSizeRatio + 0.5 ) ); else return ( point.y() / (int) ( width() * mSizeRatio + 0.5 ) ); @@ -201,7 +201,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) return; int dock = findDock( e->pos() ); - if ( mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) { + if ( mDockList[ dock ]->isA( "TQFrame" ) ) { if ( sensorType == "integer" || sensorType == "float" ) { TDEPopupMenu popup; TQWidget *wdg = 0; @@ -232,8 +232,8 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) mDockList[ dock ] = wdg; layout(); - connect( wdg, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( sensorDisplayModified( bool ) ) ); + connect( wdg, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( sensorDisplayModified( bool ) ) ); mDockList[ dock ]->show(); } @@ -246,7 +246,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) } } - if ( !mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) + if ( !mDockList[ dock ]->isA( "TQFrame" ) ) ((KSGRD::SensorDisplay*)mDockList[ dock ])-> addSensor( hostName, sensorName, sensorType, sensorDescr ); } @@ -405,8 +405,8 @@ bool KSysGuardApplet::load() delete mDockList[ dock ]; mDockList[ dock ] = newDisplay; - connect( newDisplay, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( sensorDisplayModified( bool ) ) ); + connect( newDisplay, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( sensorDisplayModified( bool ) ) ); } return true; @@ -429,7 +429,7 @@ bool KSysGuardApplet::save() TQStringList hosts; uint i; for ( i = 0; i < mDockCount; ++i ) - if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) + if ( !mDockList[ i ]->isA( "TQFrame" ) ) ((KSGRD::SensorDisplay*)mDockList[ i ])->hosts( hosts ); // save host information (name, shell, etc.) @@ -449,7 +449,7 @@ bool KSysGuardApplet::save() } for ( i = 0; i < mDockCount; ++i ) - if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) { + if ( !mDockList[ i ]->isA( "TQFrame" ) ) { TQDomElement element = doc.createElement( "display" ); ws.appendChild( element ); element.setAttribute( "dock", i ); diff --git a/ksysguard/gui/KSysGuardApplet.h b/ksysguard/gui/KSysGuardApplet.h index 43027b05c..06ab1d5ec 100644 --- a/ksysguard/gui/KSysGuardApplet.h +++ b/ksysguard/gui/KSysGuardApplet.h @@ -40,7 +40,7 @@ class KSGAppletSettings; class KSysGuardApplet : public KPanelApplet, public KSGRD::SensorBoard { - Q_OBJECT + TQ_OBJECT public: KSysGuardApplet( const TQString& configFile, Type type = Normal, diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am index 3259e44f4..0ebad4f77 100644 --- a/ksysguard/gui/Makefile.am +++ b/ksysguard/gui/Makefile.am @@ -22,11 +22,11 @@ bin_PROGRAMS = ksysguard kpm # Which sources should be compiled for ksysguard. ksysguard_SOURCES = \ - SensorBrowser.cc \ - WorkSheet.cc \ - WorkSheetSettings.cc \ - Workspace.cc \ - ksysguard.cc ksysguard.skel + SensorBrowser.cpp \ + WorkSheet.cpp \ + WorkSheetSettings.cpp \ + Workspace.cpp \ + ksysguard.cpp ksysguard.skel ksysguard_LDADD = \ ksgrd/libksgrd.la \ @@ -43,8 +43,8 @@ appdata_DATA = ProcessTable.sgrd SystemLoad.sgrd KSysGuardApplet.xml kde_module_LTLIBRARIES = sysguard_panelapplet.la sysguard_panelapplet_la_SOURCES = \ - KSysGuardApplet.cc \ - KSGAppletSettings.cc + KSysGuardApplet.cpp \ + KSGAppletSettings.cpp sysguard_panelapplet_la_LIBADD = \ ksgrd/libksgrd.la \ @@ -60,4 +60,4 @@ METASOURCES = AUTO messages: rc.cpp $(EXTRACTRC) `find . -name "*.ui"` >> rc.cpp extractattr --attr=display,title SystemLoad.sgrd KSysGuardApplet.xml >> rc.cpp - $(XGETTEXT) `find . -name "*.cpp" -o -name "*.cc"` -o $(podir)/ksysguard.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/ksysguard.pot diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cpp index 801091d98..575389bac 100644 --- a/ksysguard/gui/SensorBrowser.cc +++ b/ksysguard/gui/SensorBrowser.cpp @@ -68,11 +68,11 @@ SensorBrowser::SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, { mHostInfoList.setAutoDelete(true); - connect( mSensorManager, TQT_SIGNAL( update() ), TQT_SLOT( update() ) ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( newItemSelected( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - TQT_SLOT( newItemSelected( TQListViewItem* ) ) ); + connect( mSensorManager, TQ_SIGNAL( update() ), TQ_SLOT( update() ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( newItemSelected( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + TQ_SLOT( newItemSelected( TQListViewItem* ) ) ); addColumn( i18n( "Sensor Browser" ) ); addColumn( i18n( "Sensor Type" ) ); @@ -240,7 +240,7 @@ void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e ) * mouse tracking cannot be turned off. So we have to check each event * whether the LMB is really pressed. */ - if ( !( e->state() & Qt::LeftButton ) ) + if ( !( e->state() & TQt::LeftButton ) ) return; TQListViewItem* item = itemAt( e->pos() ); diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h index aec4f343d..f2aa98302 100644 --- a/ksysguard/gui/SensorBrowser.h +++ b/ksysguard/gui/SensorBrowser.h @@ -45,7 +45,7 @@ class HostInfo; */ class SensorBrowser : public TDEListView, public KSGRD::SensorClient { - Q_OBJECT + TQ_OBJECT public: SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, const char* name = 0 ); diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp index 8d2b5e302..1a1608b6c 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp @@ -161,10 +161,10 @@ void BarGraph::paintEvent( TQPaintEvent* ) if ( showLabels ) { p.drawText( b * barWidth + 3, h - ( 2 * fm.lineSpacing() ) - 2, - barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter, + barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter, footers[ b ] ); p.drawText( b * barWidth + 3, h - fm.lineSpacing() - 2, - barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter, + barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter, TQString( "%1" ).arg( samples[ b ] ) ); } } diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.h b/ksysguard/gui/SensorDisplayLib/BarGraph.h index 1a1262594..2c5e7ffad 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.h +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.h @@ -30,7 +30,7 @@ class BarGraph : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class DancingBars; diff --git a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt index 0fe416a0b..6fe370076 100644 --- a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt +++ b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt @@ -28,12 +28,12 @@ link_directories( tde_add_library( sensordisplays STATIC_PIC AUTOMOC SOURCES - SensorDisplay.cc BarGraph.cc DancingBars.cc DancingBarsSettings.cc - DummyDisplay.cc FancyPlotter.cc FancyPlotterSettings.cc - ListView.cc LogFile.cc MultiMeter.cc MultiMeterSettings.cc - ProcessController.cc ProcessList.cc ReniceDlg.cc - SensorLogger.cc SensorLoggerDlg.cc SensorLoggerSettings.cc - ListViewSettings.cc SignalPlotter.cc ListViewSettingsWidget.ui + SensorDisplay.cpp BarGraph.cpp DancingBars.cpp DancingBarsSettings.cpp + DummyDisplay.cpp FancyPlotter.cpp FancyPlotterSettings.cpp + ListView.cpp LogFile.cpp MultiMeter.cpp MultiMeterSettings.cpp + ProcessController.cpp ProcessList.cpp ReniceDlg.cpp + SensorLogger.cpp SensorLoggerDlg.cpp SensorLoggerSettings.cpp + ListViewSettings.cpp SignalPlotter.cpp ListViewSettingsWidget.ui LogFileSettings.ui MultiMeterSettingsWidget.ui SensorLoggerDlgWidget.ui SensorLoggerSettingsWidget.ui LINK ksgrd-shared tdeio-shared diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp index 5b09addc0..43fbe549f 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp @@ -104,7 +104,7 @@ void DancingBars::configureSettings() } mSettingsDialog->setSensors( list ); - connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); + connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); if ( mSettingsDialog->exec() ) applySettings(); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h index 3ccc03f86..4e917dabf 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.h +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h @@ -38,7 +38,7 @@ class DancingBarsSettings; class DancingBars : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: DancingBars( TQWidget *parent = 0, const char *name = 0, diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp index ee03f9e94..b754791f8 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp @@ -47,7 +47,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) TQFrame *page = addPage( i18n( "Range" ) ); TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); - TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); + TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page ); TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 ); mTitle = new KLineEdit( groupBox ); @@ -56,7 +56,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Display Range" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 ); boxLayout->setColStretch( 2, 1 ); @@ -84,7 +84,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) page = addPage( i18n( "Alarms" ) ); pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Minimum Value" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); @@ -102,7 +102,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Maximum Value" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); @@ -181,15 +181,15 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) TQWhatsThis::add( mRemoveButton, i18n( "Push this button to delete the sensor." ) ); pageLayout->addWidget( mRemoveButton, 1, 1 ); - connect( mUseLowerLimit, TQT_SIGNAL( toggled( bool ) ), - mLowerLimit, TQT_SLOT( setEnabled( bool ) ) ); - connect( mUseUpperLimit, TQT_SIGNAL( toggled( bool ) ), - mUpperLimit, TQT_SLOT( setEnabled( bool ) ) ); + connect( mUseLowerLimit, TQ_SIGNAL( toggled( bool ) ), + mLowerLimit, TQ_SLOT( setEnabled( bool ) ) ); + connect( mUseUpperLimit, TQ_SIGNAL( toggled( bool ) ), + mUpperLimit, TQ_SLOT( setEnabled( bool ) ) ); - connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( selectionChanged( TQListViewItem* ) ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) ); + connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( selectionChanged( TQListViewItem* ) ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) ); TDEAcceleratorManager::manage( this ); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h index aa9d580bd..08c02d293 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h @@ -38,7 +38,7 @@ class TQPushButton; class DancingBarsSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: DancingBarsSettings( TQWidget* parent = 0, const char* name = 0 ); diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp index 13696c502..a9b8d21c0 100644 --- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp @@ -49,7 +49,7 @@ void DummyDisplay::resizeEvent( TQResizeEvent* ) bool DummyDisplay::eventFilter( TQObject* object, TQEvent* event ) { if ( event->type() == TQEvent::MouseButtonRelease && - ( (TQMouseEvent*)event)->button() == Qt::LeftButton ) + ( (TQMouseEvent*)event)->button() == TQt::LeftButton ) setFocus(); return TQWidget::eventFilter( object, event ); diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h index cd00a6fd6..b600205b3 100644 --- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h +++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h @@ -28,7 +28,7 @@ class DummyDisplay : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: DummyDisplay( TQWidget* parent = 0, const char* name = 0, diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp index 22894afea..eccf470c2 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp @@ -58,7 +58,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name, * SensorDisplay::eventFilter. */ mPlotter->installEventFilter( this ); - setPlotterWidget( TQT_TQWIDGET(mPlotter) ); + setPlotterWidget( mPlotter ); setModified( false ); } @@ -111,9 +111,9 @@ void FancyPlotter::configureSettings() } mSettingsDialog->setSensors( list ); - connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDialog, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDialog, TQT_SIGNAL( finished() ), TQT_SLOT( killDialog() ) ); + connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDialog, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDialog, TQ_SIGNAL( finished() ), TQ_SLOT( killDialog() ) ); mSettingsDialog->show(); } @@ -242,8 +242,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name, .arg( sensors().at( mBeams - i - 1 )->name() ); } - TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); - TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip ); + TQToolTip::remove( mPlotter ); + TQToolTip::add( mPlotter, tooltip ); return true; } @@ -267,8 +267,8 @@ bool FancyPlotter::removeSensor( uint pos ) .arg( sensors().at( mBeams - i - 1 )->name() ); } - TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); - TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip ); + TQToolTip::remove( mPlotter ); + TQToolTip::add( mPlotter, tooltip ); return true; } diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h index 2f0e36c60..3ed63e3c2 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h @@ -48,7 +48,7 @@ class FPSensorProperties : public KSGRD::SensorProperties class FancyPlotter : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: FancyPlotter( TQWidget* parent = 0, const char* name = 0, diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp index ef53bab75..7e7e15d7d 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp @@ -65,7 +65,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( mTitle, 0, 1 ); label->setBuddy( mTitle ); - TQButtonGroup *buttonBox = new TQButtonGroup( 2, Qt::Vertical, + TQButtonGroup *buttonBox = new TQButtonGroup( 2, TQt::Vertical, i18n( "Graph Drawing Style" ), page ); mUsePolygonStyle = new TQRadioButton( i18n( "Basic polygons" ), buttonBox ); @@ -78,7 +78,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) page = addPage( i18n( "Scales" ) ); pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Vertical Scale" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 2, 1 ); @@ -108,7 +108,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Horizontal Scale" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() ); boxLayout->setRowStretch( 1, 1 ); @@ -126,7 +126,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) page = addPage( i18n( "Grid" ) ); pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Lines" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -165,7 +165,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Text" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -190,7 +190,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 1, 0 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Colors" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() ); label = new TQLabel( i18n( "Vertical lines:" ), groupBox ); @@ -257,30 +257,30 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) mMoveDownButton->setEnabled( false ); pageLayout->addWidget( mMoveDownButton, 4, 1 ); - connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMinValue, - TQT_SLOT( setDisabled( bool ) ) ); - connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMaxValue, - TQT_SLOT( setDisabled( bool ) ) ); - connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesDistance, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesScroll, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesColor, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesCount, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesColor, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mShowLabels, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( selectionChanged( TQListViewItem* ) ) ); - - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) ); - connect( mMoveUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveUpSensor() ) ); - connect( mMoveDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveDownSensor() ) ); - connect ( mSensorView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQT_SLOT(editSensor())); + connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMinValue, + TQ_SLOT( setDisabled( bool ) ) ); + connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMaxValue, + TQ_SLOT( setDisabled( bool ) ) ); + connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesDistance, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesScroll, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesColor, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesCount, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesColor, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mShowLabels, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( selectionChanged( TQListViewItem* ) ) ); + + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) ); + connect( mMoveUpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveUpSensor() ) ); + connect( mMoveDownButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveDownSensor() ) ); + connect ( mSensorView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQ_SLOT(editSensor())); TDEAcceleratorManager::manage( this ); } @@ -531,7 +531,7 @@ TQValueList< TQStringList > FancyPlotterSettings::sensors() const entry << it.current()->text( 2 ); entry << it.current()->text( 3 ); entry << it.current()->text( 4 ); - QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 ); + TQRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 ); TQColor color( tqRed( rgb ), tqGreen( rgb ), tqBlue( rgb ) ); entry << ( color.name() ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h index 010b4938b..d4e02a25d 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h @@ -38,7 +38,7 @@ class TQRadioButton; class FancyPlotterSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FancyPlotterSettings( TQWidget* parent = 0, const char* name = 0 ); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cpp index 5b748e9c0..828832668 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cc +++ b/ksysguard/gui/SensorDisplayLib/ListView.cpp @@ -329,7 +329,7 @@ ListView::configureSettings() { lvs = new ListViewSettings(this, "ListViewSettings"); TQ_CHECK_PTR(lvs); - connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); + connect(lvs, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings())); TQColorGroup colorGroup = monitor->colorGroup(); lvs->setGridColor(colorGroup.color(TQColorGroup::Link)); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h index 643df8747..d9bb1c828 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.h +++ b/ksysguard/gui/SensorDisplayLib/ListView.h @@ -37,7 +37,7 @@ class ListViewSettings; class PrivateListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: enum ColumnType { Text, Int, Float, Time, DiskStat }; @@ -74,7 +74,7 @@ private: class ListView : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: ListView(TQWidget* parent = 0, const char* name = 0, const TQString& = TQString::null, int min = 0, int max = 0); diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cpp index e8e8ca336..a3b1eb3ad 100644 --- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cpp @@ -71,7 +71,3 @@ void ListViewSettings::setGridColor( const TQColor &c ) } #include "ListViewSettings.moc" - -/* vim: et sw=2 ts=2 -*/ - diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h index 06a0b4002..0d2d007c9 100644 --- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h +++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h @@ -30,7 +30,7 @@ class ListViewSettingsWidget; class ListViewSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -52,6 +52,3 @@ class ListViewSettings : public KDialogBase }; #endif // LISTVIEWSETTINGS_H - -/* vim: et sw=2 ts=2 -*/ diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cpp index a8b22569d..c92594fa6 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cc +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cpp @@ -92,16 +92,16 @@ void LogFile::configureSettings(void) lfs->ruleList->insertStringList(filterRules); lfs->title->setText(title()); - connect(lfs->okButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(accept())); - connect(lfs->applyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applySettings())); - connect(lfs->cancelButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(reject())); + connect(lfs->okButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(accept())); + connect(lfs->applyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(applySettings())); + connect(lfs->cancelButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(reject())); - connect(lfs->fontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsFontSelection())); - connect(lfs->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsAddRule())); - connect(lfs->deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsDeleteRule())); - connect(lfs->changeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsChangeRule())); - connect(lfs->ruleList, TQT_SIGNAL(selected(int)), this, TQT_SLOT(settingsRuleListSelected(int))); - connect(lfs->ruleText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(settingsAddRule())); + connect(lfs->fontButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsFontSelection())); + connect(lfs->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsAddRule())); + connect(lfs->deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsDeleteRule())); + connect(lfs->changeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsChangeRule())); + connect(lfs->ruleList, TQ_SIGNAL(selected(int)), this, TQ_SLOT(settingsRuleListSelected(int))); + connect(lfs->ruleText, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(settingsAddRule())); if (lfs->exec()) { applySettings(); @@ -181,8 +181,8 @@ LogFile::restoreSettings(TQDomElement& element) TQFont font; TQColorGroup cgroup = monitor->colorGroup(); - cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); - cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); + cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green)); + cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black)); monitor->setPalette(TQPalette(cgroup, cgroup, cgroup)); addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "logfile" : element.attribute("sensorType")), element.attribute("title")); diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.h b/ksysguard/gui/SensorDisplayLib/LogFile.h index 786cf7e60..1976fa717 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.h +++ b/ksysguard/gui/SensorDisplayLib/LogFile.h @@ -37,7 +37,7 @@ class TQListBox; class LogFile : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: LogFile(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0); ~LogFile(void); diff --git a/ksysguard/gui/SensorDisplayLib/Makefile.am b/ksysguard/gui/SensorDisplayLib/Makefile.am index d3f82a3a7..8ebc4c5ee 100644 --- a/ksysguard/gui/SensorDisplayLib/Makefile.am +++ b/ksysguard/gui/SensorDisplayLib/Makefile.am @@ -9,25 +9,25 @@ libsensordisplays_la_LIBADD = ../ksgrd/libksgrd.la $(LIB_TDEIO) # Which sources should be compiled for the sensor display lib. libsensordisplays_la_SOURCES = \ - SensorDisplay.cc \ - BarGraph.cc \ - DancingBars.cc \ - DancingBarsSettings.cc \ - DummyDisplay.cc \ - FancyPlotter.cc \ - FancyPlotterSettings.cc \ - ListView.cc \ - LogFile.cc \ - MultiMeter.cc \ - MultiMeterSettings.cc \ - ProcessController.cc \ - ProcessList.cc \ - ReniceDlg.cc \ - SensorLogger.cc \ - SensorLoggerDlg.cc \ - SensorLoggerSettings.cc \ - ListViewSettings.cc \ - SignalPlotter.cc \ + SensorDisplay.cpp \ + BarGraph.cpp \ + DancingBars.cpp \ + DancingBarsSettings.cpp \ + DummyDisplay.cpp \ + FancyPlotter.cpp \ + FancyPlotterSettings.cpp \ + ListView.cpp \ + LogFile.cpp \ + MultiMeter.cpp \ + MultiMeterSettings.cpp \ + ProcessController.cpp \ + ProcessList.cpp \ + ReniceDlg.cpp \ + SensorLogger.cpp \ + SensorLoggerDlg.cpp \ + SensorLoggerSettings.cpp \ + ListViewSettings.cpp \ + SignalPlotter.cpp \ ListViewSettingsWidget.ui \ LogFileSettings.ui \ MultiMeterSettingsWidget.ui \ diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp index 111c4787b..382b6cb13 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp @@ -202,7 +202,7 @@ MultiMeter::configureSettings() mms->setAlarmDigitColor(alarmDigitColor); mms->setMeterBackgroundColor(lcd->backgroundColor()); - connect(mms, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); + connect(mms, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings())); if (mms->exec()) applySettings(); diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.h b/ksysguard/gui/SensorDisplayLib/MultiMeter.h index 49a97dbd7..9e0f8cdc5 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.h +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.h @@ -33,7 +33,7 @@ class MultiMeterSettings; class MultiMeter : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: MultiMeter(TQWidget* parent = 0, const char* name = 0, diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cpp index 903369889..63e8d1d3d 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cpp @@ -121,7 +121,3 @@ void MultiMeterSettings::setMeterBackgroundColor( const TQColor &c ) } #include "MultiMeterSettings.moc" - -/* vim: et sw=2 ts=2 -*/ - diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h index e05946a08..65c633fc6 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h @@ -30,7 +30,7 @@ class MultiMeterSettingsWidget; class MultiMeterSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -62,7 +62,3 @@ class MultiMeterSettings : public KDialogBase }; #endif // MULTIMETERSETTINGS_H - -/* vim: et sw=2 ts=2 -*/ - diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui index 4558e2374..c6c16eff7 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui @@ -440,13 +440,14 @@ </connection> </connections> <includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">knumvalidator.h</include> - <include location="local" impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include> + <include location="local" impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>setMeterBackgroundColor( const TQColor & c )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> <function specifier="non virtual" returnType="TQString">title()</function> @@ -469,7 +470,4 @@ </functions> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h index fe88f292f..e97fabffc 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h @@ -9,8 +9,8 @@ void MultiMeterSettingsWidget::init() { - m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit))); - m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit))); + m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit)); + m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit)); m_title->setFocus(); } diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp index 8daaeacf7..cb4579031 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp @@ -81,12 +81,12 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T pListSearchLine = new TDEListViewSearchLineWidget(pList, this, "process_list_search_line"); gmSearch->addWidget(pListSearchLine, 1); - connect(pList, TQT_SIGNAL(killProcess(int, int)), - this, TQT_SLOT(killProcess(int, int))); - connect(pList, TQT_SIGNAL(reniceProcess(const TQValueList<int> &, int)), - this, TQT_SLOT(reniceProcess(const TQValueList<int> &, int))); - connect(pList, TQT_SIGNAL(listModified(bool)), - this, TQT_SLOT(setModified(bool))); + connect(pList, TQ_SIGNAL(killProcess(int, int)), + this, TQ_SLOT(killProcess(int, int))); + connect(pList, TQ_SIGNAL(reniceProcess(const TQValueList<int> &, int)), + this, TQ_SLOT(reniceProcess(const TQValueList<int> &, int))); + connect(pList, TQ_SIGNAL(listModified(bool)), + this, TQ_SLOT(setModified(bool))); /* Create the combo box to configure the process filter. The * cbFilter must be created prior to constructing pList as the @@ -100,30 +100,30 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T cbFilter->insertItem(i18n("Own Processes"), 3); cbFilter->setMinimumSize(cbFilter->sizeHint()); // Create the check box to switch between tree view and list view. - xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView"); + xbTreeView = new TQCheckBox(i18n("&Tree View"), this, "xbTreeView"); TQ_CHECK_PTR(xbTreeView); xbTreeView->setMinimumSize(xbTreeView->sizeHint()); - connect(xbTreeView, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setTreeView(bool))); + connect(xbTreeView, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setTreeView(bool))); /* When the both cbFilter and pList are constructed we can connect the * missing link. */ - connect(cbFilter, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(filterModeChanged(int))); + connect(cbFilter, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(filterModeChanged(int))); // Create the 'Refresh' button. bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ), this, "bRefresh" ); TQ_CHECK_PTR(bRefresh); bRefresh->setMinimumSize(bRefresh->sizeHint()); - connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList())); + connect(bRefresh, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateList())); // Create the 'Kill' button. bKill = new KPushButton(i18n("&Kill"), this, "bKill"); TQ_CHECK_PTR(bKill); bKill->setMinimumSize(bKill->sizeHint()); - connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess())); + connect(bKill, TQ_SIGNAL(clicked()), this, TQ_SLOT(killProcess())); /* Disable the kill button until we know that the daemon supports the * kill command. */ bKill->setEnabled(false); @@ -154,7 +154,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T void ProcessController::setSearchFocus() { //stupid search line widget. See rant in fixTabOrder if(!pListSearchLine->searchLine()) - TQTimer::singleShot(100, this, TQT_SLOT(setSearchFocus())); + TQTimer::singleShot(100, this, TQ_SLOT(setSearchFocus())); else { pListSearchLine->searchLine()->setFocus(); } @@ -167,7 +167,7 @@ void ProcessController::fixTabOrder() { // //Did i mention I hate this? if(!pListSearchLine->searchLine()) - TQTimer::singleShot(100, this, TQT_SLOT(fixTabOrder())); + TQTimer::singleShot(100, this, TQ_SLOT(fixTabOrder())); else { setTabOrder(pListSearchLine->searchLine(), cbFilter); setTabOrder(cbFilter, pList); @@ -224,7 +224,7 @@ ProcessController::killProcess(int pid, int sig) if ( !timerOn() ) // give ksysguardd time to update its proccess list - TQTimer::singleShot(3000, this, TQT_SLOT(updateList())); + TQTimer::singleShot(3000, this, TQ_SLOT(updateList())); else updateList(); } @@ -274,7 +274,7 @@ ProcessController::killProcess() if ( !timerOn()) // give ksysguardd time to update its proccess list - TQTimer::singleShot(3000, this, TQT_SLOT(updateList())); + TQTimer::singleShot(3000, this, TQ_SLOT(updateList())); else updateList(); } diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h index 848d77294..e9c81e6c3 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h @@ -51,7 +51,7 @@ extern TDEApplication* Kapp; */ class ProcessController : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: ProcessController(TQWidget* parent = 0, const char* name = 0, const TQString &title = TQString::null, bool nf = false); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp index 9293ef6a0..b7e8b0c72 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp @@ -221,19 +221,19 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) /* The filter mode is controlled by a combo box of the parent. If * the mode is changed we get a signal. */ - connect(parent, TQT_SIGNAL(setFilterMode(int)), - this, TQT_SLOT(setFilterMode(int))); + connect(parent, TQ_SIGNAL(setFilterMode(int)), + this, TQ_SLOT(setFilterMode(int))); /* We need to catch this signal to show various popup menues. */ connect(this, - TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), + TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), this, - TQT_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int))); + TQ_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int))); /* Since Qt does not tell us the sorting details we have to do our * own bookkeping, so we can save and restore the sorting * settings. */ - connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortingChanged(int))); + connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(sortingChanged(int))); ctrlKeyDown = false; shiftKeyDown = false; @@ -260,10 +260,10 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) headerPM->insertItem(i18n("Add Column"), HEADER_ADD); headerPM->insertItem(i18n("Help on Column"), HEADER_HELP); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(sizeChanged(int, int, int))); - connect(header(), TQT_SIGNAL(indexChange(int, int, int)), - this, TQT_SLOT(indexChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(sizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(indexChange(int, int, int)), + this, TQ_SLOT(indexChanged(int, int, int))); killSupported = false; setModified(false); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h index 51ac510e2..ccabce745 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h @@ -59,7 +59,7 @@ class TQPopupMenu; */ class ProcessList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: // possible values for the filter mode diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cpp index e71c6e0a0..e71c6e0a0 100644 --- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc +++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cpp diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h index a9d506eb7..6ef09c175 100644 --- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h +++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h @@ -40,7 +40,7 @@ class KIntNumInput; */ class ReniceDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ReniceDlg(TQWidget* parent, const char* name, int currentPPrio, int pid); diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp index 4dfff7957..ac029e5e2 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp @@ -64,9 +64,9 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name, TQWhatsThis::add( this, "dummy" ); if(!nf) { - mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame"); + mFrame = new TQGroupBox( 2, TQt::Vertical, "", this, "displayFrame"); mFrame->setFlat(true); - mFrame->setAlignment(Qt::AlignHCenter); + mFrame->setAlignment(TQt::AlignHCenter); mFrame->setInsideMargin(2); setTitle( title ); @@ -156,7 +156,7 @@ void SensorDisplay::resizeEvent( TQResizeEvent* ) bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event ) { if ( event->type() == TQEvent::MouseButtonPress && - ( (TQMouseEvent*)event)->button() == Qt::RightButton ) { + ( (TQMouseEvent*)event)->button() == TQt::RightButton ) { TQPopupMenu pm; if ( mIsApplet ) { pm.insertItem( i18n( "Launch &System Guard"), 1 ); @@ -200,7 +200,7 @@ bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event ) return true; } else if ( event->type() == TQEvent::MouseButtonRelease && - ( ( TQMouseEvent*)event)->button() == Qt::LeftButton ) { + ( ( TQMouseEvent*)event)->button() == TQt::LeftButton ) { setFocus(); } diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h index c59f17468..27933dd6b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h @@ -50,7 +50,7 @@ class SensorProperties; */ class SensorDisplay : public TQWidget, public SensorClient { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp index 88083fca1..63cee160b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp @@ -117,8 +117,8 @@ LogSensor::answerReceived(int id, const TQString& answer) KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName)); timerOn(); } - TQDate date = TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().date()); - TQTime time = TQT_TQTIME_OBJECT(TQDateTime::currentDateTime().time()); + TQDate date = TQDateTime::currentDateTime().date(); + TQTime time = TQDateTime::currentDateTime().time(); stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value); } @@ -146,7 +146,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t monitor->setPalette(TQPalette(cgroup, cgroup, cgroup)); monitor->setSelectionMode(TQListView::NoSelection); - connect(monitor, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int))); + connect(monitor, TQ_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int))); setTitle(i18n("Sensor Logger")); @@ -237,7 +237,7 @@ SensorLogger::configureSettings() sls = new SensorLoggerSettings(this, "SensorLoggerSettings"); TQ_CHECK_PTR(sls); - connect( sls, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); + connect( sls, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); sls->setTitle(title()); sls->setForegroundColor(cgroup.text()); @@ -284,9 +284,9 @@ SensorLogger::restoreSettings(TQDomElement& element) { TQColorGroup cgroup = monitor->colorGroup(); - cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); - cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); - cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", Qt::red)); + cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green)); + cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black)); + cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", TQt::red)); monitor->setPalette(TQPalette(cgroup, cgroup, cgroup)); logSensors.clear(); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h index 6630d57e1..354d9ed5b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h @@ -59,7 +59,7 @@ private: class LogSensor : public TQObject, public KSGRD::SensorClient { - Q_OBJECT + TQ_OBJECT public: LogSensor(TQListView *parent); ~LogSensor(void); @@ -141,7 +141,7 @@ private: class SensorLogger : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: SensorLogger(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0); ~SensorLogger(void); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cpp index 422c6a835..64c76f5b8 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cpp @@ -100,7 +100,3 @@ void SensorLoggerDlg::setUpperLimit( double limit ) } #include "SensorLoggerDlg.moc" - -/* vim: et sw=2 ts=2 -*/ - diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h index e5061c722..3a1d239ca 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h @@ -30,7 +30,7 @@ class SensorLoggerDlgWidget; class SensorLoggerDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -56,7 +56,3 @@ class SensorLoggerDlg : public KDialogBase }; #endif // SENSORLOGGERDLG_H - -/* vim: et sw=2 ts=2 -*/ - diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h index 515cb13f6..ad1f2687b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h @@ -9,8 +9,8 @@ void SensorLoggerDlgWidget::init() { - m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit))); - m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit))); + m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit)); + m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit)); m_timerInterval->setRange(1, 99, 1, true); m_fileName->setFocus(); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cpp index e029d9149..c2206e092 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cpp @@ -71,7 +71,3 @@ void SensorLoggerSettings::setAlarmColor( const TQColor &c ) } #include "SensorLoggerSettings.moc" - -/* vim: et sw=2 ts=2 -*/ - diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h index e3f937166..38b19a8c4 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h @@ -30,7 +30,7 @@ class SensorLoggerSettingsWidget; class SensorLoggerSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -52,6 +52,3 @@ class SensorLoggerSettings : public KDialogBase }; #endif // SENSORLOGGERSETTINGS_H - -/* vim: et sw=2 ts=2 -*/ diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp index bcb0b821b..1568eab17 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp @@ -445,7 +445,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* ) top = p.fontMetrics().height(); h -= top; int h0 = top - 2; // h0 is our new top. It's at least 5 pixels high - p.drawText(0, 0, x0, top - 2, Qt::AlignCenter, mTitle ); + p.drawText(0, 0, x0, top - 2, TQt::AlignCenter, mTitle ); p.drawLine( x0 - 1, 1, x0 - 1, h0 ); p.drawLine( 0, top - 1, w - 2, top - 1 ); diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h index cc632ac94..7f7bcdcb3 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h @@ -36,7 +36,7 @@ class TQColor; class SignalPlotter : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SignalPlotter( TQWidget *parent = 0, const char *name = 0 ); diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cpp index d465a998d..2b0bc76dd 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cpp @@ -518,10 +518,10 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new mDisplayList[ row ][ column ] = newDisplay; if ( mDisplayList[ row ][ column ]->useGlobalUpdateInterval() ) mDisplayList[ row ][ column ]->setUpdateInterval( updateInterval() ); - connect( newDisplay, TQT_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ), - TQT_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) ); - connect( newDisplay, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( setModified( bool ) ) ); + connect( newDisplay, TQ_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ), + TQ_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) ); + connect( newDisplay, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( setModified( bool ) ) ); } diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h index 37bafbda3..e2293c243 100644 --- a/ksysguard/gui/WorkSheet.h +++ b/ksysguard/gui/WorkSheet.h @@ -44,7 +44,7 @@ class TQStringList; */ class WorkSheet : public TQWidget, public KSGRD::SensorBoard { - Q_OBJECT + TQ_OBJECT public: WorkSheet( TQWidget* parent, const char *name = 0 ); diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cpp index 703be57d5..e985cfafa 100644 --- a/ksysguard/gui/WorkSheetSettings.cc +++ b/ksysguard/gui/WorkSheetSettings.cpp @@ -45,24 +45,24 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); + TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page ); group->layout()->setMargin( marginHint() ); group->layout()->setSpacing( spacingHint() ); TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); mSheetTitle = new KLineEdit( group ); groupLayout->addWidget( mSheetTitle, 0, 0 ); topLayout->addWidget( group ); - group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page ); + group = new TQGroupBox( 0, TQt::Vertical, i18n( "Properties" ), page ); group->layout()->setMargin( marginHint() ); group->layout()->setSpacing( spacingHint() ); groupLayout = new TQGridLayout( group->layout(), 3, 2 ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); groupLayout->addWidget( label, 0, 0 ); diff --git a/ksysguard/gui/WorkSheetSettings.h b/ksysguard/gui/WorkSheetSettings.h index 5f7d8da0c..9c58502cf 100644 --- a/ksysguard/gui/WorkSheetSettings.h +++ b/ksysguard/gui/WorkSheetSettings.h @@ -31,7 +31,7 @@ class KIntNumInput; class WorkSheetSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: WorkSheetSettings( TQWidget* parent = 0, const char* name = 0 ); diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cpp index c5e622248..9aa511884 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cpp @@ -47,8 +47,8 @@ Workspace::Workspace( TQWidget* parent, const char* name ) mSheetList.setAutoDelete( true ); mAutoSave = true; - connect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), - TQT_SLOT( updateCaption( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), + TQ_SLOT( updateCaption( TQWidget* ) ) ); TQWhatsThis::add( this, i18n( "This is your work space. It holds your worksheets. You need " "to create a new worksheet (Menu File->New) before " @@ -62,8 +62,8 @@ Workspace::~Workspace() * administration data is already deleted but slots are still * being triggered. TODO: I need to ask the Trolls about this. */ - disconnect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, - TQT_SLOT( updateCaption( TQWidget* ) ) ); + disconnect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, + TQ_SLOT( updateCaption( TQWidget* ) ) ); } void Workspace::saveProperties( TDEConfig *cfg ) @@ -148,10 +148,10 @@ void Workspace::newWorkSheet() insertTab( sheet, dlg.sheetTitle() ); mSheetList.append( sheet ); showPage( sheet ); - connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ), - TQT_SLOT( updateCaption( TQWidget* ) ) ); - connect( sheet, TQT_SIGNAL( titleChanged( TQWidget* ) ), - TQT_SLOT( updateSheetTitle( TQWidget* ) ) ); + connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ), + TQ_SLOT( updateCaption( TQWidget* ) ) ); + connect( sheet, TQ_SIGNAL( titleChanged( TQWidget* ) ), + TQ_SLOT( updateSheetTitle( TQWidget* ) ) ); } } @@ -370,8 +370,8 @@ WorkSheet *Workspace::restoreWorkSheet( const TQString &fileName, const TQString } mSheetList.append( sheet ); - connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ), - TQT_SLOT( updateCaption( TQWidget* ) ) ); + connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ), + TQ_SLOT( updateCaption( TQWidget* ) ) ); /* Force the file name to be the new name. This also sets the modified * flag, so that the file will get saved on exit. */ diff --git a/ksysguard/gui/Workspace.h b/ksysguard/gui/Workspace.h index 40302ac4a..64a522a65 100644 --- a/ksysguard/gui/Workspace.h +++ b/ksysguard/gui/Workspace.h @@ -34,7 +34,7 @@ class WorkSheet; class Workspace : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: Workspace( TQWidget* parent, const char* name = 0 ); diff --git a/ksysguard/gui/ksgrd/CMakeLists.txt b/ksysguard/gui/ksgrd/CMakeLists.txt index b1ec7c5f8..daf5a0e37 100644 --- a/ksysguard/gui/ksgrd/CMakeLists.txt +++ b/ksysguard/gui/ksgrd/CMakeLists.txt @@ -34,9 +34,9 @@ install( FILES tde_add_library( ksgrd SHARED AUTOMOC SOURCES - HostConnector.cc SensorAgent.cc SensorManager.cc - SensorShellAgent.cc SensorSocketAgent.cc StyleEngine.cc - StyleSettings.cc TimerSettings.cc + HostConnector.cpp SensorAgent.cpp SensorManager.cpp + SensorShellAgent.cpp SensorSocketAgent.cpp StyleEngine.cpp + StyleSettings.cpp TimerSettings.cpp VERSION 1.2.0 LINK tdeui-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cpp index b6e85b795..9ff979965 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cpp @@ -57,11 +57,11 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) mHostNameLabel->hide(); layout->addWidget( mHostNameLabel, 0, 1 ); - TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical, + TQButtonGroup *group = new TQButtonGroup( 0, TQt::Vertical, i18n( "Connection Type" ), page ); TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4, spacingHint() ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); mUseSsh = new TQRadioButton( i18n( "ssh" ), group ); mUseSsh->setEnabled( true ); @@ -111,12 +111,12 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) layout->addMultiCellWidget( group, 1, 1, 0, 1 ); - connect( mUseCustom, TQT_SIGNAL( toggled( bool ) ), - mCommands, TQT_SLOT( setEnabled( bool ) ) ); - connect( mUseDaemon, TQT_SIGNAL( toggled( bool ) ), - mPort, TQT_SLOT( setEnabled( bool ) ) ); - connect( mHostNames->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( slotHostNameChanged( const TQString & ) ) ); + connect( mUseCustom, TQ_SIGNAL( toggled( bool ) ), + mCommands, TQ_SLOT( setEnabled( bool ) ) ); + connect( mUseDaemon, TQ_SIGNAL( toggled( bool ) ), + mPort, TQ_SLOT( setEnabled( bool ) ) ); + connect( mHostNames->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( slotHostNameChanged( const TQString & ) ) ); enableButtonOK( !mHostNames->lineEdit()->text().isEmpty() ); TDEAcceleratorManager::manage( this ); } diff --git a/ksysguard/gui/ksgrd/HostConnector.h b/ksysguard/gui/ksgrd/HostConnector.h index dbf654b7e..c4d873ffe 100644 --- a/ksysguard/gui/ksgrd/HostConnector.h +++ b/ksysguard/gui/ksgrd/HostConnector.h @@ -31,7 +31,7 @@ class TQSpinBox; class HostConnector : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: HostConnector( TQWidget *parent, const char *name = 0 ); diff --git a/ksysguard/gui/ksgrd/Makefile.am b/ksysguard/gui/ksgrd/Makefile.am index 52f5bfd01..4eead4247 100644 --- a/ksysguard/gui/ksgrd/Makefile.am +++ b/ksysguard/gui/ksgrd/Makefile.am @@ -9,14 +9,14 @@ libksgrd_la_LIBADD = $(LIB_TDEUI) # Which sources should be compiled for ksysguard. libksgrd_la_SOURCES = \ - HostConnector.cc \ - SensorAgent.cc \ - SensorManager.cc \ - SensorShellAgent.cc \ - SensorSocketAgent.cc \ - StyleEngine.cc \ - StyleSettings.cc \ - TimerSettings.cc + HostConnector.cpp \ + SensorAgent.cpp \ + SensorManager.cpp \ + SensorShellAgent.cpp \ + SensorSocketAgent.cpp \ + StyleEngine.cpp \ + StyleSettings.cpp \ + TimerSettings.cpp ksgrdincludedir = $(includedir)/ksgrd ksgrdinclude_HEADERS = \ diff --git a/ksysguard/gui/ksgrd/SensorAgent.cc b/ksysguard/gui/ksgrd/SensorAgent.cpp index 7f9615985..7f9615985 100644 --- a/ksysguard/gui/ksgrd/SensorAgent.cc +++ b/ksysguard/gui/ksgrd/SensorAgent.cpp diff --git a/ksysguard/gui/ksgrd/SensorAgent.h b/ksysguard/gui/ksgrd/SensorAgent.h index 36c44095c..14b9bc014 100644 --- a/ksysguard/gui/ksgrd/SensorAgent.h +++ b/ksysguard/gui/ksgrd/SensorAgent.h @@ -43,9 +43,9 @@ class SensorRequest; ksysguardd. The current implementation only allowes one pending requests. Incoming requests are queued in an input FIFO. */ -class KDE_EXPORT SensorAgent : public QObject +class KDE_EXPORT SensorAgent : public TQObject { - Q_OBJECT + TQ_OBJECT public: SensorAgent( SensorManager *sm ); diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cpp index 7794d9c10..1412df7d7 100644 --- a/ksysguard/gui/ksgrd/SensorManager.cc +++ b/ksysguard/gui/ksgrd/SensorManager.cpp @@ -60,6 +60,11 @@ SensorManager::SensorManager() mDict.insert( "used", new TQString( i18n( "Used Memory" ) ) ); mDict.insert( "application", new TQString( i18n( "Application Memory" ) ) ); mDict.insert( "free", new TQString( i18n( "Free Memory" ) ) ); + mDict.insert( "active", new TQString( i18n( "Active Memory" ) ) ); + mDict.insert( "inactive", new TQString( i18n( "Inactive Memory" ) ) ); + mDict.insert( "wired", new TQString( i18n( "Wired Memory" ) ) ); + mDict.insert( "execpages", new TQString( i18n( "Exec Pages" ) ) ); + mDict.insert( "filepages", new TQString( i18n( "File Pages" ) ) ); mDict.insert( "pscount", new TQString( i18n( "Process Count" ) ) ); mDict.insert( "ps", new TQString( i18n( "Process Controller" ) ) ); mDict.insert( "disk", new TQString( i18n( "Disk Throughput" ) ) ); @@ -214,8 +219,8 @@ bool SensorManager::engage( const TQString &hostName, const TQString &shell, } mAgents.insert( hostName, agent ); - connect( agent, TQT_SIGNAL( reconfigure( const SensorAgent* ) ), - TQT_SLOT( reconfigure( const SensorAgent* ) ) ); + connect( agent, TQ_SIGNAL( reconfigure( const SensorAgent* ) ), + TQ_SLOT( reconfigure( const SensorAgent* ) ) ); emit update(); return true; diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h index 1e859c638..906358c0d 100644 --- a/ksysguard/gui/ksgrd/SensorManager.h +++ b/ksysguard/gui/ksgrd/SensorManager.h @@ -43,9 +43,9 @@ class SensorManagerIterator; connection yet or the hostname is empty, a dialog will be shown to enter the connections details. */ -class KDE_EXPORT SensorManager : public QObject +class KDE_EXPORT SensorManager : public TQObject { - Q_OBJECT + TQ_OBJECT friend class SensorManagerIterator; diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.cc b/ksysguard/gui/ksgrd/SensorShellAgent.cpp index 7e137ad56..c398be32f 100644 --- a/ksysguard/gui/ksgrd/SensorShellAgent.cc +++ b/ksysguard/gui/ksgrd/SensorShellAgent.cpp @@ -55,14 +55,14 @@ bool SensorShellAgent::start( const TQString &host, const TQString &shell, mShell = shell; mCommand = command; - connect( mDaemon, TQT_SIGNAL( processExited( TDEProcess* ) ), - TQT_SLOT( daemonExited( TDEProcess* ) ) ); - connect( mDaemon, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - TQT_SLOT( msgRcvd( TDEProcess*, char*, int ) ) ); - connect( mDaemon, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - TQT_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) ); - connect( mDaemon, TQT_SIGNAL( wroteStdin( TDEProcess* ) ), - TQT_SLOT( msgSent( TDEProcess* ) ) ); + connect( mDaemon, TQ_SIGNAL( processExited( TDEProcess* ) ), + TQ_SLOT( daemonExited( TDEProcess* ) ) ); + connect( mDaemon, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + TQ_SLOT( msgRcvd( TDEProcess*, char*, int ) ) ); + connect( mDaemon, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + TQ_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) ); + connect( mDaemon, TQ_SIGNAL( wroteStdin( TDEProcess* ) ), + TQ_SLOT( msgSent( TDEProcess* ) ) ); TQString cmd; if ( !command.isEmpty() ) diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.h b/ksysguard/gui/ksgrd/SensorShellAgent.h index 2befd346b..eaa932dfc 100644 --- a/ksysguard/gui/ksgrd/SensorShellAgent.h +++ b/ksysguard/gui/ksgrd/SensorShellAgent.h @@ -45,7 +45,7 @@ class SensorManager; */ class SensorShellAgent : public SensorAgent { - Q_OBJECT + TQ_OBJECT public: SensorShellAgent( SensorManager *sm ); diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cc b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp index 30c0cc7e9..ed52a5bd4 100644 --- a/ksysguard/gui/ksgrd/SensorSocketAgent.cc +++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp @@ -34,10 +34,10 @@ using namespace KSGRD; SensorSocketAgent::SensorSocketAgent( SensorManager *sm ) : SensorAgent( sm ) { - connect( &mSocket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( error( int ) ) ); - connect( &mSocket, TQT_SIGNAL( bytesWritten( int ) ), TQT_SLOT( msgSent( int ) ) ); - connect( &mSocket, TQT_SIGNAL( readyRead() ), TQT_SLOT( msgRcvd() ) ); - connect( &mSocket, TQT_SIGNAL( closed() ), TQT_SLOT( connectionClosed() ) ); + connect( &mSocket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( error( int ) ) ); + connect( &mSocket, TQ_SIGNAL( bytesWritten( int ) ), TQ_SLOT( msgSent( int ) ) ); + connect( &mSocket, TQ_SIGNAL( readyRead() ), TQ_SLOT( msgRcvd() ) ); + connect( &mSocket, TQ_SIGNAL( closed() ), TQ_SLOT( connectionClosed() ) ); } SensorSocketAgent::~SensorSocketAgent() diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.h b/ksysguard/gui/ksgrd/SensorSocketAgent.h index 7b9062f17..f937562ff 100644 --- a/ksysguard/gui/ksgrd/SensorSocketAgent.h +++ b/ksysguard/gui/ksgrd/SensorSocketAgent.h @@ -41,7 +41,7 @@ class SensorClient; */ class SensorSocketAgent : public SensorAgent { - Q_OBJECT + TQ_OBJECT public: SensorSocketAgent( SensorManager *sm ); diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cpp index ce3e3bd6b..0e7330741 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.cc +++ b/ksysguard/gui/ksgrd/StyleEngine.cpp @@ -143,8 +143,8 @@ void StyleEngine::configure() mSettingsDialog->setFontSize( mFontSize ); mSettingsDialog->setSensorColors( mSensorColors ); - connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), - this, TQT_SLOT( applyToWorksheet() ) ); + connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), + this, TQ_SLOT( applyToWorksheet() ) ); if ( mSettingsDialog->exec() ) apply(); diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h index 50ec06e0b..15a968eb6 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.h +++ b/ksysguard/gui/ksgrd/StyleEngine.h @@ -38,9 +38,9 @@ class StyleSettings; namespace KSGRD { -class KDE_EXPORT StyleEngine : public QObject +class KDE_EXPORT StyleEngine : public TQObject { - Q_OBJECT + TQ_OBJECT public: StyleEngine(); diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cpp index b84d3e407..f70a387b4 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cc +++ b/ksysguard/gui/ksgrd/StyleSettings.cpp @@ -90,14 +90,14 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name ) mEditColorButton = new TQPushButton( i18n( "Change Color..." ), page ); mEditColorButton->setEnabled( false ); - layout->addWidget( mEditColorButton, 0, 1, Qt::AlignTop ); - - connect( mColorListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), - TQT_SLOT( selectionChanged( TQListBoxItem* ) ) ); - connect( mColorListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - TQT_SLOT( editSensorColor() ) ); - connect( mEditColorButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( editSensorColor() ) ); + layout->addWidget( mEditColorButton, 0, 1, TQt::AlignTop ); + + connect( mColorListBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQ_SLOT( selectionChanged( TQListBoxItem* ) ) ); + connect( mColorListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + TQ_SLOT( editSensorColor() ) ); + connect( mEditColorButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( editSensorColor() ) ); TDEAcceleratorManager::manage( this ); } diff --git a/ksysguard/gui/ksgrd/StyleSettings.h b/ksysguard/gui/ksgrd/StyleSettings.h index c3b3d362c..5868b9123 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.h +++ b/ksysguard/gui/ksgrd/StyleSettings.h @@ -35,7 +35,7 @@ class TQPushButton; class StyleSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: StyleSettings( TQWidget *parent = 0, const char *name = 0 ); diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cpp index 43e73ab90..4fa165f99 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.cc +++ b/ksysguard/gui/ksgrd/TimerSettings.cpp @@ -53,8 +53,8 @@ TimerSettings::TimerSettings( TQWidget *parent, const char *name ) mLabel->setBuddy( mInterval ); TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) ); - connect( mUseGlobalUpdate, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( globalUpdateChanged( bool ) ) ); + connect( mUseGlobalUpdate, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( globalUpdateChanged( bool ) ) ); mUseGlobalUpdate->setChecked( true ); diff --git a/ksysguard/gui/ksgrd/TimerSettings.h b/ksysguard/gui/ksgrd/TimerSettings.h index 64c49959b..8a2ba9588 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.h +++ b/ksysguard/gui/ksgrd/TimerSettings.h @@ -32,7 +32,7 @@ class TQSpinBox; class KDE_EXPORT TimerSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: TimerSettings( TQWidget *parent, const char *name = 0 ); diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cpp index b08763b2f..65326d826 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cpp @@ -71,28 +71,28 @@ TopLevel* topLevel; TopLevel::TopLevel( const char *name ) : TDEMainWindow( 0, name ), DCOPObject( "KSysGuardIface" ) { - setPlainCaption( i18n( "TDE System Guard" ) ); + setPlainCaption( i18n( "KSysGuard" ) ); mDontSaveSession = false; mTimerId = -1; mSplitter = new TQSplitter( this ); - mSplitter->setOrientation( Qt::Horizontal ); + mSplitter->setOrientation( TQt::Horizontal ); mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); setCentralWidget( mSplitter ); mSensorBrowser = new SensorBrowser( mSplitter, KSGRD::SensorMgr ); mServiceBrowser = new DNSSD::ServiceBrowser("_ksysguard._tcp", 0, true); - connect(mServiceBrowser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, - TQT_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); + connect(mServiceBrowser,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, + TQ_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); mWorkSpace = new Workspace( mSplitter ); - connect( mWorkSpace, TQT_SIGNAL( announceRecentURL( const KURL& ) ), - TQT_SLOT( registerRecentURL( const KURL& ) ) ); - connect( mWorkSpace, TQT_SIGNAL( setCaption( const TQString&, bool ) ), - TQT_SLOT( setCaption( const TQString&, bool ) ) ); - connect( KSGRD::Style, TQT_SIGNAL( applyStyleToWorksheet() ), mWorkSpace, - TQT_SLOT( applyStyle() ) ); + connect( mWorkSpace, TQ_SIGNAL( announceRecentURL( const KURL& ) ), + TQ_SLOT( registerRecentURL( const KURL& ) ) ); + connect( mWorkSpace, TQ_SIGNAL( setCaption( const TQString&, bool ) ), + TQ_SLOT( setCaption( const TQString&, bool ) ) ); + connect( KSGRD::Style, TQ_SIGNAL( applyStyleToWorksheet() ), mWorkSpace, + TQ_SLOT( applyStyle() ) ); /* Create the status bar. It displays some information about the * number of processes and the memory consumption of the local @@ -105,40 +105,40 @@ TopLevel::TopLevel( const char *name ) statusBar()->hide(); // create actions for menue entries - new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); + new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace, + TQ_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); - new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); + new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, mWorkSpace, + TQ_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0, - TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); + mWorkSpace, TQ_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); - new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); + new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace, + TQ_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); - new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); + new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, mWorkSpace, + TQ_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); - new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this), - TQT_SLOT( connectHost() ), actionCollection(), "connect_host" ); - new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this), - TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); + new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, this, + TQ_SLOT( connectHost() ), actionCollection(), "connect_host" ); + new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, this, + TQ_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); -// KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() ); -// KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() ); -// KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() ); - new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( configure() ), actionCollection(), "configure_sheet" ); +// KStdAction::cut( mWorkSpace, TQ_SLOT( cut() ), actionCollection() ); +// KStdAction::copy( mWorkSpace, TQ_SLOT( copy() ), actionCollection() ); +// KStdAction::paste( mWorkSpace, TQ_SLOT( paste() ), actionCollection() ); + new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace, + TQ_SLOT( configure() ), actionCollection(), "configure_sheet" ); new TDEAction( i18n( "Load Standard Sheets" ), "document-revert", - 0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ), + 0, this, TQ_SLOT( resetWorkSheets() ), actionCollection(), "revert_all_worksheets" ); - new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this), - TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); + new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, this, + TQ_SLOT( editStyle() ), actionCollection(), "configure_style" ); // TODO remove resize and fix so sizeHints() determines default size. if (!initialGeometrySet()) @@ -293,7 +293,7 @@ void TopLevel::initStatusBar() TDEToggleAction *sb = dynamic_cast<TDEToggleAction*>(action("options_show_statusbar")); if (sb) - connect(sb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateStatusBar())); + connect(sb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateStatusBar())); } void TopLevel::updateStatusBar() @@ -319,8 +319,8 @@ void TopLevel::editToolbars() { saveMainWindowSettings( kapp->config() ); KEditToolbar dlg( actionCollection() ); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this, - TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this, + TQ_SLOT( slotNewToolbarConfig() ) ); dlg.exec(); } @@ -553,7 +553,7 @@ int main( int argc, char** argv ) close( initpipe[ 0 ] ); setsid(); - TDEAboutData aboutData( "ksysguard", I18N_NOOP( "TDE System Guard" ), + TDEAboutData aboutData( "ksysguard", I18N_NOOP( "KSysGuard" ), KSYSGUARD_VERSION, Description, TDEAboutData::License_GPL, I18N_NOOP( "(c) 1996-2002 The KSysGuard Developers" ) ); aboutData.addAuthor( "Chris Schlaeger", "Current Maintainer", "cs@kde.org" ); diff --git a/ksysguard/gui/ksysguard.desktop b/ksysguard/gui/ksysguard.desktop index cfffc7d9f..22f55a92b 100644 --- a/ksysguard/gui/ksysguard.desktop +++ b/ksysguard/gui/ksysguard.desktop @@ -1,95 +1,8 @@ [Desktop Entry] Name=KSysGuard -Name[af]=Ksysguard -Name[ar]=حارس النظام -Name[bg]=Системна защита -Name[csb]=TDE Wachtôrz Systemë -Name[de]=Systemüberwachung -Name[eo]=KSistemGardilo -Name[et]=Süsteemi valvur -Name[fr]=Surveillance du système -Name[he]=משמר המערכת -Name[hi]=के-सिस-गार्ड -Name[hr]=TDE zaštitnik sustava -Name[is]=TDE álagsmælir -Name[ja]=TDE システムガード -Name[lo]=ກວດສອບແລະປ້ອງກັນລະບົບ - K -Name[mn]=Системийн хяналт -Name[nb]=TDE Systemvakt -Name[ne]=KSys रक्षक -Name[nn]=TDE Systemvakt -Name[nso]=Thlokomelo ya KSys -Name[pl]=TDE Strażnik Systemu -Name[sk]=TDE Strážca systému -Name[sv]=Systemövervakare -Name[tg]=Муҳофизати системаи-K -Name[th]=ตรวจสอบและป้องกันระบบ -Name[uz]=TDE tizim nazoratchisi -Name[uz@cyrillic]=TDE тизим назоратчиси -Name[vi]=Bảo vệ Hệ thống TDE -Name[wa]=KSisGåde + GenericName=Performance Monitor -GenericName[af]=Werkverrigting Monitor -GenericName[ar]=مراقب الإداء -GenericName[be]=Сістэмны назіральнік -GenericName[bg]=Мониторинг на системата -GenericName[bs]=Monitor performansi -GenericName[ca]=Monitor de rendiment -GenericName[cs]=Monitor výkonu -GenericName[csb]=Mònitor spòroscë -GenericName[da]=Overvågning af ydelse -GenericName[de]=Performancemonitor -GenericName[el]=Επόπτης συστήματος -GenericName[eo]=Rendimento Monitoro -GenericName[es]=Monitor de rendimiento -GenericName[et]=Jõudluse monitor -GenericName[eu]=Sistemaren errendimenduaren monitorea -GenericName[fa]=نمایشگر کارایی -GenericName[fi]=Järjestelmän suorituskyvyn monitori -GenericName[fr]=Indicateurs de performance -GenericName[fy]=Prestaasjemonitor -GenericName[gl]=Monitor de Rendemento -GenericName[he]=צג מערכת -GenericName[hr]=Nadzor performansi -GenericName[hu]=Teljesítményfigyelő -GenericName[is]=Afkasta eftirlit -GenericName[it]=Monitor delle prestazioni -GenericName[ja]=パフォーマンスモニター -GenericName[ka]=წარმადობის მონიტორი -GenericName[kk]=Жылдамдылық бақылаушысы -GenericName[km]=កម្មវិធីត្រួតពិនិត្យដំណើរការ -GenericName[lt]=Veiksenos monitorius -GenericName[mk]=Монитор на перформанси -GenericName[ms]=Pemantau Prestasi -GenericName[nb]=Ytelsesovervåker -GenericName[nds]=Leisten-Kieker -GenericName[ne]=सम्पादन मनिटर -GenericName[nl]=Prestatiemonitor -GenericName[nn]=Ytelsesovervakar -GenericName[pa]=ਪਰਦਰਸ਼ਨ ਨਿਗਰਾਨ -GenericName[pl]=Monitor wydajności -GenericName[pt]=Monitor de Performance -GenericName[pt_BR]=Monitor de Performance -GenericName[ro]=Monitor de performanță -GenericName[ru]=Монитор производительности -GenericName[rw]=Mugaragaza y'Imikorere -GenericName[se]=Buvttogoziheaddji -GenericName[sk]=Sledovač výkonu -GenericName[sl]=Nadzor delovanja -GenericName[sr]=Монитор перформанси -GenericName[sr@Latn]=Monitor performansi -GenericName[sv]=Prestandaövervakare -GenericName[ta]=செயல்திறன் திரை -GenericName[th]=สอดส่องประสิทธิภาพการทำงานของระบบ -GenericName[tr]=Sistem İzleyici -GenericName[tt]=Citezlek Küzätüçese -GenericName[uk]=Монітор швидкодії -GenericName[uz]=Tizimni nazorat qilish -GenericName[uz@cyrillic]=Тизимни назорат қилиш -GenericName[vi]=Theo dõi Hiệu năng -GenericName[wa]=Corwaitoe di ç' ki va bén -GenericName[zh_CN]=性能监视器 -GenericName[zh_TW]=效能監視器 + Exec=ksysguard %U Icon=ksysguard Type=Application diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index df1c2e0c5..b1579bf65 100644 --- a/ksysguard/gui/ksysguard.h +++ b/ksysguard/gui/ksysguard.h @@ -43,7 +43,7 @@ class Workspace; class TopLevel : public TDEMainWindow, public KSGRD::SensorClient, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/ksysguard/gui/ksysguardapplet.desktop b/ksysguard/gui/ksysguardapplet.desktop index 9eebf5381..4980ed611 100644 --- a/ksysguard/gui/ksysguardapplet.desktop +++ b/ksysguard/gui/ksysguardapplet.desktop @@ -1,120 +1,10 @@ [Desktop Entry] Type=Plugin + Name=System Guard -Name[af]=Stelsel Wag -Name[ar]=حارس النظام -Name[be]=Сістэмны ахоўнік -Name[bg]=Системен монитор -Name[bn]=সিস্টেম প্রহরী -Name[br]=Gward Reizhiad -Name[bs]=Nadzor sistema -Name[ca]=Vigilant del sistema -Name[cs]=Strážce systému -Name[csb]=Wachtôrz Systemë -Name[da]=Systemvagt -Name[de]=Systemüberwachung -Name[el]=Φρουρός συστήματος -Name[eo]=Sistemo Gardilo -Name[es]=Guardián del sistema -Name[et]=Süsteemi valvur -Name[eu]=Sistemaren zaintzailea -Name[fa]=محافظ سیستم -Name[fi]=Järjestelmän valvonta -Name[fr]=Surveillance du système -Name[fy]=Systeemwarder -Name[gl]=Vixiante do Sistema -Name[he]=משמר המערכת -Name[hr]=Zaštitnik sustava -Name[hu]=Rendszermonitor -Name[is]=Kerfiseftirlit -Name[it]=Controllo del sistema -Name[ja]=システムガード -Name[ka]=სისტემის მცველი -Name[kk]=Жүйе бақылаушысы -Name[km]=ឆ្មាំប្រព័ន្ធ -Name[ko]=TDE 시스템 지킴이 -Name[lt]=Sistemos apsauga -Name[mk]=Чувар на системот -Name[nb]=Systemvakt -Name[nds]=Systeemwachter -Name[ne]=प्रणाली रक्षक -Name[nl]=Systeembewaking -Name[nn]=Systemvakt -Name[pa]=ਸਿਸਟਮ ਗਾਰਡ -Name[pl]=Strażnik Systemu -Name[pt]=Vigilante do Sistema -Name[pt_BR]=Guarda do Sistema -Name[ro]=Sistem de gardă -Name[ru]=Системный монитор -Name[se]=Vuogádatfákta -Name[sk]=Strážca systému -Name[sl]=Sistemski varuh -Name[sr]=Заштита система -Name[sr@Latn]=Zaštita sistema -Name[sv]=Systemövervakare -Name[th]=ป้องกันระบบ -Name[tr]=Sistem İzleyici -Name[uk]=Системний вартовий -Name[uz]=Kengaytirilgan tizim nazoratchisi -Name[uz@cyrillic]=Кенгайтирилган тизим назоратчиси -Name[vi]=Bảo vệ Hệ thống -Name[wa]=Gåde do sistinme -Name[zh_CN]=系统卫士 -Name[zh_TW]=系統守衛 + Comment=An advanced system monitor which allows TDE system guard displays -Comment[af]='n Gevorderde stelsel monitor wat TDE se stelsel wag skerms insluit -Comment[be]=Адмысловы сістэмны назіральнік, які "праглынае" дысплеі сістэмнага ахоўніка TDE -Comment[bg]=Системен монитор, който следи за състоянието на системата -Comment[bs]=Napredni program za nadzor sistema koji obuhvata više drugih prozora -Comment[ca]=Un monitor del sistema avançat que inclou pantalles del vigilant del sistema TDE -Comment[cs]=Pokročilý monitor systému, který pohlcuje displeje strážce TDE -Comment[csb]=Awansowóny mònitor systemë jaczi pòkazywô wskôzywôcze TDE Wachtôrza Systemë -Comment[da]=En avanceret systemovervåger som svælger skærme fra TDE's systemovervågning -Comment[de]=Erweiterte Systemüberwachung für die Kontrollleiste -Comment[el]=Ένας προχωρημένος επόπτης του συστήματος ο οποίος ενσωματώνει προβολές του φρουρού συστήματος του TDE -Comment[eo]=Malbaza sistemomonitoro kiu glutas TDE-sistemogardilo-ekranojn. -Comment[es]=Un monitor avanzado del sistema que integra los gráficos del guardián del sistema de TDE -Comment[et]=Võimas süsteemi monitor TDE süsteemi valvuri sensoritele -Comment[eu]=Sistema monitore aurreratua, TDE sistemaren zaintzailearen pantailak bistaratzen dituena -Comment[fa]=یک نمایشگر پیشرفتۀ سیستم که نمایشهای محافظ سیستم TDE را از بین میبرد -Comment[fi]=Edistynyt järjestelmän valvonta, johon sisältyy TDE järjestelmänvalvonnan näytöt -Comment[fr]=Un surveillant avancé affichant l'état du système -Comment[fy]=In avansearre systeemmonitor mei systeemwardings werjefte -Comment[gl]=Un monitor do sistema que incorpora os resultados do vixiante do sistema de TDE -Comment[he]=מנטר מערכת מתקדם המאפשר המטעה של תצוגות של משמר המערכת של TDE -Comment[hr]=Napredan sistemski nadzor koji "guta" prikaze TDE zaštitnika sustava -Comment[hu]=Rendszermonitor kijelzőkkel -Comment[is]=Þróað kerfiseftirlit sem gleypir TDE álagsmæla -Comment[it]=Un sistema di controllo del sistema avanzato che ingloba i controlli di sistema di TDE -Comment[ja]=TDE システムガードを表示する高度なシステムモニター -Comment[kk]=Жетілдірілген жүйе бақылаушысы -Comment[km]=កម្មវិធីត្រួតពិនិត្យប្រព័ន្ធកម្រិតខ្ពស់ដែលអនុញ្ញាតឲ្យប្រព័ន្ធ TDE ត្រួតពិនិត្យការបង្ហាញ -Comment[lt]=Sudėtingesnė sistemos stebėjimo priemonė, įtraukianti TDE sistemos apsaugos stebėjimo priemones -Comment[mk]=Напреден монитор на системот кој ги врамува приказите на чуварите на системот на TDE -Comment[nb]=En avansert systemovervåker som svelger visninger av TDEs systemovervåker -Comment[nds]=En verwiedert Systeemkieker, mit inbett Diagrammen vun TDE System Guard -Comment[ne]=उन्नत प्रणाली मनिटर जसले अन्त्य गर्ने TDE प्रणाली रक्षक प्रदर्शन गर्छ -Comment[nl]=Een geavanceerde systeemmonitor met systeembewakingsdisplays -Comment[nn]=Ein avansert systemovervakar som svelgjer visingar av TDE-systemovervakaren -Comment[pl]=Zaawansowany monitor systemu pokazujący wskaźniki Strażnika systemu TDE -Comment[pt]=Um monitor de sistema avançado que engloba folhas de monitorização do sistema TDE -Comment[pt_BR]=Um monitor avançado de sistema que permite monitorar o que a guarda do sistema do TDE exibe -Comment[ro]=Un monitor de sistem avansat care înghite ecranele sistemului de gardă TDE -Comment[ru]=Системный монитор -Comment[sk]=Sledovač systému, ktorý obsahuje systémových strážcov TDE -Comment[sl]=Napreden nadzor sistema, ki uporablja prikazovalnike iz Sistemskega varuha TDE -Comment[sr]=Напредни монитор који гута приказе TDE-ове заштите система -Comment[sr@Latn]=Napredni monitor koji guta prikaze TDE-ove zaštite sistema -Comment[sv]=En avancerad systemövervakare som sväljer skärmar från TDE:s systemövervakare -Comment[th]=ตัวเฝ้าตรวจสอบระบบขั้นก้าวหน้า ซึ่งกลืนหน้าจอของตัวป้องกันระบบ TDE -Comment[tr]=Gelişmiş bir sistem izleyici -Comment[uk]=Додатковий системний монітор, який поглинає показ системного вартового TDE -Comment[uz]=Tizimning protsessor, xotira, tarmoq kabi qisimlarini kuzatib turadigan kengaytirilgan tizim nazoratchisi -Comment[uz@cyrillic]=Тизимнинг процессор, хотира, тармоқ каби қисимларини кузатиб турадиган кенгайтирилган тизим назоратчиси -Comment[vi]=Một trình theo dõi hệ thống nâng cao thế chỗ cho hiển thị bảo vệ hệ thống TDE -Comment[wa]=On corwaitoe po les spepieus k' avale li håynaedje so gåde do sistinme di TDE -Comment[zh_CN]=可显示 TDE 系统卫士效果的高级系统监视器 -Comment[zh_TW]=包含 TDE 系統守衛顯示的進階系統監視器 + Icon=ksysguard X-TDE-Library=sysguard_panelapplet X-TDE-UniqueApplet=true diff --git a/ksysguard/gui/x-ksysguard.desktop b/ksysguard/gui/x-ksysguard.desktop index 2e96b62c0..bbd799b81 100644 --- a/ksysguard/gui/x-ksysguard.desktop +++ b/ksysguard/gui/x-ksysguard.desktop @@ -1,84 +1,9 @@ [Desktop Entry] OnlyShowIn=TDE; MimeType=application/x-ksysguard + Comment=TDE System Guard -Comment[af]=TDE Stelsel Wag -Comment[ar]=حارس النظام TDE -Comment[az]=TDE Sistem Cangüdəni -Comment[be]=Ахоўнік сістэмы TDE -Comment[bg]=Системна защита -Comment[bn]=কে.ডি.ই. সিস্টেম গার্ড -Comment[br]=Gward Reizhiad TDE -Comment[bs]=TDE zaštita sistema -Comment[ca]=Vigilant del sistema TDE -Comment[cs]=Správce systému TDE -Comment[csb]=TDE Wachtôrz Systemë -Comment[cy]=Gwarchodwr Cysawd TDE -Comment[da]=TDE Systemvagt -Comment[de]=TDE-Systemüberwachung -Comment[el]=Φρουρός συστήματος του TDE -Comment[eo]=TDE-Sistemobservilo -Comment[es]=Guardián del sistema de TDE -Comment[et]=TDE süsteemi valvur -Comment[eu]=TDEren sistemaren kontrola -Comment[fa]=محافظ سیستم TDE -Comment[fi]=TDE:n järjestelmänvalvonta -Comment[fr]=Surveillance du système -Comment[fy]=TDE systeembefeiliging -Comment[ga]=Garda an Chórais TDE -Comment[gl]=Vixiante do Sistema de TDE -Comment[he]=משמר המערכת של TDE -Comment[hi]=केडीई तंत्र गार्ड -Comment[hr]=TDE zaštitnik sustava -Comment[hu]=TDE rendszermonitor -Comment[is]=TDE kerfisvörður -Comment[it]=Controllo di sistema di TDE -Comment[ja]=TDE システムガード -Comment[ka]=TDE სისტემური მონიტორი -Comment[kk]=TDE жүйелік бақылаушысы -Comment[km]=ការពារប្រព័ន្ធ TDE -Comment[ko]=TDE 시스템 지킴이 -Comment[lo]=ເຄື່ອງມືຶປ້ອງກັນລະບົບຂອງ TDE -Comment[lt]=TDE sistemos apsauga -Comment[lv]=TDE Sistēmas Sargs -Comment[mk]=TDE Системски чувар -Comment[mn]=КДЭ-Системийн хяналт -Comment[ms]=Pengawas Sistem TDE -Comment[mt]=Gwardja tas-Sistema TDE -Comment[nb]=TDE Systemovervåker -Comment[nds]=TDE-Systeemwachter -Comment[ne]=TDE प्रणाली रक्षक -Comment[nl]=TDE systeembewaking -Comment[nn]=TDE Systemvakt -Comment[nso]=Thlokomelo ya System ya TDE -Comment[pa]=TDE ਸਿਸਟਮ ਗਾਰਡ -Comment[pl]=TDE Strażnik Systemu -Comment[pt]=Vigilante do sistema do TDE -Comment[pt_BR]=Sistema de Guarda do TDE -Comment[ro]=Sistem de gardă TDE -Comment[ru]=Системный монитор -Comment[rw]=Umurinzi Sisitemu TDE -Comment[se]=TDE vuogádatfákta -Comment[sk]=TDE Strážca systému -Comment[sl]=Sistemski varuh TDE -Comment[sr]=TDE чувар система -Comment[sr@Latn]=TDE čuvar sistema -Comment[sv]=TDE:s systemövervakare -Comment[ta]=TDE கணினி காவலன் -Comment[tg]=Муҳофизи системаи TDE -Comment[th]=เครื่องมือป้องกันระบบ TDE -Comment[tr]=TDE Sistem Koruyucu -Comment[tt]=TDE'nıñ Sistem Saqçısı -Comment[uk]=Системний вартовий TDE -Comment[uz]=TDE tizim nazoratchisi -Comment[uz@cyrillic]=TDE тизим назоратчиси -Comment[ven]=Mulindi wa maitele a TDE -Comment[vi]=Trình bảo vệ Hệ thống TDE -Comment[wa]=Gåre sistinme TDE -Comment[xh]=TDE Ukhuselo lendlela yokusebenza -Comment[zh_CN]=TDE 系统卫士 -Comment[zh_TW]=TDE 系統守衛 -Comment[zu]=Unogada Wesistimu ye-TDE + Icon=ksysguard Type=MimeType Patterns=*.sgrd; diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt index 58c5f2399..16019bdc1 100644 --- a/ksysguard/ksysguardd/CMakeLists.txt +++ b/ksysguard/ksysguardd/CMakeLists.txt @@ -19,6 +19,10 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" ) set( OS_SPECIFIC_DIR OpenBSD ) elseif( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" ) set( OS_SPECIFIC_DIR FreeBSD ) +elseif( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" ) + set( OS_SPECIFIC_DIR NetBSD ) +elseif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) + set( OS_SPECIFIC_DIR Solaris ) else() tde_message_fatal( "Your operating system (${CMAKE_SYSTEM_NAME}) is not supported yet." ) endif() diff --git a/ksysguard/ksysguardd/FreeBSD/CPU.c b/ksysguard/ksysguardd/FreeBSD/CPU.c index 90d0c4721..0d83cd7f6 100644 --- a/ksysguard/ksysguardd/FreeBSD/CPU.c +++ b/ksysguard/ksysguardd/FreeBSD/CPU.c @@ -212,15 +212,15 @@ long percentages(cnt, out, new, old, diffs) int cnt; int *out; -register long *new; -register long *old; +long *new; +long *old; long *diffs; { - register int i; - register long change; - register long total_change; - register long *dp; + int i; + long change; + long total_change; + long *dp; long half_total; /* initialization */ diff --git a/ksysguard/ksysguardd/FreeBSD/ProcessList.c b/ksysguard/ksysguardd/FreeBSD/ProcessList.c index f8d2c3ba6..dbb330efb 100644 --- a/ksysguard/ksysguardd/FreeBSD/ProcessList.c +++ b/ksysguard/ksysguardd/FreeBSD/ProcessList.c @@ -98,18 +98,12 @@ typedef struct * The total amount of memory the process uses. This includes shared and * swapped memory. */ - unsigned int vmSize; + size_t vmSize; /* * The amount of physical memory the process currently uses. */ - unsigned int vmRss; - - /* - * The amount of memory (shared/swapped/etc) the process shares with - * other processes. - */ - unsigned int vmLib; + size_t vmRss; /* * The number of 1/100 of a second the process has spend in user space. @@ -264,20 +258,20 @@ updateProcess(int pid) #if __FreeBSD_version >= 500015 ps->userLoad = 100.0 * (double) p.ki_pctcpu / fscale; ps->vmSize = p.ki_size; - ps->vmRss = p.ki_rssize * getpagesize(); + ps->vmRss = (size_t)(p.ki_rssize) * (size_t)(getpagesize()); strlcpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name)); strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????"); #elif defined (__DragonFly__) && __DragonFly_version >= 190000 ps->userLoad = 100.0 * (double) p.kp_lwp.kl_pctcpu / fscale; ps->vmSize = p.kp_vm_map_size; - ps->vmRss = p.kp_vm_rssize * getpagesize(); + ps->vmRss = (size_t)(p.kp_vm_rssize) * (size_t)(getpagesize()); strlcpy(ps->name,p.kp_comm ? p.kp_comm : "????", sizeof(ps->name)); strcpy(ps->status,(p.kp_stat>=1)&&(p.kp_stat<=5)? statuses[p.kp_stat-1]:"????"); #else ps->userLoad = 100.0 * (double) p.kp_proc.p_pctcpu / fscale; ps->vmSize = p.kp_eproc.e_vm.vm_map.size; - ps->vmRss = p.kp_eproc.e_vm.vm_rssize * getpagesize(); + ps->vmRss = (size_t)(p.kp_eproc.e_vm.vm_rssize) * (size_t)(getpagesize()); #if defined (__DragonFly__) strlcpy(ps->name,p.kp_thread.td_comm ? p.kp_thread.td_comm : "????", sizeof(ps->name)); @@ -417,7 +411,7 @@ printProcessList(const char* cmd) ps = first_ctnr(ProcessList); /* skip 'kernel' entry */ for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList)) { - fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n", + fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid, (long)ps->uid, (long)ps->gid, ps->status, ps->userLoad, ps->sysLoad, ps->niceLevel, diff --git a/ksysguard/ksysguardd/Irix/NetDev.c b/ksysguard/ksysguardd/Irix/NetDev.c index 80bc2b310..403fea6cf 100644 --- a/ksysguard/ksysguardd/Irix/NetDev.c +++ b/ksysguard/ksysguardd/Irix/NetDev.c @@ -170,7 +170,7 @@ int updateNetDev(void) struct ifstats *istat; struct timeval tv; static LONGLONG timestamp=0; - register LONGLONG cts,elapsed; + LONGLONG cts,elapsed; //struct ipstat ips; if ((s=socket(PF_INET,SOCK_DGRAM,0)) < 0){ diff --git a/ksysguard/ksysguardd/Irix/ProcessList.c b/ksysguard/ksysguardd/Irix/ProcessList.c index 5bc2230b0..cf95b2937 100644 --- a/ksysguard/ksysguardd/Irix/ProcessList.c +++ b/ksysguard/ksysguardd/Irix/ProcessList.c @@ -150,7 +150,7 @@ static int updateProcess( pid_t pid ) { char buf[BUFSIZE]; prpsinfo_t psinfo; struct passwd *pw; - register double newCentStamp,timeDiff, usDiff,usTime; + double newCentStamp,timeDiff, usDiff,usTime; struct timeval tv; if( (ps = findProcessInList( pid )) == NULL ) { diff --git a/ksysguard/ksysguardd/Irix/cpu.c b/ksysguard/ksysguardd/Irix/cpu.c index 9fdd25ab7..7c013db37 100644 --- a/ksysguard/ksysguardd/Irix/cpu.c +++ b/ksysguard/ksysguardd/Irix/cpu.c @@ -212,15 +212,15 @@ long percentages(cnt, out, new, old, diffs) int cnt; int *out; -register long *new; -register long *old; +long *new; +long *old; long *diffs; { - register int i; - register long change; - register long total_change; - register long *dp; + int i; + long change; + long total_change; + long *dp; long half_total; /* initialization */ diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c index 2708664bd..8582aae56 100644 --- a/ksysguard/ksysguardd/Linux/ProcessList.c +++ b/ksysguard/ksysguardd/Linux/ProcessList.c @@ -84,10 +84,10 @@ typedef struct { The total amount of memory the process uses. This includes shared and swapped memory. */ - unsigned int vmSize; + size_t vmSize; /* The amount of physical memory the process currently uses. */ - unsigned int vmRss; + size_t vmRss; /** The number of 1/100 of a second the process has spend in user space. @@ -215,7 +215,7 @@ static int updateProcess( int pid ) return -1; if ( fscanf( fd, "%*d %*s %c %d %d %*d %d %*d %*u %*u %*u %*u %*u %d %d" - "%*d %*d %*d %d %*u %*u %*d %u %u", + "%*d %*d %*d %d %*u %*u %*d %zu %zu", &status, (int*)&ps->ppid, (int*)&ps->gid, &ps->ttyNo, &userTime, &sysTime, &ps->niceLevel, &ps->vmSize, &ps->vmRss) != 9 ) { @@ -419,7 +419,7 @@ void printProcessList( const char* cmd ) (void)cmd; for ( ps = first_ctnr( ProcessList ); ps; ps = next_ctnr( ProcessList ) ) { - fprintf( CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d" + fprintf( CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu" "\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid, (long)ps->uid, (long)ps->gid, ps->status, ps->userLoad, ps->sysLoad, ps->niceLevel, ps->vmSize / 1024, ps->vmRss / 1024, diff --git a/ksysguard/ksysguardd/Linux/netstat.c b/ksysguard/ksysguardd/Linux/netstat.c index c8570f617..c64b0ffd1 100644 --- a/ksysguard/ksysguardd/Linux/netstat.c +++ b/ksysguard/ksysguardd/Linux/netstat.c @@ -20,6 +20,8 @@ #include <config.h> +#include <sys/types.h> + #include <arpa/inet.h> #include <netdb.h> #include <stdio.h> diff --git a/ksysguard/ksysguardd/NetBSD/CMakeLists.txt b/ksysguard/ksysguardd/NetBSD/CMakeLists.txt new file mode 100644 index 000000000..0d0765382 --- /dev/null +++ b/ksysguard/ksysguardd/NetBSD/CMakeLists.txt @@ -0,0 +1,28 @@ +################################################# +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include( ConfigureChecks.cmake ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/ksysguard/CContLib + ${CMAKE_SOURCE_DIR}/ksysguard/ksysguardd +) + + +##### ksysguardd (static) ####################### + +if ( HAVE_APMIO ) + set( APM_SOURCES apm.c ) +endif ( HAVE_APMIO ) + +tde_add_library( ksysguardd STATIC + SOURCES + CPU.c Memory.c ProcessList.c ${APM_SOURCES} diskstat.c loadavg.c logfile.c netdev.c + LINK kvm +) diff --git a/ksysguard/ksysguardd/NetBSD/CPU.c b/ksysguard/ksysguardd/NetBSD/CPU.c index 959924087..1d80d9bb6 100644 --- a/ksysguard/ksysguardd/NetBSD/CPU.c +++ b/ksysguard/ksysguardd/NetBSD/CPU.c @@ -19,10 +19,11 @@ */ +#include <sys/param.h> +#include <sys/sysctl.h> #include <sys/dkstat.h> #include <sys/sched.h> /* CPUSTATES */ #include <fcntl.h> -#include <kvm.h> #include <nlist.h> #include <stdio.h> #include <stdlib.h> @@ -33,20 +34,11 @@ #include "Command.h" #include "ksysguardd.h" -long percentages(int cnt, int *out, long *new, long *old, long *diffs); +void percentages(int cnt, int *out, u_int64_t *new, u_int64_t *old, u_int64_t *diffs); -struct nlist my_nlist[] = { - {"_cp_time"}, - { 0 } -}; - -kvm_t *kd; - -unsigned long cp_time_offset; - -long cp_time[CPUSTATES]; -long cp_old[CPUSTATES]; -long cp_diff[CPUSTATES]; +u_int64_t cp_time[CPUSTATES]; +u_int64_t cp_old[CPUSTATES]; +u_int64_t cp_diff[CPUSTATES]; int cpu_states[CPUSTATES]; void @@ -61,9 +53,6 @@ initCpuInfo(struct SensorModul* sm) printCPUSysInfo, sm); registerMonitor("cpu/idle", "integer", printCPUIdle, printCPUIdleInfo, sm); - kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open"); - kvm_nlist(kd, my_nlist); - cp_time_offset = my_nlist[0].n_value; updateCpuInfo(); } @@ -71,13 +60,18 @@ initCpuInfo(struct SensorModul* sm) void exitCpuInfo(void) { - kvm_close(kd); } int updateCpuInfo(void) { - kvm_read(kd, cp_time_offset, (char *)cp_time, sizeof(cp_time)); + int mib[2]; + size_t size; + + mib[0] = CTL_KERN; + mib[1] = KERN_CP_TIME; + size = sizeof(cp_time[0]) * CPUSTATES; + sysctl(mib, 2, cp_time, &size, NULL, 0); percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff); return (0); } @@ -152,20 +146,20 @@ printCPUIdleInfo(const char* cmd) * useful on BSD mchines for calculating cpu state percentages. */ -long percentages(cnt, out, new, old, diffs) +void percentages(cnt, out, new, old, diffs) int cnt; int *out; -register long *new; -register long *old; -long *diffs; +u_int64_t *new; +u_int64_t *old; +u_int64_t *diffs; { - register int i; - register long change; - register long total_change; - register long *dp; - long half_total; + int i; + u_int64_t change; + u_int64_t total_change; + u_int64_t *dp; + u_int64_t half_total; /* initialization */ total_change = 0; @@ -174,12 +168,11 @@ long *diffs; /* calculate changes for each state and the overall change */ for (i = 0; i < cnt; i++) { - if ((change = *new - *old) < 0) - { - /* this only happens when the counter wraps */ - change = (int) - ((unsigned long)*new-(unsigned long)*old); - } + /* + * Don't worry about wrapping - even at hz=1GHz, a + * u_int64_t will last at least 544 years. + */ + change = *new - *old; total_change += (*dp++ = change); *old++ = *new++; } @@ -191,16 +184,9 @@ long *diffs; } /* calculate percentages based on overall change, rounding up */ - half_total = total_change / 2l; - - /* Do not divide by 0. Causes Floating point exception */ - if(total_change) { - for (i = 0; i < cnt; i++) - { - *out++ = (int)((*diffs++ * 1000 + half_total) / total_change); - } + half_total = total_change / 2; + for (i = 0; i < cnt; i++) + { + *out++ = (int)((*diffs++ * 1000 + half_total) / total_change); } - - /* return the total in case the caller wants to use it */ - return(total_change); } diff --git a/ksysguard/ksysguardd/NetBSD/ConfigureChecks.cmake b/ksysguard/ksysguardd/NetBSD/ConfigureChecks.cmake new file mode 100644 index 000000000..60d0b0495 --- /dev/null +++ b/ksysguard/ksysguardd/NetBSD/ConfigureChecks.cmake @@ -0,0 +1,13 @@ +################################################# +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +# apmio +check_include_files( "sys/types.h;dev/apm/apmio.h" HAVE_DEV_APM_APMIO_H ) +if( HAVE_DEV_APM_APMIO_H ) + set( HAVE_APMIO 1 CACHE INTERNAL "" FORCE ) +endif( ) diff --git a/ksysguard/ksysguardd/NetBSD/Memory.c b/ksysguard/ksysguardd/NetBSD/Memory.c index 8e9779506..19931e62b 100644 --- a/ksysguard/ksysguardd/NetBSD/Memory.c +++ b/ksysguard/ksysguardd/NetBSD/Memory.c @@ -21,12 +21,12 @@ */ #include <fcntl.h> -#include <kvm.h> #include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/param.h> +#include <sys/resource.h> #include <sys/sysctl.h> #include <sys/types.h> #include <sys/vmmeter.h> @@ -34,6 +34,7 @@ /* Everything post 1.5.x uses uvm/uvm_* includes */ #if __NetBSD_Version__ >= 105010000 #include <uvm/uvm_param.h> +#include <uvm/uvm_extern.h> #else #include <vm/vm_param.h> #endif @@ -45,29 +46,25 @@ static size_t Total = 0; static size_t MFree = 0; static size_t Used = 0; -static size_t Buffers = 0; -static size_t Cached = 0; +static size_t Active =0; +static size_t Inactive = 0; +static size_t Wired = 0; +static size_t Execpages = 0; +static size_t Filepages = 0; static size_t STotal = 0; static size_t SFree = 0; static size_t SUsed = 0; -static kvm_t *kd; void initMemory(struct SensorModul* sm) { - char *nlistf = NULL; - char *memf = NULL; - char buf[_POSIX2_LINE_MAX]; - - if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, buf)) == NULL) { - log_error("kvm_openfiles()"); - return; - } - registerMonitor("mem/physical/free", "integer", printMFree, printMFreeInfo, sm); registerMonitor("mem/physical/used", "integer", printUsed, printUsedInfo, sm); - registerMonitor("mem/physical/buf", "integer", printBuffers, printBuffersInfo, sm); - registerMonitor("mem/physical/cached", "integer", printCached, printCachedInfo, sm); + registerMonitor("mem/physical/active", "integer", printActive, printActiveInfo, sm); + registerMonitor("mem/physical/inactive", "integer", printInactive, printInactiveInfo, sm); + registerMonitor("mem/physical/wired", "integer", printWired, printWiredInfo, sm); + registerMonitor("mem/physical/execpages", "integer", printExecpages, printExecpagesInfo, sm); + registerMonitor("mem/physical/filepages", "integer", printFilepages, printFilepagesInfo, sm); registerMonitor("mem/swap/free", "integer", printSwapFree, printSwapFreeInfo, sm); registerMonitor("mem/swap/used", "integer", printSwapUsed, printSwapUsedInfo, sm); } @@ -75,7 +72,6 @@ initMemory(struct SensorModul* sm) void exitMemory(void) { - kvm_close(kd); } int @@ -83,7 +79,6 @@ updateMemory(void) { #define ARRLEN(X) (sizeof(X)/sizeof(X[0])) - long pagesize; /* using a long promotes the arithmetic */ size_t len; { @@ -95,35 +90,23 @@ updateMemory(void) } { - struct uvmexp x; - static int mib[] = { CTL_VM, VM_UVMEXP }; + struct uvmexp_sysctl x; + static int mib[] = { CTL_VM, VM_UVMEXP2 }; len = sizeof(x); STotal = SUsed = SFree = -1; - pagesize = 1; + Active = Inactive = Wired = Execpages = Filepages = MFree = Used = -1; if (-1 < sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0)) { - pagesize = x.pagesize; - STotal = (pagesize*x.swpages) >> 10; - SUsed = (pagesize*x.swpginuse) >> 10; + STotal = (x.pagesize*x.swpages) >> 10; + SUsed = (x.pagesize*x.swpginuse) >> 10; SFree = STotal - SUsed; - } - } - - /* can't find NetBSD filesystem buffer info */ - Buffers = -1; - - /* NetBSD doesn't know about vm.stats */ - Cached = -1; - - { - static int mib[]={ CTL_VM, VM_METER }; - struct vmtotal x; - - len = sizeof(x); - MFree = Used = -1; - if (sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0) > -1) { - MFree = (x.t_free * pagesize) >> 10; - Used = (x.t_rm * pagesize) >> 10; + MFree = STotal - SUsed; + Active = (x.active * x.pagesize) >> 10; + Inactive = (x.inactive * x.pagesize) >> 10; + Wired = (x.wired * x.pagesize) >> 10; + Execpages = (x.execpages * x.pagesize) >> 10; + Filepages = (x.filepages * x.pagesize) >> 10; + Used = Total - MFree; } } return 0; @@ -154,27 +137,63 @@ printUsedInfo(const char* cmd) } void -printBuffers(const char* cmd) +printActive(const char* cmd) +{ + fprintf(CurrentClient, "%d\n", Active); +} + +void +printActiveInfo(const char* cmd) +{ + fprintf(CurrentClient, "Active Memory\t0\t%dtKB\n", Total); +} + +void +printInactive(const char* cmd) +{ + fprintf(CurrentClient, "%d\n", Inactive); +} + +void +printInactiveInfo(const char* cmd) +{ + fprintf(CurrentClient, "Inctive Memory\t0\t%dtKB\n", Total); +} + +void +printWired(const char* cmd) +{ + fprintf(CurrentClient, "%d\n", Wired); +} + +void +printWiredInfo(const char* cmd) +{ + fprintf(CurrentClient, "Wired Memory\t0\t%dtKB\n", Total); +} + +void +printExecpages(const char* cmd) { - fprintf(CurrentClient, "%d\n", Buffers); + fprintf(CurrentClient, "%d\n", Execpages); } void -printBuffersInfo(const char* cmd) +printExecpagesInfo(const char* cmd) { - fprintf(CurrentClient, "Buffer Memory\t0\t%d\tKB\n", Total); + fprintf(CurrentClient, "Exec Pages\t0%d\tKB\n", Total); } void -printCached(const char* cmd) +printFilepages(const char* cmd) { - fprintf(CurrentClient, "%d\n", Cached); + fprintf(CurrentClient, "%d\n", Filepages); } void -printCachedInfo(const char* cmd) +printFilepagesInfo(const char* cmd) { - fprintf(CurrentClient, "Cached Memory\t0\t%d\tKB\n", Total); + fprintf(CurrentClient, "File Pages\t0\t%d\tKB\n", Total); } void diff --git a/ksysguard/ksysguardd/NetBSD/Memory.h b/ksysguard/ksysguardd/NetBSD/Memory.h index 57abb73a2..391306eec 100644 --- a/ksysguard/ksysguardd/NetBSD/Memory.h +++ b/ksysguard/ksysguardd/NetBSD/Memory.h @@ -31,10 +31,16 @@ void printMFree(const char* cmd); void printMFreeInfo(const char* cmd); void printUsed(const char* cmd); void printUsedInfo(const char* cmd); -void printBuffers(const char* cmd); -void printBuffersInfo(const char* cmd); -void printCached(const char* cmd); -void printCachedInfo(const char* cmd); +void printActive(const char* cmd); +void printActiveInfo(const char* cmd); +void printInactive(const char* cmd); +void printInactiveInfo(const char* cmd); +void printWired(const char* cmd); +void printWiredInfo(const char* cmd); +void printExecpages(const char* cmd); +void printExecpagesInfo(const char* cmd); +void printFilepages(const char* cmd); +void printFilepagesInfo(const char* cmd); void printSwapUsed(const char* cmd); void printSwapUsedInfo(const char* cmd); void printSwapFree(const char* cmd); diff --git a/ksysguard/ksysguardd/NetBSD/ProcessList.c b/ksysguard/ksysguardd/NetBSD/ProcessList.c index 54ab65513..a23af4cf3 100644 --- a/ksysguard/ksysguardd/NetBSD/ProcessList.c +++ b/ksysguard/ksysguardd/NetBSD/ProcessList.c @@ -24,15 +24,17 @@ #include <ctype.h> #include <dirent.h> +#include <errno.h> #include <pwd.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <kvm.h> #include <sys/param.h> #include <sys/sysctl.h> #include <sys/time.h> #include <sys/types.h> -#include <sys/user.h> +#include <sys/resource.h> #include <unistd.h> #include <signal.h> @@ -46,6 +48,8 @@ CONTAINER ProcessList = 0; #define BUFSIZE 1024 +static kvm_t *kd; + typedef struct { /* This flag is set for all found processes at the beginning of the @@ -87,18 +91,12 @@ typedef struct * The total amount of memory the process uses. This includes shared and * swapped memory. */ - unsigned int vmSize; + size_t vmSize; /* * The amount of physical memory the process currently uses. */ - unsigned int vmRss; - - /* - * The amount of memory (shared/swapped/etc) the process shares with - * other processes. - */ - unsigned int vmLib; + size_t vmRss; /* * The number of 1/100 of a second the process has spend in user space. @@ -157,15 +155,13 @@ findProcessInList(int pid) } static int -updateProcess(int pid) +updateProcess(int pid, struct kinfo_proc2 *p) { - static char *statuses[] = { "idle","run","sleep","stop","zombie" }; + static char *statuses[] = { "", "idle","run","sleep","stop","zombie","dead","onproc" }; ProcessInfo* ps; struct passwd* pwent; - int mib[4]; - struct kinfo_proc p; - size_t len; + char **argv, **a; if ((ps = findProcessInList(pid)) == 0) { @@ -178,26 +174,18 @@ updateProcess(int pid) ps->alive = 1; - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_PID; - mib[3] = pid; - - len = sizeof (p); - if (sysctl(mib, 4, &p, &len, NULL, 0) == -1 || !len) - return -1; - - ps->pid = p.kp_proc.p_pid; - ps->ppid = p.kp_eproc.e_ppid; - ps->uid = p.kp_eproc.e_ucred.cr_uid; - ps->gid = p.kp_eproc.e_pgid; - ps->priority = p.kp_proc.p_priority; - ps->niceLevel = p.kp_proc.p_nice; + ps->pid = p->p_pid; + ps->ppid = p->p_ppid; + ps->uid = p->p_uid; + ps->gid = p->p_gid; + ps->priority = p->p_priority -22; /* why 22? */ + ps->niceLevel = p->p_nice - NZERO; - /* this isn't usertime -- it's total time (??) */ - ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100; +#if 0 + ps->userTime = p->p_rtime_sec*100+p->p_rtime_usec/100; ps->sysTime = 0; ps->sysLoad = 0; +#endif /* memory, process name, process uid */ /* find out user name with process uid */ @@ -205,19 +193,26 @@ updateProcess(int pid) strlcpy(ps->userName,pwent&&pwent->pw_name? pwent->pw_name:"????",sizeof(ps->userName)); ps->userName[sizeof(ps->userName)-1]='\0'; - ps->userLoad = p.kp_proc.p_pctcpu / 100; - ps->vmSize = (p.kp_eproc.e_vm.vm_tsize + - p.kp_eproc.e_vm.vm_dsize + - p.kp_eproc.e_vm.vm_ssize) * getpagesize(); - ps->vmRss = p.kp_eproc.e_vm.vm_rssize * getpagesize(); - strlcpy(ps->name,p.kp_proc.p_comm ? p.kp_proc.p_comm : "????", sizeof(ps->name)); - strlcpy(ps->status,(p.kp_proc.p_stat>=1)&&(p.kp_proc.p_stat<=5)? statuses[p.kp_proc.p_stat-1]:"????", sizeof(ps->status)); + ps->userLoad = 100.0 * ((double)(p->p_pctcpu) /FSCALE); + ps->vmSize = ((size_t)(p->p_vm_tsize) + + (size_t)(p->p_vm_dsize) + + (size_t)(p->p_vm_ssize)) * (size_t)(getpagesize()); + ps->vmRss = (size_t)(p->p_vm_rssize) * (size_t)(getpagesize()); + strlcpy(ps->name,p->p_comm ? p->p_comm : "????", sizeof(ps->name)); + strlcpy(ps->status,(p->p_stat<=7)? statuses[p->p_stat]:"????", sizeof(ps->status)); /* process command line */ - /* the following line causes segfaults on some FreeBSD systems... why? - strncpy(ps->cmdline, p.kp_proc.p_args->ar_args, sizeof(ps->cmdline) - 1); - */ - strcpy(ps->cmdline, "????"); + argv = kvm_getargv2(kd, p, sizeof(ps->cmdline)); + ps->cmdline[0] = '\0'; + if ((a = argv) != NULL) { + while (*a) { + strlcat(ps->cmdline, *a, sizeof(ps->cmdline)); + a++; + strlcat(ps->cmdline, " ", sizeof(ps->cmdline)); + } + } else { + strcpy(ps->cmdline, "????"); + } return (0); } @@ -266,6 +261,8 @@ initProcessList(struct SensorModul* sm) registerCommand("setpriority", setPriority); } + kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open"); + updateProcessList(); } @@ -277,27 +274,22 @@ exitProcessList(void) if (ProcessList) free (ProcessList); + + kvm_close(kd); } int updateProcessList(void) { - int mib[3]; - size_t len; - size_t num; - struct kinfo_proc *p; - - - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_ALL; - sysctl(mib, 3, NULL, &len, NULL, 0); - p = malloc(len); - sysctl(mib, 3, p, &len, NULL, 0); - - for (num = 0; num < len / sizeof(struct kinfo_proc); num++) - updateProcess(p[num].kp_proc.p_pid); - free(p); + int len; + int num; + struct kinfo_proc2 *p; + + p = kvm_getproc2(kd, KERN_PROC_ALL, 0, + sizeof(struct kinfo_proc2), &len); + + for (num = 0; num < len; num++) + updateProcess(p[num].p_pid, &p[num]); cleanupProcessList(); return (0); @@ -306,8 +298,8 @@ updateProcessList(void) void printProcessListInfo(const char* cmd) { - fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\tStatus\tUser%%\tSystem%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); - fprintf(CurrentClient, "s\td\td\td\td\tS\tf\tf\td\tD\tD\ts\ts\n"); + fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\tStatus\tCPU%%\tPrio%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); + fprintf(CurrentClient, "s\td\td\td\td\tS\tf\td\td\tD\tD\ts\ts\n"); } void @@ -318,10 +310,10 @@ printProcessList(const char* cmd) ps = first_ctnr(ProcessList); /* skip 'kernel' entry */ for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList)) { - fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n", + fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%d\t%d\t%zu\t%zu\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid, (long)ps->uid, (long)ps->gid, ps->status, - ps->userLoad, ps->sysLoad, ps->niceLevel, + ps->userLoad, ps->priority, ps->niceLevel, ps->vmSize / 1024, ps->vmRss / 1024, ps->userName, ps->cmdline); } } diff --git a/ksysguard/ksysguardd/NetBSD/apm.c b/ksysguard/ksysguardd/NetBSD/apm.c index f24887483..5929da8fc 100644 --- a/ksysguard/ksysguardd/NetBSD/apm.c +++ b/ksysguard/ksysguardd/NetBSD/apm.c @@ -20,7 +20,7 @@ #include <fcntl.h> -#include <machine/apmvar.h> +#include <dev/apm/apmio.h> #include <sys/ioctl.h> #include <unistd.h> #include <stdio.h> @@ -97,4 +97,3 @@ printApmBatTimeInfo(const char* c) { fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); } - diff --git a/ksysguard/ksysguardd/NetBSD/diskstat.c b/ksysguard/ksysguardd/NetBSD/diskstat.c index 818eee1d4..e9c569065 100644 --- a/ksysguard/ksysguardd/NetBSD/diskstat.c +++ b/ksysguard/ksysguardd/NetBSD/diskstat.c @@ -63,7 +63,11 @@ char *getMntPnt(const char *cmd) int numMntPnt(void) { +#ifdef HAVE_STATVFS + struct statvfs *fs_info; +#else struct statfs *fs_info; +#endif int i, n, counter = 0; n = getmntinfo(&fs_info, MNT_WAIT); @@ -129,8 +133,13 @@ void exitDiskStat(void) int updateDiskStat(void) { +#ifdef HAVE_STATVFS + struct statvfs *fs_info; + struct statvfs fs; +#else struct statfs *fs_info; struct statfs fs; +#endif float percent; int i, mntcount; DiskInfo *disk_info; diff --git a/ksysguard/ksysguardd/NetBSD/netdev.c b/ksysguard/ksysguardd/NetBSD/netdev.c index 477acc40e..efa25cc08 100644 --- a/ksysguard/ksysguardd/NetBSD/netdev.c +++ b/ksysguard/ksysguardd/NetBSD/netdev.c @@ -269,12 +269,12 @@ void exitNetDev(void) { NDreg(0); } -void updateNetDev(void) { +int updateNetDev(void) { NetDevInfo *p, *q; int n; if (-1==(n = readSys(0))) - return; + return 0; NetDevCnt = n; /*fixme: assumes the interfaces are in the same order each time */ @@ -289,6 +289,7 @@ void updateNetDev(void) { } } + return 0; } void checkNetDev(void) { diff --git a/ksysguard/ksysguardd/NetBSD/netdev.h b/ksysguard/ksysguardd/NetBSD/netdev.h index 4287c9203..17d9c89e9 100644 --- a/ksysguard/ksysguardd/NetBSD/netdev.h +++ b/ksysguard/ksysguardd/NetBSD/netdev.h @@ -24,7 +24,7 @@ void initNetDev(struct SensorModul* sm); void exitNetDev(void); -void updateNetDev(void); +int updateNetDev(void); void checkNetDev(void); void printNetDevRecBytes(const char* cmd); diff --git a/ksysguard/ksysguardd/OpenBSD/ProcessList.c b/ksysguard/ksysguardd/OpenBSD/ProcessList.c index ccdcc2313..f84ff0b2d 100644 --- a/ksysguard/ksysguardd/OpenBSD/ProcessList.c +++ b/ksysguard/ksysguardd/OpenBSD/ProcessList.c @@ -88,18 +88,12 @@ typedef struct * The total amount of memory the process uses. This includes shared and * swapped memory. */ - unsigned int vmSize; + size_t vmSize; /* * The amount of physical memory the process currently uses. */ - unsigned int vmRss; - - /* - * The amount of memory (shared/swapped/etc) the process shares with - * other processes. - */ - unsigned int vmLib; + size_t vmRss; /* * The number of 1/100 of a second the process has spend in user space. @@ -245,10 +239,10 @@ updateProcess(struct kinfo_proc *p) ps->userName[sizeof(ps->userName)-1]='\0'; ps->userLoad = p->p_pctcpu / 100; - ps->vmSize = (p->p_vm_tsize + - p->p_vm_dsize + - p->p_vm_ssize) * getpagesize(); - ps->vmRss = p->p_vm_rssize * getpagesize(); + ps->vmSize = ((size_t)(p->p_vm_tsize) + + (size_t)(p->p_vm_dsize) + + (size_t)(p->p_vm_ssize)) * (size_t)(getpagesize()); + ps->vmRss = (size_t)(p->p_vm_rssize) * (size_t)(getpagesize()); strlcpy(ps->name,p->p_comm ? p->p_comm : "????", sizeof(ps->name)); strlcpy(ps->status,(p->p_stat>=1)&&(p->p_stat<=5)? statuses[p->p_stat-1]:"????", sizeof(ps->status)); @@ -362,7 +356,7 @@ printProcessList(const char* cmd) for (ps = first_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList)) { - fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n", + fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid, (long)ps->uid, (long)ps->gid, ps->status, ps->userLoad, ps->sysLoad, ps->niceLevel, diff --git a/ksysguard/ksysguardd/OpenBSD/cpu.c b/ksysguard/ksysguardd/OpenBSD/cpu.c index 2ecf1ed51..3aa097769 100644 --- a/ksysguard/ksysguardd/OpenBSD/cpu.c +++ b/ksysguard/ksysguardd/OpenBSD/cpu.c @@ -159,15 +159,15 @@ long percentages(cnt, out, new, old, diffs) int cnt; int *out; -register long *new; -register long *old; +long *new; +long *old; long *diffs; { - register int i; - register long change; - register long total_change; - register long *dp; + int i; + long change; + long total_change; + long *dp; long half_total; /* initialization */ diff --git a/ksysguard/ksysguardd/Porting-HOWTO b/ksysguard/ksysguardd/Porting-HOWTO index 4576783bc..f7096b03d 100644 --- a/ksysguard/ksysguardd/Porting-HOWTO +++ b/ksysguard/ksysguardd/Porting-HOWTO @@ -112,7 +112,7 @@ COMMAND\nksysguardd> ". ksysguardd does not handle native language support. In order to have a minimum installation (only a single file) on the monitored machine, all translation are handled by the front-end. Please see the files -gui/ksgrd/SensorManger.cc and gui/SensorDisplayLib/ProcessTable.cc +gui/ksgrd/SensorManger.cpp and gui/SensorDisplayLib/ProcessTable.cpp if you add new strings. /** diff --git a/ksysguard/ksysguardd/Solaris/CMakeLists.txt b/ksysguard/ksysguardd/Solaris/CMakeLists.txt new file mode 100644 index 000000000..aeeda9ac3 --- /dev/null +++ b/ksysguard/ksysguardd/Solaris/CMakeLists.txt @@ -0,0 +1,25 @@ +################################################# +# +# (C) 2023 Denis Kozadaev +# denis (AT) tambov (DOT) ru +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/ksysguard/CContLib + ${CMAKE_SOURCE_DIR}/ksysguard/ksysguardd +) + + +##### ksysguardd (static) ####################### + +tde_add_library( ksysguardd STATIC + SOURCES + Memory.c LoadAvg.c ProcessList.c NetDev.c +) diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h index 06b290b27..6130f2a83 100644 --- a/ksysguard/ksysguardd/modules.h +++ b/ksysguard/ksysguardd/modules.h @@ -55,7 +55,20 @@ #include "netdev.h" #endif /* OSTYPE_FreeBSD */ -#ifdef OSTYPE_Solaris +#ifdef OSTYPE_NetBSD +#include "CPU.h" +#include "Memory.h" +#include "ProcessList.h" +#ifdef HAVE_APMIO +#include "apm.h" +#endif +#include "diskstat.h" +#include "loadavg.h" +#include "logfile.h" +#include "netdev.h" +#endif /* OSTYPE_NetBSD */ + +#if defined(OSTYPE_Solaris) || defined(OSTYPE_SunOS) #include "LoadAvg.h" #include "Memory.h" #include "NetDev.h" @@ -120,7 +133,20 @@ struct SensorModul SensorModulList[] = { { "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev, 0, NULLTIME }, #endif /* OSTYPE_FreeBSD */ -#ifdef OSTYPE_Solaris +#ifdef OSTYPE_NetBSD + { "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC, 0, NULLTIME }, + { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME }, + { "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC, 0, NULLTIME }, +#ifdef HAVE_APMIO + { "Apm", initApm, exitApm, updateApm, NULLVVFUNC, 0, NULLTIME }, +#endif + { "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat, 0, NULLTIME }, + { "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC, 0, NULLTIME }, + { "LogFile", initLogFile, exitLogFile, NULLIVFUNC, NULLVVFUNC, 0, NULLTIME }, + { "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev, 0, NULLTIME }, +#endif /* OSTYPE_NetBSD */ + +#if defined(OSTYPE_Solaris) || defined(OSTYPE_SunOS) { "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC, 0, NULLTIME }, { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME }, { "NetDev", initNetDev, exitNetDev, updateNetDev, NULLVVFUNC, 0, NULLTIME }, |