summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kmag/kmagzoomview.cpp22
-rw-r--r--kmousetool/kmousetool/Xmd_kmousetool.h12
-rw-r--r--kmousetool/kmousetool/kmousetool.cpp8
-rw-r--r--kmousetool/kmousetool/kmousetool.h4
-rw-r--r--kttsd/kttsd/filtermgr.cpp2
-rw-r--r--kttsd/kttsd/speaker.cpp10
6 files changed, 23 insertions, 35 deletions
diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index b9531e2..921465e 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -133,8 +133,8 @@ KMagZoomView::KMagZoomView(TQWidget *parent, const char *name)
m_invert(false),
m_fitToWindow(true)
{
- TDEApplication::setGlobalMouseTracking(TRUE);
- viewport()->setMouseTracking(TRUE);
+ TDEApplication::setGlobalMouseTracking(true);
+ viewport()->setMouseTracking(true);
viewport()->setBackgroundMode (NoBackground);
viewport()->setFocusPolicy(TQWidget::StrongFocus);
@@ -167,7 +167,7 @@ KMagZoomView::KMagZoomView(TQWidget *parent, const char *name)
KMagZoomView::~KMagZoomView()
{
- TDEApplication::setGlobalMouseTracking(FALSE);
+ TDEApplication::setGlobalMouseTracking(false);
}
/**
@@ -294,8 +294,8 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos)
pz.setPen(TQt::black);
pz.setBackgroundColor(TQt::white);
- TQBitmap sCursor( 16, 16, left_ptr_bits, TRUE );
- TQBitmap mask( 16, 16, left_ptrmsk_bits, TRUE );
+ TQBitmap sCursor( 16, 16, left_ptr_bits, true );
+ TQBitmap mask( 16, 16, left_ptrmsk_bits, true );
sCursor.setMask(mask);
// since hot spot is at 3,1
@@ -307,7 +307,7 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos)
{
// 3. Actual cursor
// Get the current cursor type
- TQWidget *dummy = TDEApplication::widgetAt(TQCursor::pos(), FALSE);
+ TQWidget *dummy = TDEApplication::widgetAt(TQCursor::pos(), false);
if(!dummy)
break;
kdDebug() << ">" << dummy->name() << ":" << dummy->cursor().shape() << "-" << endl;
@@ -318,8 +318,8 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos)
pz.setPen(TQt::black);
pz.setBackgroundColor(TQt::white);
- TQBitmap sCursor( 16, 16, left_ptr_bits, TRUE );
- TQBitmap mask( 16, 16, left_ptrmsk_bits, TRUE );
+ TQBitmap sCursor( 16, 16, left_ptr_bits, true );
+ TQBitmap mask( 16, 16, left_ptrmsk_bits, true );
sCursor.setMask(mask);
// since hot spot is at 3,1
@@ -327,8 +327,8 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos)
}
break;
default:
- TQBitmap sCursor( 32, 32, phand_bits, TRUE );
- TQBitmap mask( 32, 32, phandm_bits, TRUE );
+ TQBitmap sCursor( 32, 32, phand_bits, true );
+ TQBitmap mask( 32, 32, phandm_bits, true );
sCursor.setMask(mask);
pz.drawPixmap(mousePos.x(), mousePos.y(), sCursor);
@@ -686,7 +686,7 @@ void KMagZoomView::contextMenuEvent (TQContextMenuEvent *e)
void KMagZoomView::focusOutEvent(TQFocusEvent *e)
{
- if(e->lostFocus() == TRUE) {
+ if (e->lostFocus()) {
m_ctrlKeyPressed = false;
m_shiftKeyPressed = false;
}
diff --git a/kmousetool/kmousetool/Xmd_kmousetool.h b/kmousetool/kmousetool/Xmd_kmousetool.h
index 2a35eb8..7e22fd1 100644
--- a/kmousetool/kmousetool/Xmd_kmousetool.h
+++ b/kmousetool/kmousetool/Xmd_kmousetool.h
@@ -146,18 +146,6 @@ typedef unsigned char CARD8;
typedef CARD32 BITS32;
typedef CARD16 BITS16;
-#ifndef __EMX__
-typedef CARD8 BYTE;
-typedef CARD8 BOOL;
-#else /* __EMX__ */
-/*
- * This is bad style, but the central include file <os2.h> declares them
- * as well
- */
-#define BYTE CARD8
-#define BOOL CARD8
-#endif /* __EMX__ */
-
/*
* definitions for sign-extending bitfields on 64-bit architectures
*/
diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp
index 728ffaf..a165860 100644
--- a/kmousetool/kmousetool/kmousetool.cpp
+++ b/kmousetool/kmousetool/kmousetool.cpp
@@ -85,10 +85,10 @@ Display *display;
void KMouseTool::init_vars()
{
- continue_timer = 1;
+ continue_timer = true;
tick_count = 0;
max_ticks = dwell_time+1;
- mouse_is_down = FALSE;
+ mouse_is_down = false;
loadOptions();
@@ -202,13 +202,13 @@ void KMouseTool::normalClick()
if (smart_drag_on) {
if (!mouse_is_down) {
LeftDn();
- mouse_is_down = TRUE;
+ mouse_is_down = true;
tick_count = 0;
playTickSound();
}
else if (mouse_is_down) {
LeftUp();
- mouse_is_down = FALSE;
+ mouse_is_down = false;
tick_count = max_ticks;
}
}
diff --git a/kmousetool/kmousetool/kmousetool.h b/kmousetool/kmousetool/kmousetool.h
index 303520f..16f7ca3 100644
--- a/kmousetool/kmousetool/kmousetool.h
+++ b/kmousetool/kmousetool/kmousetool.h
@@ -61,8 +61,8 @@ private:
MTStroke stroke;
// boolean flags to keep track of program states
- int mouse_is_down;
- int continue_timer;
+ bool mouse_is_down;
+ bool continue_timer;
int tick_count;
int dwell_time;
int drag_time;
diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp
index c390b3b..44fc2ff 100644
--- a/kttsd/kttsd/filtermgr.cpp
+++ b/kttsd/kttsd/filtermgr.cpp
@@ -55,7 +55,7 @@ FilterMgr::~FilterMgr()
// kdDebug() << "FilterMgr::~FilterMgr: Running" << endl;
if ( m_state == fsFiltering )
stopFiltering();
- m_filterList.setAutoDelete( TRUE );
+ m_filterList.setAutoDelete( true );
m_filterList.clear();
}
diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp
index a0636ac..d2304be 100644
--- a/kttsd/kttsd/speaker.cpp
+++ b/kttsd/kttsd/speaker.cpp
@@ -1400,7 +1400,7 @@ bool Speaker::startPlayingUtterance(uttIterator it)
m_speechData->setJobSequenceNum(m_currentJobNum, sentence->seq);
prePlaySignals(it);
it->state = usPlaying;
- if (!m_timer->start(timerInterval, FALSE))
+ if (!m_timer->start(timerInterval, false))
kdDebug() << "Speaker::startPlayingUtterance: timer.start failed" << endl;
started = true;
} else {
@@ -1420,7 +1420,7 @@ bool Speaker::startPlayingUtterance(uttIterator it)
// kdDebug() << "Speaker::startPlayingUtterance: resuming play" << endl;
it->audioPlayer->startPlay(TQString()); // resume
it->state = usPlaying;
- if (!m_timer->start(timerInterval, FALSE))
+ if (!m_timer->start(timerInterval, false))
kdDebug() << "Speaker::startPlayingUtterance: timer.start failed" << endl;
started = true;
}
@@ -1433,7 +1433,7 @@ bool Speaker::startPlayingUtterance(uttIterator it)
// Note: Must call stop(), even if player not currently playing. Why?
it->audioPlayer->startPlay(TQString()); // resume
it->state = usPlaying;
- if (!m_timer->start(timerInterval, FALSE))
+ if (!m_timer->start(timerInterval, false))
kdDebug() << "Speaker::startPlayingUtterance: timer.start failed" << endl;
started = true;
break;
@@ -1694,8 +1694,8 @@ bool Speaker::event ( TQEvent * e )
{
// kdDebug() << "Speaker::event: received event." << endl;
doUtterances();
- return TRUE;
+ return true;
}
- else return FALSE;
+ else return false;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-08 22:12:12 +0000