Rename old tq methods that no longer need a unique name

pull/1/head
Timothy Pearson 12 years ago
parent 80f772ad05
commit a6a8ad44b4

@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>305</width>
<height>20</height>
@ -143,7 +143,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@ -177,7 +177,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>140</height>
@ -196,7 +196,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>220</width>
<height>110</height>

@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>250</width>
<height>20</height>
@ -223,7 +223,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -284,7 +284,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>160</width>
<height>20</height>
@ -398,7 +398,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -428,7 +428,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>40</width>
<height>30</height>
@ -448,7 +448,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>231</width>
<height>31</height>
@ -465,7 +465,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@ -521,7 +521,7 @@
<property name="name">
<cstring>tL_brightness</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
@ -573,13 +573,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>100</width>
<height>20</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
@ -684,7 +684,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>50</height>
@ -701,7 +701,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
@ -813,7 +813,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@ -836,7 +836,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@ -919,7 +919,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@ -941,7 +941,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
@ -997,7 +997,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>170</height>
@ -1025,7 +1025,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -1066,7 +1066,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>170</height>
@ -1112,7 +1112,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@ -1167,7 +1167,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>75</width>
<height>0</height>
@ -1187,7 +1187,7 @@
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@ -1204,7 +1204,7 @@
<property name="name">
<cstring>textLabel1_2_2</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@ -1221,7 +1221,7 @@
<property name="name">
<cstring>textLabel1_2_3</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@ -1244,7 +1244,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@ -1288,7 +1288,7 @@
<property name="name">
<cstring>cB_batWarning</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -1299,7 +1299,7 @@
<property name="name">
<cstring>cB_batLow</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -1310,7 +1310,7 @@
<property name="name">
<cstring>cB_batCritical</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -1459,7 +1459,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
@ -1529,7 +1529,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -1546,7 +1546,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -1563,7 +1563,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -1580,7 +1580,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -1591,7 +1591,7 @@
<property name="name">
<cstring>cB_SleepButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@ -1602,7 +1602,7 @@
<property name="name">
<cstring>cB_LidcloseButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@ -1613,7 +1613,7 @@
<property name="name">
<cstring>cB_PowerButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@ -1624,7 +1624,7 @@
<property name="name">
<cstring>cB_S2DiskButton</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@ -1641,7 +1641,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -1676,7 +1676,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@ -1707,7 +1707,7 @@
<property name="name">
<cstring>cB_acScheme</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>175</width>
<height>0</height>
@ -1724,7 +1724,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@ -1741,7 +1741,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@ -1752,7 +1752,7 @@
<property name="name">
<cstring>cB_batteryScheme</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>175</width>
<height>0</height>
@ -1780,7 +1780,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>75</height>
@ -1829,7 +1829,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>163</width>
<height>20</height>
@ -1865,7 +1865,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
@ -1925,7 +1925,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@ -1942,7 +1942,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@ -1988,7 +1988,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -2034,7 +2034,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@ -2051,7 +2051,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>

@ -105,7 +105,7 @@ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Setti
tL_valueBrightness->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
tL_valueBrightness->setBackgroundMode(TQt::PaletteBase);
tL_valueBrightness->tqsetAlignment(TQt::AlignCenter);
tL_valueBrightness->setAlignment(TQt::AlignCenter);
tL_valueBrightness->setFocusPolicy(TQ_NoFocus);
// hide Lid item if this is not a laptop

@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>142</width>
<height>21</height>
@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>144</width>
<height>21</height>
@ -96,13 +96,13 @@
<property name="name">
<cstring>iconPixmap</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@ -175,7 +175,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>20</height>

@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>10</width>
<height>50</height>
@ -155,13 +155,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@ -181,7 +181,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@ -205,7 +205,7 @@
</sizepolicy>
</property>
<property name="title">
<string>Battery tqStatus</string>
<string>Battery Status</string>
</property>
<grid>
<property name="name">
@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>118</height>
@ -270,7 +270,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@ -300,7 +300,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@ -309,7 +309,7 @@
</spacer>
<widget class="TQLabel">
<property name="name">
<cstring>LabelACtqStatus</cstring>
<cstring>LabelACStatus</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@ -386,7 +386,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>5</height>
@ -413,7 +413,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@ -432,13 +432,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@ -465,7 +465,7 @@
</sizepolicy>
</property>
<property name="title">
<string>Processor tqStatus</string>
<string>Processor Status</string>
</property>
<grid>
<property name="name">
@ -489,7 +489,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@ -508,13 +508,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@ -580,7 +580,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>10</width>
<height>20</height>
@ -608,7 +608,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>230</width>
<height>20</height>

