From 0a439ac80bdf6ffb9cac104ad3098a321ee0403c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2025 18:08:57 +0900 Subject: Replace TRUE/FALSE with boolean values true/false Signed-off-by: Michele Calgaro --- drkonqi/backtrace.cpp | 4 +- drkonqi/debugger.cpp | 2 +- kate/app/kategrepdialog.cpp | 2 +- kcontrol/background/KCrossBGRender.cpp | 2 +- kcontrol/clock/dtime.cpp | 10 +-- kcontrol/clock/tzone.h | 2 +- kcontrol/colors/colorscm.cpp | 2 +- kcontrol/colors/widgetcanvas.cpp | 14 ++-- kcontrol/displayconfig/displayconfig.cpp | 20 +++--- kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp | 2 +- kcontrol/info/info_aix.cpp | 2 +- kcontrol/info/info_fbsd.cpp | 4 +- kcontrol/info/info_generic.cpp | 2 +- kcontrol/info/info_linux.cpp | 2 +- kcontrol/info/info_netbsd.cpp | 6 +- kcontrol/info/info_openbsd.cpp | 4 +- kcontrol/info/info_osx.cpp | 4 +- kcontrol/info/info_sgi.cpp | 2 +- kcontrol/input/logitechmouse.cpp | 24 +++---- kcontrol/keys/keyconfig.cpp | 10 +-- kcontrol/konq/desktopbehavior_impl.cpp | 2 +- kcontrol/konqhtml/pluginopts.cpp | 2 +- kcontrol/locale/klocalesample.cpp | 2 +- kcontrol/locale/localenum.cpp | 2 +- kcontrol/locale/localetime.cpp | 2 +- kcontrol/locale/toplevel.cpp | 2 +- kcontrol/randr/tderandrapp.cpp | 2 +- kcontrol/randr/tderandrtray.cpp | 2 +- kcontrol/samba/kcmsambalog.cpp | 18 +++--- kcontrol/samba/kcmsambastatistics.cpp | 14 ++-- kcontrol/samba/kcmsambastatistics.h | 4 +- kcontrol/screensaver/scrnsave.cpp | 2 +- kcontrol/smartcard/smartcard.cpp | 8 +-- kcontrol/spellchecking/spellchecking.cpp | 2 +- kcontrol/style/kcmstyle.cpp | 22 +++---- kcontrol/style/stylepreview.ui.h | 4 +- kcontrol/taskbar/kcmtaskbar.cpp | 4 +- kcontrol/tdm/tdm-shut.cpp | 4 +- kdcop/kdcopwindow.cpp | 4 +- kdesktop/kdiconview.cpp | 8 +-- kdesktop/krootwm.cpp | 2 +- kdesktop/lock/lockprocess.cpp | 64 +++++++++---------- kdesktop/lock/main.cpp | 58 ++++++++--------- kdesktop/lockeng.cpp | 18 +++--- kdesktop/tdefileividesktop.cpp | 12 ++-- kdialog/kdialog.cpp | 6 +- kdialog/widgets.cpp | 10 +-- kfind/kdatecombo.cpp | 8 +-- kfind/kftabdlg.cpp | 48 +++++++------- kfind/kfwin.cpp | 2 +- kfind/kquery.cpp | 2 +- kicker/applets/clock/clock.cpp | 8 +-- kicker/applets/launcher/quickbutton.cpp | 4 +- kicker/kicker/ui/k_mnu.cpp | 14 ++-- kicker/kicker/ui/k_new_mnu.cpp | 4 +- kicker/libkicker/panelbutton.cpp | 10 +-- kicker/libkicker/panelbutton.h | 4 +- kicker/libkicker/simplebutton.cpp | 10 +-- kicker/libkicker/simplebutton.h | 4 +- kicker/taskbar/taskbarcontainer.cpp | 4 +- kicker/taskbar/taskcontainer.cpp | 2 +- kicker/taskmanager/taskrmbmenu.cpp | 4 +- klipper/toplevel.cpp | 4 +- konqueror/about/konq_aboutpage.cpp | 2 +- konqueror/konq_combo.cpp | 2 +- konqueror/konq_frame.h | 8 +-- konqueror/konq_mainwindow.cpp | 8 +-- konqueror/konq_mainwindow.h | 2 +- konqueror/konq_tabs.h | 2 +- konqueror/listview/konq_listview.cpp | 24 +++---- konqueror/listview/konq_listviewwidget.cpp | 14 ++-- konqueror/listview/konq_textviewwidget.cpp | 4 +- .../sidebar/trees/dirtree_module/dirtree_item.cpp | 2 +- kpager/desktop.cpp | 2 +- kpager/kpager.cpp | 2 +- kpager/windowdrag.cpp | 4 +- kpersonalizer/stylepreview.ui.h | 4 +- krootbacking/main.cpp | 2 +- ksmserver/shutdown.cpp | 4 +- ksmserver/shutdowndlg.cpp | 40 ++++++------ ksmserver/startup.cpp | 8 +-- ksplashml/kcmksplash/installer.h | 2 +- ksplashml/themeengine/default/themelegacy.cpp | 2 +- ksplashml/wndmain.cpp | 10 +-- kstart/kstart.cpp | 4 +- ksysguard/gui/SensorDisplayLib/ProcessList.h | 2 +- kxkb/kcmlayout.cpp | 2 +- libkonq/konq_iconviewwidget.cpp | 2 +- libkonq/konq_iconviewwidget.h | 2 +- libkonq/konq_propsview.h | 2 +- libkonq/konq_settings.cpp | 2 +- libkonq/tdefileivi.cpp | 4 +- libkonq/tdefileivi.h | 2 +- nsplugins/nspluginloader.cpp | 2 +- nsplugins/pluginscan.cpp | 2 +- nsplugins/viewer/nsplugin.cpp | 8 +-- nsplugins/viewer/qxteventloop.cpp | 18 +++--- nsplugins/viewer/viewer.cpp | 8 +-- tdeioslave/man/man2html.cpp | 4 +- tdeioslave/man/tdeio_man.cpp | 2 +- .../media/mediamanager/tdehardwarebackend.cpp | 4 +- tdeioslave/media/medianotifier/medianotifier.cpp | 2 +- tdeioslave/media/tdecmodule/notifiermodule.cpp | 2 +- tdeioslave/nfs/tdeio_nfs.cpp | 30 ++++----- tdeioslave/nfs/tdeio_nfs.h | 2 +- tdesu/tdesud/secure.cpp | 4 +- tdm/kfrontend/kchooser.cpp | 2 +- tdm/kfrontend/kgapp.cpp | 6 +- tdm/kfrontend/sakdlg.cpp | 2 +- tdm/kfrontend/tdmclock.cpp | 12 ++-- tdm/kfrontend/tdmshutdown.cpp | 8 +-- twin/client.cpp | 74 +++++++++++----------- twin/client.h | 2 +- twin/clients/b2/b2client.cpp | 4 +- twin/clients/keramik/keramik.cpp | 6 +- twin/data/update_window_settings.cpp | 16 ++--- twin/events.cpp | 44 ++++++------- twin/geometry.cpp | 2 +- twin/kcmtwin/twindecoration/buttons.cpp | 6 +- twin/kcmtwin/twindecoration/twindecoration.cpp | 4 +- twin/kcmtwin/twinoptions/windows.cpp | 48 +++++++------- twin/killwindow.cpp | 2 +- twin/lib/kcommondecoration.cpp | 4 +- twin/main.cpp | 10 +-- twin/manage.cpp | 10 +-- twin/notifications.cpp | 2 +- twin/options.cpp | 18 +++--- twin/popupinfo.cpp | 2 +- twin/sm.cpp | 20 +++--- twin/tabbox.cpp | 16 ++--- twin/tabbox.h | 2 +- twin/useractions.cpp | 28 ++++---- twin/utils.cpp | 2 +- twin/workspace.cpp | 52 +++++++-------- twin/workspace.h | 6 +- 135 files changed, 600 insertions(+), 600 deletions(-) diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index c026d09f5..1f2521781 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -100,7 +100,7 @@ void BackTrace::start() return; } m_temp = new KTempFile; - m_temp->setAutoDelete(TRUE); + m_temp->setAutoDelete(true); int handle = m_temp->handle(); TQString backtraceCommand = m_krashconf->backtraceCommand(); const char* bt = backtraceCommand.latin1(); @@ -114,7 +114,7 @@ void BackTrace::start() // write the debugger command m_temp_cmd = new KTempFile(TQString::null, TQString::null, 0700); - m_temp_cmd->setAutoDelete(TRUE); + m_temp_cmd->setAutoDelete(true); handle = m_temp_cmd->handle(); const char* dbgcommand = str.latin1(); ::write(handle, dbgcommand, strlen(dbgcommand)); // the command to execute the debugger diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index fa959b4cc..f4f883d6a 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -51,7 +51,7 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, m_proctrace(0) { TQVBoxLayout *vbox = new TQVBoxLayout( this, 0, KDialog::marginHint() ); - vbox->setAutoAdd(TRUE); + vbox->setAutoAdd(true); m_backtrace = new KTextBrowser(this); m_backtrace->setTextFormat(TQt::PlainText); diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index 1d5db5c0f..af0d91784 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -370,7 +370,7 @@ void GrepTool::slotSearch() *childproc << "-maxdepth" << "1"; if (!cmbFiles->currentText().isEmpty() ) { - TQStringList files = TQStringList::split ( ",", cmbFiles->currentText(), FALSE ); + TQStringList files = TQStringList::split ( ",", cmbFiles->currentText(), false ); *childproc << "("; bool first = true; for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) diff --git a/kcontrol/background/KCrossBGRender.cpp b/kcontrol/background/KCrossBGRender.cpp index 489e98d1b..8f91a904d 100644 --- a/kcontrol/background/KCrossBGRender.cpp +++ b/kcontrol/background/KCrossBGRender.cpp @@ -149,7 +149,7 @@ bool KCrossBGRender::needWallpaperChange(){ } /* - * This method change the enabledEffect flag to TRUE of FALSE, according + * This method change the enabledEffect flag to true of false, according * with multiWallpaperMode and FileName (it needs to be a XML) */ void KCrossBGRender::fixEnabled(){ diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index 37222ab90..6ff8505b5 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -225,17 +225,17 @@ void Dtime::set_time() time.setHMS( hour->value(), minute->value(), second->value() ); kclock->setTime( time ); - emit timeChanged( TRUE ); + emit timeChanged( true ); } void Dtime::changeDate(TQDate d) { date = d; - emit timeChanged( TRUE ); + emit timeChanged( true ); } void Dtime::configChanged(){ - emit timeChanged( TRUE ); + emit timeChanged( true ); } void Dtime::load() @@ -347,11 +347,11 @@ void Dtime::timeout() // get current time time = TQTime::currentTime(); - ontimeout = TRUE; + ontimeout = true; second->setValue(time.second()); minute->setValue(time.minute()); hour->setValue(time.hour()); - ontimeout = FALSE; + ontimeout = false; kclock->setTime( time ); } diff --git a/kcontrol/clock/tzone.h b/kcontrol/clock/tzone.h index 8508c9ee0..5887628e9 100644 --- a/kcontrol/clock/tzone.h +++ b/kcontrol/clock/tzone.h @@ -43,7 +43,7 @@ signals: void zoneChanged(bool); protected slots: - void handleZoneChange() {emit zoneChanged( TRUE );} + void handleZoneChange() {emit zoneChanged( true );} private: void currentZone(); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index e7b069584..7b8b029a7 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -167,7 +167,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " prompted for a name.") ); removeBt = new TQPushButton(i18n("R&emove Scheme"), group); - removeBt->setEnabled(FALSE); + removeBt->setEnabled(false); connect(removeBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); TQWhatsThis::add( removeBt, i18n("Press this button to remove the selected" diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index addf82baa..3ee662627 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -344,7 +344,7 @@ void WidgetCanvas::drawSampleWidgets() // Inactive window - qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, FALSE, + qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, false, &brush); paint.setBrush( iaTitle ); @@ -392,7 +392,7 @@ void WidgetCanvas::drawSampleWidgets() // Active window - qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, FALSE, + qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, false, &brush); paint.setBrush( aTitle );paint.setPen( aTitle ); @@ -432,7 +432,7 @@ void WidgetCanvas::drawSampleWidgets() // Menu bar - //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush); + //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, false, 2, &brush); tdeApp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg); @@ -440,7 +440,7 @@ void WidgetCanvas::drawSampleWidgets() paint.setPen(txt ); TQString file = i18n("File"); textLen = paint.fontMetrics().width( file ); - //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush); + //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, false, 2, &brush); tdeApp->style().drawPrimitive(TQStyle::PE_Panel, &paint, TQRect(30, 59, textLen + 10, 21), cg); paint.drawText( 35, 74, file ); @@ -463,7 +463,7 @@ void WidgetCanvas::drawSampleWidgets() brush.setColor( window ); qDrawShadePanel ( &paint, 25, 80+5-4, width()-7-45-2, - height(), cg, TRUE, 2, &brush); + height(), cg, true, 2, &brush); // Standard text TQFont fnt = TDEGlobalSettings::generalFont(); @@ -583,12 +583,12 @@ void WidgetCanvas::drawSampleWidgets() // Valance qDrawWinPanel ( &paint, 0, 0, width(), height(), - parentWidget()->colorGroup(), TRUE, 0); + parentWidget()->colorGroup(), true, 0); // Stop the painting hotspots[ spot++ ] = HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? - repaint( FALSE ); + repaint( false ); } diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 192940e60..21857b5bc 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -933,7 +933,7 @@ void KDisplayConfig::identifyMonitors () { } void KDisplayConfig::activatePreview() { - m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE); + m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true); } void KDisplayConfig::load() @@ -1080,10 +1080,10 @@ void KDisplayConfig::renameProfile () { void KDisplayConfig::activateProfile() { if (getuid() != 0) { - m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE, locateLocal("config", "/", true)); + m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true, locateLocal("config", "/", true)); } else { - m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE, KDE_CONFDIR); + m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true, KDE_CONFDIR); } rescanHardware(); } @@ -1331,7 +1331,7 @@ void KDisplayConfig::updateDragDropDisplay() { for ( i = 0; i < int(monitors.count()); ++i ) { if (::tqt_cast(monitors.at( i ))) { TQWidget *monitor = static_cast(monitors.at( i )); - if ( !monitor->close(TRUE) ) { + if ( !monitor->close(true) ) { Q_ASSERT("zombie monitor will not go away!"); } } @@ -1536,7 +1536,7 @@ void KDisplayConfig::gammaAllSliderChanged(int index) { screendata->gamma_green = ((float)base->gammaAllSlider->value())/10.0; screendata->gamma_blue = ((float)base->gammaAllSlider->value())/10.0; - m_gammaApplyTimer->start(10, TRUE); + m_gammaApplyTimer->start(10, true); base->gammaAllSlider->blockSignals(false); base->gammaRedSlider->blockSignals(false); @@ -1558,7 +1558,7 @@ void KDisplayConfig::gammaRedSliderChanged(int index) { screendata->gamma_red = ((float)index)/10.0; gammaSetAverageAllSlider(); setGammaLabels(); - m_gammaApplyTimer->start(10, TRUE); + m_gammaApplyTimer->start(10, true); base->gammaAllSlider->blockSignals(false); base->gammaRedSlider->blockSignals(false); @@ -1580,7 +1580,7 @@ void KDisplayConfig::gammaGreenSliderChanged(int index) { screendata->gamma_green = ((float)index)/10.0; gammaSetAverageAllSlider(); setGammaLabels(); - m_gammaApplyTimer->start(10, TRUE); + m_gammaApplyTimer->start(10, true); base->gammaAllSlider->blockSignals(false); base->gammaRedSlider->blockSignals(false); @@ -1602,7 +1602,7 @@ void KDisplayConfig::gammaBlueSliderChanged(int index) { screendata->gamma_blue = ((float)index)/10.0; gammaSetAverageAllSlider(); setGammaLabels(); - m_gammaApplyTimer->start(10, TRUE); + m_gammaApplyTimer->start(10, true); base->gammaAllSlider->blockSignals(false); base->gammaRedSlider->blockSignals(false); @@ -1992,7 +1992,7 @@ void KDisplayConfig::saveActiveSystemWideProfileToDisk() void KDisplayConfig::save() { - if (m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE)) { + if (m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true)) { saveActiveSystemWideProfileToDisk(); updateProfileConfigObjectFromGrid(); @@ -2021,7 +2021,7 @@ void KDisplayConfig::save() // Signal that settings were NOT applied TQTimer *t = new TQTimer( this ); connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(changed()) ); - t->start( 100, FALSE ); + t->start( 100, false ); } } diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 9a5adf2fc..dd20ec3ae 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -332,7 +332,7 @@ void FilterOptions::defaults() void FilterOptions::configChanged() { - // kdDebug () << "FilterOptions::configChanged: TRUE" << endl; + // kdDebug () << "FilterOptions::configChanged: true" << endl; emit changed(true); } diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp index 9aa0d3767..f4625813f 100644 --- a/kcontrol/info/info_aix.cpp +++ b/kcontrol/info/info_aix.cpp @@ -265,7 +265,7 @@ struct model _4C_models[] = }; -/* all GetInfo_ functions should return TRUE, when the Information +/* all GetInfo_ functions should return true, when the Information was filled into the lBox-Widget. returning false indicates, that information was not available. */ diff --git a/kcontrol/info/info_fbsd.cpp b/kcontrol/info/info_fbsd.cpp index 3ccd1c086..ec7b90bf8 100644 --- a/kcontrol/info/info_fbsd.cpp +++ b/kcontrol/info/info_fbsd.cpp @@ -21,8 +21,8 @@ /* - * all following functions should return TRUE, when the Information - * was filled into the lBox-Widget. Returning FALSE indicates that + * all following functions should return true, when the Information + * was filled into the lBox-Widget. Returning false indicates that * information was not available. */ diff --git a/kcontrol/info/info_generic.cpp b/kcontrol/info/info_generic.cpp index 367e1657b..c914159ab 100644 --- a/kcontrol/info/info_generic.cpp +++ b/kcontrol/info/info_generic.cpp @@ -25,7 +25,7 @@ #define INFO_CD_ROM_AVAILABLE -/* all following functions should return TRUE, when the Information +/* all following functions should return true, when the Information was filled into the lBox-Widget. returning false indicates, that information was not available. */ diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp index bbda9691d..6354aa46d 100644 --- a/kcontrol/info/info_linux.cpp +++ b/kcontrol/info/info_linux.cpp @@ -293,7 +293,7 @@ static void cleanPassword(TQString & str) while (index >= 0) { - index = str.find(passwd, index, FALSE); + index = str.find(passwd, index, false); if (index >= 0) { index += passwd.length(); while (index < (int) str.length() && diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index 2fced7e40..73b252501 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -24,8 +24,8 @@ /* - * all following functions should return TRUE, when the Information - * was filled into the lBox-Widget. Returning FALSE indicates that + * all following functions should return true, when the Information + * was filled into the lBox-Widget. Returning false indicates that * information was not available. */ @@ -179,7 +179,7 @@ bool GetInfo_IRQ (TQListView *lBox) lBox->addColumn(i18n("IRQ")); lBox->addColumn(i18n("Device")); lBox->setSorting(0); - lBox->setShowSortIndicator(FALSE); + lBox->setShowSortIndicator(false); (void) GetDmesgInfo(lBox, "[ (]irq ", AddIRQLine); return true; } diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp index 7b484da76..84000b79a 100644 --- a/kcontrol/info/info_openbsd.cpp +++ b/kcontrol/info/info_openbsd.cpp @@ -24,8 +24,8 @@ /* - * all following functions should return TRUE, when the Information - * was filled into the lBox-Widget. Returning FALSE indicates that + * all following functions should return true, when the Information + * was filled into the lBox-Widget. Returning false indicates that * information was not available. */ diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp index 5f18aebea..96bfa75bb 100644 --- a/kcontrol/info/info_osx.cpp +++ b/kcontrol/info/info_osx.cpp @@ -31,8 +31,8 @@ #define INFO_XSERVER_AVAILABLE /* - * all following functions should return TRUE, when the Information - * was filled into the lBox-Widget. Returning FALSE indicates that + * all following functions should return true, when the Information + * was filled into the lBox-Widget. Returning false indicates that * information was not available. */ diff --git a/kcontrol/info/info_sgi.cpp b/kcontrol/info/info_sgi.cpp index 7961d4e16..f2740c0d4 100644 --- a/kcontrol/info/info_sgi.cpp +++ b/kcontrol/info/info_sgi.cpp @@ -15,7 +15,7 @@ #define INFO_XSERVER_AVAILABLE -/* all following functions should return TRUE, when the Information +/* all following functions should return true, when the Information was filled into the lBox-Widget. returning false indicates, that information was not available. */ diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index 78c37d717..870f26047 100644 --- a/kcontrol/input/logitechmouse.cpp +++ b/kcontrol/input/logitechmouse.cpp @@ -68,18 +68,18 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag if ( mouseCapabilityFlags & HAS_RES ) { updateResolution(); - resolutionSelector->setEnabled( TRUE ); + resolutionSelector->setEnabled( true ); connect( button400cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); connect( button800cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); if ( 4 == resolution() ) { - button800cpi->setChecked( TRUE ); + button800cpi->setChecked( true ); } else if ( 3 == resolution() ) { - button400cpi->setChecked( TRUE ); + button400cpi->setChecked( true ); } else { // it must have failed, try to help out - resolutionSelector->setEnabled(FALSE); + resolutionSelector->setEnabled(false); permissionProblemText->show(); } } @@ -90,20 +90,20 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag // Do a name cordlessNameLabel->setText( i18n("Mouse type: %1").arg( cordlessName() ) ); - cordlessNameLabel->setEnabled( TRUE ); + cordlessNameLabel->setEnabled( true ); // Display the battery power level - the level gets updated in updateGUI() - batteryBox->setEnabled( TRUE ); + batteryBox->setEnabled( true ); // Channel - channelSelector->setEnabled( TRUE ); + channelSelector->setEnabled( true ); // if the channel is changed, we need to turn off the timer, otherwise it // just resets the button to reflect the current status. The timer is // started again when we applyChanges() connect( channel1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) ); connect( channel1, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); if ( isDualChannelCapable() ) { - channel2->setEnabled( TRUE ); + channel2->setEnabled( true ); connect( channel2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) ); connect( channel2, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); } @@ -144,8 +144,8 @@ void LogitechMouse::updateCordlessStatus() if (0 > result) { // We probably have a permission problem - channelSelector->setEnabled( FALSE ); - batteryBox->setEnabled( FALSE ); + channelSelector->setEnabled( false ); + batteryBox->setEnabled( false ); cordlessNameLabel->hide(); permissionProblemText->show(); } else { @@ -198,9 +198,9 @@ void LogitechMouse::updateGUI() if ( isDualChannelCapable() ) { if ( 2 == channel() ) { - channel2->setChecked( TRUE ); + channel2->setChecked( true ); } else if ( 1 == channel() ) { - channel1->setChecked( TRUE ); + channel1->setChecked( true ); } // else it might have failed - we don't do anything } } diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 3235d15c7..1c7340220 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -128,7 +128,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.")); removeBt = new TQPushButton( i18n("&Remove Scheme"), this ); - removeBt->setEnabled(FALSE); + removeBt->setEnabled(false); connect( removeBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) ); TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not" " remove the standard system wide schemes, 'Current scheme' and 'TDE default'.") ); @@ -303,7 +303,7 @@ void KKeyModule::readScheme( int index ) do { - nameValid = TRUE; + nameValid = true; if ( ss.exec() ) { sName = ss.nameLine->text(); @@ -354,7 +354,7 @@ void KKeyModule::readScheme( int index ) } } else return; - } while ( nameValid == FALSE ); + } while ( nameValid == false ); disconnect( sList, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreviewScheme( int ) ) ); @@ -418,9 +418,9 @@ void KKeyModule::readScheme( int index ) if ( indx < nSysSchemes || (*sFileList->at(indx)).contains( "/global-" ) || (*sFileList->at(indx)).contains( "/app-" ) ) { - removeBt->setEnabled( FALSE ); + removeBt->setEnabled( false ); } else { - removeBt->setEnabled( TRUE ); + removeBt->setEnabled( true ); } }*/ diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 16f8688d7..41885202f 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -253,7 +253,7 @@ void DesktopBehavior::setMediaListViewEnabled(bool enabled) if (it->mimeType().startsWith("media/builtin-") == false) it->setVisible(enabled); else - it->setVisible(TRUE); + it->setVisible(true); } } diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index 0af6b8db8..412fbe0b8 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -555,7 +555,7 @@ void KPluginOptions::pluginLoad( TDEConfig* /*config*/ ) continue; } - TQStringList desc = TQStringList::split(':', line, TRUE); + TQStringList desc = TQStringList::split(':', line, true); TQString mime = desc[0].stripWhiteSpace(); TQString name = desc[2]; TQString suffixes = desc[1]; diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index aac454061..487a3455e 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -42,7 +42,7 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale, m_locale(locale) { TQGridLayout *lay = new TQGridLayout(this, 5, 2); - lay->setAutoAdd(TRUE); + lay->setAutoAdd(true); // Whatever the color scheme is, we want black text TQColorGroup a = palette().active(); diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index 9eec5ec01..d4311a1e7 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -43,7 +43,7 @@ TDELocaleConfigNumber::TDELocaleConfigNumber(TDELocale *locale, TQGridLayout *lay = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint()); - lay->setAutoAdd(TRUE); + lay->setAutoAdd(true); m_labDecSym = new TQLabel(this, I18N_NOOP("&Decimal symbol:")); m_edDecSym = new TQLineEdit(this); diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index cfe76557d..c181dfb11 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -198,7 +198,7 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale, TQGridLayout *lay = new TQGridLayout(this, 7, 2, KDialog::marginHint(), KDialog::spacingHint()); - lay->setAutoAdd(TRUE); + lay->setAutoAdd(true); m_labCalendarSystem = new TQLabel(this, I18N_NOOP("Calendar system:")); m_comboCalendarSystem = new TQComboBox(false, this); diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index f367d5121..525a73953 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -64,7 +64,7 @@ TDELocaleApplication::TDELocaleApplication(TQWidget *parent, const char* /*name* m_locale = new TDELocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - l->setAutoAdd(TRUE); + l->setAutoAdd(true); m_tab = new TQTabWidget(this); diff --git a/kcontrol/randr/tderandrapp.cpp b/kcontrol/randr/tderandrapp.cpp index 97e602496..a6d704e30 100644 --- a/kcontrol/randr/tderandrapp.cpp +++ b/kcontrol/randr/tderandrapp.cpp @@ -41,7 +41,7 @@ void KRandRApp::handleX11ConfigChangeEvent() bool KRandRApp::x11EventFilter(XEvent* e) { if (e->type == m_tray->screenChangeNotifyEvent()) { - m_eventMergingTimer.start(1000, TRUE); + m_eventMergingTimer.start(1000, true); } return TDEApplication::x11EventFilter( e ); } diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 37d49dbb0..7506f3907 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -851,7 +851,7 @@ void KRandRSystemTray::slotDisplayProfileChanged(int parameter) profileName = ""; } TQPtrList profileData = loadDisplayConfiguration(profileName, locateLocal("config", "/", true)); - applyDisplayConfiguration(profileData, TRUE, locateLocal("config", "/", true)); + applyDisplayConfiguration(profileData, true, locateLocal("config", "/", true)); destroyScreenInformationObject(profileData); } diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index a2a03fed3..fdb21bb1e 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -90,7 +90,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name) logFileName.setURL("/var/log/samba.log"); - viewHistory.setAllColumnsShowFocus(TRUE); + viewHistory.setAllColumnsShowFocus(true); viewHistory.setFocusPolicy(TQWidget::ClickFocus); viewHistory.setShowSortIndicator(true); @@ -108,10 +108,10 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name) " If the list is empty, try clicking the \"Update\" button. The samba" " log file will be read and the list refreshed.") ); - showConnOpen.setChecked(TRUE); - showConnClose.setChecked(TRUE); - showFileOpen.setChecked(FALSE); - showFileClose.setChecked(FALSE); + showConnOpen.setChecked(true); + showConnClose.setChecked(true); + showFileOpen.setChecked(false); + showFileClose.setChecked(false); connect(&updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(updateList())); emit contentsChanged(&viewHistory,0,0); @@ -132,10 +132,10 @@ void LogView::loadSettings() configFile->setGroup(LOGGROUPNAME); logFileName.setURL(configFile->readPathEntry( "SambaLogFile", "/var/log/samba.log")); - showConnOpen.setChecked(configFile->readBoolEntry( "ShowConnectionOpen", TRUE)); - showConnClose.setChecked(configFile->readBoolEntry( "ShowConnectionClose", FALSE)); - showFileOpen.setChecked(configFile->readBoolEntry( "ShowFileOpen", TRUE)); - showFileClose.setChecked(configFile->readBoolEntry( "ShowFileClose", FALSE)); + showConnOpen.setChecked(configFile->readBoolEntry( "ShowConnectionOpen", true)); + showConnClose.setChecked(configFile->readBoolEntry( "ShowConnectionClose", false)); + showFileOpen.setChecked(configFile->readBoolEntry( "ShowFileOpen", true)); + showFileClose.setChecked(configFile->readBoolEntry( "ShowFileClose", false)); } void LogView::saveSettings() diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index faeb54702..650c43a05 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -59,7 +59,7 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n expandedInfoCb = new TQCheckBox( i18n( "Show expanded service info" ), this ); expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this ); - viewStatistics->setAllColumnsShowFocus(TRUE); + viewStatistics->setAllColumnsShowFocus(true); viewStatistics->setFocusPolicy(TQWidget::ClickFocus); viewStatistics->setShowSortIndicator(true); @@ -73,8 +73,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n eventCb->insertItem(i18n("Connection")); eventCb->insertItem(i18n("File Access")); - expandedInfoCb->setChecked(FALSE); - expandedUserCb->setChecked(FALSE); + expandedInfoCb->setChecked(false); + expandedUserCb->setChecked(false); clearStatistics(); serviceLe->setText("*"); hostLe->setText("*"); @@ -142,8 +142,8 @@ void StatisticsView::calculate() if ((expandedInfoCb->isChecked()) || (expandedUserCb->isChecked())) { SambaLog sLog; - TQRegExp rService(serviceLe->text(),FALSE,TRUE); - TQRegExp rHost(hostLe->text(),FALSE,TRUE); + TQRegExp rService(serviceLe->text(),false,true); + TQRegExp rHost(hostLe->text(),false,true); TQString item2, item3; TQListViewItem* item=dataList->firstChild(); while (item!=0) @@ -194,8 +194,8 @@ void StatisticsView::calculate() { calcCount++; int count(0); - TQRegExp rService(serviceLe->text(),FALSE,TRUE); - TQRegExp rHost(hostLe->text(),FALSE,TRUE); + TQRegExp rService(serviceLe->text(),false,true); + TQRegExp rHost(hostLe->text(),false,true); TQListViewItem* item=dataList->firstChild(); while (item!=0) { diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h index 157fc62b3..cf7817ce5 100644 --- a/kcontrol/samba/kcmsambastatistics.h +++ b/kcontrol/samba/kcmsambastatistics.h @@ -50,7 +50,7 @@ class LogItem LogItem():name(""), accessed(),count(0) {}; LogItem(TQString n, TQString a):name(n), accessed(), count(1) { - accessed.setAutoDelete(TRUE); + accessed.setAutoDelete(true); accessed.append(new SmallLogItem(a)); }; TQString name; @@ -66,7 +66,7 @@ class SambaLog public: SambaLog() { - items.setAutoDelete(TRUE); + items.setAutoDelete(true); }; TQPtrList items; void addItem (TQString share, TQString host); diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index a31be2be0..1b13bfe12 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -899,7 +899,7 @@ void KScreenSaver::slotTest() grabMouse(); grabKeyboard(); - mTestBt->setEnabled( FALSE ); + mTestBt->setEnabled( false ); mPreviewProc->kill(); while (!ts.atEnd()) diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index 8425d9124..998f936e8 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -92,7 +92,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) "", "signalReaderListChanged(TQStringList)", "loadReadersTab(TQStringList)", - FALSE)) + false)) kdDebug()<<"Error connecting to DCOP server" <setSelectable(FALSE); + hil->setSelectable(false); } else{ TDEListViewItem * hil =new TDEListViewItem(ant, i18n("No module managing this card")); - hil->setSelectable(FALSE); + hil->setSelectable(false); } } diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index 5b08f56cf..6816cd6c2 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -66,7 +66,7 @@ void KSpellCheckingConfig::defaults() spellConfig->setNoRootAffix(0); spellConfig->setRunTogether(0); spellConfig->setDictionary(""); - spellConfig->setDictFromList(FALSE); + spellConfig->setDictFromList(false); spellConfig->setEncoding (KS_E_UTF8); spellConfig->setClient (KS_CLIENT_ISPELL); } diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index a2a7edaf2..0ef66c6b3 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -163,12 +163,12 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); - cbStyle->setEditable( FALSE ); + cbStyle->setEditable( false ); hbLayout->addWidget( cbStyle ); pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); - pbConfigStyle->setEnabled( FALSE ); + pbConfigStyle->setEnabled( false ); hbLayout->addWidget( pbConfigStyle ); gbWidgetStyleLayout->addLayout( hbLayout ); @@ -227,7 +227,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout = new TQGridLayout( containerFrame, 1, 1, // rows, columns KDialog::marginHint(), KDialog::spacingHint() ); - comboComboEffect = new TQComboBox( FALSE, containerFrame ); + comboComboEffect = new TQComboBox( false, containerFrame ); comboComboEffect->insertItem( i18n("Disable") ); comboComboEffect->insertItem( i18n("Animate") ); lblComboEffect = new TQLabel( i18n("Combobo&x effect:"), containerFrame ); @@ -235,7 +235,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblComboEffect, 0, 0 ); containerLayout->addWidget( comboComboEffect, 0, 1 ); - comboTooltipEffect = new TQComboBox( FALSE, containerFrame ); + comboTooltipEffect = new TQComboBox( false, containerFrame ); comboTooltipEffect->insertItem( i18n("Disable") ); comboTooltipEffect->insertItem( i18n("Animate") ); comboTooltipEffect->insertItem( i18n("Fade") ); @@ -244,7 +244,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblTooltipEffect, 1, 0 ); containerLayout->addWidget( comboTooltipEffect, 1, 1 ); - comboRubberbandEffect = new TQComboBox( FALSE, containerFrame ); + comboRubberbandEffect = new TQComboBox( false, containerFrame ); comboRubberbandEffect->insertItem( i18n("Disable") ); comboRubberbandEffect->insertItem( i18n("Make translucent") ); lblRubberbandEffect = new TQLabel( i18n("&Rubberband effect:"), containerFrame ); @@ -252,7 +252,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblRubberbandEffect, 2, 0 ); containerLayout->addWidget( comboRubberbandEffect, 2, 1 ); - comboMenuEffect = new TQComboBox( FALSE, containerFrame ); + comboMenuEffect = new TQComboBox( false, containerFrame ); comboMenuEffect->insertItem( i18n("Disable") ); comboMenuEffect->insertItem( i18n("Animate") ); comboMenuEffect->insertItem( i18n("Fade") ); @@ -262,7 +262,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblMenuEffect, 3, 0 ); containerLayout->addWidget( comboMenuEffect, 3, 1 ); - comboMenuHandle = new TQComboBox( FALSE, containerFrame ); + comboMenuHandle = new TQComboBox( false, containerFrame ); comboMenuHandle->insertItem( i18n("Disable") ); comboMenuHandle->insertItem( i18n("Application Level") ); // comboMenuHandle->insertItem( i18n("Enable") ); @@ -291,7 +291,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) menuPreview = new MenuPreview( menuContainer, /* opacity */ 90, MenuPreview::Blend ); - comboMenuEffectType = new TQComboBox( FALSE, menuContainer ); + comboMenuEffectType = new TQComboBox( false, menuContainer ); comboMenuEffectType->insertItem( i18n("Software Tint") ); comboMenuEffectType->insertItem( i18n("Software Blend") ); #ifdef HAVE_XRENDER @@ -353,7 +353,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) TQHBoxLayout* box2 = new TQHBoxLayout( dummy, 0, KDialog::spacingHint() ); lbl = new TQLabel( i18n("Text pos&ition:"), dummy ); - comboToolbarIcons = new TQComboBox( FALSE, dummy ); + comboToolbarIcons = new TQComboBox( false, dummy ); comboToolbarIcons->insertItem( i18n("Icons Only") ); comboToolbarIcons->insertItem( i18n("Text Only") ); comboToolbarIcons->insertItem( i18n("Text Alongside Icons") ); @@ -697,11 +697,11 @@ bool KCMStyle::findStyle( const TQString& str, int& combobox_item ) if ( cbStyle->text(i) == name ) { combobox_item = i; - return TRUE; + return true; } } - return FALSE; + return false; } diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h index 38f47ecee..2d2128396 100644 --- a/kcontrol/style/stylepreview.ui.h +++ b/kcontrol/style/stylepreview.ui.h @@ -59,9 +59,9 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev ) case TQEvent::Leave: case TQEvent::Wheel: case TQEvent::ContextMenu: - return TRUE; // ignore + return true; // ignore default: break; } - return FALSE; + return false; } diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 73b0a1f96..0d6de4f0c 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -200,7 +200,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL TQFile configFile(locateLocal("config", m_configFileName)); if (!configFile.exists()) { - TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true); TDEConfig localConfig(m_configFileName); globalConfig.copyTo(m_configFileName, &localConfig); localConfig.sync(); @@ -333,7 +333,7 @@ void TaskbarConfig::processLockouts() void TaskbarConfig::slotReloadConfigurationFromGlobals() { - TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true); TDEConfig localConfig(m_configFileName); globalConfig.copyTo(m_configFileName, &localConfig); localConfig.sync(); diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp index 6d6ed8cd7..30dd0f506 100644 --- a/kcontrol/tdm/tdm-shut.cpp +++ b/kcontrol/tdm/tdm-shut.cpp @@ -49,13 +49,13 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) TQGroupBox *group0 = new TQGroupBox( i18n("Allow Shutdown"), this ); - sdlcombo = new TQComboBox( FALSE, group0 ); + sdlcombo = new TQComboBox( false, group0 ); sdllabel = new TQLabel (sdlcombo, i18n ("&Local:"), group0); sdlcombo->insertItem(i18n("Everybody"), SdAll); sdlcombo->insertItem(i18n("Only Root"), SdRoot); sdlcombo->insertItem(i18n("Nobody"), SdNone); connect(sdlcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); - sdrcombo = new TQComboBox( FALSE, group0 ); + sdrcombo = new TQComboBox( false, group0 ); sdrlabel = new TQLabel (sdrcombo, i18n ("&Remote:"), group0); sdrcombo->insertItem(i18n("Everybody"), SdAll); sdrcombo->insertItem(i18n("Only Root"), SdRoot); diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index 53af22ee8..b0f8d85bb 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -295,8 +295,8 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) mainView->lv->header()->setStretchEnabled(true, 0); // mainView->lv->addColumn(i18n("Interface")); // mainView->lv->addColumn(i18n("Function")); - mainView->lv->setDragAutoScroll( FALSE ); - mainView->lv->setRootIsDecorated( TRUE ); + mainView->lv->setDragAutoScroll( false ); + mainView->lv->setRootIsDecorated( true ); connect(mainView->lv, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotCallFunction(TQListViewItem *))); connect(mainView->lv, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(slotCurrentChanged(TQListViewItem *))); connect(mainView->lb_replyData, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp index 597d78139..4b0527674 100644 --- a/kdesktop/kdiconview.cpp +++ b/kdesktop/kdiconview.cpp @@ -1832,8 +1832,8 @@ void KDIconView::updateWorkArea( const TQRect &wr ) } } if ( needRepaint ) { - viewport()->repaint( FALSE ); - repaint( FALSE ); + viewport()->repaint( false ); + repaint( false ); saveIconPositions(); } @@ -1905,7 +1905,7 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect &curre if (area.isNull()) area = iconArea(); // If the proposed item rect is not contained by the desktop, by definition the item position is not free! - if (!area.contains(r, FALSE)) { + if (!area.contains(r, false)) { return false; } @@ -1929,7 +1929,7 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect& rect, if (area.isNull()) area = iconArea(); // If the proposed item rect is not contained by the desktop, by definition the item position is not free! - if (!area.contains(rect, FALSE)) { + if (!area.contains(rect, false)) { return false; } diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp index abe4b52e1..9e751d573 100644 --- a/kdesktop/krootwm.cpp +++ b/kdesktop/krootwm.cpp @@ -72,7 +72,7 @@ KRootWm * KRootWm::s_rootWm = 0; extern TQCString kdesktop_name, kicker_name, twin_name; -KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop), startup(FALSE) +KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop), startup(false) { s_rootWm = this; m_actionCollection = new TDEActionCollection(_desktop, this, "KRootWm::m_actionCollection"); diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index d36b02559..41fb78371 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -174,16 +174,16 @@ extern pid_t kdesktop_pid; extern TQXLibWindowList trinity_desktop_lock_hidden_window_list; -bool trinity_desktop_lock_autohide_lockdlg = TRUE; +bool trinity_desktop_lock_autohide_lockdlg = true; #define ENABLE_CONTINUOUS_LOCKDLG_DISPLAY \ -if (!mForceContinualLockDisplayTimer->isActive()) mForceContinualLockDisplayTimer->start(100, FALSE); \ -trinity_desktop_lock_autohide_lockdlg = FALSE; \ +if (!mForceContinualLockDisplayTimer->isActive()) mForceContinualLockDisplayTimer->start(100, false); \ +trinity_desktop_lock_autohide_lockdlg = false; \ mHackDelayStartupTimer->stop(); #define DISABLE_CONTINUOUS_LOCKDLG_DISPLAY \ mForceContinualLockDisplayTimer->stop(); \ -trinity_desktop_lock_autohide_lockdlg = TRUE; \ +trinity_desktop_lock_autohide_lockdlg = true; \ mHackDelayStartupTimer->stop(); //=========================================================================== @@ -463,7 +463,7 @@ static void sighup_handler(int) bool LockProcess::closeCurrentWindow() { - mClosingWindows = TRUE; + mClosingWindows = true; if (currentDialog != NULL) { mForceReject = true; if (dynamic_cast(currentDialog)) { @@ -478,12 +478,12 @@ bool LockProcess::closeCurrentWindow() } if( mDialogs.isEmpty() ) { - mClosingWindows = FALSE; + mClosingWindows = false; mForceReject = false; return false; } else { - mClosingWindows = TRUE; + mClosingWindows = true; return true; } } @@ -672,7 +672,7 @@ void LockProcess::startSecureDialog() } if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } else { if (mHackStartupEnabled == true) { @@ -681,7 +681,7 @@ void LockProcess::startSecureDialog() else { if (trinity_desktop_lock_use_system_modal_dialogs == true) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } else { startHack(); @@ -710,7 +710,7 @@ void LockProcess::startSecureDialog() // Handle remaining case (switch user) if (forcecontdisp) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } stopSaver(); } @@ -1065,7 +1065,7 @@ void LockProcess::desktopResized() resizeTimer = new TQTimer( this ); connect( resizeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doDesktopResizeFinish()) ); } - resizeTimer->start( 100, TRUE ); // 100 millisecond single shot timer; should allow display switching operations to finish before hack is started + resizeTimer->start( 100, true ); // 100 millisecond single shot timer; should allow display switching operations to finish before hack is started } void LockProcess::doDesktopResizeFinish() @@ -1084,7 +1084,7 @@ void LockProcess::doDesktopResizeFinish() // Restart the hack as the window size is now different if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_use_system_modal_dialogs) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } else { if (mHackStartupEnabled == true) { @@ -1093,7 +1093,7 @@ void LockProcess::doDesktopResizeFinish() else { if (trinity_desktop_lock_use_system_modal_dialogs == true) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } else { startHack(); @@ -1397,10 +1397,10 @@ bool LockProcess::startSaver(bool notify_ready) } } - if (mInSecureDialog == FALSE) { + if (mInSecureDialog == false) { if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } else { if (mHackStartupEnabled || mOverrideHackStartupEnabled) { @@ -1410,7 +1410,7 @@ bool LockProcess::startSaver(bool notify_ready) else { if (trinity_desktop_lock_use_system_modal_dialogs == true) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } else { startHack(); @@ -1529,7 +1529,7 @@ void LockProcess::closeDialogAndStartHack() // Make sure saver will attempt to start again after DPMS wakeup // This is related to Bug 1475 ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); // Should not start saver here, because the DPMS check method below would turn it right back off! // This is related to Bug 1475 return; @@ -1577,10 +1577,10 @@ void LockProcess::repaintRootWindowIfNeeded() bool LockProcess::startHack() { - mHackActive = TRUE; + mHackActive = true; if ((mEnsureVRootWindowSecurityTimer) && (!mEnsureVRootWindowSecurityTimer->isActive())) { - mEnsureVRootWindowSecurityTimer->start(250, FALSE); + mEnsureVRootWindowSecurityTimer->start(250, false); } if (currentDialog || (!mDialogs.isEmpty())) { @@ -1709,7 +1709,7 @@ bool LockProcess::startHack() } if (trinity_desktop_lock_use_system_modal_dialogs) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } saverReadyIfNeeded(); } @@ -1735,7 +1735,7 @@ void LockProcess::stopHack() } setCursor( TQt::arrowCursor ); - mHackActive = FALSE; + mHackActive = false; } //--------------------------------------------------------------------------- @@ -1744,7 +1744,7 @@ void LockProcess::hackExited(TDEProcess *) { // Hack exited while we're supposed to be saving the screen. // Make sure the saver window is black. - mHackActive = FALSE; + mHackActive = false; usleep(100); TQApplication::syncX(); if (!trinity_desktop_lock_use_system_modal_dialogs) { @@ -1779,7 +1779,7 @@ void LockProcess::hackExited(TDEProcess *) if (!mSuspended) { if (trinity_desktop_lock_use_system_modal_dialogs) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } } saverReadyIfNeeded(); @@ -1816,7 +1816,7 @@ void LockProcess::suspend() stopHack(); ENABLE_CONTINUOUS_LOCKDLG_DISPLAY if (mHackStartupEnabled) { - mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } } else { @@ -1834,7 +1834,7 @@ void LockProcess::suspend() } hackstat[8191] = 0; hackStatus = hackstat; - hackStatus = hackStatus.remove(TQRegExp("(*) ", TRUE, TRUE)); + hackStatus = hackStatus.remove(TQRegExp("(*) ", true, true)); TQStringList hackStatusList = TQStringList::split(" ", hackStatus); hackStatus = (*(hackStatusList.at(1))); } @@ -2029,7 +2029,7 @@ int LockProcess::execDialog( TQDialog *dlg ) connect( hackResumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resumeUnforced()) ); } if (mResizingDesktopLock == false) { - hackResumeTimer->start( 10, TRUE ); + hackResumeTimer->start( 10, true ); } } else { @@ -2192,7 +2192,7 @@ bool LockProcess::x11Event(XEvent *event) // fall through case KeyPress: if ((mHackDelayStartupTimer) && (mHackDelayStartupTimer->isActive())) { - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } if (mBusy || !mDialogs.isEmpty()) { break; @@ -2202,7 +2202,7 @@ bool LockProcess::x11Event(XEvent *event) if (mLocked) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY if (mHackStartupEnabled) { - mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } } if ((!mLocked) && (!mInSecureDialog)) { @@ -2251,7 +2251,7 @@ bool LockProcess::x11Event(XEvent *event) else { if (trinity_desktop_lock_use_system_modal_dialogs == true) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY - if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE); + if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } else { resume( false ); @@ -2678,7 +2678,7 @@ void LockProcess::slotMouseActivity(XEvent *event) } // Clicked inside dialog; set focus - if (inFrame == TRUE) { + if (inFrame) { WId window = mDialogs.first()->winId(); XSetInputFocus(tqt_xdisplay(), window, RevertToParent, CurrentTime); fakeFocusIn(window); @@ -2688,7 +2688,7 @@ void LockProcess::slotMouseActivity(XEvent *event) } // Clicked inside window handle (or border); drag window - if ((inFrame == TRUE) && (inDialog == FALSE)) { + if (inFrame && !inDialog) { TQPoint oldPoint = mDialogs.first()->pos(); m_mouseDown = 1; m_dialogPrevX = oldPoint.x(); @@ -2701,7 +2701,7 @@ void LockProcess::slotMouseActivity(XEvent *event) // Drag the window... if (event->type == MotionNotify) { - if (m_mouseDown == TRUE) { + if (m_mouseDown) { int deltaX = me->x_root - m_mousePrevX; int deltaY = me->y_root - m_mousePrevY; m_dialogPrevX = m_dialogPrevX + deltaX; diff --git a/kdesktop/lock/main.cpp b/kdesktop/lock/main.cpp index 3e789e780..2e00b4c3a 100644 --- a/kdesktop/lock/main.cpp +++ b/kdesktop/lock/main.cpp @@ -58,12 +58,12 @@ TQXLibWindowList trinity_desktop_lock_hidden_window_list; // [FIXME] Add GUI configuration checkboxes for these three settings (see kdesktoprc [ScreenSaver] UseUnmanagedLockWindows, DelaySaverStart, and UseTDESAK) -bool trinity_desktop_lock_use_system_modal_dialogs = FALSE; -bool trinity_desktop_lock_delay_screensaver_start = FALSE; -bool trinity_desktop_lock_use_sak = FALSE; -bool trinity_desktop_lock_hide_active_windows = FALSE; -bool trinity_desktop_lock_hide_cancel_button = FALSE; -bool trinity_desktop_lock_forced = FALSE; +bool trinity_desktop_lock_use_system_modal_dialogs = false; +bool trinity_desktop_lock_delay_screensaver_start = false; +bool trinity_desktop_lock_use_sak = false; +bool trinity_desktop_lock_hide_active_windows = false; +bool trinity_desktop_lock_hide_cancel_button = false; +bool trinity_desktop_lock_forced = false; LockProcess* trinity_desktop_lock_process = NULL; @@ -72,35 +72,35 @@ bool signalled_dontlock; bool signalled_securedialog; bool signalled_blank; bool signalled_run; -bool in_internal_mode = FALSE; +bool in_internal_mode = false; -bool argb_visual = FALSE; +bool argb_visual = false; pid_t kdesktop_pid = -1; -bool trinity_desktop_lock_settings_initialized = FALSE; +bool trinity_desktop_lock_settings_initialized = false; static void sigusr1_handler(int) { - signalled_forcelock = TRUE; + signalled_forcelock = true; } static void sigusr2_handler(int) { - signalled_dontlock = TRUE; + signalled_dontlock = true; } static void sigusr3_handler(int) { - signalled_securedialog = TRUE; + signalled_securedialog = true; } static void sigusr4_handler(int) { - signalled_blank = TRUE; + signalled_blank = true; } static void sigusr5_handler(int) { - signalled_run = TRUE; + signalled_run = true; } static int trapXErrors(Display *, XErrorEvent *) @@ -246,11 +246,11 @@ int main( int argc, char **argv ) sigfillset(&new_mask); sigprocmask(SIG_BLOCK, &new_mask, NULL); - signalled_forcelock = FALSE; - signalled_dontlock = FALSE; - signalled_securedialog = FALSE; - signalled_blank = FALSE; - signalled_run = FALSE; + signalled_forcelock = false; + signalled_dontlock = false; + signalled_securedialog = false; + signalled_blank = false; + signalled_run = false; int kdesktop_screen_number = 0; int starting_screen = 0; @@ -396,7 +396,7 @@ int main( int argc, char **argv ) kdesktop_pid = atoi(args->getOption( "internal" )); struct sigaction act; - in_internal_mode = TRUE; + in_internal_mode = true; // handle SIGUSR1 act.sa_handler= sigusr1_handler; @@ -437,7 +437,7 @@ int main( int argc, char **argv ) sigaddset(&new_mask,SIGTTIN); sigaddset(&new_mask,SIGTTOU); - while (signalled_run == FALSE) { + while (!signalled_run) { // let kdesktop know the saver process is ready if (kill(kdesktop_pid, SIGTTIN) < 0) { // The controlling kdesktop process probably died. Commit suicide... @@ -454,7 +454,7 @@ int main( int argc, char **argv ) // wait for SIGUSR1, SIGUSR2, SIGWINCH, SIGTTIN, or SIGTTOU sigprocmask(SIG_BLOCK, &new_mask, &orig_mask); - if (signalled_run != TRUE) { + if (!signalled_run) { sigsuspend(&orig_mask); } sigprocmask(SIG_UNBLOCK, &new_mask, NULL); @@ -494,11 +494,11 @@ int main( int argc, char **argv ) delete tdmconfig; - if (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE)) { - trinity_desktop_lock_forced = TRUE; + if (args->isSet( "forcelock" ) || signalled_forcelock) { + trinity_desktop_lock_forced = true; } - trinity_desktop_lock_process->init(child, (args->isSet( "blank" ) || (signalled_blank == TRUE))); + trinity_desktop_lock_process->init(child, (args->isSet( "blank" ) || signalled_blank)); if (!child) { trinity_desktop_lock_process->setChildren(child_sockets); } @@ -507,13 +507,13 @@ int main( int argc, char **argv ) } bool rt; - if( (((!child) && (args->isSet( "forcelock" ))) || (signalled_forcelock == TRUE))) { + if( (((!child) && (args->isSet( "forcelock" ))) || signalled_forcelock)) { rt = trinity_desktop_lock_process->lock(); } - else if( child || (args->isSet( "dontlock" ) || (signalled_dontlock == TRUE))) { + else if( child || (args->isSet( "dontlock" ) || signalled_dontlock)) { rt = trinity_desktop_lock_process->dontLock(); } - else if( child || (args->isSet( "securedialog" ) || (signalled_securedialog == TRUE))) { + else if( child || (args->isSet( "securedialog" ) || signalled_securedialog)) { int retcode = tde_sak_verify_calling_process(); if (retcode == 0) { rt = trinity_desktop_lock_process->runSecureDialog(); @@ -529,7 +529,7 @@ int main( int argc, char **argv ) return 0; } - if (in_internal_mode == FALSE) { + if (!in_internal_mode) { trinity_desktop_lock_hidden_window_list.clear(); int ret = app->exec(); restore_hidden_override_redirect_windows(); diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp index a9f0cb2f7..c4b781c2a 100644 --- a/kdesktop/lockeng.cpp +++ b/kdesktop/lockeng.cpp @@ -56,7 +56,7 @@ #include "xautolock_c.h" extern xautolock_corner_t xautolock_corners[ 4 ]; -bool trinity_lockeng_sak_available = TRUE; +bool trinity_lockeng_sak_available = true; SaverEngine* m_masterSaverEngine = NULL; static void sigusr1_handler(int) @@ -172,7 +172,7 @@ SaverEngine::SaverEngine() } mLockProcess << path; mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid()); - if (mLockProcess.start() == false ) + if (!mLockProcess.start()) { kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl; } @@ -482,7 +482,7 @@ void SaverEngine::slotSAKProcessExited() } int retcode = mSAKProcess->exitStatus(); if ((retcode != 0) && (mSAKProcess->normalExit())) { - trinity_lockeng_sak_available = FALSE; + trinity_lockeng_sak_available = false; printf("[kdesktop] SAK driven secure dialog is not available for use (retcode %d). Check tdmtsak for proper functionality.\n", retcode); fflush(stdout); } @@ -490,7 +490,7 @@ void SaverEngine::slotSAKProcessExited() return; } - if ((mSAKProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) { + if (mSAKProcess->normalExit() && trinity_lockeng_sak_available) { bool ok = true; if (mState == Waiting) { @@ -561,7 +561,7 @@ bool SaverEngine::restartDesktopLockProcess() } mLockProcess << path; mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid()); - if (mLockProcess.start() == false) { + if (!mLockProcess.start()) { kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl; return false; } @@ -686,7 +686,7 @@ void SaverEngine::recoverFromHackingAttempt() void SaverEngine::lockProcessExited() { bool abnormalExit = false; - if (mLockProcess.normalExit() == false) { + if (!mLockProcess.normalExit()) { abnormalExit = true; } else { @@ -694,11 +694,11 @@ void SaverEngine::lockProcessExited() abnormalExit = true; } } - if (mTerminationRequested == true) { + if (mTerminationRequested) { abnormalExit = false; mTerminationRequested = false; } - if (abnormalExit == true) { + if (abnormalExit) { // PROBABLE HACKING ATTEMPT DETECTED restartDesktopLockProcess(); mState = Waiting; @@ -750,7 +750,7 @@ void SaverEngine::slotLockProcessReady() void SaverEngine::lockProcessWaiting() { kdDebug(1204) << "SaverEngine: lock exited" << endl; - if (trinity_lockeng_sak_available == TRUE) { + if (trinity_lockeng_sak_available) { handleSecureDialog(); } if( mState == Waiting ) { diff --git a/kdesktop/tdefileividesktop.cpp b/kdesktop/tdefileividesktop.cpp index bf9aa074c..464b5490d 100644 --- a/kdesktop/tdefileividesktop.cpp +++ b/kdesktop/tdefileividesktop.cpp @@ -144,10 +144,10 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg ) int textX; if (drawRoundedRect == true) - textX = textRect( FALSE ).x() + 4; + textX = textRect( false ).x() + 4; else - textX = textRect( FALSE ).x() + 2; - int textY = textRect( FALSE ).y(); + textX = textRect( false ).x() + 2; + int textY = textRect( false ).y(); int align = ((TDEIconView *) iconView())->itemTextPos() == TQIconView::Bottom ? AlignHCenter : AlignAuto; // FIXME @@ -222,11 +222,11 @@ TQImage *KFileIVIDesktop::buildShadow( TQPainter *p, const int align, TQPainter pixPainter; int spread = shadowThickness(); - TQPixmap textPixmap(textRect( FALSE ).width() + spread * 2 + 2, - textRect( FALSE ).height() + spread * 2 + 2); + TQPixmap textPixmap(textRect( false ).width() + spread * 2 + 2, + textRect( false ).height() + spread * 2 + 2); textPixmap.fill(TQColor(0,0,0)); - textPixmap.setMask( textPixmap.createHeuristicMask(TRUE) ); + textPixmap.setMask( textPixmap.createHeuristicMask(true) ); pixPainter.begin(&textPixmap); pixPainter.setPen(white); // get the pen from the root painter diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 348314800..5d2c90ae2 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -156,7 +156,7 @@ static void outputStringList(TQStringList list, bool separateOutput) static int directCommand(TDECmdLineArgs *args) { TQString title; - bool separateOutput = FALSE; + bool separateOutput = false; bool printWId = args->isSet("print-winid"); bool embed = args->isSet("embed") || args->isSet("attach"); TQString defaultEntry; @@ -170,7 +170,7 @@ static int directCommand(TDECmdLineArgs *args) // --separate-output if (args->isSet("separate-output")) { - separateOutput = TRUE; + separateOutput = true; } if (printWId || embed) { @@ -315,7 +315,7 @@ static int directCommand(TDECmdLineArgs *args) TQTimer *timer = new TQTimer(); TQObject::connect( timer, TQ_SIGNAL( timeout() ), tdeApp, TQ_SLOT( quit() ) ); TQObject::connect( popup, TQ_SIGNAL( clicked() ), tdeApp, TQ_SLOT( quit() ) ); - timer->start( duration, TRUE ); + timer->start( duration, true ); #ifdef TQ_WS_X11 if ( ! tdeApp->geometryArgument().isEmpty()) { diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index c0f3921f5..8a92a5dd3 100644 --- a/kdialog/widgets.cpp +++ b/kdialog/widgets.cpp @@ -83,12 +83,12 @@ bool Widgets::passwordBox(TQWidget *parent, const TQString& title, const TQStrin int Widgets::textBox(TQWidget *parent, int width, int height, const TQString& title, const TQString& file) { -// KTextBox dlg(parent, 0, TRUE, width, height, file); +// KTextBox dlg(parent, 0, true, width, height, file); KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok ); tdeApp->setTopWidget( &dlg ); KTextEdit *edit = new KTextEdit( dlg.makeVBoxMainWidget() ); - edit->setReadOnly(TRUE); + edit->setReadOnly(true); TQFile f(file); if (!f.open(IO_ReadOnly)) @@ -116,7 +116,7 @@ int Widgets::textBox(TQWidget *parent, int width, int height, const TQString& ti int Widgets::textInputBox(TQWidget *parent, int width, int height, const TQString& title, const TQStringList& args, TQCString &result) { -// KTextBox dlg(parent, 0, TRUE, width, height, file); +// KTextBox dlg(parent, 0, true, width, height, file); KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok ); tdeApp->setTopWidget( &dlg ); @@ -129,7 +129,7 @@ int Widgets::textInputBox(TQWidget *parent, int width, int height, const TQStrin } KTextEdit *edit = new KTextEdit( vbox ); - edit->setReadOnly(FALSE); + edit->setReadOnly(false); edit->setTextFormat( TQt::PlainText ); edit->setFocus(); @@ -214,7 +214,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString& } table.insertStringList(entries); - table.setMultiSelection(TRUE); + table.setMultiSelection(true); table.setCurrentItem(0); // This is to circumvent a Qt bug for (unsigned int i=0; i+2setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named"); TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") ); - dirBox = new KComboBox(TRUE, pages[0], "combo2"); + dirBox = new KComboBox(true, pages[0], "combo2"); dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named"); subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]); @@ -79,9 +79,9 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) if(TDEStandardDirs::findExe("locate")==NULL) useLocateCb->setEnabled(false); - nameBox->setDuplicatesEnabled(FALSE); + nameBox->setDuplicatesEnabled(false); nameBox->setFocus(); - dirBox->setDuplicatesEnabled(FALSE); + dirBox->setDuplicatesEnabled(false); nameBox->setInsertionPolicy(TQComboBox::AtTop); dirBox->setInsertionPolicy(TQComboBox::AtTop); @@ -149,7 +149,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) rb[0] = new TQRadioButton(i18n("&between"), pages[1] ); rb[1] = new TQRadioButton(i18n("&during the previous"), pages[1] ); TQLabel * andL = new TQLabel(i18n("and"), pages[1], "and"); - betweenType = new KComboBox(FALSE, pages[1], "comboBetweenType"); + betweenType = new KComboBox(false, pages[1], "comboBetweenType"); betweenType->insertItem(i18n("minute(s)")); betweenType->insertItem(i18n("hour(s)")); betweenType->insertItem(i18n("day(s)")); @@ -164,11 +164,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) toDate = new KDateCombo(pages[1], "toDate"); timeBox = new TQSpinBox(1, 60, 1, pages[1], "timeBox"); - sizeBox =new KComboBox(FALSE, pages[1], "sizeBox"); + sizeBox =new KComboBox(false, pages[1], "sizeBox"); TQLabel * sizeL =new TQLabel(sizeBox,i18n("File &size is:"), pages[1],"size"); sizeEdit=new TQSpinBox(0, INT_MAX, 1, pages[1], "sizeEdit" ); sizeEdit->setValue(1); - sizeUnitBox =new KComboBox(FALSE, pages[1], "sizeUnitBox"); + sizeUnitBox =new KComboBox(false, pages[1], "sizeUnitBox"); m_usernameBox = new KComboBox( true, pages[1], "m_combo1"); TQLabel *usernameLabel= new TQLabel(m_usernameBox,i18n("Files owned by &user:"),pages[1]); @@ -189,8 +189,8 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) int tmp = sizeEdit->fontMetrics().width(" 000000000 "); sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); - m_usernameBox->setDuplicatesEnabled(FALSE); - m_groupBox->setDuplicatesEnabled(FALSE); + m_usernameBox->setDuplicatesEnabled(false); + m_groupBox->setDuplicatesEnabled(false); m_usernameBox->setInsertionPolicy(TQComboBox::AtTop); m_groupBox->setInsertionPolicy(TQComboBox::AtTop); @@ -244,7 +244,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[2] = new TQWidget( this, "page3" ); - typeBox =new KComboBox(FALSE, pages[2], "typeBox"); + typeBox =new KComboBox(false, pages[2], "typeBox"); typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * typeL =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type"); textEdit=new KLineEdit(pages[2], "textEdit" ); @@ -543,18 +543,18 @@ void KfindTabWidget::setDefaults() bool KfindTabWidget::isDateValid() { // All files - if ( !findCreated->isChecked() ) return TRUE; + if ( !findCreated->isChecked() ) return true; if (rb[1]->isChecked()) { - if (timeBox->value() > 0 ) return TRUE; + if (timeBox->value() > 0 ) return true; KMessageBox::sorry(this, i18n("Unable to search within a period that is less than a minute.")); - return FALSE; + return false; } // If we can not parse either of the dates or - // "from" date is bigger than "to" date return FALSE. + // "from" date is bigger than "to" date return false. TQDate hi1, hi2; TQString str; @@ -568,9 +568,9 @@ bool KfindTabWidget::isDateValid() if (!str.isNull()) { KMessageBox::sorry(0, str); - return FALSE; + return false; } - return TRUE; + return true; } void KfindTabWidget::setQuery(KQuery *query) @@ -756,12 +756,12 @@ void KfindTabWidget::beginSearch() /// dirlister->openURL(KURL(dirBox->currentText().stripWhiteSpace())); saveHistory(); - setEnabled( FALSE ); + setEnabled( false ); } void KfindTabWidget::endSearch() { - setEnabled( TRUE ); + setEnabled( true ); } /* @@ -775,16 +775,16 @@ void KfindTabWidget::fixLayout() // and second radio group on page two if(! findCreated->isChecked()) { - fromDate->setEnabled(FALSE); - toDate->setEnabled(FALSE); - timeBox->setEnabled(FALSE); + fromDate->setEnabled(false); + toDate->setEnabled(false); + timeBox->setEnabled(false); for(i=0; i<2; i++) - rb[i]->setEnabled(FALSE); - betweenType->setEnabled(FALSE); + rb[i]->setEnabled(false); + betweenType->setEnabled(false); } else { for(i=0; i<2; i++) - rb[i]->setEnabled(TRUE); + rb[i]->setEnabled(true); fromDate->setEnabled(rb[0]->isChecked()); toDate->setEnabled(rb[0]->isChecked()); diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index 1a581553b..5399d3c92 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -110,7 +110,7 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name ) ,m_menu(0) { setSelectionMode( TQListView::Extended ); - setShowSortIndicator( TRUE ); + setShowSortIndicator( true ); addColumn(i18n("Name")); addColumn(i18n("In Subfolder")); diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index 39e914fab..abeee3c5f 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -452,7 +452,7 @@ void KQuery::setRegExp(const TQString ®exp, bool caseSensitive) TQRegExp *regExp; TQRegExp sep(";"); TQStringList strList=TQStringList::split( sep, regexp, false); -// TQRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE); +// TQRegExp globChars ("[\\*\\?\\[\\]]", true, false); m_regexps.clear(); // m_regexpsContainsGlobs.clear(); diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 7cfe949eb..f8ddf0d38 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -353,9 +353,9 @@ void DigitalClock::updateClock() if (_force || newStr != _timeStr) { _timeStr = newStr; - setUpdatesEnabled( FALSE ); + setUpdatesEnabled( false ); display(_timeStr); - setUpdatesEnabled( TRUE ); + setUpdatesEnabled( true ); update(); } @@ -415,7 +415,7 @@ void DigitalClock::paintEvent(TQPaintEvent*) // but other colors would break the lcd-lock anyway void DigitalClock::drawContents( TQPainter * p) { - setUpdatesEnabled( FALSE ); + setUpdatesEnabled( false ); TQPalette pal = palette(); if (_prefs->digitalLCDStyle()) pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128)); @@ -430,7 +430,7 @@ void DigitalClock::drawContents( TQPainter * p) pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); setPalette( pal ); p->translate( -2, -2 ); - setUpdatesEnabled( TRUE ); + setUpdatesEnabled( true ); TQLCDNumber::drawContents( p ); p->translate( +1, +1 ); } diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index ee608a92e..7c8186ce5 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -266,10 +266,10 @@ void QuickButton::launch() } if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") { if (isOn()) { - ShowDesktop::the()->showDesktop(TRUE); + ShowDesktop::the()->showDesktop(true); } else { - ShowDesktop::the()->showDesktop(FALSE); + ShowDesktop::the()->showDesktop(false); } } else { diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 80bf0e108..189e7e03e 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -77,7 +77,7 @@ PanelKMenu::PanelKMenu() : PanelServiceMenu(TQString::null, TQString::null, 0, "KMenu") , bookmarkMenu(0) , bookmarkOwner(0) - , displayRepaired(FALSE) + , displayRepaired(false) { static const TQCString dcopObjId("KMenu"); DCOPObject::setObjId(dcopObjId); @@ -129,7 +129,7 @@ void PanelKMenu::hideMenu() TQTimer *windowtimer = new TQTimer( this ); connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; - windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed + windowtimer->start( 0, true ); // Wait for all window system events to be processed while (windowTimerTimedOut == false) tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); @@ -142,7 +142,7 @@ void PanelKMenu::hideMenu() TQTimer *delaytimer = new TQTimer( this ); connect( delaytimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; - delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds + delaytimer->start( 100, true ); // Wait for 100 milliseconds while (windowTimerTimedOut == false) tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); } @@ -430,9 +430,9 @@ void PanelKMenu::initialize() insertTearOffHandle(); #endif - if (displayRepaired == FALSE) { - displayRepairTimer->start(5, FALSE); - displayRepaired = TRUE; + if (displayRepaired == false) { + displayRepairTimer->start(5, false); + displayRepaired = true; } setInitialized(true); @@ -445,7 +445,7 @@ void PanelKMenu::repairDisplay(void) { // Now do a nasty hack to prevent search bar merging into the side image // This forces a layout/repaint of the qpopupmenu repaint(); // This ensures that the side bar image was applied - styleChange(style()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. + styleChange(style()); // This forces a call to the private function updateSize(true) inside the qpopupmenu. update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above } } diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index c7e347fb5..5549bcf42 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -1974,7 +1974,7 @@ void KMenu::searchChanged(const TQString & text) if (input_timer->isActive ()) input_timer->stop (); - input_timer->start (WAIT_BEFORE_QUERYING, TRUE); + input_timer->start (WAIT_BEFORE_QUERYING, true); } bool KMenu::dontQueryNow (const TQString& str) @@ -2619,7 +2619,7 @@ TQString KMenu::iconForHitMenuItem(HitMenuItem *hit_item) return (mimetype_iconstore [hit_item->mimetype]); else { KMimeType::Ptr mimetype_ptr = KMimeType::mimeType (hit_item->mimetype); - TQString mimetype_icon = mimetype_ptr->icon(TQString(), FALSE); + TQString mimetype_icon = mimetype_ptr->icon(TQString(), false); mimetype_iconstore [hit_item->mimetype] = mimetype_icon; return mimetype_icon; } diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 9d97cdf8b..42e5286e2 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -225,10 +225,10 @@ void PanelButton::updateSettings(int category) return; } - if (m_forceStandardCursor == FALSE) + if (!m_forceStandardCursor) m_changeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); else - m_changeCursorOverItem = FALSE; + m_changeCursorOverItem = false; if (m_changeCursorOverItem) { @@ -436,7 +436,7 @@ void PanelButton::startDrag() void PanelButton::enterEvent(TQEvent* e) { - if (!m_highlight && m_disableHighlighting == FALSE) + if (!m_highlight && !m_disableHighlighting) { m_highlight = true; repaint(false); @@ -602,7 +602,7 @@ void PanelButton::drawDeepButton(TQPainter *p) style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); } - drawButtonLabel(p,0,FALSE); + drawButtonLabel(p,0,false); if (hasFocus() || m_hasAcceptedDrag) { @@ -616,7 +616,7 @@ void PanelButton::drawDeepButton(TQPainter *p) void PanelButton::drawButtonLabel(TQPainter *p) { - drawButtonLabel(p,0,TRUE); + drawButtonLabel(p,0,true); } void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index 15193c3bf..dda35d398 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -53,7 +53,7 @@ public: * @param parent the parent widget * @param name the widget's name */ - PanelButton( TQWidget* parent, const char* name, bool forceStandardCursor = FALSE ); + PanelButton( TQWidget* parent, const char* name, bool forceStandardCursor = false ); /** * Configures this button according to the user's preferences for @@ -430,7 +430,7 @@ public: * @param parent the parent widget * @param name the widget's name */ - PanelPopupButton(TQWidget *parent=0, const char *name=0, bool forceStandardCursor = FALSE); + PanelPopupButton(TQWidget *parent=0, const char *name=0, bool forceStandardCursor = false); /** * Sets the button's popup menu. diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index a8387cbb6..6836e06eb 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -95,7 +95,7 @@ void SimpleButton::drawButton( TQPainter *p ) { TQRect r(0, 0, width(), height()); - if (m_disableHighlighting == TRUE) { + if (m_disableHighlighting) { if (m_highlight || isDown() || isOn()) { int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; @@ -115,13 +115,13 @@ void SimpleButton::drawButtonLabel( TQPainter *p ) TQPixmap pix = isEnabled() ? ((m_highlight&&(!m_disableHighlighting))? m_activeIcon : m_normalIcon) : m_disabledIcon; - if ((isOn() || isDown()) && (m_disableHighlighting == FALSE)) + if ((isOn() || isDown()) && !m_disableHighlighting) { pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 2, pix.height() - 2); } - if (m_disableHighlighting == TRUE) { + if (m_disableHighlighting) { pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 4, pix.height() - 4); } @@ -171,10 +171,10 @@ void SimpleButton::slotSettingsChanged(int category) } bool changeCursor; - if (m_forceStandardCursor == FALSE) + if (!m_forceStandardCursor) changeCursor = TDEGlobalSettings::changeCursorOverIcon(); else - changeCursor = FALSE; + changeCursor = false; if (changeCursor) { diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index ea91e6f91..9a7dce4e8 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -31,7 +31,7 @@ class TDE_EXPORT SimpleButton : public TQButton TQ_OBJECT public: - SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE); + SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = false); void setPixmap(const TQPixmap &pix); void setOrientation(TQt::Orientation orientaton); TQSize sizeHint() const; @@ -66,7 +66,7 @@ class TDE_EXPORT SimpleArrowButton: public SimpleButton TQ_OBJECT public: - SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE); + SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = false); virtual ~SimpleArrowButton() {}; TQSize sizeHint() const; diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index 911ce8810..e9cc87979 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -65,10 +65,10 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid TQFile configFileObject(locateLocal("config", configFile)); if (!configFileObject.exists()) { - TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true); TDEConfig localConfig(configFile); globalConfig.copyTo(configFile, &localConfig); - localConfig.writeEntry("UseGlobalSettings", TRUE); + localConfig.writeEntry("UseGlobalSettings", true); localConfig.sync(); } settingsObject = new TaskBarSettings(TDESharedConfig::openConfig(configFile)); diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index bbb449a52..8e44f100f 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -117,7 +117,7 @@ bool is_process_resumable(pid_t pid) { TQByteArray statRaw = procStatFile.readAll(); procStatFile.close(); TQString statString(statRaw); - TQStringList statFields = TQStringList::split(" ", statString, TRUE); + TQStringList statFields = TQStringList::split(" ", statString, true); TQString tcomm = statFields[1]; TQString state = statFields[2]; if( state == "T" ) { diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index c2c8a11bc..31c48d61c 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -117,7 +117,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) insertSeparator(); if (taskMoveMenu) { - taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE); + taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), false); insertItem(i18n("Move Task Button"), taskMoveMenu); insertSeparator(); @@ -209,7 +209,7 @@ void TaskRMBMenu::fillMenu() enable = false; if (taskMoveMenu) { - taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE); + taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), false); insertItem(i18n("Move Task Button"), taskMoveMenu); insertSeparator(); diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 70d4b6c65..7df429401 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -908,7 +908,7 @@ void KlipperWidget::checkClipData( bool selectionMode ) // changing the clipboard at the same time. bSavedSelectionMode = selectionMode; bCheckForEmpty = true; - m_setClipboardTimer.start(100, TRUE); + m_setClipboardTimer.start(100, true); return; } @@ -984,7 +984,7 @@ void KlipperWidget::checkClipData( bool selectionMode ) // changing the clipboard at the same time. bSavedSelectionMode = !selectionMode; // inverted in order to sync bCheckForEmpty = false; - m_setClipboardTimer.start(100, TRUE); + m_setClipboardTimer.start(100, true); } } diff --git a/konqueror/about/konq_aboutpage.cpp b/konqueror/about/konq_aboutpage.cpp index c2e85c479..9d9fe4c71 100644 --- a/konqueror/about/konq_aboutpage.cpp +++ b/konqueror/about/konq_aboutpage.cpp @@ -81,7 +81,7 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file ) file.left( file.findRev( '/' )) + TQString::fromLatin1("/\">\n"); TQRegExp reg(""); - reg.setCaseSensitive(FALSE); + reg.setCaseSensitive(false); res.replace(reg, "\n\t" + basehref); return res; } diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp index d7e5870ae..edba44247 100644 --- a/konqueror/konq_combo.cpp +++ b/konqueror/konq_combo.cpp @@ -632,7 +632,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe ) p.fillRect( re.right() - pix.width() - 3 , re.y(), pix.width() + 4, re.height(), TQBrush( useColor ? color : edit->paletteBackgroundColor() )); p.drawPixmap( re.right() - pix.width() -1 , re.y() + ( re.height() - pix.height() ) / 2, pix ); - p.setClipping( FALSE ); + p.setClipping( false ); } else { TQRect r = edit->geometry(); diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h index 77dd99689..735561720 100644 --- a/konqueror/konq_frame.h +++ b/konqueror/konq_frame.h @@ -161,7 +161,7 @@ class KonqFrameBase virtual void printFrameInfo( const TQString& spaces ); virtual void reparentFrame( TQWidget* parent, - const TQPoint & p, bool showIt=FALSE ) = 0; + const TQPoint & p, bool showIt=false ) = 0; virtual KonqFrameContainerBase* parentContainer() { return m_pParentContainer; } virtual void setParentContainer(KonqFrameContainerBase* parent) { m_pParentContainer = parent; } @@ -251,7 +251,7 @@ public: virtual void setTabIcon( const KURL &url, TQWidget* sender ); virtual void reparentFrame(TQWidget * parent, - const TQPoint & p, bool showIt=FALSE ); + const TQPoint & p, bool showIt=false ); //virtual KonqFrameContainerBase* parentContainer(); virtual TQWidget* widget() { return this; } @@ -317,7 +317,7 @@ public: virtual TQCString frameType() { return TQCString("ContainerBase"); } virtual void reparentFrame(TQWidget * parent, - const TQPoint & p, bool showIt=FALSE ) = 0; + const TQPoint & p, bool showIt=false ) = 0; virtual KonqFrameBase* activeChild() { return m_pActiveChild; } @@ -385,7 +385,7 @@ public: //inherited virtual void reparentFrame(TQWidget * parent, - const TQPoint & p, bool showIt=FALSE ); + const TQPoint & p, bool showIt=false ); //make this one public int idAfter( TQWidget* w ){ return TQSplitter::idAfter( w ); } diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index f81eaadb2..3454f0bf1 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -3682,9 +3682,9 @@ void KonqMainWindow::slotUpdateFullScreen( bool set ) // happens only with the hackish non-_NET_WM_STATE_FULLSCREEN way setWFlags( WDestructiveClose ); // Qt bug (see below) - setAcceptDrops( FALSE ); + setAcceptDrops( false ); topData()->dnd = 0; - setAcceptDrops( TRUE ); + setAcceptDrops( true ); } else { @@ -3710,9 +3710,9 @@ void KonqMainWindow::slotUpdateFullScreen( bool set ) // Qt bug, the flags aren't restored. They know about it. setWFlags( WType_TopLevel | WDestructiveClose ); // Other Qt bug - setAcceptDrops( FALSE ); + setAcceptDrops( false ); topData()->dnd = 0; - setAcceptDrops( TRUE ); + setAcceptDrops( true ); } } diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index d95cada6b..e9e86ed52 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -282,7 +282,7 @@ public: void printFrameInfo( const TQString &spaces ); void reparentFrame( TQWidget* parent, - const TQPoint & p, bool showIt=FALSE ); + const TQPoint & p, bool showIt=false ); KonqFrameContainerBase* parentContainer()const; void setParentContainer(KonqFrameContainerBase* parent); diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h index bfc15dbb0..59e172e89 100644 --- a/konqueror/konq_tabs.h +++ b/konqueror/konq_tabs.h @@ -81,7 +81,7 @@ public: //inherited virtual void reparentFrame(TQWidget * parent, - const TQPoint & p, bool showIt=FALSE ); + const TQPoint & p, bool showIt=false ); void moveTabBackward(int index); void moveTabForward(int index); diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp index 6a0d58973..5cd554d55 100644 --- a/konqueror/listview/konq_listview.cpp +++ b/konqueror/listview/konq_listview.cpp @@ -393,7 +393,7 @@ void KonqListView::slotSelect() for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ ) { if ((m_pListView->automaticSelection()) && (it->isSelected())) { - it->setSelected(FALSE); + it->setSelected(false); //the following line is to prevent that more than one item were selected //and now get deselected and automaticSelection() was true, this shouldn't happen //but who knows, aleXXX @@ -401,11 +401,11 @@ void KonqListView::slotSelect() } if ( it->isVisible() ) { if ( re.exactMatch( it->text(0) ) ) { - it->setSelected(TRUE); + it->setSelected(true); } } else { - it->setSelected(FALSE); + it->setSelected(false); } } m_pListView->blockSignals( false ); @@ -422,22 +422,22 @@ void KonqListView::slotUnselect() if ( !ok ) return; - TQRegExp re( pattern, TRUE, TRUE ); + TQRegExp re( pattern, true, true ); - m_pListView->blockSignals(TRUE); + m_pListView->blockSignals(true); for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ ) { if ( it->isVisible() ) { if ( re.exactMatch( it->text(0) ) ) { - it->setSelected(FALSE); + it->setSelected(false); } } else { - it->setSelected(FALSE); + it->setSelected(false); } } - m_pListView->blockSignals(FALSE); + m_pListView->blockSignals(false); m_pListView->deactivateAutomaticSelection(); emit m_pListView->selectionChanged(); m_pListView->viewport()->update(); @@ -445,14 +445,14 @@ void KonqListView::slotUnselect() void KonqListView::slotSelectAll() { - m_pListView->selectAll(TRUE); + m_pListView->selectAll(true); m_pListView->deactivateAutomaticSelection(); emit m_pListView->selectionChanged(); } void KonqListView::slotUnselectAll() { - m_pListView->selectAll(FALSE); + m_pListView->selectAll(false); m_pListView->deactivateAutomaticSelection(); emit m_pListView->selectionChanged(); } @@ -463,7 +463,7 @@ void KonqListView::slotInvertSelection() if ((m_pListView->automaticSelection()) && (m_pListView->currentItem()!=0) && (m_pListView->currentItem()->isSelected())) - m_pListView->currentItem()->setSelected(FALSE); + m_pListView->currentItem()->setSelected(false); m_pListView->invertSelection(); m_pListView->deactivateAutomaticSelection(); @@ -563,7 +563,7 @@ void KonqListView::slotHeaderClicked(int sec) if (nameOfSortColumn!=m_pListView->sortedByColumn) { m_pListView->sortedByColumn=nameOfSortColumn; - m_pListView->setAscending(TRUE); + m_pListView->setAscending(true); } else { diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp index a41cf6367..e1b1a5a66 100644 --- a/konqueror/listview/konq_listviewwidget.cpp +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -412,7 +412,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) { TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; - repaintContents( r, FALSE ); + repaintContents( r, false ); } delete m_selected; @@ -449,7 +449,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) { TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; - repaintContents( r, FALSE ); + repaintContents( r, false ); } if ( m_scrollTimer ) { @@ -619,7 +619,7 @@ void KonqBaseListViewWidget::slotAutoScroll() TQRect rr; TQRect nr = m_rubber->normalize(); - bool changed = FALSE; + bool changed = false; if ( cur ) { @@ -657,7 +657,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); setActiveMultiSelectItem( at ); - changed = TRUE; + changed = true; rr = rr.unite( itemRect( cur ) ); } } @@ -665,7 +665,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { if ( cur->isSelected() ) { - changed = TRUE; + changed = true; rr = rr.unite( itemRect( cur ) ); } @@ -695,7 +695,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); setActiveMultiSelectItem( at ); - changed = TRUE; + changed = true; rr = rr.unite( itemRect( cur ) ); } } @@ -703,7 +703,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { if ( cur->isSelected() ) { - changed = TRUE; + changed = true; rr = rr.unite( itemRect( cur ) ); } diff --git a/konqueror/listview/konq_textviewwidget.cpp b/konqueror/listview/konq_textviewwidget.cpp index d814d2fbc..0bf67cf81 100644 --- a/konqueror/listview/konq_textviewwidget.cpp +++ b/konqueror/listview/konq_textviewwidget.cpp @@ -40,7 +40,7 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi // I know, but I want to have it this way and I use it all the time. // If I want to have free space, I disable some columns. // If people don't like it, they can use a different view type. Alex - setAllColumnsShowFocus(TRUE); + setAllColumnsShowFocus(true); setRootIsDecorated(false); colors[KTVI_REGULAR]=TQt::black; @@ -55,7 +55,7 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi colors[KTVI_CHARDEV]=TQt::blue; colors[KTVI_BLOCKDEV]=TQt::blue; - m_showIcons=FALSE; + m_showIcons=false; } KonqTextViewWidget::~KonqTextViewWidget() diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 8368d4d37..56f77ba40 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -113,7 +113,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup if (m_fileItem->isLink()) { TQFont f( _painter->font() ); - f.setItalic( TRUE ); + f.setItalic( true ); _painter->setFont( f ); } TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment ); diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index 1e22ceb5f..ba75663f9 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -58,7 +58,7 @@ Desktop::Desktop( int desk, TQString desktopName, TQWidget *parent, const char * m_bgPixmap = 0L; m_bgDirty=true; m_grabWindows=false; - setAcceptDrops(TRUE); + setAcceptDrops(true); setBackgroundMode(NoBackground); if (m_desk==1) Desktop::m_windowPixmaps.setAutoDelete(true); diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 3d6804974..95f4ec61c 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -600,7 +600,7 @@ void KPager::desktopPopupAboutToShow() id = m_dmnu->insertItem( TQString("&")+TQString::number(i )+TQString(" ") + m_winmodule->desktopName(i), i ); if ( m_winfo.desktop() == i ) - m_dmnu->setItemChecked( id, TRUE ); + m_dmnu->setItemChecked( id, true ); } } diff --git a/kpager/windowdrag.cpp b/kpager/windowdrag.cpp index fc854b8a9..bcfd9e77d 100644 --- a/kpager/windowdrag.cpp +++ b/kpager/windowdrag.cpp @@ -54,7 +54,7 @@ bool PagerWindowDrag::decode( TQDropEvent *e, WId &w,int &deltax,int &deltay,int char *tmp=data.data(); sscanf(tmp,"%lu %d %d %d", &w, &deltax, &deltay, &origdesk); e->accept(); - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h index b4c626221..5384edd04 100644 --- a/kpersonalizer/stylepreview.ui.h +++ b/kpersonalizer/stylepreview.ui.h @@ -67,9 +67,9 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev ) case TQEvent::Leave: case TQEvent::Wheel: case TQEvent::ContextMenu: - return TRUE; // ignore + return true; // ignore default: break; } - return FALSE; + return false; } diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp index 420ecf07c..a3491ff20 100644 --- a/krootbacking/main.cpp +++ b/krootbacking/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char **argv) TQObject* mainWin = new KRootBacking(); TQTimer *timer = new TQTimer( mainWin ); TQObject::connect( timer, TQ_SIGNAL(timeout()), mainWin, TQ_SLOT(start()) ); - timer->start( 100, TRUE ); // 100ms single shot timer + timer->start( 100, true ); // 100ms single shot timer app.exec(); diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index ced5ceb79..4b30d5cf4 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -908,14 +908,14 @@ void KSMServer::startKilling() kdDebug( 1218 ) << " We killed all clients. We have now clients.count()=" << clients.count() << endl; completeKilling(); - shutdownTimer.start( KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT, TRUE ); + shutdownTimer.start( KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT, true ); } void KSMServer::completeKilling() { // Activity detected; reset forcible shutdown timer... if (shutdownTimer.isActive()) { - shutdownTimer.start( KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT, TRUE ); + shutdownTimer.start( KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT, true ); } SHUTDOWN_MARKER("completeKilling"); kdDebug( 1218 ) << "KSMServer::completeKilling clients.count()=" << clients.count() << endl; diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 2cf7c9a5f..b8a91d3f4 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -78,12 +78,12 @@ KSMShutdownFeedback::KSMShutdownFeedback() m_currentY( 0 ), m_grayOpacity( 0.0f ), m_compensation( 0.0f ), - m_fadeBackwards( FALSE ), + m_fadeBackwards( false ), m_unfadedImage(), m_grayImage(), m_fadeTime(), m_pmio(), - m_greyImageCreated( FALSE ) + m_greyImageCreated( false ) { if (tdeApp->isX11CompositionAvailable()) { @@ -113,7 +113,7 @@ KSMShutdownFeedback::KSMShutdownFeedback() void KSMShutdownFeedback::fadeBack( void ) { m_fadeTime.restart(); - m_fadeBackwards = TRUE; + m_fadeBackwards = true; // its possible that we have to fade back, before all is completely gray, so we cannot start // with completely gray when fading back... m_compensation = 1.0f - m_grayOpacity; @@ -137,7 +137,7 @@ void KSMShutdownFeedback::slotPaintEffect() // if slotPaintEffect() is called first time, we have to initialize the gray image // we also could do that in the constructor, but then the displaying of the // logout-UI would be too much delayed... - if ( m_greyImageCreated == false ) + if ( !m_greyImageCreated ) { m_greyImageCreated = true; @@ -170,11 +170,11 @@ void KSMShutdownFeedback::slotPaintEffect() } // return if fading is completely done... - if ( ( m_grayOpacity >= 1.0f && m_fadeBackwards == FALSE ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards == TRUE ) ) + if ( ( m_grayOpacity >= 1.0f && !m_fadeBackwards ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards ) ) return; - if ( m_fadeBackwards == FALSE ) + if ( !m_fadeBackwards ) { m_grayOpacity = m_fadeTime.elapsed() / doFancyLogoutFadeTime; if ( m_grayOpacity > 1.0f ) @@ -201,7 +201,7 @@ void KSMShutdownFeedback::slotPaintEffect() if( y2 > imgHeight ) y2 = imgHeight; - if( m_fadeBackwards == FALSE ) + if( !m_fadeBackwards ) { if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight ) { @@ -250,7 +250,7 @@ void KSMShutdownFeedback::slotPaintEffect() // if slotPaintEffect() is called first time, we have to initialize the gray image // we also could do that in the constructor, but then the displaying of the // logout-UI would be too much delayed... - if ( m_greyImageCreated == false ) + if ( !m_greyImageCreated ) { m_greyImageCreated = true; @@ -278,11 +278,11 @@ void KSMShutdownFeedback::slotPaintEffect() } // return if fading is completely done... - if ( ( m_grayOpacity >= 1.0f && m_fadeBackwards == FALSE ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards == TRUE ) ) + if ( ( m_grayOpacity >= 1.0f && !m_fadeBackwards ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards ) ) return; - if ( m_fadeBackwards == FALSE ) + if ( !m_fadeBackwards ) { m_grayOpacity = m_fadeTime.elapsed() / doFancyLogoutFadeTime; if ( m_grayOpacity > 1.0f ) @@ -309,7 +309,7 @@ void KSMShutdownFeedback::slotPaintEffect() if( y2 > imgHeight ) y2 = imgHeight; - if( m_fadeBackwards == FALSE ) + if( !m_fadeBackwards ) { if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight ) { @@ -382,7 +382,7 @@ void KSMShutdownFeedback::slotPaintEffect() // The end effect will be very similar to the old style logout float doFancyLogoutFadeTime = 1000; float doFancyLogoutFadeBackTime = 0; - if ( m_greyImageCreated == false ) { + if ( !m_greyImageCreated ) { m_greyImageCreated = true; // eliminate nasty flicker on first show @@ -414,11 +414,11 @@ void KSMShutdownFeedback::slotPaintEffect() } // return if fading is completely done... - if ( ( m_grayOpacity >= 1.0f && m_fadeBackwards == FALSE ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards == TRUE ) ) { + if ( ( m_grayOpacity >= 1.0f && !m_fadeBackwards ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards ) ) { return; } - if ( m_fadeBackwards == FALSE ) { + if ( !m_fadeBackwards ) { m_grayOpacity = m_fadeTime.elapsed() / doFancyLogoutFadeTime; if ( m_grayOpacity > 1.0f ) m_grayOpacity = 1.0f; @@ -445,7 +445,7 @@ void KSMShutdownFeedback::slotPaintEffect() y2 = imgHeight; } - if( m_fadeBackwards == FALSE ) + if( !m_fadeBackwards ) { if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight ) { @@ -704,7 +704,7 @@ void KSMShutdownIPFeedback::slotPaintEffect() KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, bool maysd, bool mayrb, TDEApplication::ShutdownType sdtype, int* selection ) - : TQDialog( parent, 0, TRUE, (WFlags)WType_Popup ), targets(0), m_selection(selection) + : TQDialog( parent, 0, true, (WFlags)WType_Popup ), targets(0), m_selection(selection) // this is a WType_Popup on purpose. Do not change that! Not // having a popup here has severe side effects. @@ -1377,7 +1377,7 @@ switch ( e->key() ) case Key_Enter: case Key_Return: case Key_Space: - m_pressed = TRUE; + m_pressed = true; setDown(true); emit pressed(); break; @@ -1402,7 +1402,7 @@ void KSMPushButton::keyReleaseEvent( TQKeyEvent* e ) if ( m_pressed ) { setDown(false); - m_pressed = FALSE; + m_pressed = false; emit released(); emit clicked(); } @@ -1447,7 +1447,7 @@ void FlatButton::keyPressEvent( TQKeyEvent* e ) case Key_Enter: case Key_Return: case Key_Space: - m_pressed = TRUE; + m_pressed = true; setDown(true); emit pressed(); break; @@ -1472,7 +1472,7 @@ void FlatButton::keyReleaseEvent( TQKeyEvent* e ) if ( m_pressed ) { setDown(false); - m_pressed = FALSE; + m_pressed = false; emit released(); emit clicked(); } diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 23fb2275b..8e02643eb 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -87,8 +87,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include // shall we show a nice fancy login screen? -bool showFancyLogin = FALSE; -bool trinity_startup_main_sequence_done = FALSE; +bool showFancyLogin = false; +bool trinity_startup_main_sequence_done = false; /*! Restores the previous session. Ensures the window manager is running (if specified). @@ -307,7 +307,7 @@ void KSMServer::tryRestoreNext() config->readEntry( TQString("userId")+n )); lastIdStarted = config->readEntry( TQString("clientId")+n ); if ( !lastIdStarted.isEmpty() ) { - restoreTimer.start( 2000, TRUE ); + restoreTimer.start( 2000, true ); return; // we get called again from the clientRegistered handler } } @@ -462,7 +462,7 @@ void KSMServer::upAndRunning( const TQString& msg ) if (startupNotifierIPDlg) { static_cast(startupNotifierIPDlg)->setStartupPhase(msg); if (msg == TQString("session ready")) { - trinity_startup_main_sequence_done = TRUE; + trinity_startup_main_sequence_done = true; } } DCOPRef( "ksplash" ).send( "upAndRunning", msg ); diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h index 5ede31d1f..a88c3f632 100644 --- a/ksplashml/kcmksplash/installer.h +++ b/ksplashml/kcmksplash/installer.h @@ -26,7 +26,7 @@ class SplashInstaller : public TQWidget { TQ_OBJECT public: - SplashInstaller(TQWidget *parent=0, const char *aName=0, bool aInit=FALSE); + SplashInstaller(TQWidget *parent=0, const char *aName=0, bool aInit=false); ~SplashInstaller(); virtual void load(); diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index 86bdcc6a3..99a3145f0 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -158,7 +158,7 @@ void ThemeDefault::_initUi() mLabel->setPaletteForegroundColor( mLabelForeground ); mLabel->setPaletteBackgroundPixmap( blimage ); TQFont f(mLabel->font()); - f.setBold(TRUE); + f.setBold(true); mLabel->setFont(f); mProgressBar = new KProgress( mLabel ); diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index f8e7a4907..eb0a1472a 100644 --- a/ksplashml/wndmain.cpp +++ b/ksplashml/wndmain.cpp @@ -55,7 +55,7 @@ KSplash::KSplash(const char *name) mCurrentAction = mActionList.first(); config->setGroup( "General" ); - if ( config->readBoolEntry( "CloseOnClick", TRUE ) ) + if ( config->readBoolEntry( "CloseOnClick", true ) ) mThemeEngine->installEventFilter( this ); connect( mThemeEngine, TQ_SIGNAL(destroyed()), this, TQ_SLOT(close()) ); @@ -75,7 +75,7 @@ KSplash::KSplash(const char *name) { close_timer = new TQTimer( this ); connect( close_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( close() ) ); - close_timer->start( 60000, TRUE ); + close_timer->start( 60000, true ); } } @@ -206,7 +206,7 @@ void KSplash::upAndRunning( TQString s ) firstTime = false; } if ( close_timer->isActive() ) - close_timer->start( 60000, TRUE ); + close_timer->start( 60000, true ); if( s == "dcop" ) { @@ -427,8 +427,8 @@ bool KSplash::eventFilter( TQObject *o, TQEvent *e ) if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) ) { TQTimer::singleShot( 0, this, TQ_SLOT(close())); - return TRUE; + return true; } else - return FALSE; + return false; } diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index 0fbc44ce2..50efa566c 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -181,9 +181,9 @@ static bool wstate_withdrawn( WId winid ) unsigned long length, after; unsigned char *data; int r = XGetWindowProperty( tqt_xdisplay(), winid, tqt_wm_state, 0, 2, - FALSE, AnyPropertyType, &type, &format, + false, AnyPropertyType, &type, &format, &length, &after, &data ); - bool withdrawn = TRUE; + bool withdrawn = true; if ( r == Success && data && format == 32 ) { TQ_UINT32 *wstate = (TQ_UINT32*)data; withdrawn = (*wstate == WithdrawnState ); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h index ccabce745..8964ccf77 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h @@ -106,7 +106,7 @@ public: /** * The udpate function can be used to update the displayed process * list. A current list of processes is requested from the OS. In - * case the list contains invalid or corrupted info, FALSE is + * case the list contains invalid or corrupted info, false is * returned. */ bool update(const TQString& list); diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index 2424a3599..d9efb9e57 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -173,7 +173,7 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name) widget->listLayoutsSrc->setColumnWidth(LAYOUT_COLUMN_FLAG, 28); widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_FLAG, 28); - widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_DISPLAY_NAME); + widget->listLayoutsDst->header()->setResizeEnabled(false, LAYOUT_COLUMN_DISPLAY_NAME); // widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_DISPLAY_NAME, 0); widget->listLayoutsDst->setSorting(-1); diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp index 246a60828..58e7eadc3 100644 --- a/libkonq/konq_iconviewwidget.cpp +++ b/libkonq/konq_iconviewwidget.cpp @@ -1502,7 +1502,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item) TQMemArray rects = r.rects(); TQMemArray::Iterator it = rects.begin(); - bool foundPlace = FALSE; + bool foundPlace = false; for (; it != rects.end(); ++it) { TQRect rect = *it; diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h index 9f00e3aee..75e3c1f37 100644 --- a/libkonq/konq_iconviewwidget.h +++ b/libkonq/konq_iconviewwidget.h @@ -56,7 +56,7 @@ public: /** * Constructor */ - KonqIconViewWidget( TQWidget *parent = 0L, const char *name = 0L, WFlags f = 0, bool kdesktop = FALSE ); + KonqIconViewWidget( TQWidget *parent = 0L, const char *name = 0L, WFlags f = 0, bool kdesktop = false ); virtual ~KonqIconViewWidget(); /** diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index 132c53a55..48b2b7e4f 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -70,7 +70,7 @@ public: * Called when entering a directory * Checks for a .directory, read it. * Don't do this on the default properties instance - * Returns TRUE if the settings for the new directories are + * Returns true if the settings for the new directories are * different from the settings in the old directory. */ bool enterDir( const KURL & dir ); diff --git a/libkonq/konq_settings.cpp b/libkonq/konq_settings.cpp index fe61d150a..4b59f3375 100644 --- a/libkonq/konq_settings.cpp +++ b/libkonq/konq_settings.cpp @@ -109,7 +109,7 @@ void KonqFMSettings::init( TDEConfig * config ) m_iconTransparency = DEFAULT_TEXTPREVIEW_ICONTRANSPARENCY; // Behaviour - m_alwaysNewWin = config->readBoolEntry( "AlwaysNewWin", FALSE ); + m_alwaysNewWin = config->readBoolEntry( "AlwaysNewWin", false ); m_homeURL = config->readPathEntry("HomeURL", "~"); diff --git a/libkonq/tdefileivi.cpp b/libkonq/tdefileivi.cpp index aa086d3f2..02fa748ca 100644 --- a/libkonq/tdefileivi.cpp +++ b/libkonq/tdefileivi.cpp @@ -437,7 +437,7 @@ void KFileIVI::paintItem( TQPainter *p, const TQColorGroup &c ) /*if ( ( ( KonqIconViewWidget* ) iconView() )->m_pActiveItem == this ) { TQFont f( p->font() ); - f.setUnderline( TRUE ); + f.setUnderline( true ); p->setFont( f ); }*/ @@ -510,7 +510,7 @@ void KFileIVI::paintFontUpdate( TQPainter *p ) const if ( m_fileitem->isLink() ) { TQFont f( p->font() ); - f.setItalic( TRUE ); + f.setItalic( true ); p->setFont( f ); } } diff --git a/libkonq/tdefileivi.h b/libkonq/tdefileivi.h index 3fb7e3734..7ddb2deb7 100644 --- a/libkonq/tdefileivi.h +++ b/libkonq/tdefileivi.h @@ -237,7 +237,7 @@ private: /** You are not supposed to call this on a KFileIVI, from the outside, * it bypasses the icons cache */ virtual void setPixmap ( const TQPixmap & icon ) { TDEIconViewItem::setPixmap( icon ); } - virtual void setPixmap ( const TQPixmap & icon, bool recalc, bool redraw = TRUE ) + virtual void setPixmap ( const TQPixmap & icon, bool recalc, bool redraw = true ) { TDEIconViewItem::setPixmap( icon, recalc, redraw ); } /** Check if a thumbnail will be generated and calc the size of the icon */ diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 274e81f69..80634f72a 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -272,7 +272,7 @@ void NSPluginLoader::scanPlugins() continue; } - TQStringList desc = TQStringList::split(':', line, TRUE); + TQStringList desc = TQStringList::split(':', line, true); TQString mime = desc[0].stripWhiteSpace(); TQStringList suffixes = TQStringList::split(',', desc[1].stripWhiteSpace()); if (!mime.isEmpty()) diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index bd7a8fb89..21b6bb5a0 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -415,7 +415,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, } // write into type cache - TQStringList tokens = TQStringList::split(':', *type, TRUE); + TQStringList tokens = TQStringList::split(':', *type, true); TQStringList::Iterator token; token = tokens.begin(); cache << (*token).lower(); diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index 1aec3dd44..5a873c45d 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -1574,7 +1574,7 @@ void NSPluginClass::destroyInstance( NSPluginInstance* inst ) { // mark for destruction _trash.append( inst ); - timer(); //_timer->start( 0, TRUE ); + timer(); //_timer->start( 0, true ); } /****************************************************************************/ @@ -1642,7 +1642,7 @@ void NSPluginStreamBase::inform() // stream into temporary file (use lower() in case the // filename as an upper case X in it) _tempFile = new KTempFile; - _tempFile->setAutoDelete( TRUE ); + _tempFile->setAutoDelete( true ); _fileURL = _tempFile->name(); kdDebug() << "saving into " << _fileURL << endl; } @@ -1949,7 +1949,7 @@ void NSPluginStream::data(TDEIO::Job * job, const TQByteArray &data) queue( data ); if ( !pump() ) { _job->suspend(); - _resumeTimer->start( 100, TRUE ); + _resumeTimer->start( 100, true ); } } @@ -1986,7 +1986,7 @@ void NSPluginStream::resume() _job->resume(); } else { kdDebug(1431) << "restart timer" << endl; - _resumeTimer->start( 100, TRUE ); + _resumeTimer->start( 100, true ); } } diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp index 1f112ba08..b8b4329b2 100644 --- a/nsplugins/viewer/qxteventloop.cpp +++ b/nsplugins/viewer/qxteventloop.cpp @@ -93,8 +93,8 @@ bool QXtEventLoop::redeliverEvent( XEvent *event ) { // redeliver the event to Xt, NOT through Qt if ( static_d->dispatchers[ event->type ]( event ) ) - return TRUE; - return FALSE; + return true; + return false; } @@ -108,7 +108,7 @@ XEvent* QXtEventLoop::lastEvent() QXtEventLoopPrivate::QXtEventLoopPrivate() : appContext(NULL), ownContext(NULL), - activate_timers(FALSE), timerid(0) + activate_timers(false), timerid(0) { } @@ -181,18 +181,18 @@ Boolean qmotif_event_dispatcher( XEvent *event ) case EnterNotify: case LeaveNotify: event->xcrossing.focus = False; - delivered = FALSE; + delivered = false; break; case XKeyPress: case XKeyRelease: - delivered = TRUE; + delivered = true; break; case XFocusIn: case XFocusOut: - delivered = FALSE; + delivered = false; break; default: - delivered = FALSE; + delivered = false; break; } } @@ -412,7 +412,7 @@ void QXtEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier ) */ void qmotif_timeout_handler( XtPointer, XtIntervalId * ) { - static_d->activate_timers = TRUE; + static_d->activate_timers = true; static_d->timerid = 0; } @@ -461,7 +461,7 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags ) if ( d->activate_timers ) { nevents += activateTimers(); } - d->activate_timers = FALSE; + d->activate_timers = false; return ( (flags & WaitForMore) || ( pendingmask != 0 ) || nevents > 0 ); } diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp index 6007e5b0e..488168b4d 100644 --- a/nsplugins/viewer/viewer.cpp +++ b/nsplugins/viewer/viewer.cpp @@ -152,7 +152,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable ) #if defined(CHECK_RANGE) tqWarning( "TQSocketNotifier: Internal error" ); #endif - return FALSE; + return false; } XtPointer inpMask = 0; @@ -161,7 +161,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable ) case TQSocketNotifier::Read: inpMask = (XtPointer)XtInputReadMask; break; case TQSocketNotifier::Write: inpMask = (XtPointer)XtInputWriteMask; break; case TQSocketNotifier::Exception: inpMask = (XtPointer)XtInputExceptMask; break; - default: return FALSE; + default: return false; } if (enable) { @@ -197,13 +197,13 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable ) while ( sn && !(sn->obj == obj && sn->fd == sockfd) ) sn = _notifiers[type].next(); if ( !sn ) // not found - return FALSE; + return false; XtRemoveInput( sn->id ); _notifiers[type].remove(); } - return TRUE; + return true; } #endif diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp index 69c0e25c5..cf3d8dc6a 100644 --- a/tdeioslave/man/man2html.cpp +++ b/tdeioslave/man/man2html.cpp @@ -774,13 +774,13 @@ static void add_links(char *c) if (g!=NULL && f>c && (g-f)<12 && (isalnum(f[-1]) || f[-1]=='>' || ( f[-1] == ';' ) ) && isdigit(f[1]) && f[1]!='0' && ((g-f)<=2 || isalpha(f[2]))) { - ok = TRUE; + ok = true; h = f+2; while (hdeviceNode(), TRUE); + TQStringList devNodeList = TQStringList::split("/", sdevice->deviceNode(), true); TQString devNode0 = devNodeList[devNodeList.count()-2]; TQString devNode1 = devNodeList[devNodeList.count()-1]; @@ -1268,7 +1268,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium) } if (diskLabel.isEmpty()) { // Try to use a pretty mount point if possible - TQStringList pieces = TQStringList::split("/", sdevice->deviceNode(), FALSE); + TQStringList pieces = TQStringList::split("/", sdevice->deviceNode(), false); TQString node = pieces[pieces.count()-1]; diskLabel = medium->label() + " (" + node + ")"; diskLabel.replace("/", "_"); diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index 29527d055..d47ee0129 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/tdeioslave/media/medianotifier/medianotifier.cpp @@ -67,7 +67,7 @@ MediaNotifier::MediaNotifier(const TQCString &name) : KDEDModule(name) connectDCOPSignal( "kded", "mediamanager", "mediumRemoved(TQString, bool)", "onMediumRemove(TQString, bool)", true ); - m_notificationDialogList.setAutoDelete(FALSE); + m_notificationDialogList.setAutoDelete(false); m_freeTimer = new TQTimer( this ); connect( m_freeTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkFreeDiskSpace() ) ); m_freeTimer->start( 1000*6*2 /* 20 minutes */ ); diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp index 2d2d53481..edce1789d 100644 --- a/tdeioslave/media/tdecmodule/notifiermodule.cpp +++ b/tdeioslave/media/tdecmodule/notifiermodule.cpp @@ -129,7 +129,7 @@ void NotifierModule::slotActionSelected(TQListBoxItem *item) bool isWritable = action!=0L && action->isWritable(); m_view->deleteButton->setEnabled( isWritable ); m_view->editButton->setEnabled( isWritable ); - m_view->addButton->setEnabled( TRUE ); + m_view->addButton->setEnabled( true ); m_view->toggleAutoButton->setEnabled( action!=0L && !m_mimetype.isEmpty() ); } diff --git a/tdeioslave/nfs/tdeio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp index 8ab3817af..2f114c29b 100644 --- a/tdeioslave/nfs/tdeio_nfs.cpp +++ b/tdeioslave/nfs/tdeio_nfs.cpp @@ -135,9 +135,9 @@ static bool isRoot(const TQString& path) static bool isAbsoluteLink(const TQString& path) { //hmm, don't know - if (path.isEmpty()) return TRUE; - if (path[0]=='/') return TRUE; - return FALSE; + if (path.isEmpty()) return true; + if (path[0]=='/') return true; + return false; } static void createVirtualDirEntry(UDSEntry & entry) @@ -190,14 +190,14 @@ static TQString removeFirstPart(const TQString& path) } NFSFileHandle::NFSFileHandle() -:m_isInvalid(FALSE) +:m_isInvalid(false) { memset(m_handle,'\0',NFS_FHSIZE+1); // m_detectTime=time(0); } NFSFileHandle::NFSFileHandle(const NFSFileHandle & handle) -:m_isInvalid(FALSE) +:m_isInvalid(false) { m_handle[NFS_FHSIZE]='\0'; memcpy(m_handle,handle.m_handle,NFS_FHSIZE); @@ -220,11 +220,11 @@ NFSFileHandle& NFSFileHandle::operator= (const char* src) { if (src==0) { - m_isInvalid=TRUE; + m_isInvalid=true; return *this; }; memcpy(m_handle,src,NFS_FHSIZE); - m_isInvalid=FALSE; + m_isInvalid=false; // m_detectTime=time(0); return *this; } @@ -455,7 +455,7 @@ void NFSProtocol::openConnection() if (!checkForError(clnt_stat, 0, m_currentHost.latin1())) return; fhstatus fhStatus; - bool atLeastOnceSucceeded(FALSE); + bool atLeastOnceSucceeded(false); for(; exportlist!=0;exportlist = exportlist->ex_next) { kdDebug(7121) << "found export: " << exportlist->ex_dir << endl; @@ -463,7 +463,7 @@ void NFSProtocol::openConnection() clnt_stat = clnt_call(m_client, MOUNTPROC_MNT,(xdrproc_t) xdr_dirpath, (char*)(&(exportlist->ex_dir)), (xdrproc_t) xdr_fhstatus,(char*) &fhStatus,total_timeout); if (fhStatus.fhs_status==0) { - atLeastOnceSucceeded=TRUE; + atLeastOnceSucceeded=true; NFSFileHandle fh; fh=fhStatus.fhstatus_u.fhs_fhandle; TQString fname; @@ -1018,7 +1018,7 @@ bool NFSProtocol::checkForError(int clientStat, int nfsStat, const TQString& tex kdDebug(7121)<<"rpc error: "<addWidget( host_view ); iline = new TQLineEdit( this ); - iline->setEnabled( TRUE ); + iline->setEnabled( true ); TQLabel *itxt = new TQLabel( iline, i18n("Hos&t:"), this ); TQPushButton *addButton = new TQPushButton( i18n("A&dd"), this ); connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addHostname()) ); diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index 7b9cf6b4c..b285c6a2d 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -70,9 +70,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. bool argb_visual_available = false; bool has_twin = false; bool is_themed = false; -bool trinity_desktop_lock_use_sak = TRUE; -bool trinity_desktop_synchronize_keyboard_lights = TRUE; -bool trinity_desktop_watch_cryptographic_cards = TRUE; +bool trinity_desktop_lock_use_sak = true; +bool trinity_desktop_synchronize_keyboard_lights = true; +bool trinity_desktop_watch_cryptographic_cards = true; TQPoint primaryScreenPosition; static int diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp index 8a2f6264d..1d7b952e4 100644 --- a/tdm/kfrontend/sakdlg.cpp +++ b/tdm/kfrontend/sakdlg.cpp @@ -84,7 +84,7 @@ #define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1" #define FIFO_SAK_FILE "/tmp/tdesocket-global/tdm/tdmctl-sak-%1" -bool trinity_desktop_lock_use_system_modal_dialogs = TRUE; +bool trinity_desktop_lock_use_system_modal_dialogs = true; extern bool trinity_desktop_lock_use_sak; //=========================================================================== diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp index b6fbd29c9..b3a79295f 100644 --- a/tdm/kfrontend/tdmclock.cpp +++ b/tdm/kfrontend/tdmclock.cpp @@ -44,17 +44,17 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) //TDEConfig *config = tdeApp->config(); //config->setGroup( "Option" ); - mDate = false;//config->readNumEntry( "date", FALSE ); - mSecond = true;//config->readNumEntry( "second", TRUE ); - mDigital = false;//config->readNumEntry( "digital", FALSE ); - mBorder = false;//config->readNumEntry( "border", FALSE ); + mDate = false;//config->readNumEntry( "date", false ); + mSecond = true;//config->readNumEntry( "second", true ); + mDigital = false;//config->readNumEntry( "digital", false ); + mBorder = false;//config->readNumEntry( "border", false ); //config->setGroup( "Font" ); mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ ); mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ ); mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ ); - mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ ); - mFont.setBold( TRUE/*config->readNumEntry( "Bold",TRUE )*/ ); + mFont.setItalic( true/*config->readNumEntry( "Italic",true )*/ ); + mFont.setBold( true/*config->readNumEntry( "Bold",true )*/ ); setFixedSize( 100, 100 ); diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index cc16cf7ed..84a0153e5 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -698,7 +698,7 @@ void KSMPushButton::keyPressEvent( TQKeyEvent* e ) case Key_Enter: case Key_Return: case Key_Space: - m_pressed = TRUE; + m_pressed = true; setDown(true); emit pressed(); break; @@ -723,7 +723,7 @@ void KSMPushButton::keyReleaseEvent( TQKeyEvent* e ) if ( m_pressed ) { setDown(false); - m_pressed = FALSE; + m_pressed = false; emit released(); emit clicked(); } @@ -764,7 +764,7 @@ void FlatButton::keyPressEvent( TQKeyEvent* e ) case Key_Enter: case Key_Return: case Key_Space: - m_pressed = TRUE; + m_pressed = true; setDown(true); emit pressed(); break; @@ -788,7 +788,7 @@ void FlatButton::keyReleaseEvent( TQKeyEvent* e ) if ( m_pressed ) { setDown(false); - m_pressed = FALSE; + m_pressed = false; emit released(); emit clicked(); } diff --git a/twin/client.cpp b/twin/client.cpp index 2f1849fed..028c32c12 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -144,23 +144,23 @@ Client::Client( Workspace *ws ) desk = 0; // no desktop yet mode = PositionCenter; - buttonDown = FALSE; - moveResizeMode = FALSE; + buttonDown = false; + moveResizeMode = false; info = NULL; shade_mode = ShadeNone; - active = FALSE; + active = false; deleting = false; - keep_above = FALSE; - keep_below = FALSE; - is_shape = FALSE; + keep_above = false; + keep_below = false; + is_shape = false; motif_noborder = false; - motif_may_move = TRUE; - motif_may_resize = TRUE; - motif_may_close = TRUE; + motif_may_move = true; + motif_may_resize = true; + motif_may_close = true; fullscreen_mode = FullScreenNone; - skip_taskbar = FALSE; + skip_taskbar = false; original_skip_taskbar = false; minimized = false; hidden = false; @@ -177,8 +177,8 @@ Client::Client( Workspace *ws ) Ptakeactivity = 0; Pcontexthelp = 0; Pping = 0; - input = FALSE; - skip_pager = FALSE; + input = false; + skip_pager = false; max_mode = MaximizeRestore; maxmode_restore = MaximizeRestore; @@ -224,7 +224,7 @@ void Client::releaseWindow( bool on_shutdown ) deleting = true; workspace()->discardUsedWindowRules( this, true ); // remove ForceTemporarily rules StackingUpdatesBlocker blocker( workspace()); - if (!custom_opacity) setOpacity(FALSE); + if (!custom_opacity) setOpacity(false); if (moveResizeMode) leaveMoveResize(); removeShadow(); @@ -445,7 +445,7 @@ void Client::detectShapable() case NET::Menu : case NET::Dialog : case NET::Utility : - setShapable(FALSE); + setShapable(false); break; default: assert( false ); @@ -522,9 +522,9 @@ bool Client::isModalSystemNotification() const result = XGetWindowProperty(tqt_xdisplay(), window(), atoms->net_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void Client::updateShape() @@ -541,7 +541,7 @@ void Client::updateShape() XShapeCombineShape(tqt_xdisplay(), frameId(), ShapeBounding, clientPos().x(), clientPos().y(), window(), ShapeBounding, ShapeSet); - setShapable(TRUE); + setShapable(true); } // !shape() mask setting is done in setMask() when the decoration // calls it or when the decoration is created/destroyed @@ -709,7 +709,7 @@ void Client::unminimize( bool avoid_animation ) if( isOnCurrentDesktop() && isShown( true )) { if( mainClients().isEmpty() && !avoid_animation ) - animateMinimizeOrUnminimize( FALSE ); + animateMinimizeOrUnminimize( false ); } updateVisibility(); updateAllowedActions(); @@ -778,7 +778,7 @@ void Client::animateMinimizeOrUnminimize( bool minimize ) float diff; TQPainter p ( workspace()->desktopWidget() ); - bool need_to_clear = FALSE; + bool need_to_clear = false; TQPixmap pm3; do { @@ -790,7 +790,7 @@ void Client::animateMinimizeOrUnminimize( bool minimize ) if ( need_to_clear ) { p.drawPixmap( area2.x(), area2.y(), pm3 ); - need_to_clear = FALSE; + need_to_clear = false; } area2 = area; } @@ -810,7 +810,7 @@ void Client::animateMinimizeOrUnminimize( bool minimize ) else { // no overlap, we can clear later to avoid flicker pm3 = pm2; - need_to_clear = TRUE; + need_to_clear = true; } } } while ( t.elapsed() < step); @@ -897,7 +897,7 @@ void Client::setShade( ShadeMode mode ) XSelectInput( tqt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it //done xcompmgr workaround -// FRAME repaint( FALSE ); +// FRAME repaint( false ); // bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); int step = TQMAX( 4, TQABS( h - s.height() ) / as )+1; @@ -938,7 +938,7 @@ void Client::setShade( ShadeMode mode ) resizeDecoration( TQSize( s.width(), h )); // assume a border // we do not have time to wait for X to send us paint events -// FRAME repaint( 0, h - step-5, width(), step+5, TRUE); +// FRAME repaint( 0, h - step-5, width(), step+5, true); TQApplication::syncX(); } while ( h < s.height() - step ); // if ( !wasStaticContents ) @@ -946,7 +946,7 @@ void Client::setShade( ShadeMode mode ) shade_geometry_change = false; plainResize( s ); if( shade_mode == ShadeHover || shade_mode == ShadeActivated ) - setActive( TRUE ); + setActive( true ); XMapWindow( tqt_xdisplay(), wrapperId()); XMapWindow( tqt_xdisplay(), window()); XDeleteProperty (tqt_xdisplay(), client, atoms->net_wm_window_shade); @@ -1897,7 +1897,7 @@ bool Client::isSuspendable() const tcomm = basename(tbuf); #else /* default */ TQString statString(statRaw); - TQStringList statFields = TQStringList::split(" ", statString, TRUE); + TQStringList statFields = TQStringList::split(" ", statString, true); TQString tcomm = statFields[1]; TQString state = statFields[2]; #endif /* default */ @@ -1967,7 +1967,7 @@ bool Client::isResumeable() const TQString state(TQChar(inf->pr_sname)); #else /* default */ TQString statString(statRaw); - TQStringList statFields = TQStringList::split(" ", statString, TRUE); + TQStringList statFields = TQStringList::split(" ", statString, true); TQString tcomm = statFields[1]; TQString state = statFields[2]; #endif /* default */ @@ -2422,11 +2422,11 @@ void Client::readIcons( Window win, TQPixmap* icon, TQPixmap* miniicon ) { // get the icons, allow scaling if( icon != NULL ) - *icon = KWin::icon( win, 32, 32, TRUE, KWin::NETWM | KWin::WMHints ); + *icon = KWin::icon( win, 32, 32, true, KWin::NETWM | KWin::WMHints ); if( miniicon != NULL ) { if( icon == NULL || !icon->isNull()) - *miniicon = KWin::icon( win, 16, 16, TRUE, KWin::NETWM | KWin::WMHints ); + *miniicon = KWin::icon( win, 16, 16, true, KWin::NETWM | KWin::WMHints ); else *miniicon = TQPixmap(); } @@ -2454,8 +2454,8 @@ void Client::getIcons() } if( icon_pix.isNull()) { // and if nothing else, load icon from classhint or xapp icon - icon_pix = KWin::icon( window(), 32, 32, TRUE, KWin::ClassHint | KWin::XApp ); - miniicon_pix = KWin::icon( window(), 16, 16, TRUE, KWin::ClassHint | KWin::XApp ); + icon_pix = KWin::icon( window(), 32, 32, true, KWin::ClassHint | KWin::XApp ); + miniicon_pix = KWin::icon( window(), 16, 16, true, KWin::ClassHint | KWin::XApp ); } if( isManaged() && decoration != NULL ) decoration->iconChange(); @@ -3022,9 +3022,9 @@ bool Client::getWindowOpacity() //query translucency settings from X, returns tr custom_opacity = true; // setOpacity(opacity_ < 0xFFFFFFFF, opacity_); XFree ((char*)data); - return TRUE; + return true; } - return FALSE; + return false; } void Client::setCustomOpacityFlag(bool custom) @@ -3046,14 +3046,14 @@ bool Client::touches(const Client* c) // checks if this client borders c, needed to test beep media player window state { if (y() == c->y() + c->height()) // this bottom to c - return TRUE; + return true; if (y() + height() == c->y()) // this top to c - return TRUE; + return true; if (x() == c->x() + c->width()) // this right to c - return TRUE; + return true; if (x() + width() == c->x()) // this left to c - return TRUE; - return FALSE; + return true; + return false; } void Client::setDecoHashProperty(uint topHeight, uint rightWidth, uint bottomHeight, uint leftWidth) diff --git a/twin/client.h b/twin/client.h index dbe6f65c2..178c718c4 100644 --- a/twin/client.h +++ b/twin/client.h @@ -761,7 +761,7 @@ inline bool Client::isOnAllDesktops() const } /*! Returns whether the client is on the virtual desktop \a d. - This is always TRUE for onAllDesktops clients. + This is always true for onAllDesktops clients. */ inline bool Client::isOnDesktop( int d ) const { diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 032065602..571b16909 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -444,9 +444,9 @@ bool B2Client::isModalSystemNotification() result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void B2Client::addButtons(const TQString& s, const TQString tips[], diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 576d2d97b..d5c441a26 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -1035,9 +1035,9 @@ bool KeramikClient::isModalSystemNotification() result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) @@ -1662,7 +1662,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, titlebar->geometry().bottom() ) ) ); // Titlebar needs no paint event - TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), FALSE ) ); + TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), false ) ); } } } diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index e52f8c760..422bb30c5 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -82,14 +82,14 @@ void loadFakeSessionInfo( TDEConfig* config ) info->maximized = config->readNumEntry( TQString("maximize")+n, 0 ); info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 ); info->desktop = config->readNumEntry( TQString("desktop")+n, 0 ); - info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE ); - info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE ); - info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE ); - info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE ); - info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE ); - info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE ); - info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE ); - info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE ); + info->minimized = config->readBoolEntry( TQString("iconified")+n, false ); + info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, false ); + info->shaded = config->readBoolEntry( TQString("shaded")+n, false ); + info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, false ); + info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, false ); + info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, false ); + info->skipPager = config->readBoolEntry( TQString("skipPager")+n, false ); + info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, false ); info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1()); info->active = false; info->fake = true; diff --git a/twin/events.cpp b/twin/events.cpp index 3d3ba999c..5158df40b 100644 --- a/twin/events.cpp +++ b/twin/events.cpp @@ -196,7 +196,7 @@ bool Workspace::workspaceEvent( XEvent * e ) { if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease ) ) { - mouse_emulation = FALSE; + mouse_emulation = false; XUngrabKeyboard( tqt_xdisplay(), get_tqt_x_time() ); } @@ -221,7 +221,7 @@ bool Workspace::workspaceEvent( XEvent * e ) if ( tab_grab || control_grab ) { tab_box->handleMouseEvent( e ); - return TRUE; + return true; } break; case KeyPress: @@ -323,7 +323,7 @@ bool Workspace::workspaceEvent( XEvent * e ) addSystemTrayWin( w ); } } - return TRUE; + return true; } return ( e->xunmap.event != e->xunmap.window ); // hide wm typical event from Qt @@ -336,12 +336,12 @@ bool Workspace::workspaceEvent( XEvent * e ) { //do not confuse Qt with these events. After all, _we_ are the //window manager who does the reparenting. - return TRUE; + return true; } case DestroyNotify: { if ( removeSystemTrayWin( e->xdestroywindow.window, false ) ) - return TRUE; + return true; return false; } case MapRequest: @@ -362,7 +362,7 @@ bool Workspace::workspaceEvent( XEvent * e ) // this code doesn't check the parent to be root. // if ( e->xmaprequest.parent == root ) { //###TODO store previously destroyed client ids if ( addSystemTrayWin( e->xmaprequest.window ) ) - return TRUE; + return true; c = createClient( e->xmaprequest.window, false ); if ( c != NULL && root != tqt_xrootwin() ) { // TODO what is this? @@ -428,7 +428,7 @@ bool Workspace::workspaceEvent( XEvent * e ) break; case KeyRelease: if ( mouse_emulation ) - return FALSE; + return false; break; case FocusIn: if( e->xfocus.window == rootWin() && TQCString( getenv("TDE_MULTIHEAD")).lower() != "true" @@ -460,7 +460,7 @@ bool Workspace::workspaceEvent( XEvent * e ) default: break; } - return FALSE; + return false; } // Some events don't have the actual window which caused the event @@ -733,7 +733,7 @@ void Client::destroyNotifyEvent( XDestroyWindowEvent* e ) } -bool blockAnimation = FALSE; +bool blockAnimation = false; /*! Handles client messages for the client window @@ -887,7 +887,7 @@ void Client::enterNotifyEvent( XCrossingEvent* e ) delete shadeHoverTimer; shadeHoverTimer = new TQTimer( this ); connect( shadeHoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( shadeHover() )); - shadeHoverTimer->start( options->shadeHoverInterval, TRUE ); + shadeHoverTimer->start( options->shadeHoverInterval, true ); } if ( options->focusPolicy == Options::ClickToFocus ) @@ -900,7 +900,7 @@ void Client::enterNotifyEvent( XCrossingEvent* e ) delete autoRaiseTimer; autoRaiseTimer = new TQTimer( this ); connect( autoRaiseTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoRaise() ) ); - autoRaiseTimer->start( options->autoRaiseInterval, TRUE ); + autoRaiseTimer->start( options->autoRaiseInterval, true ); } TQPoint currentPos( e->x_root, e->y_root ); @@ -979,7 +979,7 @@ void Client::grabButton( int modifier ) ++i ) XGrabButton( tqt_xdisplay(), AnyButton, modifier | mods[ i ], - wrapperId(), FALSE, ButtonPressMask, + wrapperId(), false, ButtonPressMask, GrabModeSync, GrabModeAsync, None, None ); } @@ -1425,7 +1425,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in bool replay = performMouseCommand( com, TQPoint( x_root, y_root), perform_handled ); if ( isSpecialWindow()) - replay = TRUE; + replay = true; if( w == wrapperId()) // these can come only from a grab XAllowEvents(tqt_xdisplay(), replay? ReplayPointer : SyncPointer, CurrentTime ); //tqt_x_time); @@ -1453,7 +1453,7 @@ void Client::processDecorationButtonPress( int button, int /*state*/, int x, int Options::MouseCommand com = Options::MouseNothing; bool active = isActive(); if ( !wantsInput() ) // we cannot be active, use it anyway - active = TRUE; + active = true; if ( button == Button1 ) com = active ? options->commandActiveTitlebar1() : options->commandInactiveTitlebar1(); @@ -1466,7 +1466,7 @@ void Client::processDecorationButtonPress( int button, int /*state*/, int x, int && com != Options::MouseMinimize ) // mouse release event { mode = mousePosition( TQPoint( x, y )); - buttonDown = TRUE; + buttonDown = true; moveOffset = TQPoint( x, y ); invertedMoveOffset = rect().bottomRight() - moveOffset; unrestrictedMoveResize = false; @@ -1517,7 +1517,7 @@ bool Client::buttonReleaseEvent( Window w, int /*button*/, int state, int x, int y = this->y(); if ( (state & ( Button1Mask & Button2Mask & Button3Mask )) == 0 ) { - buttonDown = FALSE; + buttonDown = false; if ( moveResizeMode ) { finishMoveResize( false ); @@ -1604,7 +1604,7 @@ void Client::focusInEvent( XFocusInEvent* e ) bool activate = workspace()->allowClientActivation( this, -1U, true ); workspace()->gotFocusIn( this ); // remove from should_get_focus list if( activate ) - setActive( TRUE ); + setActive( true ); else { workspace()->restoreFocus(); @@ -1673,7 +1673,7 @@ void Client::focusOutEvent( XFocusOutEvent* e ) if ( TQApplication::activePopupWidget() ) return; if( !check_follows_focusin( this )) - setActive( FALSE ); + setActive( false ); } // performs _NET_WM_MOVERESIZE @@ -1684,7 +1684,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction ) else if( moveResizeMode && direction == NET::MoveResizeCancel ) { finishMoveResize( true ); - buttonDown = FALSE; + buttonDown = false; setCursor( mode ); } else if( direction >= NET::TopLeft && direction <= NET::Left ) @@ -1704,7 +1704,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction ) return; if( moveResizeMode ) finishMoveResize( false ); - buttonDown = TRUE; + buttonDown = true; moveOffset = TQPoint( x_root - x(), y_root - y()); // map from global invertedMoveOffset = rect().bottomRight() - moveOffset; unrestrictedMoveResize = false; @@ -1756,12 +1756,12 @@ void Client::keyPressEvent( uint key_code ) case Key_Return: case Key_Enter: finishMoveResize( false ); - buttonDown = FALSE; + buttonDown = false; setCursor( mode ); break; case Key_Escape: finishMoveResize( true ); - buttonDown = FALSE; + buttonDown = false; setCursor( mode ); break; default: diff --git a/twin/geometry.cpp b/twin/geometry.cpp index 1678cb80d..6adad44fe 100644 --- a/twin/geometry.cpp +++ b/twin/geometry.cpp @@ -1692,7 +1692,7 @@ bool Client::isMaximizable() const return false; } if ( maximizeMode() != MaximizeRestore ) - return TRUE; + return true; TQSize max = maxSize(); #if 0 if( max.width() < 32767 || max.height() < 32767 ) // sizes are 16bit with X diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index 0a3c6331e..36534f806 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -84,9 +84,9 @@ bool ButtonDrag::decode( TQDropEvent* e, Button& btn ) int supported; stream >> supported; btn.supported = supported; - return TRUE; + return true; } - return FALSE; + return false; } @@ -267,7 +267,7 @@ ButtonDropSite::ButtonDropSite( TQWidget* parent, const char* name ) : TQFrame( parent, name ), m_selected(0) { - setAcceptDrops( TRUE ); + setAcceptDrops( true ); setFrameShape( WinPanel ); setFrameShadow( Raised ); setMinimumHeight( 26 ); diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 63547b918..c2f260d62 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -753,11 +753,11 @@ void KWinDecorationModule::readConfig( TDEConfig* conf ) int swm; for ( swm = 0; swm < thirdpartyWMList->count(); ++swm ) { if ( thirdpartyWMList->text( swm ).startsWith(selectedWM + " ") ) { - found = TRUE; + found = true; break; } } - if (found == FALSE) { + if (found == false) { thirdpartyWMList->setCurrentItem(0); } else { diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index c7a2479fd..53c55f90c 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -1436,7 +1436,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { kompmgr = 0L; - resetKompmgr_ = FALSE; + resetKompmgr_ = false; TQVBoxLayout *lay = new TQVBoxLayout (this); kompmgrAvailable_ = kompmgrAvailable(); if (!kompmgrAvailable_){ @@ -1523,7 +1523,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, tabW->addTab(tGroup, i18n("Opacity")); TQWidget *sGroup = new TQWidget(tabW); -// sGroup->setCheckable(TRUE); +// sGroup->setCheckable(true); TQVBoxLayout *vLay2 = new TQVBoxLayout (sGroup,11,6); vLay2->addSpacing(11); // to get the proper gb top offset useShadows = new TQCheckBox(i18n("Use shadows on windows (standard effects should be disabled in the Styles module if this is checked)"),sGroup); @@ -1738,7 +1738,7 @@ void KTranslucencyConfig::processShadowLockouts() void KTranslucencyConfig::resetKompmgr() { - resetKompmgr_ = TRUE; + resetKompmgr_ = true; } void KTranslucencyConfig::load( void ) @@ -1778,17 +1778,17 @@ void KTranslucencyConfig::load( void ) TDEConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc"); conf_.setGroup("xcompmgr"); - disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",FALSE)); - useOpenGL->setChecked(conf_.readBoolEntry("useOpenGL",FALSE)); - blurBackground->setChecked(conf_.readBoolEntry("blurBackground",FALSE)); + disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",false)); + useOpenGL->setChecked(conf_.readBoolEntry("useOpenGL",false)); + blurBackground->setChecked(conf_.readBoolEntry("blurBackground",false)); blurBackground->setEnabled(useOpenGL->isChecked()); - greyscaleBackground->setChecked(conf_.readBoolEntry("greyscaleBackground",FALSE)); + greyscaleBackground->setChecked(conf_.readBoolEntry("greyscaleBackground",false)); greyscaleBackground->setEnabled(useOpenGL->isChecked()); useShadows->setChecked(conf_.readEntry("Compmode","").compare("CompClientShadows") == 0); - useShadowsOnMenuWindows->setChecked(conf_.readBoolEntry("ShadowsOnMenuWindows",TRUE)); - useShadowsOnToolTipWindows->setChecked(conf_.readBoolEntry("ShadowsOnToolTipWindows",TRUE)); - useShadowsOnDockWindows->setChecked(conf_.readBoolEntry("ShadowsOnDockWindows",FALSE)); + useShadowsOnMenuWindows->setChecked(conf_.readBoolEntry("ShadowsOnMenuWindows",true)); + useShadowsOnToolTipWindows->setChecked(conf_.readBoolEntry("ShadowsOnToolTipWindows",true)); + useShadowsOnDockWindows->setChecked(conf_.readBoolEntry("ShadowsOnDockWindows",false)); shadowTopOffset->setValue(-1*(conf_.readNumEntry("ShadowOffsetY",0))); shadowLeftOffset->setValue(-1*(conf_.readNumEntry("ShadowOffsetX",0))); @@ -1808,10 +1808,10 @@ void KTranslucencyConfig::load( void ) else shadowColor->setColor(TQColor(r,g,b)); - fadeInWindows->setChecked(conf_.readBoolEntry("FadeWindows",FALSE)); - fadeInMenuWindows->setChecked(conf_.readBoolEntry("FadeMenuWindows",TRUE)); - fadeInToolTipWindows->setChecked(conf_.readBoolEntry("FadeToolTipWindows",TRUE)); - fadeOnOpacityChange->setChecked(conf_.readBoolEntry("FadeTrans",FALSE)); + fadeInWindows->setChecked(conf_.readBoolEntry("FadeWindows",false)); + fadeInMenuWindows->setChecked(conf_.readBoolEntry("FadeMenuWindows",true)); + fadeInToolTipWindows->setChecked(conf_.readBoolEntry("FadeToolTipWindows",true)); + fadeOnOpacityChange->setChecked(conf_.readBoolEntry("FadeTrans",false)); fadeInSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeInStep",0.070)*1000.0)); fadeOutSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeOutStep",0.070)*1000.0)); @@ -2006,17 +2006,17 @@ void KTranslucencyConfig::defaults() inactiveWindowOpacity->setEnabled(false); movingWindowOpacity->setEnabled(false); dockWindowOpacity->setEnabled(false); - useShadows->setChecked(FALSE); - useShadowsOnMenuWindows->setChecked(TRUE); - useShadowsOnToolTipWindows->setChecked(TRUE); - useShadowsOnDockWindows->setChecked(FALSE); - removeShadowsOnMove->setChecked(FALSE); - removeShadowsOnResize->setChecked(FALSE); + useShadows->setChecked(false); + useShadowsOnMenuWindows->setChecked(true); + useShadowsOnToolTipWindows->setChecked(true); + useShadowsOnDockWindows->setChecked(false); + removeShadowsOnMove->setChecked(false); + removeShadowsOnResize->setChecked(false); shadowColor->setColor(TQt::black); - fadeInWindows->setChecked(FALSE); - fadeInMenuWindows->setChecked(TRUE); - fadeInToolTipWindows->setChecked(TRUE); - fadeOnOpacityChange->setChecked(FALSE); + fadeInWindows->setChecked(false); + fadeInMenuWindows->setChecked(true); + fadeInToolTipWindows->setChecked(true); + fadeOnOpacityChange->setChecked(false); fadeInSpeed->setValue(70); fadeOutSpeed->setValue(70); emit TDECModule::changed(true); diff --git a/twin/killwindow.cpp b/twin/killwindow.cpp index c67ab50a0..8bc1abb57 100644 --- a/twin/killwindow.cpp +++ b/twin/killwindow.cpp @@ -81,7 +81,7 @@ void KillWindow::start() button_released = (ev.xbutton.button == Button1); if ( ev.xbutton.button == Button3 ) { - escape_pressed = TRUE; + escape_pressed = true; break; } if( ev.xbutton.button == Button1 || ev.xbutton.button == Button2 ) diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index d8a22458b..a31471611 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -332,9 +332,9 @@ bool KCommonDecoration::isModalSystemNotification() result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString& s, bool isLeft) diff --git a/twin/main.cpp b/twin/main.cpp index 540595a1b..c988b53f2 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -45,13 +45,13 @@ Atoms* atoms; int screen_number = -1; bool disable_twin_composition_manager = false; -static bool initting = FALSE; +static bool initting = false; static int x11ErrorHandler(Display *d, XErrorEvent *e) { char msg[80], req[80], number[80]; - bool ignore_badwindow = TRUE; //maybe temporary + bool ignore_badwindow = true; //maybe temporary if (initting && ( @@ -151,7 +151,7 @@ Application::Application( ) // if there was already twin running, it saved its configuration after loosing the selection -> reread config()->reparseConfiguration(); - initting = TRUE; // startup.... + initting = true; // startup.... // install X11 error handler XSetErrorHandler( x11ErrorHandler ); @@ -176,7 +176,7 @@ Application::Application( ) DCOPRef ref( "kded", "kded" ); ref.send( "unloadModule", TQCString( "kdetrayproxy" )); - initting = FALSE; // startup done, we are up and running now. + initting = false; // startup done, we are up and running now. dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("wm started")); XEvent e; @@ -216,7 +216,7 @@ void Application::lostSelection() bool Application::x11EventFilter( XEvent *e ) { if ( Workspace::self()->workspaceEvent( e ) ) - return TRUE; + return true; return TDEApplication::x11EventFilter( e ); } diff --git a/twin/manage.cpp b/twin/manage.cpp index 8b96c070e..394d7fc20 100644 --- a/twin/manage.cpp +++ b/twin/manage.cpp @@ -190,7 +190,7 @@ bool Client::manage( Window w, bool isMapped ) // onAllDesktopsChange(); decoration doesn't exist here yet TQRect geom( attr.x, attr.y, attr.width, attr.height ); - bool placementDone = FALSE; + bool placementDone = false; if ( session ) geom = session->geometry; @@ -269,7 +269,7 @@ bool Client::manage( Window w, bool isMapped ) if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) || (xSizeHint.flags & USPosition) ) { - placementDone = TRUE; + placementDone = true; // disobey xinerama placement option for now (#70943) area = workspace()->clientArea( PlacementArea, geom.center(), desktop()); } @@ -290,7 +290,7 @@ bool Client::manage( Window w, bool isMapped ) if( isMovable()) { if( geom.x() > area.right() || geom.y() > area.bottom()) - placementDone = FALSE; // weird, do not trust. + placementDone = false; // weird, do not trust. } if ( placementDone ) @@ -312,7 +312,7 @@ bool Client::manage( Window w, bool isMapped ) if( !placementDone ) { // placement needs to be after setting size workspace()->place( this, area ); - placementDone = TRUE; + placementDone = true; } if(( !isSpecialWindow() || isToolbar()) && isMovable()) @@ -358,7 +358,7 @@ bool Client::manage( Window w, bool isMapped ) // probably should be replaced by something better bool doNotShow = false; if ( workspace()->isNotManaged( caption() ) ) - doNotShow = TRUE; + doNotShow = true; // other settings from the previous session if ( session ) diff --git a/twin/notifications.cpp b/twin/notifications.cpp index 5a83e9bce..43ae37cdf 100644 --- a/twin/notifications.cpp +++ b/twin/notifications.cpp @@ -92,7 +92,7 @@ TQString Notify::eventToName( Event e ) return event; } -static bool forgetIt = FALSE; +static bool forgetIt = false; TQValueList< Notify::EventData > Notify::pending_events; bool Notify::raise( Event e, const TQString& message, Client* c ) diff --git a/twin/options.cpp b/twin/options.cpp index 46c557b4a..c9411f6de 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -77,7 +77,7 @@ unsigned long Options::updateSettings() separateScreenFocus = config->readBoolEntry( "SeparateScreenFocus", false ); activeMouseScreen = config->readBoolEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus ); - rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE); + rollOverDesktops = config->readBoolEntry("RollOverDesktops", true); // focusStealingPreventionLevel = config->readNumEntry( "FocusStealingPreventionLevel", 2 ); // TODO use low level for now @@ -99,8 +99,8 @@ unsigned long Options::updateSettings() xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ), -1, tqApp->desktop()->numScreens() - 1 ); - animateShade = config->readBoolEntry("AnimateShade", TRUE ); - animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); + animateShade = config->readBoolEntry("AnimateShade", true ); + animateMinimize = config->readBoolEntry("AnimateMinimize", true ); animateMinimizeSpeed = config->readNumEntry("AnimateMinimizeSpeed", 5 ); if( focusPolicy == ClickToFocus ) @@ -112,21 +112,21 @@ unsigned long Options::updateSettings() } else { - autoRaise = config->readBoolEntry("AutoRaise", FALSE ); + autoRaise = config->readBoolEntry("AutoRaise", false ); autoRaiseInterval = config->readNumEntry("AutoRaiseInterval", 0 ); - delayFocus = config->readBoolEntry("DelayFocus", FALSE ); + delayFocus = config->readBoolEntry("DelayFocus", false ); delayFocusInterval = config->readNumEntry("DelayFocusInterval", 0 ); } - shadeHover = config->readBoolEntry("ShadeHover", FALSE ); + shadeHover = config->readBoolEntry("ShadeHover", false ); shadeHoverInterval = config->readNumEntry("ShadeHoverInterval", 250 ); // important: autoRaise implies ClickRaise - clickRaise = autoRaise || config->readBoolEntry("ClickRaise", TRUE ); + clickRaise = autoRaise || config->readBoolEntry("ClickRaise", true ); borderSnapZone = config->readNumEntry("BorderSnapZone", 10); windowSnapZone = config->readNumEntry("WindowSnapZone", 10); - snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",FALSE); + snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",false); // active borders: compatibility with old option names (Electric*) active_borders = config->readNumEntry("ActiveBorders", -1); @@ -205,7 +205,7 @@ unsigned long Options::updateSettings() onlyDecoTranslucent = config->readBoolEntry("OnlyDecoTranslucent",false); resetKompmgr = config->readBoolEntry("ResetKompmgr", false); if (resetKompmgr) - config->writeEntry("ResetKompmgr",FALSE); + config->writeEntry("ResetKompmgr",false); // window drop shadows config->setGroup("Style"); diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index d86037a84..324b8a782 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -42,7 +42,7 @@ PopupInfo::PopupInfo( Workspace* ws, const char *name ) connect(&m_delayedHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hide())); TQFont f = font(); - f.setBold( TRUE ); + f.setBold( true ); f.setPointSize( 14 ); setFont( f ); diff --git a/twin/sm.cpp b/twin/sm.cpp index 0b51dd284..5ef97f62d 100644 --- a/twin/sm.cpp +++ b/twin/sm.cpp @@ -94,7 +94,7 @@ void Workspace::storeSession( TDEConfig* config, SMSavePhase phase ) config->writeEntry( TQString("wmClientMachine")+n, c->wmClientMachine( true ).data() ); config->writeEntry( TQString("resourceName")+n, c->resourceName().data() ); config->writeEntry( TQString("resourceClass")+n, c->resourceClass().data() ); - config->writeEntry( TQString("geometry")+n, TQRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME + config->writeEntry( TQString("geometry")+n, TQRect( c->calculateGravitation(true), c->clientSize() ) ); // FRAME config->writeEntry( TQString("restore")+n, c->geometryRestore() ); config->writeEntry( TQString("fsrestore")+n, c->geometryFSRestore() ); config->writeEntry( TQString("maximize")+n, (int) c->maximizeMode() ); @@ -170,15 +170,15 @@ void Workspace::loadSessionInfo() info->maximized = config->readNumEntry( TQString("maximize")+n, 0 ); info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 ); info->desktop = config->readNumEntry( TQString("desktop")+n, 0 ); - info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE ); - info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE ); - info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE ); - info->shadowed = config->readBoolEntry( TQString("shadowed")+n, TRUE ); - info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE ); - info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE ); - info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE ); - info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE ); - info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE ); + info->minimized = config->readBoolEntry( TQString("iconified")+n, false ); + info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, false ); + info->shaded = config->readBoolEntry( TQString("shaded")+n, false ); + info->shadowed = config->readBoolEntry( TQString("shadowed")+n, true ); + info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, false ); + info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, false ); + info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, false ); + info->skipPager = config->readBoolEntry( TQString("skipPager")+n, false ); + info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, false ); info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1()); info->shortcut = config->readEntry( TQString("shortcut")+n ); info->active = ( active_client == i ); diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index 28de58755..f638d755e 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -203,7 +203,7 @@ void TabBox::reset() if ( clients.count() == 0 ) // height for the "not tasks" text { TQFont f = font(); - f.setBold( TRUE ); + f.setBold( true ); f.setPointSize( 14 ); h = TQFontMetrics(f).height()*4; @@ -401,7 +401,7 @@ void TabBox::drawContents( TQPainter * ) if ( !currentClient() ) { TQFont f = font(); - f.setBold( TRUE ); + f.setBold( true ); f.setPointSize( 14 ); p.setFont(f); @@ -993,26 +993,26 @@ bool Workspace::startKDEWalkThroughWindows() { if( !establishTabBoxGrab()) return false; - tab_grab = TRUE; + tab_grab = true; keys->suspend( true ); disable_shortcuts_keys->suspend( true ); client_keys->suspend( true ); tab_box->setMode( TabBox::WindowsMode ); tab_box->reset(); - return TRUE; + return true; } bool Workspace::startWalkThroughDesktops( int mode ) { if( !establishTabBoxGrab()) return false; - control_grab = TRUE; + control_grab = true; keys->suspend( true ); disable_shortcuts_keys->suspend( true ); client_keys->suspend( true ); tab_box->setMode( (TabBox::Mode) mode ); tab_box->reset(); - return TRUE; + return true; } bool Workspace::startWalkThroughDesktops() @@ -1195,8 +1195,8 @@ void Workspace::closeTabBox() keys->suspend( false ); disable_shortcuts_keys->suspend( false ); client_keys->suspend( false ); - tab_grab = FALSE; - control_grab = FALSE; + tab_grab = false; + control_grab = false; } /*! diff --git a/twin/tabbox.h b/twin/tabbox.h index 3fd419ad7..0f07b019c 100644 --- a/twin/tabbox.h +++ b/twin/tabbox.h @@ -46,7 +46,7 @@ class TabBox : public TQFrame bool isAppsOnly() const; void reset(); - void nextPrev( bool next = TRUE); + void nextPrev( bool next = true); void delayedShow(); void hide(); diff --git a/twin/useractions.cpp b/twin/useractions.cpp index f4183af5d..fe60c4d04 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -76,13 +76,13 @@ TQPopupMenu* Workspace::clientPopup() if ( !popup ) { popup = new TQPopupMenu; - popup->setCheckable( TRUE ); + popup->setCheckable( true ); popup->setFont(TDEGlobalSettings::menuFont()); connect( popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( clientPopupAboutToShow() ) ); connect( popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) ); advanced_popup = new TQPopupMenu( popup ); - advanced_popup->setCheckable( TRUE ); + advanced_popup->setCheckable( true ); advanced_popup->setFont(TDEGlobalSettings::menuFont()); connect( advanced_popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) ); advanced_popup->insertItem( SmallIconSet( "go-up" ), @@ -228,7 +228,7 @@ void Workspace::initDesktopPopup() return; desk_popup = new TQPopupMenu( popup ); - desk_popup->setCheckable( TRUE ); + desk_popup->setCheckable( true ); desk_popup->setFont(TDEGlobalSettings::menuFont()); connect( desk_popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotSendToDesktop(int) ) ); @@ -250,7 +250,7 @@ void Workspace::desktopPopupAboutToShow() desk_popup->clear(); desk_popup->insertItem( i18n("&All Desktops"), 0 ); if ( active_popup_client && active_popup_client->isOnAllDesktops() ) - desk_popup->setItemChecked( 0, TRUE ); + desk_popup->setItemChecked( 0, true ); desk_popup->insertSeparator( -1 ); int id; const int BASE = 10; @@ -268,7 +268,7 @@ void Workspace::desktopPopupAboutToShow() i ); if ( active_popup_client && !active_popup_client->isOnAllDesktops() && active_popup_client->desktop() == i ) - desk_popup->setItemChecked( id, TRUE ); + desk_popup->setItemChecked( id, true ); } } @@ -501,7 +501,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op ) */ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalPos, bool handled ) { - bool replay = FALSE; + bool replay = false; switch (command) { case Options::MouseRaise: @@ -548,12 +548,12 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP case Options::MouseActivateRaiseAndPassClick: workspace()->takeActivity( this, ActivityFocus | ActivityRaise, handled ); workspace()->setActiveScreenMouse( globalPos ); - replay = TRUE; + replay = true; break; case Options::MouseActivateAndPassClick: workspace()->takeActivity( this, ActivityFocus, handled ); workspace()->setActiveScreenMouse( globalPos ); - replay = TRUE; + replay = true; break; case Options::MouseActivateRaiseAndMove: case Options::MouseActivateRaiseAndUnrestrictedMove: @@ -571,7 +571,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP if( moveResizeMode ) finishMoveResize( false ); mode = PositionCenter; - buttonDown = TRUE; + buttonDown = true; moveOffset = TQPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global invertedMoveOffset = rect().bottomRight() - moveOffset; unrestrictedMoveResize = ( command == Options::MouseActivateRaiseAndUnrestrictedMove @@ -591,7 +591,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP break; if( moveResizeMode ) finishMoveResize( false ); - buttonDown = TRUE; + buttonDown = true; moveOffset = TQPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global int x = moveOffset.x(), y = moveOffset.y(); bool left = x < width() / 3; @@ -652,12 +652,12 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP { if (opacity_ < 0xF3333333) { - setOpacity(TRUE, opacity_ + 0xCCCCCCC); + setOpacity(true, opacity_ + 0xCCCCCCC); custom_opacity = true; } else { - setOpacity(FALSE, 0xFFFFFFFF); + setOpacity(false, 0xFFFFFFFF); custom_opacity = false; } } @@ -665,12 +665,12 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP case Options::MouseOpacityLess: if (opacity_ > 0) { - setOpacity(TRUE, (opacity_ > 0xCCCCCCC) ? opacity_ - 0xCCCCCCC : 0); + setOpacity(true, (opacity_ > 0xCCCCCCC) ? opacity_ - 0xCCCCCCC : 0); custom_opacity = true; } break; case Options::MouseNothing: - replay = TRUE; + replay = true; break; } return replay; diff --git a/twin/utils.cpp b/twin/utils.cpp index bc44eee56..d21393d2e 100644 --- a/twin/utils.cpp +++ b/twin/utils.cpp @@ -57,7 +57,7 @@ bool Shape::hasShape( WId w) unsigned int wws, hws, wbs, hbs; int boundingShaped = 0, clipShaped = 0; if (!available()) - return FALSE; + return false; XShapeQueryExtents(tqt_xdisplay(), w, &boundingShaped, &xws, &yws, &wws, &hws, &clipShaped, &xbs, &ybs, &wbs, &hbs); diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 8e41be550..2d95e9226 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -58,7 +58,7 @@ Workspace *Workspace::_self = 0; TDEProcess* kompmgr = 0; TDESelectionOwner* kompmgr_selection; -bool allowKompmgrRestart = TRUE; +bool allowKompmgrRestart = true; extern bool disable_twin_composition_manager; bool supportsCompMgr() @@ -187,7 +187,7 @@ Workspace::Workspace( bool restore ) root = tqt_xrootwin(); default_colormap = DefaultColormap(tqt_xdisplay(), tqt_xscreen() ); installed_colormap = default_colormap; - session.setAutoDelete( TRUE ); + session.setAutoDelete( true ); for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i) { @@ -1306,10 +1306,10 @@ bool Workspace::isNotManaged( const TQString& title ) if (r.search(title) != -1) { doNotManageList.remove( it ); - return TRUE; + return true; } } - return FALSE; + return false; } /*! @@ -1875,19 +1875,19 @@ void Workspace::calcDesktopLayout(int &x, int &y) const bool Workspace::addSystemTrayWin( WId w ) { if ( systemTrayWins.contains( w ) ) - return TRUE; + return true; NETWinInfo ni( tqt_xdisplay(), w, root, NET::WMKDESystemTrayWinFor ); WId trayWinFor = ni.kdeSystemTrayWinFor(); if ( !trayWinFor ) - return FALSE; + return false; systemTrayWins.append( SystemTrayWindow( w, trayWinFor ) ); XSelectInput( tqt_xdisplay(), w, StructureNotifyMask ); XAddToSaveSet( tqt_xdisplay(), w ); propagateSystemTrayWins(); - return TRUE; + return true; } /*! @@ -1897,7 +1897,7 @@ bool Workspace::addSystemTrayWin( WId w ) bool Workspace::removeSystemTrayWin( WId w, bool check ) { if ( !systemTrayWins.contains( w ) ) - return FALSE; + return false; if( check ) { // When getting UnmapNotify, it's not clear if it's the systray @@ -1925,7 +1925,7 @@ bool Workspace::removeSystemTrayWin( WId w, bool check ) systemTrayWins.remove( w ); XRemoveFromSaveSet (tqt_xdisplay (), w); propagateSystemTrayWins(); - return TRUE; + return true; } @@ -2155,16 +2155,16 @@ void Workspace::slotMouseEmulation() if ( mouse_emulation ) { XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time()); - mouse_emulation = FALSE; + mouse_emulation = false; return; } if ( XGrabKeyboard(tqt_xdisplay(), - root, FALSE, + root, false, GrabModeAsync, GrabModeAsync, get_tqt_x_time()) == GrabSuccess ) { - mouse_emulation = TRUE; + mouse_emulation = true; mouse_emulation_state = 0; mouse_emulation_window = 0; } @@ -2284,7 +2284,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation bool Workspace::keyPressMouseEmulation( XKeyEvent& ev ) { if ( root != tqt_xrootwin() ) - return FALSE; + return false; int kc = XkbKeycodeToKeysym(tqt_xdisplay(), ev.keycode, 0, 0); int km = ev.state & (ControlMask | Mod1Mask | ShiftMask); @@ -2361,16 +2361,16 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev ) // fall through case XK_Escape: XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time()); - mouse_emulation = FALSE; - return TRUE; + mouse_emulation = false; + return true; default: - return FALSE; + return false; } TQCursor::setPos( pos ); if ( mouse_emulation_state ) mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuMove, 0, mouse_emulation_state ); - return TRUE; + return true; } @@ -2397,7 +2397,7 @@ void Workspace::requestDelayFocus( Client* c ) delete delayFocusTimer; delayFocusTimer = new TQTimer( this ); connect( delayFocusTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( delayFocus() ) ); - delayFocusTimer->start( options->delayFocusInterval, TRUE ); + delayFocusTimer->start( options->delayFocusInterval, true ); } void Workspace::cancelDelayFocus() @@ -2981,7 +2981,7 @@ void Workspace::startKompmgr() } if (!kompmgr->start(TDEProcess::OwnGroup, TDEProcess::Stderr)) { - options->useTranslucency = FALSE; + options->useTranslucency = false; TDEProcess proc; proc << "kdialog" << "--error" << i18n("The Composite Manager could not be started.\\nMake sure you have \"" TDE_COMPOSITOR_BINARY "\" in a $PATH directory.") @@ -2997,8 +2997,8 @@ void Workspace::startKompmgr() connect( kompmgr_selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( stopKompmgr())); kompmgr_selection->claim( true ); connect(kompmgr, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(restartKompmgr(TDEProcess*))); - options->useTranslucency = TRUE; - //allowKompmgrRestart = FALSE; + options->useTranslucency = true; + //allowKompmgrRestart = false; //TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) ); TQByteArray ba; TQDataStream arg(ba, IO_WriteOnly); @@ -3016,7 +3016,7 @@ void Workspace::stopKompmgr() delete kompmgr_selection; kompmgr_selection = NULL; kompmgr->disconnect(this, TQ_SLOT(restartKompmgr(TDEProcess*))); - options->useTranslucency = FALSE; + options->useTranslucency = false; if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider kompmgr->kill(SIGKILL); TQByteArray ba; @@ -3040,7 +3040,7 @@ bool Workspace::kompmgrIsRunning() void Workspace::unblockKompmgrRestart() { - allowKompmgrRestart = TRUE; + allowKompmgrRestart = true; } void Workspace::restartKompmgr( TDEProcess *proc ) @@ -3059,7 +3059,7 @@ void Workspace::restartKompmgr( TDEProcess *proc ) { delete kompmgr_selection; kompmgr_selection = NULL; - options->useTranslucency = FALSE; + options->useTranslucency = false; if (crashed) { TDEProcess proc; proc << "kdialog" << "--error" @@ -3083,7 +3083,7 @@ void Workspace::restartKompmgr( TDEProcess *proc ) { delete kompmgr_selection; kompmgr_selection = NULL; - options->useTranslucency = FALSE; + options->useTranslucency = false; TDEProcess proc; proc << "kdialog" << "--error" << i18n("The Composite Manager could not be started.\\nMake sure you have \"" TDE_COMPOSITOR_BINARY "\" in a $PATH directory.") @@ -3092,7 +3092,7 @@ void Workspace::restartKompmgr( TDEProcess *proc ) } else { - allowKompmgrRestart = FALSE; + allowKompmgrRestart = false; TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) ); } } diff --git a/twin/workspace.h b/twin/workspace.h index 28da82ff0..17ef0c0b3 100644 --- a/twin/workspace.h +++ b/twin/workspace.h @@ -74,7 +74,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin { TQ_OBJECT public: - Workspace( bool restore = FALSE ); + Workspace( bool restore = false ); virtual ~Workspace(); static Workspace * self() { return _self; } @@ -119,8 +119,8 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin // stealing prevention code. Client* mostRecentlyActivatedClient() const; - void activateClient( Client*, bool force = FALSE ); - void requestFocus( Client* c, bool force = FALSE ); + void activateClient( Client*, bool force = false ); + void requestFocus( Client* c, bool force = false ); void takeActivity( Client* c, int flags, bool handled ); // flags are ActivityFlags void handleTakeActivity( Client* c, Time timestamp, int flags ); // flags are ActivityFlags bool allowClientActivation( const Client* c, Time time = -1U, bool focus_in = false ); -- cgit v1.2.3