summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-14 22:33:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-14 22:33:41 -0600
commit0f92dd542b65bc910caaf190b7c623aa5158c86a (patch)
tree120ab7e08fa0ffc354ef58d100f79a33c92aa6e6 /src/kernel
parentd796c9dd933ab96ec83b9a634feedd5d32e1ba3f (diff)
downloadtqt3-0f92dd542b65bc910caaf190b7c623aa5158c86a.tar.gz
tqt3-0f92dd542b65bc910caaf190b7c623aa5158c86a.zip
Fix native TQt3 accidental conversion to tquit
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/qaccel.cpp6
-rw-r--r--src/kernel/qapplication.cpp38
-rw-r--r--src/kernel/qapplication.h6
-rw-r--r--src/kernel/qapplication_x11.cpp12
-rw-r--r--src/kernel/qasyncio.cpp2
-rw-r--r--src/kernel/qevent.cpp2
-rw-r--r--src/kernel/qevent.h2
-rw-r--r--src/kernel/qeventloop.cpp26
-rw-r--r--src/kernel/qeventloop_p.h8
-rw-r--r--src/kernel/qeventloop_x11.cpp4
-rw-r--r--src/kernel/qfont.cpp2
-rw-r--r--src/kernel/qimage.cpp2
-rw-r--r--src/kernel/qinputcontext.cpp4
-rw-r--r--src/kernel/qnetworkprotocol.cpp2
-rw-r--r--src/kernel/qobject.cpp2
-rw-r--r--src/kernel/qpalette.cpp2
-rw-r--r--src/kernel/qpixmap.cpp2
-rw-r--r--src/kernel/qpsprinter.cpp2
-rw-r--r--src/kernel/qpsprinter.ps2
-rw-r--r--src/kernel/qscriptengine_x11.cpp2
-rw-r--r--src/kernel/qt_x11_p.h2
-rw-r--r--src/kernel/qtimer.cpp2
-rw-r--r--src/kernel/qwidget.cpp12
23 files changed, 72 insertions, 72 deletions
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index b761c736..6c4dcde2 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -685,8 +685,8 @@ static int get_seq_id()
\code
TQAccel *a = new TQAccel( myWindow ); // create accels for myWindow
a->insertItem( CTRL + Key_P, 200 ); // Ctrl+P, e.g. to print document
- a->insertItem( ALT + Key_X, 201 ); // Alt+X, e.g. to tquit
- a->insertItem( UNICODE_ACCEL + 'q', 202 ); // Unicode 'q', e.g. to tquit
+ a->insertItem( ALT + Key_X, 201 ); // Alt+X, e.g. to quit
+ a->insertItem( UNICODE_ACCEL + 'q', 202 ); // Unicode 'q', e.g. to quit
a->insertItem( Key_D ); // gets a unique negative id < -1
a->insertItem( CTRL + SHIFT + Key_P ); // gets a unique negative id < -1
\endcode
@@ -781,7 +781,7 @@ void TQAccel::setItemEnabled( int id, bool enable )
receiver.
\code
- a->connectItem( 201, mainView, SLOT(tquit()) );
+ a->connectItem( 201, mainView, SLOT(quit()) );
\endcode
Of course, you can also send a signal as \a member.
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 437361f8..6c0bde41 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -188,7 +188,7 @@
enter_loop(),
exit_loop(),
exit(),
- tquit().
+ quit().
sendEvent(),
postEvent(),
sendPostedEvents(),
@@ -952,8 +952,8 @@ void TQApplication::initialize( int argc, char **argv )
app_argc = argc;
app_argv = argv;
- tquit_now = FALSE;
- tquit_code = 0;
+ quit_now = FALSE;
+ quit_code = 0;
TQWidget::createMapper(); // create widget mapper
#ifndef QT_NO_PALETTE
(void) palette(); // trigger creation of application palette
@@ -2130,20 +2130,20 @@ TQFontMetrics TQApplication::fontMetrics()
Tells the application to exit with return code 0 (success).
Equivalent to calling TQApplication::exit( 0 ).
- It's common to connect the lastWindowClosed() signal to tquit(), and
+ It's common to connect the lastWindowClosed() signal to quit(), and
you also often connect e.g. TQButton::clicked() or signals in
TQAction, TQPopupMenu or TQMenuBar to it.
Example:
\code
- TQPushButton *tquitButton = new TQPushButton( "Quit" );
- connect( tquitButton, SIGNAL(clicked()), qApp, SLOT(tquit()) );
+ TQPushButton *quitButton = new TQPushButton( "Quit" );
+ connect( quitButton, SIGNAL(clicked()), qApp, SLOT(quit()) );
\endcode
\sa exit() aboutToQuit() lastWindowClosed() TQAction
*/
-void TQApplication::tquit()
+void TQApplication::quit()
{
TQApplication::exit( 0 );
}
@@ -2161,15 +2161,15 @@ void TQApplication::tquit()
TQPopupMenu* file = new TQPopupMenu( this );
file->insertItem( "&Quit", qApp, SLOT(closeAllWindows()), CTRL+Key_Q );
- // when the last window is closed, the application should tquit
- connect( qApp, SIGNAL( lastWindowClosed() ), qApp, SLOT( tquit() ) );
+ // when the last window is closed, the application should quit
+ connect( qApp, SIGNAL( lastWindowClosed() ), qApp, SLOT( quit() ) );
\endcode
The windows are closed in random order, until one window does not
accept the close event.
\sa TQWidget::close(), TQWidget::closeEvent(), lastWindowClosed(),
- tquit(), topLevelWidgets(), TQWidget::isTopLevel()
+ quit(), topLevelWidgets(), TQWidget::isTopLevel()
*/
void TQApplication::closeAllWindows()
@@ -2219,7 +2219,7 @@ void TQApplication::aboutTQt()
top level window.
The signal is very useful when your application has many top level
- widgets but no main widget. You can then connect it to the tquit()
+ widgets but no main widget. You can then connect it to the quit()
slot.
For convenience, this signal is \e not emitted for transient top level
@@ -2231,16 +2231,16 @@ void TQApplication::aboutTQt()
/*!
\fn void TQApplication::aboutToQuit()
- This signal is emitted when the application is about to tquit the
+ This signal is emitted when the application is about to quit the
main event loop, e.g. when the event loop level drops to zero.
- This may happen either after a call to tquit() from inside the
+ This may happen either after a call to quit() from inside the
application or when the users shuts down the entire desktop session.
The signal is particularly useful if your application has to do some
last-second cleanup. Note that no user interaction is possible in
this state.
- \sa tquit()
+ \sa quit()
*/
@@ -2551,7 +2551,7 @@ bool TQApplication::event( TQEvent *e )
if(ce->isAccepted())
return TRUE;
} else if (e->type() == TQEvent::Quit) {
- tquit();
+ quit();
return TRUE;
}
return TQObject::event(e);
@@ -2738,7 +2738,7 @@ TQEventLoop *TQApplication::eventLoop()
/*!
Enters the main event loop and waits until exit() is called or the
main widget is destroyed, and returns the value that was set to
- exit() (which is 0 if exit() is called via tquit()).
+ exit() (which is 0 if exit() is called via quit()).
It is necessary to call this function to start event handling. The
main event loop receives events from the window system and
@@ -2754,7 +2754,7 @@ TQEventLoop *TQApplication::eventLoop()
TQTimer with 0 timeout. More advanced idle processing schemes can
be achieved using processEvents().
- \sa tquit(), exit(), processEvents(), setMainWidget()
+ \sa quit(), exit(), processEvents(), setMainWidget()
*/
int TQApplication::exec()
{
@@ -2775,7 +2775,7 @@ int TQApplication::exec()
function \e does return to the caller -- it is event processing that
stops.
- \sa tquit(), exec()
+ \sa quit(), exec()
*/
void TQApplication::exit( int retcode )
{
@@ -4176,7 +4176,7 @@ bool TQApplication::reverseLayout()
\value RestartAnyway the application wants to be started at the
start of the next session, no matter what. (This is useful for
- utilities that run just after startup and then tquit.)
+ utilities that run just after startup and then quit.)
\value RestartImmediately the application wants to be started
immediately whenever it is not running.
diff --git a/src/kernel/qapplication.h b/src/kernel/qapplication.h
index 7a50a164..98449cf1 100644
--- a/src/kernel/qapplication.h
+++ b/src/kernel/qapplication.h
@@ -307,7 +307,7 @@ signals:
void guiThreadAwake();
public slots:
- void tquit();
+ void quit();
void closeAllWindows();
void aboutTQt();
@@ -357,8 +357,8 @@ private:
int app_argc;
char **app_argv;
- bool tquit_now;
- int tquit_code;
+ bool quit_now;
+ int quit_code;
static TQStyle *app_style;
static int app_cspec;
#ifndef QT_NO_PALETTE
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 1e2b6c8e..ba926e09 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -2726,14 +2726,14 @@ GC qt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC
yourself.
You need not have a main widget; connecting lastWindowClosed() to
- tquit() is an alternative.
+ quit() is an alternative.
For X11, this function also resizes and moves the main widget
according to the \e -geometry command-line option, so you should
set the default geometry (using \l TQWidget::setGeometry()) before
calling setMainWidget().
- \sa mainWidget(), exec(), tquit()
+ \sa mainWidget(), exec(), quit()
*/
void TQApplication::setMainWidget( TQWidget *mainWidget )
@@ -3334,7 +3334,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
#ifndef QT_NO_IM
// Filtering input events by the input context. It has to be taken
// place before any other key event consumers such as eventfilters
- // and accelerators because some input methods retquire tquite
+ // and accelerators because some input methods retquire quite
// various key combination and sequences. It often conflicts with
// accelerators and so on, so we must give the input context the
// filtering opportunity first to ensure all input methods work
@@ -4393,7 +4393,7 @@ bool TQETWidget::translateWheelEvent( int global_x, int global_y, int delta, int
bool TQETWidget::translateXinputEvent( const XEvent *ev )
{
#if defined (Q_OS_IRIX)
- // Wacom has put defines in their wacom.h file so it would be tquite wise
+ // Wacom has put defines in their wacom.h file so it would be quite wise
// to use them, need to think of a decent way of not using
// it when it doesn't exist...
XDeviceState *s;
@@ -6405,8 +6405,8 @@ static void sm_dieCallback( SmcConn smcConn, SmPointer /* clientData */)
if (smcConn != smcConnection )
return;
resetSmState();
- TQEvent tquitEvent(TQEvent::Quit);
- TQApplication::sendEvent(qApp, &tquitEvent);
+ TQEvent quitEvent(TQEvent::Quit);
+ TQApplication::sendEvent(qApp, &quitEvent);
}
static void sm_shutdownCancelledCallback( SmcConn smcConn, SmPointer /* clientData */)
diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp
index e8c12748..5fd05685 100644
--- a/src/kernel/qasyncio.cpp
+++ b/src/kernel/qasyncio.cpp
@@ -309,7 +309,7 @@ void TQIODeviceSource::rewind()
and a sink, and data will be moved during subsequent event processing.
Note that each source can only provide data to one sink and each sink
- can only receive data from one source (although it is tquite possible
+ can only receive data from one source (although it is quite possible
to write a multiplexing sink that is multiple sources).
*/
diff --git a/src/kernel/qevent.cpp b/src/kernel/qevent.cpp
index 6881c806..b787122d 100644
--- a/src/kernel/qevent.cpp
+++ b/src/kernel/qevent.cpp
@@ -1447,7 +1447,7 @@ void TQFocusEvent::resetReason()
\sa TQWidget::close(), TQWidget::hide(), TQObject::destroyed(),
TQApplication::setMainWidget(), TQApplication::lastWindowClosed(),
- TQApplication::exec(), TQApplication::tquit()
+ TQApplication::exec(), TQApplication::quit()
*/
/*!
diff --git a/src/kernel/qevent.h b/src/kernel/qevent.h
index 8f270684..dcc53586 100644
--- a/src/kernel/qevent.h
+++ b/src/kernel/qevent.h
@@ -83,7 +83,7 @@ public:
Show = 17, // widget is shown
Hide = 18, // widget is hidden
Close = 19, // request to close widget
- Quit = 20, // request to tquit application
+ Quit = 20, // request to quit application
Reparent = 21, // widget has been reparented
ShowMinimized = 22, // widget is shown minimized
ShowNormal = 23, // widget is shown normal
diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp
index 480cbf54..2dab316d 100644
--- a/src/kernel/qeventloop.cpp
+++ b/src/kernel/qeventloop.cpp
@@ -139,7 +139,7 @@ TQEventLoop::~TQEventLoop()
TQTimer with 0 timeout. More advanced idle processing schemes can
be achieved using processEvents().
- \sa TQApplication::tquit(), exit(), processEvents()
+ \sa TQApplication::quit(), exit(), processEvents()
*/
int TQEventLoop::exec()
{
@@ -149,12 +149,12 @@ int TQEventLoop::exec()
// cleanup
d->looplevel = 0;
- d->tquitnow = FALSE;
+ d->quitnow = FALSE;
d->exitloop = FALSE;
d->shortcut = FALSE;
- // don't reset tquitcode!
+ // don't reset quitcode!
- return d->tquitcode;
+ return d->quitcode;
}
/*! \fn void TQEventLoop::exit( int retcode = 0 )
@@ -171,14 +171,14 @@ int TQEventLoop::exec()
function \e does return to the caller -- it is event processing that
stops.
- \sa TQApplication::tquit(), exec()
+ \sa TQApplication::quit(), exec()
*/
void TQEventLoop::exit( int retcode )
{
- if ( d->tquitnow ) // preserve existing tquitcode
+ if ( d->quitnow ) // preserve existing quitcode
return;
- d->tquitcode = retcode;
- d->tquitnow = TRUE;
+ d->quitcode = retcode;
+ d->quitnow = TRUE;
d->exitloop = TRUE;
d->shortcut = TRUE;
}
@@ -201,13 +201,13 @@ int TQEventLoop::enterLoop()
processEvents( AllEvents | WaitForMore );
d->looplevel--;
- // restore the exitloop state, but if tquitnow is TRUE, we need to keep
+ // restore the exitloop state, but if quitnow is TRUE, we need to keep
// exitloop set so that all other event loops drop out.
- d->exitloop = old_exitloop || d->tquitnow;
- d->shortcut = d->tquitnow;
+ d->exitloop = old_exitloop || d->quitnow;
+ d->shortcut = d->quitnow;
if ( d->looplevel < 1 ) {
- d->tquitnow = FALSE;
+ d->quitnow = FALSE;
d->exitloop = FALSE;
d->shortcut = FALSE;
emit qApp->aboutToQuit();
@@ -258,7 +258,7 @@ void TQEventLoop::processEvents( ProcessEventsFlags flags, int maxTime )
{
TQTime start = TQTime::currentTime();
TQTime now;
- while ( ! d->tquitnow && processEvents( flags & ~WaitForMore ) ) {
+ while ( ! d->quitnow && processEvents( flags & ~WaitForMore ) ) {
now = TQTime::currentTime();
if ( start.msecsTo( now ) > maxTime )
break;
diff --git a/src/kernel/qeventloop_p.h b/src/kernel/qeventloop_p.h
index d70bb0ef..c1c00b82 100644
--- a/src/kernel/qeventloop_p.h
+++ b/src/kernel/qeventloop_p.h
@@ -108,15 +108,15 @@ public:
void reset() {
looplevel = 0;
- tquitcode = 0;
- tquitnow = FALSE;
+ quitcode = 0;
+ quitnow = FALSE;
exitloop = FALSE;
shortcut = FALSE;
}
int looplevel;
- int tquitcode;
- unsigned int tquitnow : 1;
+ int quitcode;
+ unsigned int quitnow : 1;
unsigned int exitloop : 1;
unsigned int shortcut : 1;
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index 76d2e62e..6ada21dc 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -211,8 +211,8 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags )
return TRUE;
}
- // don't block if exitLoop() or exit()/tquit() has been called.
- bool canWait = d->exitloop || d->tquitnow ? FALSE : (flags & WaitForMore);
+ // don't block if exitLoop() or exit()/quit() has been called.
+ bool canWait = d->exitloop || d->quitnow ? FALSE : (flags & WaitForMore);
// Process timers and socket notifiers - the common UNIX stuff
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 671e5685..9543be66 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -458,7 +458,7 @@ TQFontEngineData::~TQFontEngineData()
\value Sinhala is used for Sri Lanka's majority language Sinhala
and is also employed to write Pali, Sanskrit, and Tamil.
\value Thai is used to write Thai and other Southeast Asian languages.
- \value Lao is a language and script tquite similar to Thai.
+ \value Lao is a language and script quite similar to Thai.
\value Tibetan is the script used to write Tibetan in several
countries like Tibet, the bordering Indian regions and
Nepal. It is also used in the Buddist philosophy and
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index f26f24c0..82630a29 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -2949,7 +2949,7 @@ TQImage TQImage::scaleHeight( int h ) const
#ifndef QT_NO_IMAGE_TRANSFORMATION
TQImage TQImage::xForm( const TQWMatrix &matrix ) const
{
- // This function uses the same algorithm as (and steals tquite some
+ // This function uses the same algorithm as (and steals quite some
// code from) TQPixmap::xForm().
if ( isNull() )
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 3d50405e..40614d8f 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -153,7 +153,7 @@ public:
reduce resource consumption. In ideal case, each text widgets
should be allocated dedicated input context. But some complex
input contexts retquire slightly heavy resource such as 100
- kilobytes of memory. It prevents tquite many text widgets from
+ kilobytes of memory. It prevents quite many text widgets from
being used concurrently.
To resolve such problem, we can share an input context. There is
@@ -463,7 +463,7 @@ bool TQInputContext::isComposing() const
The filtering opportunity is always given to the input context as
soon as possible. It has to be taken place before any other key
event consumers such as eventfilters and accelerators because some
- input methods retquire tquite various key combination and
+ input methods retquire quite various key combination and
sequences. It often conflicts with accelerators and so on, so we
must give the input context the filtering opportunity first to
ensure all input methods work properly regardless of application
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp
index 8f095fae..bb79296f 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/qnetworkprotocol.cpp
@@ -503,7 +503,7 @@ void TQNetworkProtocol::setUrl( TQUrlOperator *u )
/*!
For processing operations the network protocol base class calls
- this method tquite often. This should be reimplemented by new
+ this method quite often. This should be reimplemented by new
network protocols. It should return TRUE if the connection is OK
(open); otherwise it should return FALSE. If the connection is not
open the protocol should open it.
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 242a35e6..adf4fec9 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -1156,7 +1156,7 @@ const TQObjectList *TQObject::objectTrees()
Note that \a inheritsClass uses single inheritance from TQObject,
the way inherits() does. According to inherits(), TQMenuBar
- inherits TQWidget but not TQMenuData. This does not tquite match
+ inherits TQWidget but not TQMenuData. This does not quite match
reality, but is the best that can be done on the wide variety of
compilers TQt supports.
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index 31e43672..77ddf8a8 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -163,7 +163,7 @@
\value NColorRoles Internal.
Note that text colors can be used for things other than just
- words; text colors are \e usually used for text, but it's tquite
+ words; text colors are \e usually used for text, but it's quite
common to use the text color roles for lines, icons, etc.
This image shows most of the color roles in use:
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index f719a830..b7c5ac65 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -1133,7 +1133,7 @@ static TQPixmap grabChildWidgets( TQWidget * w )
!((TQWidget *)child)->isHidden() &&
!((TQWidget *)child)->isTopLevel() &&
((TQWidget *)child)->geometry().intersects( w->rect() ) ) {
- // those conditions aren't tquite right, it's possible
+ // those conditions aren't quite right, it's possible
// to have a grandchild completely outside its
// grandparent, but partially inside its parent. no
// point in optimizing for that.
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index 66621591..5a4c76ee 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -2627,7 +2627,7 @@ void TQPSPrinterFontTTF::download(TQTextStream& s,bool global)
s << Trademark;
s << ") def\n";
- /* This information is not tquite correct. */
+ /* This information is not quite correct. */
s << "/Weight (";
s << Style;
s << ") def\n";
diff --git a/src/kernel/qpsprinter.ps b/src/kernel/qpsprinter.ps
index 4fbd9854..12a4c407 100644
--- a/src/kernel/qpsprinter.ps
+++ b/src/kernel/qpsprinter.ps
@@ -638,7 +638,7 @@
% if encoding is false the default one will be used.
/MF { % newname encoding fontlist
% this function tries to find a suitable postscript font.
- % We try tquite hard not to get courier for a
+ % We try quite hard not to get courier for a
% proportional font. The following takes an array of fonts.
% The algorithm will take the first font that
% gives a match (defined as not resulting in a courier font).
diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp
index 20b01dc5..3d0ad3b4 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/qscriptengine_x11.cpp
@@ -2402,7 +2402,7 @@ static inline KhmerCharClass getKhmerCharClass(const TQChar &uc)
// eliminating it would very much complicate the table, and it does not create typing
// problems, as the case above.
//
-// The table is tquite complex, in order to limit the number of coeng consonants
+// The table is quite complex, in order to limit the number of coeng consonants
// to 2 (by means of the table).
//
// There a peculiarity, as far as Unicode is concerned:
diff --git a/src/kernel/qt_x11_p.h b/src/kernel/qt_x11_p.h
index f3447dea..a573ba64 100644
--- a/src/kernel/qt_x11_p.h
+++ b/src/kernel/qt_x11_p.h
@@ -89,7 +89,7 @@
#if defined (QT_TABLET_SUPPORT)
# include <X11/extensions/XInput.h>
#if defined (Q_OS_IRIX)
-# include <wacom.h> // wacom driver defines for IRIX (tquite handy)
+# include <wacom.h> // wacom driver defines for IRIX (quite handy)
#endif
#endif // QT_TABLET_SUPPORT
diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp
index f6a02ee9..39ace415 100644
--- a/src/kernel/qtimer.cpp
+++ b/src/kernel/qtimer.cpp
@@ -308,7 +308,7 @@ bool TQSingleShotTimer::event( TQEvent * )
int main( int argc, char **argv )
{
TQApplication a( argc, argv );
- TQTimer::singleShot( 10*60*1000, &a, SLOT(tquit()) );
+ TQTimer::singleShot( 10*60*1000, &a, SLOT(quit()) );
... // create and show your widgets
return a.exec();
}
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index f531cfc9..4d851988 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -288,7 +288,7 @@
widget flag).
\i \c{const char *name = 0} is the widget name of the new
widget. You can access it using name(). The widget name is little
- used by programmers but is tquite useful with GUI builders such as
+ used by programmers but is quite useful with GUI builders such as
\e{TQt Designer} (you can name a widget in \e{TQt Designer}, and
connect() to it using the name in your code). The dumpObjectTree()
debugging function also uses it.
@@ -333,10 +333,10 @@
mouse button is held down, this popup immediately steals the mouse
events.
- \i mouseDoubleClickEvent() - not tquite as obvious as it might seem.
+ \i mouseDoubleClickEvent() - not quite as obvious as it might seem.
If the user double-clicks, the widget receives a mouse press event
(perhaps a mouse move event or two if they don't hold the mouse
- tquite steady), a mouse release event and finally this event. It is
+ quite steady), a mouse release event and finally this event. It is
\e{not possible} to distinguish a click from a double click until you've
seen whether the second click arrives. (This is one reason why most GUI
books recommend that double clicks be an extension of single clicks,
@@ -956,7 +956,7 @@ TQWidget::~TQWidget()
if ( TQApplication::main_widget == this ) { // reset main widget
TQApplication::main_widget = 0;
if (qApp)
- qApp->tquit();
+ qApp->quit();
}
if ( hasFocus() )
@@ -4274,7 +4274,7 @@ void TQWidget::polish()
Note that closing the \l TQApplication::mainWidget() terminates the
application.
- \sa closeEvent(), TQCloseEvent, hide(), TQApplication::tquit(),
+ \sa closeEvent(), TQCloseEvent, hide(), TQApplication::quit(),
TQApplication::setMainWidget(), TQApplication::lastWindowClosed()
*/
@@ -4316,7 +4316,7 @@ bool TQWidget::close( bool alsoDelete )
emit qApp->lastWindowClosed();
}
if ( isMain )
- qApp->tquit();
+ qApp->quit();
if ( deleted )
return TRUE;
is_closing = 0;