@ -123,7 +123,7 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
ProcessorFrame->adjustSize();
connect(OkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeDetailedDlg()));
connect(hwinfo, TQT_SIGNAL(ACtqStatus(bool)), this, TQT_SLOT(setAC()));
connect(hwinfo, TQT_SIGNAL(ACStatus(bool)), this, TQT_SLOT(setAC()));
// TODO: replace event
//connect(pd, TQT_SIGNAL(schemeDataChanged()), this, TQT_SLOT(setInfos()));
connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setInfos()));
@ -388,11 +388,11 @@ void detaileddialog::setAC() {
kdDebugFuncIn(trace);
if (hwinfo->getAcAdapter()) {
LabelACtqStatus->setText( i18n("plugged in") );
LabelACStatus->setText( i18n("plugged in") );
LedAC->on();
} else {
LedAC->off();
LabelACtqStatus->setText( i18n("unplugged") );
LabelACStatus->setText( i18n("unplugged") );
}
setInfos();

@ -866,7 +866,7 @@ void HardwareInfo::checkACAdapterState() {
if (_state != acadapter) {
acadapter = _state;
update_info_ac_changed = true;
emit ACtqStatus( acadapter );
emit ACStatus( acadapter );
} else {
update_info_ac_changed = false;
}
@ -891,7 +891,7 @@ void HardwareInfo::checkLidcloseState() {
if (dbus_HAL->halGetPropertyBool(*udis["lidclose"] , "button.state.value", &_state )) {
if (_state != lidclose) {
lidclose = _state;
emit lidclosetqStatus( lidclose );
emit lidcloseStatus( lidclose );
}
} else {
lidclose = false;

@ -362,9 +362,9 @@ signals:
void currentCPUFreqPolicyChanged();
//! signal the AC adapter
void ACtqStatus( bool );
void ACStatus( bool );
//! signal for the lidclose button
void lidclosetqStatus ( bool );
void lidcloseStatus ( bool );
//! signal for pressed the power button
void powerButtonPressed ();
//! signal for pressed sleep (suspend2ram) button

@ -23,7 +23,7 @@
<property name="name">
<cstring>buttonOK</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>171</width>
<height>21</height>
@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@ -74,13 +74,13 @@
<property name="name">
<cstring>iconPixmap</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@ -97,7 +97,7 @@
<property name="name">
<cstring>msgText</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>370</width>
<height>50</height>
@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>10</width>
<height>20</height>
@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>10</width>
<height>20</height>
@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@ -165,7 +165,7 @@
<property name="name">
<cstring>dontShowAgain</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>330</width>
<height>0</height>
@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>21</height>

@ -97,7 +97,7 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0
// connect to signals for changes
connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(update()));
connect(hwinfo, TQT_SIGNAL(primaryBatteryChanged()), this, TQT_SLOT(update()));
connect(hwinfo, TQT_SIGNAL(ACtqStatus(bool)), this, TQT_SLOT(handleACStatusChange (bool)));
connect(hwinfo, TQT_SIGNAL(ACStatus(bool)), this, TQT_SLOT(handleACStatusChange (bool)));
connect(hwinfo, TQT_SIGNAL(resumed(int)), this, TQT_SLOT(forwardResumeSignal(int)));
// connect to error mesages
@ -106,7 +106,7 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0
connect(hwinfo, TQT_SIGNAL(dbusRunning(int)), this, TQT_SLOT(showDBusErrorMsg(int)));
// connect to events
connect(hwinfo, TQT_SIGNAL(lidclosetqStatus(bool)), this, TQT_SLOT(handleLidEvent(bool)));
connect(hwinfo, TQT_SIGNAL(lidcloseStatus(bool)), this, TQT_SLOT(handleLidEvent(bool)));
connect(hwinfo, TQT_SIGNAL(powerButtonPressed()), this, TQT_SLOT (handlePowerButtonEvent()));
connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSleepButtonEvent()));
connect(hwinfo, TQT_SIGNAL(s2diskButtonPressed()), this, TQT_SLOT (handleS2DiskButtonEvent()));

@ -390,7 +390,7 @@ private slots:
//! set for a battery status the related actions
void handleActionCall ( action action, int value, bool checkAC = false, bool batWarnCall = false );
//! this lock/reactivate the screen if a lidclosetqStatus() signal is triggered
//! this lock/reactivate the screen if a lidcloseStatus() signal is triggered
void handleLidEvent( bool closed );
//! show the login dialog after locked the screen
void activateLoginScreen();

@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>330</width>
<height>20</height>

@ -52,7 +52,7 @@ screen::screen() {
xlock = NULL;
got_XScreensaver = false;
checkDPMStqStatus();
checkDPMSStatus();
check_xscreensaver_timer_runs = false;
SCREENSAVER_STATUS = -1;
@ -61,7 +61,7 @@ screen::screen() {
check_xscreensaver_timer = new TQTimer( this );
connect( check_xscreensaver_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(xscreensaver_ping() ));
SCREENSAVER_STATUS = checkScreenSavertqStatus();
SCREENSAVER_STATUS = checkScreenSaverStatus();
kdDebugFuncOut(trace);
}
@ -80,7 +80,7 @@ screen::~screen() {
bool screen::setScreenSaver(bool enable){
kdDebugFuncIn(trace);
if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus();
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
screen_save_dcop_ref.send( "enable", enable);
kdDebugFuncOut(trace);
@ -243,7 +243,7 @@ void screen::xscreensaver_ping(){
* \retval 99 gnome-screensaver check is running
* \retval -1 else
*/
int screen::checkScreenSavertqStatus() {
int screen::checkScreenSaverStatus() {
kdDebugFuncIn(trace);
bool get_reply = false;
@ -326,7 +326,7 @@ void screen::getGSExited (KProcess *gnomecheckcommand) {
* \retval 0 if DMPS is disabled
* \retval -1 if there is a error
*/
int screen::checkDPMStqStatus(){
int screen::checkDPMSStatus(){
kdDebugFuncIn(trace);
CARD16 state;
@ -432,7 +432,7 @@ bool screen::lockScreen(){
kdDebugFuncIn(trace);
// screensaver status known?
if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus();
// set lock for KScreensaver
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
@ -549,7 +549,7 @@ bool screen::lockScreen( TQString lock_withMethod ) {
}
else {
// screensaver status known?
SCREENSAVER_STATUS = checkScreenSavertqStatus();
SCREENSAVER_STATUS = checkScreenSaverStatus();
if (lock_withMethod == "kscreensaver") {
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
@ -597,7 +597,7 @@ xscreensaver:
void screen::blankOnlyScreen( bool blankonly ){
kdDebugFuncIn(trace);
if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus();
// set KScreensaver
if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){
screen_save_dcop_ref.send("setBlankOnly", blankonly);
@ -620,7 +620,7 @@ bool screen::resetKDEScreensaver(){
kdDebugFuncIn(trace);
if(SCREENSAVER_STATUS == -1)
SCREENSAVER_STATUS = checkScreenSavertqStatus();
SCREENSAVER_STATUS = checkScreenSaverStatus();
// do this only if the screensaver is not running
if(SCREENSAVER_STATUS == 0){
@ -648,7 +648,7 @@ bool screen::resetKDEScreensaver(){
bool screen::resetXScreensaver(){
kdDebugFuncIn(trace);
if(checkScreenSavertqStatus() == 11) {
if(checkScreenSaverStatus() == 11) {
delete xscreensaver_reset;

@ -167,9 +167,9 @@ public:
bool setScreenSaver( bool );
//! for check the status of the screensaver
int checkScreenSavertqStatus();
int checkScreenSaverStatus();
//! for check the actual status of DPMS on the machine
int checkDPMStqStatus();
int checkDPMSStatus();
//! default constructor
screen();

@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>300</width>
<height>90</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>300</width>
<height>90</height>
@ -73,13 +73,13 @@
<height>48</height>
</rect>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>

Loading…
Cancel
Save